实时数据增加字段

baoshiwei

2023-06-07 5bcc4b8737ba70cc672fd5a1c64496a94c6ab7bd

实时数据增加字段

 doc/²¼ÊðÊÖ²á.docx

Binary files differ

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrder.java

@@ -146,5 +146,15 @@
    @ApiModelProperty(value = "操作人")
    private String operator;

    /**温度趋势*/
    @ApiModelProperty(value = "温度趋势")
    private String temps;

    /**蒸汽消耗*/
    @ApiModelProperty(value = "蒸汽消耗")
    private Double steam;

    /**电能消耗*/
    @ApiModelProperty(value = "电能消耗")
    private Double electric;
}

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java

@@ -84,4 +84,13 @@
    @Excel(name = "租户id", width = 15)
    @ApiModelProperty(value = "租户id")
    private Integer tenantId;


    /**蒸汽消耗*/
    @ApiModelProperty(value = "蒸汽消耗")
    private Double steam;

    /**电能消耗*/
    @ApiModelProperty(value = "电能消耗")
    private Double electric;
}

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java

@@ -61,6 +61,15 @@
    private Integer tenantId;


    /**蒸汽消耗*/
    @ApiModelProperty(value = "蒸汽消耗")
    private Double steam;

    /**电能消耗*/
    @ApiModelProperty(value = "电能消耗")
    private Double electric;


    public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
        this.fanFrequency = realTimeDataVo.getFanfrq();
        this.weight = realTimeDataVo.getWeight3();

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderVo.java

@@ -83,7 +83,14 @@
    /**租户id*/
    @ApiModelProperty(value = "租户id", example = "1000")
    private Integer tenantId;
    /**工单状态*/
    /**工单状态
     *      ä¸Šæ–™
     *      ç¿»æ–™
     *      å¹²ç‡¥
     *      ç§°é‡
     *      å‡ºæ–™
     *
     * */
    @ApiModelProperty(value = "工单状态")
    private String orderStatus;
    /**操作人*/
@@ -92,6 +99,17 @@
    private String operator;


    /**蒸汽消耗*/
    @ApiModelProperty(value = "蒸汽消耗")
    private Double steam;

    /**电能消耗*/
    @ApiModelProperty(value = "电能消耗")
    private Double electric;
    /**故障*/
    @ApiModelProperty(value = "故障")
    private String fault;

    @ApiModelProperty(value = "明细数据列表")
    private List<DryOrderTrendVo> detailList = new ArrayList<>();
    @ApiModelProperty(value = "明细")

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java

@@ -16,8 +16,9 @@
    /**药材名称*/
    private String name;

    /**租户ID*/
    private Integer tenantid;

    /**设备编号*/
    private String machineid;
    /**荡料延时*/
    private Integer delay;

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java

@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.entity.DryEquipment;
import org.jeecg.modules.dry.service.IDryEqpTypeService;
import org.jeecg.modules.dry.service.IDryEquipmentService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -52,6 +53,9 @@
public class DryEquipmentController extends JeecgController<DryEquipment, IDryEquipmentService> {
    @Autowired
    private IDryEquipmentService dryEquipmentService;

    @Autowired
    private IDryEqpTypeService dryEqpTypeService;

    /**
     * åˆ†é¡µåˆ—表查询
@@ -92,6 +96,7 @@
        //------------------------------------------------------------------------------------------------
        QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

        queryWrapper.orderByAsc("code");
        List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
        return Result.OK(eqps);
    }
@@ -167,6 +172,7 @@
    @GetMapping(value = "/queryById")
    public Result<DryEquipment> queryById(@RequestParam(name="id",required=true) String id) {
        DryEquipment dryEquipment = dryEquipmentService.getById(id);
        dryEquipment.setType(dryEqpTypeService.getById(dryEquipment.getType()).getName());
        if(dryEquipment==null) {
            return Result.error("未找到对应数据");
        }

 pom.xml

@@ -56,7 +56,7 @@
        <minidao.version>1.9.0</minidao.version>

        <!-- ç§¯æœ¨æŠ¥è¡¨-->
        <jimureport-spring-boot-starter.version>1.5.6</jimureport-spring-boot-starter.version>
        <jimureport-spring-boot-starter.version>1.5.8</jimureport-spring-boot-starter.version>
        <commons.version>2.6</commons.version>
        <aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
        <aliyun.oss.version>3.11.2</aliyun.oss.version>
@@ -332,6 +332,7 @@
                </exclusions>
            </dependency>
            <!-- ç§¯æœ¨æŠ¥è¡¨-->

            <dependency>
                <groupId>org.jeecgframework.jimureport</groupId>
                <artifactId>jimureport-spring-boot-starter</artifactId>
@@ -346,7 +347,7 @@
            <dependency>
                <groupId>org.jeecgframework.jimureport</groupId>
                <artifactId>jimureport-nosql-starter</artifactId>
                <version>${jimureport-spring-boot-starter.version}</version>
                <version>1.5.6</version>
            </dependency>
        </dependencies>
    </dependencyManagement>