yangjun
/
hldy_yunwei_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改字段含义

This commit is contained in:
yangjun 2025-07-30 16:09:27 +08:00
parent 47651c966a
commit ad9a4940ec
5 changed files with 81 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/syncLog/entity/SyncLog.java
View File

@ -97,8 +97,8 @@ public class SyncLog implements Serializable {
@Excel(name = "服务类型", width = 15) @Excel(name = "服务类型", width = 15)
@ApiModelProperty(value = "服务类型") @ApiModelProperty(value = "服务类型")
private String serverType; private String serverType;
@ApiModelProperty(value = "现在的nuid")
private String nuId;
@ApiModelProperty(value = "原来的nuid") @ApiModelProperty(value = "原来的nuid")
private String oldNuId; private String nuId;
@ApiModelProperty(value = "现在的nuid")
private String newNuId;
} }

42
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java
View File

@ -2645,14 +2645,20 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
return "1";//参数为空 return "1";//参数为空
} }
QueryWrapper<CameraInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("nu_id",nuId); List<Map<String,Object>> list = (List<Map<String,Object>>) cameraList.get("list");
List<CameraInfo> allList =baseMapper.selectList(queryWrapper); for (Map<String, Object> map : list) {
//先清空掉原来的数据 CameraInfo cameraInfo = new CameraInfo();
for(CameraInfo cameraInfo : allList){ String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
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); syncImpl.syncCameraDel(cameraInfo.getOldServerUrl(),cameraInfo);
SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
nuIotTqElectricitySyncLogDel.setMainId(cameraInfo.getDeviceIndex()); nuIotTqElectricitySyncLogDel.setMainId(cameraInfo.getDeviceIndex());
@ -2667,26 +2673,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
nuIotTqElectricitySyncLogDel.setStatus("成功"); nuIotTqElectricitySyncLogDel.setStatus("成功");
nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据");
nuIotTqElectricitySyncLogDel.setServerType("摄像头"); nuIotTqElectricitySyncLogDel.setServerType("摄像头");
nuIotTqElectricitySyncLogDel.setNuId(cameraInfo.getNuId());
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
baseMapper.updateDepartById(cameraInfo);
}
List<Map<String,Object>> list = (List<Map<String,Object>>) cameraList.get("list");
for (Map<String, Object> map : list) {
CameraInfo cameraInfo = new CameraInfo();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
return "2";//设备ID为空;
}
cameraInfo = baseMapper.selectById(iotId);
//判断如果新的机构和老的机构不相同则把老的机构删除
String oldDataSourceCode = (String) map.get("oldServerUrl");
if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
syncImpl.syncCameraDel(cameraInfo.getOldServerUrl(),cameraInfo);
} }
cameraInfo.setNuId(nuId); cameraInfo.setNuId(nuId);
cameraInfo.setNuName(nuName); cameraInfo.setNuName(nuName);
@ -2711,6 +2699,8 @@ public class CameraInfoServiceImpl extends ServiceImpl<CameraInfoMapper, CameraI
nuIotTqElectricitySyncLog.setStatus("成功"); nuIotTqElectricitySyncLog.setStatus("成功");
nuIotTqElectricitySyncLog.setContent("同步成功"); nuIotTqElectricitySyncLog.setContent("同步成功");
nuIotTqElectricitySyncLog.setServerType("摄像头"); nuIotTqElectricitySyncLog.setServerType("摄像头");
nuIotTqElectricitySyncLog.setNuId(oldNuId);
nuIotTqElectricitySyncLog.setNewNuId(nuId);
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
//更新同步状态及旧系统编码 //更新同步状态及旧系统编码

43
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java
View File

