diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index a6dfbc950..6e0309619 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -106,25 +106,27 @@ public class HikvisionCall { String srcIndex = jo1.getString("srcIndex"); JSONObject extEventIdentityCardInfoJo = dataJo.getJSONObject("ExtEventIdentityCardInfo"); if (extEventIdentityCardInfoJo == null) { - log.info("extEventIdentityCardInfoJo为null"); - return null; + String s = "extEventIdentityCardInfoJo为null"; + log.info(s); + return Result.error(s); } String extEventPersonNo = dataJo.getString("ExtEventPersonNo"); String extEventCardNo = dataJo.getString("ExtEventCardNo"); WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo); if (workerInfo == null) { log.info("未找到该人员信息,extEventPersonNo:{}", extEventPersonNo); - return null; + return Result.error("未找到该人员信息,extEventPersonNo:" + extEventPersonNo); } Project project = projectMapper.selectOne(new LambdaQueryWrapper().eq(Project::getProjectSn, workerInfo.getProjectSn())); + String idCard = workerInfo.getIdCard(); if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { - log.info("未配置,idCard:{},extEventCardNo:{}", workerInfo.getIdCard(), extEventCardNo); - return null; + log.info("未配置,idCard:{},extEventCardNo:{}", idCard, extEventCardNo); + return Result.error("未配置,idCard:" + idCard + ",extEventCardNo:" + extEventCardNo); } HashMap map = new HashMap<>(); map.put("passTime", DateUtil.formatDateTime(DateUtil.parse(happenTime))); - map.put("idCard", workerInfo.getIdCard()); + map.put("idCard", idCard); map.put("attendanceNumber", workerInfo.getAttendanceNumber()); map.put("direction", getDirection(dataJo)); map.put("passType", 2); @@ -156,12 +158,13 @@ public class HikvisionCall { .eq(CarCamera::getCameraId, srcIndex)); if (carCamera == null) { log.info("海康回调车辆相机设备不存在:CameraId:{}", srcIndex); - return null; + return Result.error("海康回调车辆相机设备不存在:CameraId:" + srcIndex); } Project project = projectMapper.selectOne(new LambdaQueryWrapper().eq(Project::getProjectSn, carCamera.getProjectSn())); if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { - log.info("海康事件车辆入场压线的project不存在,cameraId:{}", carCamera.getCameraId()); - return null; + String cameraId = carCamera.getCameraId(); + log.info("海康事件车辆入场压线的project不存在,cameraId:{}", cameraId); + return Result.error("海康事件车辆入场压线的project不存在,cameraId:" + cameraId); } String plateNo = dataJo.getString("plateNo"); @@ -195,8 +198,6 @@ public class HikvisionCall { entity.setProjectSn(carCamera.getProjectSn()); entity.setColor(getColor(dataJo.getInteger("vehicleColor"))); entity.setCameraId(srcIndex); - JSONObject personJo = dataJo.getJSONObject("person"); - entity.setDriverData(personJo.getString("personName")); entity.setIsOpen(0); carPassRecordMapper.insert(entity); } diff --git a/src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java b/src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java index be90baaa5..414fc5ed1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java +++ b/src/main/java/com/zhgd/xmgl/modules/goulipkpm/entity/TaskProgressRt.java @@ -158,6 +158,13 @@ public class TaskProgressRt implements Serializable { private String componentColorJson; @ApiModelProperty(value = "任务级别") private Integer level; + @ApiModelProperty(value = "危险点辨识") + private String dangerPointIdentification; + @ApiModelProperty(value = "风险控制措施") + private String riskControlMeasure; + @ApiModelProperty(value = "施工要点") + private String constructionKeyPoint; + @TableField(exist = false) private Long gouliPkpmModelId;