From 84ea072d82e0605685c4dd8fdb8b2dc82d773c52 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 1 Aug 2025 09:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tplink/camera/mapper/xml/CameraInfoMapper.xml | 4 ++-- .../tplink/camera/service/impl/CameraInfoServiceImpl.java | 8 ++++++++ .../tq/electricity/mapper/xml/ElectricityMeterMapper.xml | 4 ++-- .../service/impl/ElectricityMeterServiceImpl.java | 8 ++++++++ .../nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml | 4 ++-- .../tq/water/service/impl/WaterMeterServiceImpl.java | 8 ++++++++ .../yiweilian/humid/mapper/xml/HumidDeviceMapper.xml | 4 ++-- .../humid/service/impl/HumidDeviceServiceImpl.java | 8 ++++++++ 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml index 9669ab2..32edcbd 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/mapper/xml/CameraInfoMapper.xml @@ -65,10 +65,10 @@ AND a.nu_id = #{params.nuId} - + AND a.nu_id is not null - + AND a.nu_id is null diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index 72abd13..27a7a14 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -2645,6 +2645,14 @@ public class CameraInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("nu_id",nuId); + List allList =baseMapper.selectList(queryWrapper); + //先清空掉原来的数据 + for(CameraInfo cameraInfo : allList){ + baseMapper.updateDepartById(cameraInfo); + } + List> list = (List>) cameraList.get("list"); for (Map map : list) { 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 78491a7..2c94465 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 @@ -49,10 +49,10 @@ AND b.csq < 10 - + AND a.nu_id is not null - + AND a.nu_id is null diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index e78816a..3565688 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -16,6 +16,7 @@ import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.utils.HttpTool; import com.nu.modules.tq.utils.SignTool; import com.nu.modules.tq.utils.TqApi; +import com.nu.modules.tq.water.entity.WaterMeter; import lombok.extern.slf4j.Slf4j; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.electricity.mapper.ElectricityMeterMapper; @@ -566,6 +567,13 @@ public class ElectricityMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("nu_id",nuId); + List allList =baseMapper.selectList(queryWrapper); + //先清空掉原来的数据 + for(ElectricityMeter cameraInfo : allList){ + baseMapper.updateDepartById(cameraInfo); + } List> list = (List>) electricityList.get("list"); for (Map map : list) { diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 8e11732..76dbf60 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -51,10 +51,10 @@ AND b.csq < 10 - + AND a.nu_id is not null - + AND a.nu_id is null diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 530ea25..adeec14 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.syncLog.entity.SyncLog; import com.nu.modules.syncLog.service.ISyncLogService; +import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tq.common.entity.TqApiLog; import com.nu.modules.tq.common.service.ITqApiLogService; import com.nu.modules.tq.electricity.entity.ElectricityMeter; @@ -578,6 +579,13 @@ public class WaterMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("nu_id",nuId); + List allList =baseMapper.selectList(queryWrapper); + //先清空掉原来的数据 + for(WaterMeter cameraInfo : allList){ + baseMapper.updateDepartById(cameraInfo); + } 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 ec83d8b..fd0b575 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 @@ -50,10 +50,10 @@ AND status = #{params.status} - + AND a.nu_id is not null - + AND a.nu_id is null 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 97e27c5..8374519 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 @@ -534,6 +534,14 @@ public class HumidDeviceServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("nu_id",nuId); + List allList =baseMapper.selectList(queryWrapper); + //先清空掉原来的数据 + for(HumidDevice cameraInfo : allList){ + baseMapper.updateDepartById(cameraInfo); + } + List> list = (List>) humidList.get("list"); for (Map map : list) {