diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java index 2a6b446b..300beadd 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java +++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java @@ -711,6 +711,7 @@ public class DeviceMessageHandler { expands.put("wet", meteorologicalDetectorData.getWetSlipperyCoefficient()); //湿滑 expands.put("rainXingTai", meteorologicalDetectorData.getPrecipitationType()); //雨量降水形态 expands.put("visibility", meteorologicalDetectorData.getVisibility()); //能见度 + expands.put("visibilityType", meteorologicalDetectorData.getVisibilityType()); //能见度类型 expands.put("remoteRoadSurfaceTemperature", meteorologicalDetectorData.getRemoteRoadSurfaceTemperature()); //路面温度 expands.put("pathContactZhuang", meteorologicalDetectorData.getRemoteRoadSurfaceStatus()); //路面状况 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java index 1c4fb8b1..0f823ab8 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcWarningServiceImpl.java @@ -780,6 +780,7 @@ public class DcWarningServiceImpl implements IDcWarningService return AjaxResult.error(); } Long dispatchId = dcDispatch.getId();//信息记录id + String context = ""; if (employees!=null) { dcDispatchResource.setResourceId(employees);//资源id dcDispatchResource.setDispatchType(UniversalEnum.ONE.getNumber());//资源类型 @@ -788,6 +789,8 @@ public class DcWarningServiceImpl implements IDcWarningService if (employeesSource==UniversalEnum.ZERO.getNumber()){ return AjaxResult.error(UniversalEnum.PERSONNEL_SCHEDULING_EXCEPTION.getValue()); } + String employeesName = dcWarningMapper.employeesName(employees); + context = "路管人员" + employeesName + "参与事件救援,"; } if (vehicles!=null) { // 生成一个随机索引,范围在0到列表长度减1之间 @@ -798,7 +801,19 @@ public class DcWarningServiceImpl implements IDcWarningService if (dispatchResource==UniversalEnum.ZERO.getNumber()){ return AjaxResult.error(UniversalEnum.VEHICLE_SCHEDULING_EXCEPTION.getValue()); } + String vehiclePlate = dcWarningMapper.vehiclesName(vehicles); + context += "救援车辆" + vehiclePlate + "参与事件救援,"; } + + if (StringUtils.isNotBlank(context)){ + context = context.substring(0,context.length() -1); + DcEventProcess dcEventProcess = new DcEventProcess(); + dcEventProcess.setEventId(eventId); + dcEventProcess.setSource(UniversalEnum.ONE.getNumber()); + dcEventProcess.setContext(context); + dcEventProcessService.insertDcEventProcess(dcEventProcess); + } + return AjaxResult.success(); }