From 043a91a360e5fbffa8fd8cde84ecff78e238342a Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 10 Jul 2024 12:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/async/AsyncElectricalDev.java | 2 +- .../java/com/zhgd/xmgl/async/AsyncEnvironment.java | 5 +++-- src/main/java/com/zhgd/xmgl/async/AsyncProject.java | 5 +++-- .../java/com/zhgd/xmgl/async/AsyncProjectWork.java | 13 ++++++++----- .../service/impl/ElectricAlarmServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncElectricalDev.java b/src/main/java/com/zhgd/xmgl/async/AsyncElectricalDev.java index 8e315ba5c..233e88963 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncElectricalDev.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncElectricalDev.java @@ -79,7 +79,7 @@ public class AsyncElectricalDev { * 转发逸风智建配电箱实时数据 */ @Async("electricalExecutor") - public void sendYFZJElectricalData(ElectricalData electricalData, ElectricalDev electricalDev, int temperatureAlarm,int leakageAlarm,int currentAlarm,int voltageAlarm) { + public void sendYfzjElectricalData(ElectricalData electricalData, ElectricalDev electricalDev, int temperatureAlarm, int leakageAlarm, int currentAlarm, int voltageAlarm) { try { QueryWrapper queryWrapper =new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectExternalSystemService::getProjectSn, electricalDev.getProjectSn()) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncEnvironment.java b/src/main/java/com/zhgd/xmgl/async/AsyncEnvironment.java index 5a449f53b..44aafb3af 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncEnvironment.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncEnvironment.java @@ -30,6 +30,7 @@ import java.util.Map; @Slf4j @Component public class AsyncEnvironment { + public static final String ZERO = "0"; @Autowired private ProjectUfaceConfigMapper projectUfaceConfigMapper; @Autowired @@ -72,7 +73,7 @@ public class AsyncEnvironment { QueryWrapper queryWrapper =new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectUfaceConfig::getProjectSn, environmentDev.getProjectSn()); ProjectUfaceConfig tempProjectUfaceConfig=projectUfaceConfigMapper.selectOne(queryWrapper); - if(tempProjectUfaceConfig!=null&& StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing())&&!"0".equals(tempProjectUfaceConfig.getHousing())) { + if(tempProjectUfaceConfig!=null&& StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing())&&!ZERO.equals(tempProjectUfaceConfig.getHousing())) { String[] arr = tempProjectUfaceConfig.getHousing().split(Cts.COMMA); Map data=new HashMap<>(16); data.put("projectSn",environmentDev.getProjectSn()); @@ -104,7 +105,7 @@ public class AsyncEnvironment { QueryWrapper queryWrapper =new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectUfaceConfig::getProjectSn, environmentDev.getProjectSn()); ProjectUfaceConfig tempProjectUfaceConfig=projectUfaceConfigMapper.selectOne(queryWrapper); - if(tempProjectUfaceConfig!=null&& StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing())&&!"0".equals(tempProjectUfaceConfig.getHousing())) { + if(tempProjectUfaceConfig!=null&& StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing())&&!ZERO.equals(tempProjectUfaceConfig.getHousing())) { String[] arr = tempProjectUfaceConfig.getHousing().split(Cts.COMMA); Map data=new HashMap<>(16); data.put("projectSn",environmentDev.getProjectSn()); diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncProject.java b/src/main/java/com/zhgd/xmgl/async/AsyncProject.java index 7e0bc8c46..5caac0764 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncProject.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncProject.java @@ -39,6 +39,7 @@ import java.util.Map; @Slf4j @Component public class AsyncProject { + public static final String ZERO = "0"; @Autowired private ProjectMapper projectMapper; @Autowired @@ -65,7 +66,7 @@ public class AsyncProject { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectUfaceConfig::getProjectSn, projectSn); ProjectUfaceConfig tempProjectUfaceConfig = projectUfaceConfigMapper.selectOne(queryWrapper); - if (tempProjectUfaceConfig != null && StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing()) && !"0".equals(tempProjectUfaceConfig.getHousing())) { + if (tempProjectUfaceConfig != null && StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing()) && !ZERO.equals(tempProjectUfaceConfig.getHousing())) { QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.lambda().eq(Project::getProjectSn, projectSn); Project project = projectMapper.selectOne(queryWrapper1); @@ -108,7 +109,7 @@ public class AsyncProject { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ProjectUfaceConfig::getProjectSn, projectSn); ProjectUfaceConfig tempProjectUfaceConfig = projectUfaceConfigMapper.selectOne(queryWrapper); - if (tempProjectUfaceConfig != null && StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing()) && !"0".equals(tempProjectUfaceConfig.getHousing())) { + if (tempProjectUfaceConfig != null && StringUtils.isNotEmpty(tempProjectUfaceConfig.getHousing()) && !ZERO.equals(tempProjectUfaceConfig.getHousing())) { QueryWrapper qu = new QueryWrapper<>(); qu.lambda().eq(ProjectVideoConfig::getProjectSn, projectSn) .eq(ProjectVideoConfig::getIsEnable, 1); diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java b/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java index bf1ecd9b8..676a835f5 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java @@ -31,6 +31,9 @@ import java.util.UUID; @Slf4j @Component public class AsyncProjectWork { + public static final String WORKER_NUMBER = "workerNumber"; + public static final String ID_CARD_END_DATE = "idCardEndDate"; + public static final String LONG_TIME = "长期"; @Autowired private WorkerInfoMapper workerInfoMapper; @Autowired @@ -80,8 +83,8 @@ public class AsyncProjectWork { log.info("---同步人员开始-----"+MapUtils.getString(info, "workerName")+"------项目编号："+projectSn); WorkerInfo workerInfo = new WorkerInfo(); workerInfo.setWorkerName(MapUtils.getString(info, "workerName")); - if (StringUtils.isNotEmpty(MapUtils.getString(info, "workerNumber"))) { - workerInfo.setAttendanceNumber(MapUtils.getString(info, "workerNumber")); + if (StringUtils.isNotEmpty(MapUtils.getString(info, WORKER_NUMBER))) { + workerInfo.setAttendanceNumber(MapUtils.getString(info, WORKER_NUMBER)); } else { workerInfo.setAttendanceNumber(MapUtils.getString(info, "idCard")); } @@ -102,11 +105,11 @@ public class AsyncProjectWork { workerInfo.setPoliticsStatus(MapUtils.getInteger(info, "politicsStatus")); workerInfo.setEmergentPerson(MapUtils.getString(info, "emergentPerson")); workerInfo.setEmergentPhone(MapUtils.getString(info, "emergentPhone")); - if (StringUtils.isNotEmpty(MapUtils.getString(info, "idCardEndDate"))) { - if (MapUtils.getString(info, "idCardEndDate").indexOf("长期") >= 0) { + if (StringUtils.isNotEmpty(MapUtils.getString(info, ID_CARD_END_DATE))) { + if (MapUtils.getString(info, ID_CARD_END_DATE).indexOf(LONG_TIME) >= 0) { workerInfo.setLongTerm(1); } else { - workerInfo.setIdCardEndDate(MapUtils.getString(info, "idCardEndDate")); + workerInfo.setIdCardEndDate(MapUtils.getString(info, ID_CARD_END_DATE)); } } workerInfo.setPersonSn(MapUtils.getString(info, "workInfoSn")); diff --git a/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricAlarmServiceImpl.java index 2dbdb59bc..89ebacbeb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricAlarmServiceImpl.java @@ -729,7 +729,7 @@ public class ElectricAlarmServiceImpl extends ServiceImpl