1、设备安装增加初始值，防止新安装设备数据不统计；

2、优化时间响应格式化处理，之前缺少时区控制；

user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java

@@ -78,6 +78,9 @@ public class DeviceInstallController {
         }
         // 在创建新的device_code_param值
         deviceInstallService.createParamCode(deviceInstallEntity);
+        if (deviceInstallEntity.getLastValue() > 0) {
+            deviceInstallEntity.setInitValue(0);
+        }
         // 更新device_install
         deviceInstallService.updateDevice(deviceInstallEntity);
         String isUse="";

user-service/src/main/java/com/mh/user/dto/HotWaterControlVO.java

@@ -120,7 +120,7 @@ public class HotWaterControlVO {
     private String minSetId;
 
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date curTime;
 
     private int orderNum;

user-service/src/main/java/com/mh/user/entity/CollectionParamsManageEntity.java

@@ -27,12 +27,12 @@ public class CollectionParamsManageEntity implements Serializable {
     private Long id;
 
     /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
     private Long buildingId;
@@ -54,7 +54,7 @@ public class CollectionParamsManageEntity implements Serializable {
     private BigDecimal curValue;
     /** 当前时间 */
     /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date curTime;
     /** 是否是总表 (0: 是, 1: 否) */

user-service/src/main/java/com/mh/user/entity/MqttSubscriptionEntity.java

@@ -32,14 +32,14 @@ public class MqttSubscriptionEntity {
     private String createBy;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date createTime;
 
     /** 更新者 */
     private String updateBy;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date updateTime;
 
     /** 备注 */

user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java

@@ -70,7 +70,7 @@ public class CollectionLoopRunner implements ApplicationRunner {
 //		NettyEchoServer nettyEchoServer = new NettyEchoServer();
 //		nettyEchoServer.bind(8098);
 		// 初始化mqtt订阅记录
-//		initializeMqttSubscription();
+		initializeMqttSubscription();
 	}
 
 	/**

user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java

@@ -19,8 +19,8 @@ public interface DeviceInstallMapper extends BaseMapper<DeviceInstallEntity> {
      * 保存设备信息
      * @param deviceInstallEntity
      */
-    @Insert("insert into device_install(device_addr,device_name,device_type,data_com,ratio,baudrate,brand,model,building_id,building_name,installer,install_date,is_use,parity) values (" +
+    @Insert("insert into device_install(device_addr,device_name,device_type,data_com,ratio,baudrate,brand,model,building_id,building_name,installer,install_date,is_use,parity,init_value,last_value,last_date) values (" +
-            " #{deviceAddr},#{deviceName},#{deviceType},#{dataCom},#{ratio},#{baudRate},#{brand},#{model},#{buildingId},#{buildingName},#{installer},getDate(),#{use},#{parity})")
+            " #{deviceAddr},#{deviceName},#{deviceType},#{dataCom},#{ratio},#{baudRate},#{brand},#{model},#{buildingId},#{buildingName},#{installer},getDate(),#{use},#{parity},#{initValue},#{initValue},getDate())")
     int saveDevice(DeviceInstallEntity deviceInstallEntity);
 
     /**
@@ -44,6 +44,8 @@ public interface DeviceInstallMapper extends BaseMapper<DeviceInstallEntity> {
             "  <if test='buildingId!=null'> , building_id = #{buildingId} </if>" +
             "  <if test='remarks!=null'> , remarks = #{remarks} </if>" +
             "  <if test='parity!=null'> , parity = #{parity} </if>" +
+            "  <if test='initValue!=0'> , init_value = #{initValue} </if>" +
+            "  <if test='initValue!=0'> , last_value = #{initValue} , last_date = getDate() </if>" +
             "   where id = #{id} " +
             "</script>")
     int updateDevice(DeviceInstallEntity deviceInstallEntity);

user-service/src/main/resources/application-prod.yml

@@ -74,11 +74,11 @@ spring:
 #      username: chws_gw
 #      password: chws_gw@803
 
-      # 华软江门
+#      # 华软江门
-      url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true;encrypt=false
+#      url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true;encrypt=false
-      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      username: chws_jm
+#      username: chws_jm
-      password: Mhtech@803
+#      password: Mhtech@803
 
 #      # 珠海北师大
 #      url: jdbc:sqlserver://127.0.0.1:8033;DatabaseName=chws_bsdz;allowMultiQueries=true;encrypt=false
@@ -86,11 +86,11 @@ spring:
 #      username: chws_bsdz
 #      password: Mhtech@803803
 
-#      #南方学院
+      #南方学院
-#      url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false
+      url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      username: chws_nfxy
+      username: chws_nfxy
-#      password: minghan@123456
+      password: minghan@123456
 
       filters: stat,wall,config
       max-active: 100