Browse Source

更新字段

zhuoning 4 years ago
parent
commit
caaa69c77c

+ 21 - 21
huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/entity/DeviceUpdataEntity.java

@@ -63,14 +63,14 @@ public class DeviceUpdataEntity implements Serializable {
     @Column(name = "tenant_id")
     private String tenantId;
 
-    @Column(name = "convert_temp")
-    private double convertTemp;
+    @Column(name = "data_temp_convert")
+    private double dataTempConvert;
 
-    @Column(name = "convert_humi")
-    private double convertHumi;
+    @Column(name = "data_humi_convert")
+    private double dataHumiConvert;
 
-    @Column(name = "convert_bat")
-    private double convertBat;
+    @Column(name = "data_bat_convert")
+    private double dataBatConvert;
 
     public void setId(Integer id) {
         this.id = id;
@@ -216,28 +216,28 @@ public class DeviceUpdataEntity implements Serializable {
         this.tenantId = tenantId;
     }
 
-    public double getConvertTemp() {
-        return convertTemp;
+    public double getDataTempConvert() {
+        return dataTempConvert;
     }
 
-    public void setConvertTemp(double convertTemp) {
-        this.convertTemp = convertTemp;
+    public void setDataTempConvert(double dataTempConvert) {
+        this.dataTempConvert = dataTempConvert;
     }
 
-    public double getConvertHumi() {
-        return convertHumi;
+    public double getDataHumiConvert() {
+        return dataHumiConvert;
     }
 
-    public void setConvertHumi(double convertHumi) {
-        this.convertHumi = convertHumi;
+    public void setDataHumiConvert(double dataHumiConvert) {
+        this.dataHumiConvert = dataHumiConvert;
     }
 
-    public double getConvertBat() {
-        return convertBat;
+    public double getDataBatConvert() {
+        return dataBatConvert;
     }
 
-    public void setConvertBat(double convertBat) {
-        this.convertBat = convertBat;
+    public void setDataBatConvert(double dataBatConvert) {
+        this.dataBatConvert = dataBatConvert;
     }
 
     @Override
@@ -261,9 +261,9 @@ public class DeviceUpdataEntity implements Serializable {
                 ", dataHumi=" + dataHumi +
                 ", dataBat=" + dataBat +
                 ", tenantId='" + tenantId + '\'' +
-                ", convertTemp=" + convertTemp +
-                ", convertHumi=" + convertHumi +
-                ", convertBat=" + convertBat +
+                ", dataTempConvert=" + dataTempConvert +
+                ", dataHumiConvert=" + dataHumiConvert +
+                ", dataBatConvert=" + dataBatConvert +
                 '}';
     }
 }

+ 3 - 3
huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/service/impl/DeviceDataServiceImpl.java

@@ -74,9 +74,9 @@ public class DeviceDataServiceImpl implements IDeviceDataService {
         deviceUpdataEntity.setDataHumi(dataHumi);
         deviceUpdataEntity.setDataBat(dataBat);
         deviceUpdataEntity.setTenantId(tenantId);
-        deviceUpdataEntity.setConvertTemp(mathUtil.formatDecimalNumber(dataTemp*0.1,1));
-        deviceUpdataEntity.setConvertHumi(mathUtil.formatDecimalNumber(dataHumi*0.1,1));
-        deviceUpdataEntity.setConvertBat(mathUtil.formatDecimalNumber(dataBat*0.01,1));
+        deviceUpdataEntity.setDataTempConvert(mathUtil.formatDecimalNumber(dataTemp*0.1,1));
+        deviceUpdataEntity.setDataHumiConvert(mathUtil.formatDecimalNumber(dataHumi*0.1,1));
+        deviceUpdataEntity.setDataBatConvert(mathUtil.formatDecimalNumber(dataBat*0.01,1));
 //        System.out.println("dataTemp/10:"+mathUtil.formatDecimalNumber(dataTemp*0.1,1));
 //        System.out.println("dataHumi/10:"+mathUtil.formatDecimalNumber(dataHumi*0.1,1));
 //        System.out.println("dataBat/10:"+mathUtil.formatDecimalNumber(dataBat*0.01,1));