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-07 17:35:20 +08:00
parent 3234a54483
commit 3b52744fef
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -106,25 +106,27 @@ public class HikvisionCall {
String srcIndex = jo1.getString("srcIndex"); String srcIndex = jo1.getString("srcIndex");
JSONObject extEventIdentityCardInfoJo = dataJo.getJSONObject("ExtEventIdentityCardInfo"); JSONObject extEventIdentityCardInfoJo = dataJo.getJSONObject("ExtEventIdentityCardInfo");
if (extEventIdentityCardInfoJo == null) { if (extEventIdentityCardInfoJo == null) {
log.info("extEventIdentityCardInfoJo为null"); String s = "extEventIdentityCardInfoJo为null";
return null; log.info(s);
return Result.error(s);
} }
String extEventPersonNo = dataJo.getString("ExtEventPersonNo"); String extEventPersonNo = dataJo.getString("ExtEventPersonNo");
String extEventCardNo = dataJo.getString("ExtEventCardNo"); String extEventCardNo = dataJo.getString("ExtEventCardNo");
WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo); WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo);
if (workerInfo == null) { if (workerInfo == null) {
log.info("未找到该人员信息,extEventPersonNo:{}", extEventPersonNo); log.info("未找到该人员信息,extEventPersonNo:{}", extEventPersonNo);
return null; return Result.error("未找到该人员信息,extEventPersonNo:" + extEventPersonNo);
} }
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, workerInfo.getProjectSn())); Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, workerInfo.getProjectSn()));
String idCard = workerInfo.getIdCard();
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
log.info("未配置，idCard:{},extEventCardNo:{}", workerInfo.getIdCard(), extEventCardNo); log.info("未配置，idCard:{},extEventCardNo:{}", idCard, extEventCardNo);
return null; return Result.error("未配置，idCard:" + idCard + ",extEventCardNo:" + extEventCardNo);
} }
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("passTime", DateUtil.formatDateTime(DateUtil.parse(happenTime))); map.put("passTime", DateUtil.formatDateTime(DateUtil.parse(happenTime)));
map.put("idCard", workerInfo.getIdCard()); map.put("idCard", idCard);
map.put("attendanceNumber", workerInfo.getAttendanceNumber()); map.put("attendanceNumber", workerInfo.getAttendanceNumber());
map.put("direction", getDirection(dataJo)); map.put("direction", getDirection(dataJo));
map.put("passType", 2); map.put("passType", 2);
@ -156,12 +158,13 @@ public class HikvisionCall {
.eq(CarCamera::getCameraId, srcIndex)); .eq(CarCamera::getCameraId, srcIndex));
if (carCamera == null) { if (carCamera == null) {
log.info("海康回调车辆相机设备不存在：CameraId:{}", srcIndex); log.info("海康回调车辆相机设备不存在：CameraId:{}", srcIndex);
return null; return Result.error("海康回调车辆相机设备不存在：CameraId:" + srcIndex);
} }
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carCamera.getProjectSn())); Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getProjectSn, carCamera.getProjectSn()));
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
log.info("海康事件车辆入场压线的project不存在,cameraId:{}", carCamera.getCameraId()); String cameraId = carCamera.getCameraId();
return null; log.info("海康事件车辆入场压线的project不存在,cameraId:{}", cameraId);
return Result.error("海康事件车辆入场压线的project不存在,cameraId:" + cameraId);
} }
String plateNo = dataJo.getString("plateNo"); String plateNo = dataJo.getString("plateNo");
@ -195,8 +198,6 @@ public class HikvisionCall {
entity.setProjectSn(carCamera.getProjectSn()); entity.setProjectSn(carCamera.getProjectSn());
entity.setColor(getColor(dataJo.getInteger("vehicleColor"))); entity.setColor(getColor(dataJo.getInteger("vehicleColor")));
entity.setCameraId(srcIndex); entity.setCameraId(srcIndex);
JSONObject personJo = dataJo.getJSONObject("person");
entity.setDriverData(personJo.getString("personName"));
entity.setIsOpen(0); entity.setIsOpen(0);
carPassRecordMapper.insert(entity); carPassRecordMapper.insert(entity);
} }

7
src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java
View File

@ -158,6 +158,13 @@ public class TaskProgressRt implements Serializable {
private String componentColorJson; private String componentColorJson;
@ApiModelProperty(value = "任务级别") @ApiModelProperty(value = "任务级别")
private Integer level; private Integer level;
@ApiModelProperty(value = "危险点辨识")
private String dangerPointIdentification;
@ApiModelProperty(value = "风险控制措施")
private String riskControlMeasure;
@ApiModelProperty(value = "施工要点")
private String constructionKeyPoint;
@TableField(exist = false) @TableField(exist = false)
private Long gouliPkpmModelId; private Long gouliPkpmModelId;