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<CameraInfoMapper, CameraI
             return "1";//参数为空
         }
 
-        QueryWrapper<CameraInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("nu_id",nuId);
-        List<CameraInfo> 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<Map<String,Object>> list = (List<Map<String,Object>>) cameraList.get("list");
         for (Map<String, Object> map : list) {
@@ -2683,10 +2654,27 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
                 return "2";//设备ID为空;
             }
             cameraInfo = baseMapper.selectById(iotId);
+            String oldNuId = cameraInfo.getNuId();
             //判断如果新的机构和老的机构不相同则把老的机构删除
             String oldDataSourceCode = (String) map.get("oldServerUrl");
             if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
                 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("摄像头");
+                nuIotTqElectricitySyncLogDel.setNuId(cameraInfo.getNuId());
+                nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
             }
             cameraInfo.setNuId(nuId);
             cameraInfo.setNuName(nuName);
@@ -2711,6 +2699,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
             nuIotTqElectricitySyncLog.setStatus("成功");
             nuIotTqElectricitySyncLog.setContent("同步成功");
             nuIotTqElectricitySyncLog.setServerType("摄像头");
+            nuIotTqElectricitySyncLog.setNuId(oldNuId);
+            nuIotTqElectricitySyncLog.setNewNuId(nuId);
             nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
 
             //更新同步状态及旧系统编码
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 cd66f6d..e78816a 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
@@ -566,35 +566,6 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
             return "1";//参数为空
         }
 
-        QueryWrapper<ElectricityMeter> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("nu_id",nuId);
-        List<ElectricityMeter> 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<Map<String,Object>> list = (List<Map<String,Object>>) electricityList.get("list");
         for (Map<String, Object> map : list) {
@@ -604,10 +575,28 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
                 return "2";//设备ID为空;
             }
             electricityInfo = baseMapper.selectById(iotId);
+            String oldNuId = electricityInfo.getNuId();
             //判断如果新的机构和老的机构不相同则把老的机构删除
             String oldDataSourceCode = (String) map.get("oldServerUrl");
             if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
                 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("电表");
+                nuIotTqElectricitySyncLogDel.setNuId(electricityInfo.getNuId());
+                nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
             }
             electricityInfo.setNuId(nuId);
             electricityInfo.setNuName(nuName);
@@ -632,6 +621,8 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
             nuIotTqElectricitySyncLog.setStatus("成功");
             nuIotTqElectricitySyncLog.setContent("同步成功");
             nuIotTqElectricitySyncLog.setServerType("电表");
+            nuIotTqElectricitySyncLog.setNuId(oldNuId);
+            nuIotTqElectricitySyncLog.setNewNuId(nuId);
             nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
 
             //更新同步状态及旧系统编码
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 bc1852a..121393c 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
@@ -578,33 +578,6 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
             return "1";//参数为空
         }
 
-        QueryWrapper<WaterMeter> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("nu_id",nuId);
-        List<WaterMeter> 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<WaterMeterMapper, WaterMe
                 return "2";//设备ID为空;
             }
             waterInfo = baseMapper.selectById(iotId);
+            String oldNuId = waterInfo.getNuId();
             //判断如果新的机构和老的机构不相同则把老的机构删除
             String oldDataSourceCode = (String) map.get("oldServerUrl");
             if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
                 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("水表");
+                nuIotTqElectricitySyncLogDel.setNuId(waterInfo.getNuId());
+                nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
             }
             waterInfo.setNuId(nuId);
             waterInfo.setNuName(nuName);
@@ -644,6 +634,8 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
             nuIotTqElectricitySyncLog.setStatus("成功");
             nuIotTqElectricitySyncLog.setContent("同步成功");
             nuIotTqElectricitySyncLog.setServerType("水表");
+            nuIotTqElectricitySyncLog.setNuId(oldNuId);
+            nuIotTqElectricitySyncLog.setNewNuId(nuId);
             nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
 
             //更新同步状态及旧系统编码
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 3be6c84..97e27c5 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,35 +534,6 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
             return "1";//参数为空
         }
 
-        QueryWrapper<HumidDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("nu_id",nuId);
-        List<HumidDevice> 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<Map<String,Object>> list = (List<Map<String,Object>>) humidList.get("list");
         for (Map<String, Object> map : list) {
@@ -573,10 +544,28 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
                 return "2";//设备ID为空;
             }
             humidInfo = baseMapper.selectById(iotId);
+            String oldNuId = humidInfo.getNuId();
             //判断如果新的机构和老的机构不相同则把老的机构删除
             String oldDataSourceCode = (String) map.get("oldServerUrl");
             if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
                 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("温湿度计");
+                nuIotTqElectricitySyncLogDel.setNuId(humidInfo.getNuId());
+                nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
             }
             humidInfo.setNuId(nuId);
             humidInfo.setNuName(nuName);
@@ -601,6 +590,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
             nuIotTqElectricitySyncLog.setStatus("成功");
             nuIotTqElectricitySyncLog.setContent("同步成功");
             nuIotTqElectricitySyncLog.setServerType("温湿度计");
+            nuIotTqElectricitySyncLog.setNuId(oldNuId);
+            nuIotTqElectricitySyncLog.setNewNuId(nuId);
             nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
 
             //更新同步状态及旧系统编码