admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

代码规范

Browse Source
This commit is contained in:
guoshengxiong 2024-07-10 12:01:55 +08:00
parent 021a87fabf
commit 043a91a360
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/async/AsyncElectricalDev.java
View File

@ -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<ProjectExternalSystemService> queryWrapper =new QueryWrapper<>();
queryWrapper.lambda().eq(ProjectExternalSystemService::getProjectSn, electricalDev.getProjectSn())

5
src/main/java/com/zhgd/xmgl/async/AsyncEnvironment.java
View File

@ -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<ProjectUfaceConfig> 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<String,Object> data=new HashMap<>(16);
data.put("projectSn",environmentDev.getProjectSn());
@ -104,7 +105,7 @@ public class AsyncEnvironment {
QueryWrapper<ProjectUfaceConfig> 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<String,Object> data=new HashMap<>(16);
data.put("projectSn",environmentDev.getProjectSn());

5
src/main/java/com/zhgd/xmgl/async/AsyncProject.java
View File

@ -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<ProjectUfaceConfig> 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<Project> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(Project::getProjectSn, projectSn);
Project project = projectMapper.selectOne(queryWrapper1);
@ -108,7 +109,7 @@ public class AsyncProject {
QueryWrapper<ProjectUfaceConfig> 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<ProjectVideoConfig> qu = new QueryWrapper<>();
qu.lambda().eq(ProjectVideoConfig::getProjectSn, projectSn)
.eq(ProjectVideoConfig::getIsEnable, 1);

13
src/main/java/com/zhgd/xmgl/async/AsyncProjectWork.java
View File

@ -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"));

2
src/main/java/com/zhgd/xmgl/modules/electrical/service/impl/ElectricAlarmServiceImpl.java
View File

@ -729,7 +729,7 @@ public class ElectricAlarmServiceImpl extends ServiceImpl<ElectricAlarmMapper, E
}
asyncElectricalDev.sendElectricalData(electricalData, electricalDev, alarmFlag);
//将数据转发其它平台
asyncElectricalDev.sendYFZJElectricalData(electricalData, electricalDev, temperatureAlarm, leakageAlarm, currentAlarm, voltageAlarm);
asyncElectricalDev.sendYfzjElectricalData(electricalData, electricalDev, temperatureAlarm, leakageAlarm, currentAlarm, voltageAlarm);
}
}