From bf9e7f4cb8492843f841824bd5780510523ca5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 30 Jun 2025 08:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A9=E6=B9=BF=E5=BA=A6=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=94=B9=E5=81=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HumidDeviceController.java | 19 ++++++++-- .../yiweilian/humid/entity/HumidDevice.java | 2 + .../humid/mapper/HumidDeviceMapper.java | 2 +- .../humid/mapper/xml/HumidDeviceMapper.xml | 11 ++++-- .../humid/service/IHumidDeviceService.java | 2 +- .../service/impl/HumidDeviceServiceImpl.java | 37 +++++++++++-------- 6 files changed, 49 insertions(+), 24 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java index 8874f64..7eb4515 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/controller/HumidDeviceController.java @@ -62,15 +62,26 @@ public class HumidDeviceController extends JeecgController deleteDevice(HumidDevice humidDevice) { +// return service.deleteDevice(humidDevice); +// } + /** - * 删除设备 + * 启用/停用设备 * * @param humidDevice * @return */ - @GetMapping(value = "/deleteDevice") - public Result deleteDevice(HumidDevice humidDevice) { - return service.deleteDevice(humidDevice); + @GetMapping(value = "/delFlagDevice") + public Result delFlagDevice(HumidDevice humidDevice) { + return service.delFlagDevice(humidDevice); } /** diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java index 04b06ab..a11f5c6 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/entity/HumidDevice.java @@ -115,4 +115,6 @@ public class HumidDevice implements Serializable { private String oldDepartId;//原机构id private String oldDepartName;//原机构名称 + private String delFlag;//停用标识 0正常 1停用 + } \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java index ae13ef8..388d50b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java @@ -11,7 +11,7 @@ public interface HumidDeviceMapper extends BaseMapper { HumidDevice getHumidDevice(HumidDevice humidDevice); int insertDevice(HumidDevice humidDevice); int updateDevice(HumidDevice humidDevice); - int deleteDevice(HumidDevice humidDevice); + int delFlagDevice(HumidDevice humidDevice); int updateValue(HumidDevice humidDevice); int insertLog(HumidDevice humidDevice); IPage findLogPage(Page page, @Param("params") HumidDevice humidDevice); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml index 13e122f..acecd75 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml @@ -34,6 +34,7 @@ depart_server_url as departServerUrl, old_server_url , sync_type, + del_flag as delFlag, (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn from nu_iot_yiweilian_humid_device a @@ -84,6 +85,7 @@ depart_server_url as departServerUrl, old_server_url , sync_type, + del_flag as delFlag, (select count(*) from nu_iot_yiweilian_humid_alarm b where a.sn = b.sn and b.status = '0') as alarmCn from nu_iot_yiweilian_humid_device @@ -101,12 +103,14 @@ sn, time_code, device_name, + del_flag, create_time ) values( #{sn}, #{timeCode}, #{deviceName}, + '0', now() ) @@ -134,9 +138,9 @@ where sn = #{sn} - - delete from nu_iot_yiweilian_humid_device where sn = #{sn} - + + update nu_iot_yiweilian_humid_device set del_flag = #{delFlag} where sn = #{sn} + update nu_iot_yiweilian_humid_device @@ -147,6 +151,7 @@ reporting_time = #{reportingTime}, electricity = #{electricity} where sn = #{sn} + and del_flag = '0' diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java index a28145d..bdb5f0d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/IHumidDeviceService.java @@ -12,7 +12,7 @@ public interface IHumidDeviceService extends IService { String updateDeviceParameters(HumidDevice humidDevice,String type); String updateDeviceRealTime(HumidDevice humidDevice); Result updateDevice(HumidDevice humidDevice); - Result deleteDevice(HumidDevice humidDevice); + Result delFlagDevice(HumidDevice humidDevice); Result getDeviceParameters(HumidDevice humidDevice); IPage findLogPage(Page page, HumidDevice humidDevice); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java index 044ae88..ae53f84 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java @@ -332,26 +332,33 @@ public class HumidDeviceServiceImpl extends ServiceImpl deleteDevice(HumidDevice humidDevice){ - Map params = new HashMap<>(); - params.put("sn", humidDevice.getSn()); - String responseStr = yiweilianApi.deleteDevice(params); - JSONObject jsonObject = new JSONObject(responseStr); - Integer responseCode = jsonObject.getInt("code"); - if(responseCode.equals(0)){ - baseMapper.deleteDevice(humidDevice); - humidDevice.setOptType("delete"); + public Result delFlagDevice(HumidDevice humidDevice){ +// Map params = new HashMap<>(); +// params.put("sn", humidDevice.getSn()); +// String responseStr = yiweilianApi.deleteDevice(params); +// JSONObject jsonObject = new JSONObject(responseStr); +// Integer responseCode = jsonObject.getInt("code"); +// if(responseCode.equals(0)){ + String option = ""; + baseMapper.delFlagDevice(humidDevice); + if(humidDevice.getDelFlag().equals("0")){ + humidDevice.setOptType("activate"); + option = "启用成功"; + }else{ + humidDevice.setOptType("deactivated"); + option = "停用成功"; + } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); humidDevice.setOptBy(sysUser.getUsername()); baseMapper.insertLog(humidDevice); - return Result.OK("删除成功"); - }else{ - String error = "删除失败："+jsonObject.getStr("msg"); - return Result.error(error); - } + return Result.OK(option); +// }else{ +// String error = "删除失败："+jsonObject.getStr("msg"); +// return Result.error(error); +// } } /**