@ -566,13 +566,20 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
return "1";//参数为空 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);
List<Map<String,Object>> list = (List<Map<String,Object>>) electricityList.get("list");
for (Map<String, Object> map : list) {
ElectricityMeter electricityInfo = new ElectricityMeter();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
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(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
@ -586,28 +593,10 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
nuIotTqElectricitySyncLogDel.setNewOrgCode(electricityInfo.getDepartServerUrl()); nuIotTqElectricitySyncLogDel.setNewOrgCode(electricityInfo.getDepartServerUrl());
nuIotTqElectricitySyncLogDel.setNewOrgName(electricityInfo.getDepartName()); nuIotTqElectricitySyncLogDel.setNewOrgName(electricityInfo.getDepartName());
nuIotTqElectricitySyncLogDel.setStatus("成功"); nuIotTqElectricitySyncLogDel.setStatus("成功");
nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构电表数据");
nuIotTqElectricitySyncLogDel.setServerType("电表"); nuIotTqElectricitySyncLogDel.setServerType("电表");
nuIotTqElectricitySyncLogDel.setNuId(electricityInfo.getNuId());
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
baseMapper.updateDepartById(electricityInfo);
}
List<Map<String,Object>> list = (List<Map<String,Object>>) electricityList.get("list");
for (Map<String, Object> map : list) {
ElectricityMeter electricityInfo = new ElectricityMeter();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
return "2";//设备ID为空;
}
electricityInfo = baseMapper.selectById(iotId);
//判断如果新的机构和老的机构不相同则把老的机构删除
String oldDataSourceCode = (String) map.get("oldServerUrl");
if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
syncImpl.syncElectricityDel(electricityInfo.getOldServerUrl(),electricityInfo);
} }
electricityInfo.setNuId(nuId); electricityInfo.setNuId(nuId);
electricityInfo.setNuName(nuName); electricityInfo.setNuName(nuName);
@ -632,6 +621,8 @@ public class ElectricityMeterServiceImpl extends ServiceImpl<ElectricityMeterMap
nuIotTqElectricitySyncLog.setStatus("成功"); nuIotTqElectricitySyncLog.setStatus("成功");
nuIotTqElectricitySyncLog.setContent("同步成功"); nuIotTqElectricitySyncLog.setContent("同步成功");
nuIotTqElectricitySyncLog.setServerType("电表"); nuIotTqElectricitySyncLog.setServerType("电表");
nuIotTqElectricitySyncLog.setNuId(oldNuId);
nuIotTqElectricitySyncLog.setNewNuId(nuId);
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
//更新同步状态及旧系统编码 //更新同步状态及旧系统编码

46
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java
View File

@ -578,14 +578,22 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
return "1";//参数为空 return "1";//参数为空
} }
QueryWrapper<WaterMeter> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("nu_id",nuId);
List<WaterMeter> allList =baseMapper.selectList(queryWrapper);
//先清空掉原来的数据 List<Map<String,Object>> list = (List<Map<String,Object>>) waterList.get("list");
for(WaterMeter waterInfo : allList){ for (Map<String, Object> map : list) {
WaterMeter waterInfo = new WaterMeter();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
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); syncImpl.syncElectricityDel(waterInfo.getOldServerUrl(),waterInfo);
SyncLog nuIotTqElectricitySyncLogDel = new SyncLog(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
nuIotTqElectricitySyncLogDel.setMainId(waterInfo.getCid()); nuIotTqElectricitySyncLogDel.setMainId(waterInfo.getCid());
@ -598,28 +606,10 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
nuIotTqElectricitySyncLogDel.setNewOrgCode(waterInfo.getDepartServerUrl()); nuIotTqElectricitySyncLogDel.setNewOrgCode(waterInfo.getDepartServerUrl());
nuIotTqElectricitySyncLogDel.setNewOrgName(waterInfo.getDepartName()); nuIotTqElectricitySyncLogDel.setNewOrgName(waterInfo.getDepartName());
nuIotTqElectricitySyncLogDel.setStatus("成功"); nuIotTqElectricitySyncLogDel.setStatus("成功");
nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构摄像头数据"); nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构水表数据");
nuIotTqElectricitySyncLogDel.setServerType("水表"); nuIotTqElectricitySyncLogDel.setServerType("水表");
nuIotTqElectricitySyncLogDel.setNuId(waterInfo.getNuId());
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
baseMapper.updateDepartById(waterInfo);
}
List<Map<String,Object>> list = (List<Map<String,Object>>) waterList.get("list");
for (Map<String, Object> map : list) {
WaterMeter waterInfo = new WaterMeter();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
return "2";//设备ID为空;
}
waterInfo = baseMapper.selectById(iotId);
//判断如果新的机构和老的机构不相同则把老的机构删除
String oldDataSourceCode = (String) map.get("oldServerUrl");
if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
syncImpl.syncElectricityDel(waterInfo.getOldServerUrl(),waterInfo);
} }
waterInfo.setNuId(nuId); waterInfo.setNuId(nuId);
waterInfo.setNuName(nuName); waterInfo.setNuName(nuName);
@ -644,6 +634,8 @@ public class WaterMeterServiceImpl extends ServiceImpl<WaterMeterMapper, WaterMe
nuIotTqElectricitySyncLog.setStatus("成功"); nuIotTqElectricitySyncLog.setStatus("成功");
nuIotTqElectricitySyncLog.setContent("同步成功"); nuIotTqElectricitySyncLog.setContent("同步成功");
nuIotTqElectricitySyncLog.setServerType("水表"); nuIotTqElectricitySyncLog.setServerType("水表");
nuIotTqElectricitySyncLog.setNuId(oldNuId);
nuIotTqElectricitySyncLog.setNewNuId(nuId);
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
//更新同步状态及旧系统编码 //更新同步状态及旧系统编码

