From 5afc1a020595df3c0eafd71ec5057fa50560297d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 16 Apr 2026 15:56:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E7=94=B5?= =?UTF-8?q?=E8=A1=A8SN=E9=AA=8C=E8=AF=81=E5=8F=8A=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/nu/dto/IotElectricityMeterMQDto.java | 1 + .../nu/modules/tq/electricity/entity/ElectricityMeter.java | 1 + .../tq/electricity/mapper/xml/ElectricityMeterMapper.xml | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java index 42247f63..f4c2c050 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java @@ -22,6 +22,7 @@ public class IotElectricityMeterMQDto{ private String readTime; /**描述*/ private String remark; + private String sim; /**区域编码*/ private String nuId; /**区域名称*/ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java index 1be0b886..58cbcea5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java @@ -67,6 +67,7 @@ public class ElectricityMeter implements Serializable { @Excel(name = "描述", width = 15) @ApiModelProperty(value = "描述") private String remark; + private String sim; @Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info") private String nuId;//护理单元ID diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index 59d08fde..163561b3 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -19,7 +19,8 @@ a.depart_server_url as departServerUrl, a.old_server_url , a.sync_type, - a.maintain_status + a.maintain_status, + a.sim from nu_iot_ds_electricity_meter a left join nu_base_info c on a.nu_id = c.nu_id @@ -58,7 +59,8 @@ a.depart_server_url as departServerUrl, a.old_server_url , a.sync_type, - a.maintain_status + a.maintain_status, + a.sim from nu_iot_ds_electricity_meter a @@ -72,6 +74,7 @@ read_time as readTime, ( case when timestampdiff(minute, str_to_date(read_time, '%y-%m-%d %h:%i:%s'), now()) > 120 then 'false' else 'true' end ) as online, remark, + sim, nu_id as nuId, nu_name as nuName, depart_id as departId,