更改设备状态

module_tpm/src/main/java/org/jeecg/modules/equipmentStatus/entity/EquipmentStatus.java

@@ -138,6 +138,11 @@ public class EquipmentStatus implements Serializable {
     @ApiModelProperty(value = "设备编号")
     private String equipmentcode;
 
+    /**设备名称*/
+    @TableField(exist = false)
+    @ApiModelProperty(value = "设备名称")
+    private String equipmentname;
+
     /**值*/
     @TableField(exist = false)
     @ApiModelProperty(value = "值")

module_tpm/src/main/java/org/jeecg/modules/equipmentStatus/mapper/xml/EquipmentStatusMapper.xml

@@ -28,6 +28,7 @@
         <result property="logtime"    column="logtime"    />
         <result property="status"    column="status"    />
         <result property="equipmentcode"    column="equipmentcode"    />
+        <result property="equipmentname"    column="equipmentname"    />
         <result property="tagvalue"    column="tagvalue"    />
     </resultMap>
 
@@ -48,7 +49,7 @@
     </select>
 
     <select id="listStatus" resultMap="EquipmentStatusResult">
-        select s.equipmentid,s.status, e.equipmentcode, d.electricityvalue as tagvalue,
+        select s.equipmentid,s.status, e.equipmentcode, e.equipmentname, d.electricityvalue as tagvalue,
             s.tagvaluep, s.tagvalueca, s.tagvalueva, s.tagvaluecb, s.tagvaluevb, s.tagvaluecc, s.tagvaluevc
         from tpm_equipment as e
         left join tpm_equipment_status as s

module_tpm/src/main/java/org/jeecg/modules/tpmparams/entity/TpmParams.java

@@ -47,10 +47,10 @@ public class TpmParams implements Serializable {
     private java.lang.String symbol;
     /**最小值*/
     @ApiModelProperty(value = "最小值")
-    private java.lang.String minvalue;
+    private java.lang.String minv;
     /**最大值*/
     @ApiModelProperty(value = "最大值")
-    private java.lang.String maxvalue;
+    private java.lang.String maxv;
     /**类型：int，float，long*/
     @ApiModelProperty(value = "类型")
     private java.lang.String valuetype;

module_tpm/src/main/java/org/jeecg/modules/tpmparams/mapper/xml/TpmParamsMapper.xml

@@ -8,15 +8,15 @@
         <result property="equipmentcode"    column="equipmentcode"    />
         <result property="tagname"    column="tagname"    />
         <result property="symbol"    column="symbol"    />
-        <result property="minvalue"    column="minvalue"    />
-        <result property="maxvalue"    column="maxvalue"    />
+        <result property="minv"    column="minv"    />
+        <result property="maxv"    column="maxv"    />
         <result property="valuetype"    column="valuetype"    />
         <result property="createTime"    column="create_time"    />
         <result property="sysOrgCode"    column="sys_org_code"    />
     </resultMap>
 
     <sql id="selectTpmParamsVo">
-        select id, equipmentname, equipmentcode, tagname, symbol, minvalue, maxvalue, valuetype, create_time, sys_org_code
+        select id, equipmentname, equipmentcode, tagname, symbol, minv, maxv, valuetype, create_time, sys_org_code
         from tpm_params
     </sql>