修改仓库数据相差八小时的问题；

修改mqtt判断是否重发配置的问题

src/main/java/com/example/tdl/domain/vo/WarehouseTimeAndDataVo.java

@@ -6,6 +6,14 @@ public class WarehouseTimeAndDataVo {
 
     private String value;
 
+    public WarehouseTimeAndDataVo() {
+    }
+
+    public WarehouseTimeAndDataVo(String time, String value) {
+        this.time = time;
+        this.value = value;
+    }
+
     public String getTime() {
         return time;
     }

src/main/java/com/example/tdl/domain/vo/WarehouseVo.java

+package com.example.tdl.domain.vo;
+
+public class WarehouseVo {
+
+    private String offset;
+
+    private String  warehouseNo;
+
+    public String getOffset() {
+        return offset;
+    }
+
+    public void setOffset(String offset) {
+        this.offset = offset;
+    }
+
+    public String getWarehouseNo() {
+        return warehouseNo;
+    }
+
+    public void setWarehouseNo(String warehouseNo) {
+        this.warehouseNo = warehouseNo;
+    }
+}

src/main/java/com/example/tdl/mqtt/MqttListener.java

@@ -244,9 +244,9 @@ public class MqttListener implements MqttCallback {
                 return 3;//重发
             }
             if (compare(configCMDVo.getDevList(),checkInVo.getDevList())
-                    && checkInVo.getGprsPeriod()==configCMDVo.getGprsPeriod()
-                    && checkInVo.getGpsPeriod()==configCMDVo.getGpsPeriod()
-                    && checkInVo.getMode()==configCMDVo.getMode()
+                    && checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod())
+                    && checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod())
+                    && checkInVo.getMode().equals(configCMDVo.getMode())
                     && compare(configCMDVo.getTempL(),checkInVo.getTempL())
                     && compare(configCMDVo.getTempH(),checkInVo.getTempH())
                     && compare(configCMDVo.getHumiL(),checkInVo.getHumiL())

src/main/resources/application.properties

@@ -41,7 +41,7 @@ logging.config=classpath:logback.xml
 
 
 # Mqtt
-tdl.mqtt.url = ssl://172.16.1.11
+tdl.mqtt.url = ssl://172.16.1.24
 tdl.mqtt.port = 8883
 tdl.mqtt.username = ugen
 tdl.mqtt.password = ugen