From 8fdd37fdac1d0d0d6e503f75b3cd485bbb4883cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 17 Apr 2026 17:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87BUG?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceManagerController.java | 3 +- .../modules/manager/entity/DeviceManager.java | 2 ++ .../manager/mapper/DeviceManagerMapper.java | 1 + .../mapper/xml/DeviceManagerMapper.xml | 33 ++++++++++++++++--- .../service/IDeviceManagerService.java | 3 +- .../impl/DeviceManagerServiceImpl.java | 8 ++++- 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java index be89918b..7bf33ca1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java @@ -127,8 +127,7 @@ public class DeviceManagerController extends JeecgController edit(@RequestBody DeviceManager deviceManager) { - service.updateManager(deviceManager); - return Result.OK("编辑成功!"); + return service.updateManager(deviceManager); } /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java index 68b2ffda..00abb133 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java @@ -52,5 +52,7 @@ public class DeviceManager implements Serializable { private String onlineStatus;//在线状态 private String deviceStatus;//设备状态 private Integer ywId;//运维ID + @TableField(exist = false) + private String deviceIndex; } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java index 699a7bfd..f78b4b4a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java @@ -22,6 +22,7 @@ import java.util.List; public interface DeviceManagerMapper extends BaseMapper { IPage findPage(Page page, @Param("params") DeviceManager deviceManager); IPage findAllPage(Page page, @Param("params") DeviceManager deviceManager); + DeviceManager findBySn(DeviceManager deviceManager); IPage findBingLogPage(Page page, @Param("params") DeviceBindLog deviceBindLog); void addLog(DeviceBindLog deviceBindLog); List queryNuList(DeviceManager deviceManager); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml index 7f0f9cde..f6c38450 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml @@ -18,24 +18,29 @@ a.remarks, a.device_status, ifnull(t.online_status,'待集成') as online_status, - a.yw_id + a.yw_id, + t.device_index from nu_iot_device_preview a left join nu_base_info c on a.nu_id = c.nu_id left join ( select mac as sn, - ( case device_status when '0' then '离线' when '1' then '在线' end ) as online_status + ( case device_status when '0' then '离线' when '1' then '在线' end ) as online_status, + device_index from nu_iot_tplink_camera union all select sn, - ( case relay_state when '0' then '离线' else '在线' end ) as online_status + ( case relay_state when '0' then '离线' else '在线' end ) as online_status, + '' as device_index from nu_iot_ds_electricity_meter union all select cid as sn, - ( case relay_state when '0' then '离线' else '在线' end ) as online_status + ( case relay_state when '0' then '离线' else '在线' end ) as online_status, + '' as device_index from nu_iot_tq_water_meter union all select sn, - ( case status when '0' then '在线' else '离线' end ) as online_status + ( case status when '0' then '在线' else '离线' end ) as online_status, + '' as device_index from nu_iot_yiweilian_humid_device ) t on a.sn = t.sn where a.sn is not null @@ -77,6 +82,24 @@ order by a.dimension,a.device_type,a.device_model,a.sn + +