From ad9a4940ec4a6ff7af58067af7920ceb1b912190 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 30 Jul 2025 16:09:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=AB?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/syncLog/entity/SyncLog.java | 6 +-- .../service/impl/CameraInfoServiceImpl.java | 48 +++++++----------- .../impl/ElectricityMeterServiceImpl.java | 49 ++++++++----------- .../service/impl/WaterMeterServiceImpl.java | 46 +++++++---------- .../service/impl/HumidDeviceServiceImpl.java | 49 ++++++++----------- 5 files changed, 81 insertions(+), 117 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java index 7ffb6c3..85bd708 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java @@ -97,8 +97,8 @@ public class SyncLog implements Serializable { @Excel(name = "服务类型", width = 15) @ApiModelProperty(value = "服务类型") private String serverType; - @ApiModelProperty(value = "现在的nuid") - private String nuId; @ApiModelProperty(value = "原来的nuid") - private String oldNuId; + private String nuId; + @ApiModelProperty(value = "现在的nuid") + private String newNuId; } 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 6e51b95..72abd13 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,35 +2645,6 @@ public class CameraInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id",nuId); - List allList =baseMapper.selectList(queryWrapper); - //先清空掉原来的数据 - for(CameraInfo cameraInfo : allList){ - syncImpl.syncCameraDel(cameraInfo.getOldServerUrl(),cameraInfo); - - - SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); - nuIotTqElectricitySyncLogDel.setId(null); - nuIotTqElectricitySyncLogDel.setMainId(cameraInfo.getDeviceIndex()); - nuIotTqElectricitySyncLogDel.setMainName(cameraInfo.getDeviceName()); - nuIotTqElectricitySyncLogDel.setSyncType("删除"); - nuIotTqElectricitySyncLogDel.setOrgId(cameraInfo.getOldDepartId()); - nuIotTqElectricitySyncLogDel.setOrgCode(cameraInfo.getOldServerUrl()); - nuIotTqElectricitySyncLogDel.setOrgName(cameraInfo.getOldDepartName()); - nuIotTqElectricitySyncLogDel.setNewOrgId(cameraInfo.getDepartId()); - nuIotTqElectricitySyncLogDel.setNewOrgCode(cameraInfo.getDepartServerUrl()); - nuIotTqElectricitySyncLogDel.setNewOrgName(cameraInfo.getDepartName()); - nuIotTqElectricitySyncLogDel.setStatus("成功"); - nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); - nuIotTqElectricitySyncLogDel.setServerType("摄像头"); - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); - - baseMapper.updateDepartById(cameraInfo); - } - - - List> list = (List>) cameraList.get("list"); for (Map map : list) { @@ -2683,10 +2654,27 @@ public class CameraInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id",nuId); - List allList =baseMapper.selectList(queryWrapper); - //先清空掉原来的数据 - for(ElectricityMeter electricityInfo : allList){ - syncImpl.syncElectricityDel(electricityInfo.getOldServerUrl(),electricityInfo); - - - SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); - nuIotTqElectricitySyncLogDel.setId(null); - nuIotTqElectricitySyncLogDel.setMainId(electricityInfo.getCid()); - nuIotTqElectricitySyncLogDel.setMainName(electricityInfo.getCid()); - nuIotTqElectricitySyncLogDel.setSyncType("删除"); - nuIotTqElectricitySyncLogDel.setOrgId(electricityInfo.getOldDepartId()); - nuIotTqElectricitySyncLogDel.setOrgCode(electricityInfo.getOldServerUrl()); - nuIotTqElectricitySyncLogDel.setOrgName(electricityInfo.getOldDepartName()); - nuIotTqElectricitySyncLogDel.setNewOrgId(electricityInfo.getDepartId()); - nuIotTqElectricitySyncLogDel.setNewOrgCode(electricityInfo.getDepartServerUrl()); - nuIotTqElectricitySyncLogDel.setNewOrgName(electricityInfo.getDepartName()); - nuIotTqElectricitySyncLogDel.setStatus("成功"); - nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); - nuIotTqElectricitySyncLogDel.setServerType("电表"); - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); - - baseMapper.updateDepartById(electricityInfo); - } - - - List> list = (List>) electricityList.get("list"); for (Map map : list) { @@ -604,10 +575,28 @@ public class ElectricityMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id",nuId); - List allList =baseMapper.selectList(queryWrapper); - //先清空掉原来的数据 - for(WaterMeter waterInfo : allList){ - syncImpl.syncElectricityDel(waterInfo.getOldServerUrl(),waterInfo); - - - SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); - nuIotTqElectricitySyncLogDel.setId(null); - nuIotTqElectricitySyncLogDel.setMainId(waterInfo.getCid()); - nuIotTqElectricitySyncLogDel.setMainName(waterInfo.getCid()); - nuIotTqElectricitySyncLogDel.setSyncType("删除"); - nuIotTqElectricitySyncLogDel.setOrgId(waterInfo.getOldDepartId()); - nuIotTqElectricitySyncLogDel.setOrgCode(waterInfo.getOldServerUrl()); - nuIotTqElectricitySyncLogDel.setOrgName(waterInfo.getOldDepartName()); - nuIotTqElectricitySyncLogDel.setNewOrgId(waterInfo.getDepartId()); - nuIotTqElectricitySyncLogDel.setNewOrgCode(waterInfo.getDepartServerUrl()); - nuIotTqElectricitySyncLogDel.setNewOrgName(waterInfo.getDepartName()); - nuIotTqElectricitySyncLogDel.setStatus("成功"); - nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); - nuIotTqElectricitySyncLogDel.setServerType("水表"); - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); - - baseMapper.updateDepartById(waterInfo); - } - @@ -616,10 +589,27 @@ public class WaterMeterServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("nu_id",nuId); - List allList =baseMapper.selectList(queryWrapper); - //先清空掉原来的数据 - for(HumidDevice humidInfo : allList){ - syncImpl.syncElectricityDel(humidInfo.getOldServerUrl(),humidInfo); - - - SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); - nuIotTqElectricitySyncLogDel.setId(null); - nuIotTqElectricitySyncLogDel.setMainId(humidInfo.getSn()); - nuIotTqElectricitySyncLogDel.setMainName(humidInfo.getSn()); - nuIotTqElectricitySyncLogDel.setSyncType("删除"); - nuIotTqElectricitySyncLogDel.setOrgId(humidInfo.getOldDepartId()); - nuIotTqElectricitySyncLogDel.setOrgCode(humidInfo.getOldServerUrl()); - nuIotTqElectricitySyncLogDel.setOrgName(humidInfo.getOldDepartName()); - nuIotTqElectricitySyncLogDel.setNewOrgId(humidInfo.getDepartId()); - nuIotTqElectricitySyncLogDel.setNewOrgCode(humidInfo.getDepartServerUrl()); - nuIotTqElectricitySyncLogDel.setNewOrgName(humidInfo.getDepartName()); - nuIotTqElectricitySyncLogDel.setStatus("成功"); - nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构温湿度计数据"); - nuIotTqElectricitySyncLogDel.setServerType("温湿度计"); - nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); - - baseMapper.updateDepartById(humidInfo); - } - - - List> list = (List>) humidList.get("list"); for (Map map : list) { @@ -573,10 +544,28 @@ public class HumidDeviceServiceImpl extends ServiceImpl