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 12:29:27 +08:00
parent c8a795899a
commit 3372416187
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java
View File

@ -94,7 +94,14 @@ public class SystemLogoConfig implements Serializable {
*/
@ApiModelProperty(value = "是否开启登录超时，0不开启1开启")
private java.lang.Integer loginTimeOut;
@ApiModelProperty(value = "默认审批用户注册企业sn")
private java.lang.String defaultApprovalCompanySn;
@ApiModelProperty(value = "是否显示项目前台，0不开启1开启")
private java.lang.Integer isShowProjectFront;
@ApiModelProperty(value = "是否开启劳务人员资质证书到期预警")
private java.lang.Integer isOpenCertificateExpireWarn;
@ApiModelProperty(value = "劳务人员资质证书提前多少天预警")
private java.lang.Integer certificateExpireWarnAheadDay;
@TableField(exist = false)
private java.lang.String fileStorageType;
}

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

@ -91,6 +91,26 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
if (dev == null) {
throw new OpenAlertException("设备编号不正确");
}
//GPS定位静止也有微小的偏差。业务端需要处理一下，获取静止开始时间的点就可以了。
MechanicalEquipmentPositionData lastData = mechanicalEquipmentPositionDataMapper.selectOne(new LambdaQueryWrapper<MechanicalEquipmentPositionData>()
.eq(MechanicalEquipmentPositionData::getDevSn, mechanicalEquipmentPositionData.getDevSn())
.orderByDesc(MechanicalEquipmentPositionData::getUploadTime)
.last("limit 1")
);
if (lastData != null) {
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);
if (lastFixed && fixed) {
log.info("设备上次静止、离线、怠速状态，无需新增，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
throw new OpenAlertException("设备上次静止、离线、怠速状态，无需新增，devSn" + mechanicalEquipmentPositionData.getDevSn());
}
}
if (Objects.equals(mechanicalEquipmentPositionData.getLongitude(), 0D) && Objects.equals(mechanicalEquipmentPositionData.getLatitude(), 0D)) {
log.info("设备坐标0,0不插入，devSn:{}", mechanicalEquipmentPositionData.getDevSn());
throw new OpenAlertException("设备坐标0,0不插入，devSn" + mechanicalEquipmentPositionData.getDevSn());
}
dev.setHeartbeatTime(new Date());
mechanicalEquipmentPositionDevMapper.update(dev, new LambdaQueryWrapper<MechanicalEquipmentPositionDev>()
.eq(MechanicalEquipmentPositionDev::getDevSn, mechanicalEquipmentPositionData.getDevSn()));

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

@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataService;
import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil;
import com.zhgd.xmgl.util.RegionUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,6 +42,7 @@ import java.util.Objects;
*/
@Service
@Transactional(rollbackFor = Exception.class)
@Slf4j
public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, SafetyHatData> implements ISafetyHatDataService {
@Autowired
private SafetyHatDataMapper safetyHatDataMapper;
@ -91,6 +93,15 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
if (dev == null) {
throw new OpenAlertException("设备编号不正确");
}
SafetyHatData lastData = safetyHatDataMapper.selectOne(new LambdaQueryWrapper<SafetyHatData>()
.eq(SafetyHatData::getDevSn, safetyHatData.getDevSn())
.orderByDesc(SafetyHatData::getUploadTime)
.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());
safetyHatDevMapper.update(dev, new LambdaQueryWrapper<SafetyHatDev>()
.eq(SafetyHatDev::getDevSn, safetyHatData.getDevSn()));