diff --git a/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java b/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java index 77a96664..0d0ae47b 100644 --- a/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java +++ b/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java @@ -102,6 +102,12 @@ public class ValueConverter { eventSourceName.put("5","视频AI"); eventSourceName.put("6","一键救援"); eventSourceName.put("7","其他"); + eventSourceName.put("8","雷达识别"); + eventSourceName.put("9","锥桶"); + eventSourceName.put("10","护栏碰撞"); + eventSourceName.put("11","扫码报警"); + eventSourceName.put("12","非机预警"); + eventSourceName.put("13","气象检测器"); eventTypeName.put("1","交通事故"); eventTypeName.put("2","车辆故障"); @@ -166,7 +172,7 @@ public class ValueConverter { eventLabel.put("dcEventAccident.fatalities","死亡(人)"); eventLabel.put("dcEventAccident.isPrivate","私密事件"); eventLabel.put("dcEventAccident.facilityId","设施关联"); - eventLabel.put("dcEventAccident.rampId","匝道id"); +// eventLabel.put("dcEventAccident.rampId","匝道id"); eventLabel.put("dcEventAccident.location","地点"); eventLabel.put("dcEventConstruction.controlMode","管制方式"); eventLabel.put("dcEventConstruction.locationType","地点类型"); @@ -189,7 +195,7 @@ public class ValueConverter { eventLabel.put("dcEventTrafficCongestion.maxCongestionMileage","最大拥堵里程(公里)"); eventLabel.put("dcEventTrafficCongestion.congestionCause","拥堵原因"); eventLabel.put("dcEventTrafficCongestion.facilityId","设施id"); - eventLabel.put("dcEventTrafficCongestion.rampId","匝道"); +// eventLabel.put("dcEventTrafficCongestion.rampId","匝道"); eventLabel.put("dcEventTrafficCongestion.location","地点"); eventLabel.put("dcEventTrafficCongestion.detailedReasons","详细原因"); eventLabel.put("dcEventTrafficCongestion.locationType","地点类型"); @@ -212,13 +218,13 @@ public class ValueConverter { eventLabel.put("dcEventVehicleAccident.fatalities","死亡(人)"); eventLabel.put("dcEventVehicleAccident.isPrivate","私密事件"); eventLabel.put("dcEventVehicleAccident.facilityId","地点"); - eventLabel.put("dcEventVehicleAccident.rampId","匝道"); +// eventLabel.put("dcEventVehicleAccident.rampId","匝道"); eventLabel.put("dcEventVehicleAccident.location","地点"); eventLabel.put("dcEventTrafficControl.controlType","管制分类"); eventLabel.put("dcEventTrafficControl.controlCause","管制原因"); eventLabel.put("dcEventTrafficControl.exitsInlets","出入口"); eventLabel.put("dcEventTrafficControl.facilityId","设施id"); - eventLabel.put("dcEventTrafficControl.rampId","匝道"); +// eventLabel.put("dcEventTrafficControl.rampId","匝道"); eventLabel.put("dcEventTrafficControl.causeType","原因类型"); eventLabel.put("dcEventTrafficControl.measure","措施"); eventLabel.put("dcEventTrafficControl.classify","分类"); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java index 8fd2494e..0252e65f 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java @@ -461,9 +461,11 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { // 指定设备资源 // 根据设备id，获取设备集合 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - String[] deviceList = dcExecuteAction.getDeviceList().split(","); - queryWrapper.in(DcDevice::getIotDeviceId, deviceList); - dcDevices = dcDeviceService.list(queryWrapper); + if (StringUtils.isNotEmpty(dcExecuteAction.getDeviceList())) { + String[] deviceList = dcExecuteAction.getDeviceList().split(","); + queryWrapper.in(DcDevice::getIotDeviceId, deviceList); + dcDevices = dcDeviceService.list(queryWrapper); + } } else if (searchRule.equals(2)) { // 事件上游最近 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java index 4b9ec88c..0fafc02c 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java @@ -783,12 +783,15 @@ public class DcEventServiceImpl extends ServiceImpl impl int i7 = dcEventMapper.updateDcEvent(dcEvent); if (i7 > 0) { String context = comparisonInfo(oldEvent, dcEvent); - //事件处置流程记录 - DcEventProcess dcEventProcess = new DcEventProcess(); - dcEventProcess.setEventId(dcEvent.getId()); - dcEventProcess.setSource(1); - dcEventProcess.setContext(context); - dcEventProcessService.insertDcEventProcess(dcEventProcess); + if (context.length() > 0){ + //事件处置流程记录 + DcEventProcess dcEventProcess = new DcEventProcess(); + dcEventProcess.setEventId(dcEvent.getId()); + dcEventProcess.setSource(1); + dcEventProcess.setContext(context); + dcEventProcessService.insertDcEventProcess(dcEventProcess); + } + //中间库 MdEvent mdEvent = new MdEvent(dcEvent); @@ -1230,6 +1233,15 @@ public class DcEventServiceImpl extends ServiceImpl impl e.printStackTrace(); } } else if ("direction".equals(result.getRightPath())) { + + if (("1".equals(result.getRight()) || "上行".equals(result.getRight()) || "菏泽方向".equals(result.getRight())) + && ("1".equals(result.getLeft()) || "上行".equals(result.getLeft()) || "菏泽方向".equals(result.getLeft()))){ + continue; + } else if(("3".equals(result.getRight()) || "下行".equals(result.getRight()) || "济南方向".equals(result.getRight())) + && ("3".equals(result.getLeft()) || "下行".equals(result.getLeft()) || "济南方向".equals(result.getLeft()))){ + continue; + } + if ("1".equals(result.getRight())) { result.setRight("菏泽方向"); } else if ("2".equals(result.getRight())) { diff --git a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml index a1028599..06cf12f4 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventTrafficControlMapper.xml @@ -36,7 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dc_event_traffic_control.exits_inlets as exits_inlets, dc_event_traffic_control.facility_id as facility_id, dc_event_traffic_control.id as id, + dc_event_traffic_control.classify as classify, dc_event_traffic_control.ramp_id as ramp_id, + dc_event_traffic_control.limited_type as limited_type, + dc_event_traffic_control.vehicle_type as vehicle_type, + dc_event_traffic_control.measure as measure, dc_facility.other_config as other_config, dc_facility.remark as remark, dc_facility.stake_mark as stake_mark,