From 5bc6a1e993752d48e859bc1a6f1438a404c57e94 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Tue, 17 Mar 2026 17:07:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=BE=E5=A4=87=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=80=BC=EF=BC=8C=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E6=96=B0=E5=AE=89=E8=A3=85=E8=AE=BE=E5=A4=87=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E7=BB=9F=E8=AE=A1=EF=BC=9B=202=E3=80=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E5=93=8D=E5=BA=94=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=A4=84=E7=90=86=EF=BC=8C=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E6=97=B6=E5=8C=BA=E6=8E=A7=E5=88=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceInstallController.java | 3 +++ .../com/mh/user/dto/HotWaterControlVO.java | 2 +- .../entity/CollectionParamsManageEntity.java | 6 +++--- .../user/entity/MqttSubscriptionEntity.java | 4 ++-- .../com/mh/user/job/CollectionLoopRunner.java | 2 +- .../mh/user/mapper/DeviceInstallMapper.java | 6 ++++-- .../src/main/resources/application-prod.yml | 20 +++++++++---------- 7 files changed, 24 insertions(+), 19 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java b/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java index d8b15c1..cb6819f 100644 --- a/user-service/src/main/java/com/mh/user/controller/DeviceInstallController.java +++ b/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=""; diff --git a/user-service/src/main/java/com/mh/user/dto/HotWaterControlVO.java b/user-service/src/main/java/com/mh/user/dto/HotWaterControlVO.java index 658675a..d4e5ef4 100644 --- a/user-service/src/main/java/com/mh/user/dto/HotWaterControlVO.java +++ b/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; diff --git a/user-service/src/main/java/com/mh/user/entity/CollectionParamsManageEntity.java b/user-service/src/main/java/com/mh/user/entity/CollectionParamsManageEntity.java index d785b62..89a259e 100644 --- a/user-service/src/main/java/com/mh/user/entity/CollectionParamsManageEntity.java +++ b/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: 否) */ diff --git a/user-service/src/main/java/com/mh/user/entity/MqttSubscriptionEntity.java b/user-service/src/main/java/com/mh/user/entity/MqttSubscriptionEntity.java index 0c526f6..c61986b 100644 --- a/user-service/src/main/java/com/mh/user/entity/MqttSubscriptionEntity.java +++ b/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; /** 备注 */ diff --git a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java b/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java index 5ee049d..d5d774b 100644 --- a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java +++ b/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(); } /** diff --git a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java index 3a69243..bc1529d 100644 --- a/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java +++ b/user-service/src/main/java/com/mh/user/mapper/DeviceInstallMapper.java @@ -19,8 +19,8 @@ public interface DeviceInstallMapper extends BaseMapper { * 保存设备信息 * @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 (" + - " #{deviceAddr},#{deviceName},#{deviceType},#{dataCom},#{ratio},#{baudRate},#{brand},#{model},#{buildingId},#{buildingName},#{installer},getDate(),#{use},#{parity})") + @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},#{initValue},#{initValue},getDate())") int saveDevice(DeviceInstallEntity deviceInstallEntity); /** @@ -44,6 +44,8 @@ public interface DeviceInstallMapper extends BaseMapper { " , building_id = #{buildingId} " + " , remarks = #{remarks} " + " , parity = #{parity} " + + " , init_value = #{initValue} " + + " , last_value = #{initValue} , last_date = getDate() " + " where id = #{id} " + "") int updateDevice(DeviceInstallEntity deviceInstallEntity); diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml index 6a0a56b..bb8a779 100644 --- a/user-service/src/main/resources/application-prod.yml +++ b/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 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - username: chws_jm - password: Mhtech@803 +# # 华软江门 +# url: jdbc:sqlserver://127.0.0.1:57238;DatabaseName=chws_jm;allowMultiQueries=true;encrypt=false +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# username: chws_jm +# 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 -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# username: chws_nfxy -# password: minghan@123456 + #南方学院 + url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + username: chws_nfxy + password: minghan@123456 filters: stat,wall,config max-active: 100