43
nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
View File

@ -534,13 +534,21 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
return "1";//参数为空 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);
List<Map<String,Object>> list = (List<Map<String,Object>>) humidList.get("list");
for (Map<String, Object> map : list) {
HumidDevice humidInfo = new HumidDevice();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
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(); SyncLog nuIotTqElectricitySyncLogDel = new SyncLog();
nuIotTqElectricitySyncLogDel.setId(null); nuIotTqElectricitySyncLogDel.setId(null);
@ -556,27 +564,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
nuIotTqElectricitySyncLogDel.setStatus("成功"); nuIotTqElectricitySyncLogDel.setStatus("成功");
nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构温湿度计数据"); nuIotTqElectricitySyncLogDel.setContent("删除原来业务机构温湿度计数据");
nuIotTqElectricitySyncLogDel.setServerType("温湿度计"); nuIotTqElectricitySyncLogDel.setServerType("温湿度计");
nuIotTqElectricitySyncLogDel.setNuId(humidInfo.getNuId());
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLogDel);
baseMapper.updateDepartById(humidInfo);
}
List<Map<String,Object>> list = (List<Map<String,Object>>) humidList.get("list");
for (Map<String, Object> map : list) {
HumidDevice humidInfo = new HumidDevice();
String iotId = map.get("id").toString();
if(StringUtils.isEmpty(iotId)){
return "2";//设备ID为空;
}
humidInfo = baseMapper.selectById(iotId);
//判断如果新的机构和老的机构不相同则把老的机构删除
String oldDataSourceCode = (String) map.get("oldServerUrl");
if(!StringUtils.equals(oldDataSourceCode,dataSourceCode) && StringUtils.isNotBlank(oldDataSourceCode)){
syncImpl.syncElectricityDel(humidInfo.getOldServerUrl(),humidInfo);
} }
humidInfo.setNuId(nuId); humidInfo.setNuId(nuId);
humidInfo.setNuName(nuName); humidInfo.setNuName(nuName);
@ -601,6 +590,8 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
nuIotTqElectricitySyncLog.setStatus("成功"); nuIotTqElectricitySyncLog.setStatus("成功");
nuIotTqElectricitySyncLog.setContent("同步成功"); nuIotTqElectricitySyncLog.setContent("同步成功");
nuIotTqElectricitySyncLog.setServerType("温湿度计"); nuIotTqElectricitySyncLog.setServerType("温湿度计");
nuIotTqElectricitySyncLog.setNuId(oldNuId);
nuIotTqElectricitySyncLog.setNewNuId(nuId);
nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog); nuIotTqElectricitySyncLogService.save(nuIotTqElectricitySyncLog);
//更新同步状态及旧系统编码 //更新同步状态及旧系统编码