From 9e2b62113a267ab5a5526fe84405b71ad5b6e511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 9 Apr 2026 17:25:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/mapper/DeviceManagerMapper.java | 2 +- .../mapper/xml/DeviceManagerMapper.xml | 6 ++++++ .../service/IDeviceManagerService.java | 1 + .../impl/DeviceManagerServiceImpl.java | 5 +++++ .../device/listener/IotSyncBizMQListener.java | 21 +++++++++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) 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 9ccbb9ba..699a7bfd 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 @@ -34,5 +34,5 @@ public interface DeviceManagerMapper extends BaseMapper { IPage findElectricityMeterUnbindPage(Page page, @Param("params") DeviceManager deviceManager); List humidDeviceList(DeviceManager deviceManager); IPage findHumidDeviceUnbindPage(Page page, @Param("params") DeviceManager deviceManager); - + void editPreviewStatusBySn(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 38e7b224..4bcbca1f 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 @@ -194,4 +194,10 @@ and a.device_status != '损坏' + + update nu_iot_device_preview + set device_status = #{deviceStatus} + where sn = #{sn} + + diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java index f397b21c..aed23975 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/IDeviceManagerService.java @@ -32,4 +32,5 @@ public interface IDeviceManagerService extends IService { IPage findElectricityMeterUnbindPage(Page page, DeviceManager deviceManager); IPage findWaterMeterUnbindPage(Page page, DeviceManager deviceManager); IPage findHumidDeviceUnbindPage(Page page, DeviceManager deviceManager); + void editPreviewStatusBySn(DeviceManager deviceManager); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java index d5099070..72eac10d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/service/impl/DeviceManagerServiceImpl.java @@ -123,4 +123,9 @@ public class DeviceManagerServiceImpl extends ServiceImpl findHumidDeviceUnbindPage(Page page, DeviceManager deviceManager) { return baseMapper.findHumidDeviceUnbindPage(page,deviceManager); } + + @Override + public void editPreviewStatusBySn(DeviceManager deviceManager){ + baseMapper.editPreviewStatusBySn(deviceManager); + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java index 02b32340..763cce50 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/mq/device/listener/IotSyncBizMQListener.java @@ -3,6 +3,8 @@ package com.nu.mq.device.listener; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.dto.*; import com.nu.entity.NuBaseInfoEntity; +import com.nu.modules.manager.entity.DeviceManager; +import com.nu.modules.manager.service.IDeviceManagerService; import com.nu.modules.nubaseinfo.api.INuBaseInfoApi; import com.nu.modules.tplink.camera.entity.CameraCapability; import com.nu.modules.tplink.camera.entity.CameraInfo; @@ -62,6 +64,9 @@ public class IotSyncBizMQListener { @Autowired private MqttMessageHandler mqttMessageHandler; + @Autowired + private IDeviceManagerService deviceManagerService; + @RabbitListener( bindings = @QueueBinding( value = @Queue(name = "#{iotDeviceAsyncDQNP.getSyncDeviceQueueName()}"), @@ -140,6 +145,10 @@ public class IotSyncBizMQListener { CameraInfo cameraInfo = new CameraInfo(); BeanUtils.copyProperties(iotCameraInfoMQDto, cameraInfo); cameraInfoService.save(cameraInfo); + DeviceManager deviceManager = new DeviceManager(); + deviceManager.setSn(iotCameraInfoMQDto.getMac()); + deviceManager.setDeviceStatus("正常"); + deviceManagerService.editPreviewStatusBySn(deviceManager); } statusList.add(statusMQDto); } @@ -215,6 +224,10 @@ public class IotSyncBizMQListener { BeanUtils.copyProperties(iotElectricityMeterMQDto, electricityMeter); electricityMeterService.save(electricityMeter); mqttMessageHandler.subscribeUplinkMessage(iotElectricityMeterMQDto.getSn()); + DeviceManager deviceManager = new DeviceManager(); + deviceManager.setSn(iotElectricityMeterMQDto.getSn()); + deviceManager.setDeviceStatus("正常"); + deviceManagerService.editPreviewStatusBySn(deviceManager); } statusList.add(statusMQDto); } @@ -258,6 +271,10 @@ public class IotSyncBizMQListener { WaterMeter waterMeter = new WaterMeter(); BeanUtils.copyProperties(iotWaterMeterMQDto, waterMeter); waterMeterService.save(waterMeter); + DeviceManager deviceManager = new DeviceManager(); + deviceManager.setSn(iotWaterMeterMQDto.getCid()); + deviceManager.setDeviceStatus("正常"); + deviceManagerService.editPreviewStatusBySn(deviceManager); } statusList.add(statusMQDto); } @@ -332,6 +349,10 @@ public class IotSyncBizMQListener { HumidDevice humidDevice = new HumidDevice(); BeanUtils.copyProperties(iotHumidDeviceMQDto, humidDevice); humidDeviceService.save(humidDevice); + DeviceManager deviceManager = new DeviceManager(); + deviceManager.setSn(iotHumidDeviceMQDto.getSn()); + deviceManager.setDeviceStatus("正常"); + deviceManagerService.editPreviewStatusBySn(deviceManager); } statusList.add(statusMQDto); }