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

bug修复

Browse Source
This commit is contained in:
guo 2024-03-24 14:12:16 +08:00
parent 32f90c2e23
commit 94d1209005
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java
View File

@ -97,23 +97,23 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
.orderByDesc(MechanicalEquipmentPositionData::getUploadTime) .orderByDesc(MechanicalEquipmentPositionData::getUploadTime)
.last("limit 1") .last("limit 1")
); );
dev.setHeartbeatTime(new Date());
mechanicalEquipmentPositionDevMapper.update(dev, new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
.eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionData.getDevSn()));
if (lastData != null) { if (lastData != null) {
boolean lastFixed = (Objects.equals(lastData.getWorkStatus(), 2) || Objects.equals(lastData.getWorkStatus(), 3)) || Objects.equals(lastData.getWorkStatus(), 4); boolean lastFixed = (Objects.equals(lastData.getWorkStatus(), 2) || Objects.equals(lastData.getWorkStatus(), 3)) || Objects.equals(lastData.getWorkStatus(), 4);
boolean fixed = (Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 2) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 3)) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 4); boolean fixed = (Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 2) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 3)) || Objects.equals(mechanicalEquipmentPositionData.getWorkStatus(), 4);
if (lastFixed && fixed) { if (lastFixed && fixed) {
log.info("设备上次静止、离线、怠速状态，无需新增，devSn:{}", mechanicalEquipmentPositionData.getDevSn()); log.info("设备上次静止、离线、怠速状态，无需新增，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
throw new OpenAlertException("设备上次静止、离线、怠速状态，无需新增，devSn" + mechanicalEquipmentPositionData.getDevSn()); return;
} }
} }
if (Objects.equals(mechanicalEquipmentPositionData.getLongitude(), 0D) && Objects.equals(mechanicalEquipmentPositionData.getLatitude(), 0D)) { if (Objects.equals(mechanicalEquipmentPositionData.getLongitude(), 0D) && Objects.equals(mechanicalEquipmentPositionData.getLatitude(), 0D)) {
log.info("设备坐标0,0不插入，devSn:{}", mechanicalEquipmentPositionData.getDevSn()); log.info("设备坐标0,0不插入，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
throw new OpenAlertException("设备坐标0,0不插入，devSn" + mechanicalEquipmentPositionData.getDevSn()); return;
} }
dev.setHeartbeatTime(new Date());
mechanicalEquipmentPositionDevMapper.update(dev, new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
.eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionData.getDevSn()));
mechanicalEquipmentPositionData.setDevSn(dev.getDevSn()); mechanicalEquipmentPositionData.setDevSn(dev.getDevSn());
mechanicalEquipmentPositionData.setProjectSn(dev.getProjectSn()); mechanicalEquipmentPositionData.setProjectSn(dev.getProjectSn());
mechanicalEquipmentPositionData.setId(null); mechanicalEquipmentPositionData.setId(null);

8
src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
View File

@ -98,13 +98,13 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
.orderByDesc(SafetyHatData::getUploadTime) .orderByDesc(SafetyHatData::getUploadTime)
.last("limit 1") .last("limit 1")
); );
if (Objects.equals(safetyHatData.getLongitude(), 0D) && Objects.equals(safetyHatData.getLatitude(), 0D)) {
log.info("设备坐标0,0不插入，devSn:{}", safetyHatData.getDevSn());
throw new OpenAlertException("设备坐标0,0不插入，devSn" + safetyHatData.getDevSn());
}
dev.setHeartbeatTime(new Date()); dev.setHeartbeatTime(new Date());
safetyHatDevMapper.update(dev, new LambdaQueryWrapper<SafetyHatDev>() safetyHatDevMapper.update(dev, new LambdaQueryWrapper<SafetyHatDev>()
.eq(SafetyHatDev::getDevSn, safetyHatData.getDevSn())); .eq(SafetyHatDev::getDevSn, safetyHatData.getDevSn()));
if (Objects.equals(safetyHatData.getLongitude(), 0D) && Objects.equals(safetyHatData.getLatitude(), 0D)) {
log.info("设备坐标0,0不插入，devSn:{}", safetyHatData.getDevSn());
return;
}
safetyHatData.setDevSn(dev.getDevSn()); safetyHatData.setDevSn(dev.getDevSn());
safetyHatData.setProjectSn(dev.getProjectSn()); safetyHatData.setProjectSn(dev.getProjectSn());
safetyHatData.setId(null); safetyHatData.setId(null);