diff --git a/zc-business/src/main/java/com/zc/business/enums/EventSource.java b/zc-business/src/main/java/com/zc/business/enums/EventSource.java index 37547c10..b03a4a02 100644 --- a/zc-business/src/main/java/com/zc/business/enums/EventSource.java +++ b/zc-business/src/main/java/com/zc/business/enums/EventSource.java @@ -5,7 +5,13 @@ package com.zc.business.enums; */ //事件来源枚举 public enum EventSource { - VIDEO_AI(1, "视频AI"); + VIDEO(1, "96656"), + TRAFFIC_POLICE(2,"交警转接"), + ROAD_PATROL(3,"道路巡查"), + VIDEO_INSPECTION(4,"视频巡查"), + VIDEO_AI(5,"视频AI"), + ONE_CLICK_RESCUE(6,"一键救援"), + REST(7,"其他"); private final Integer code; private final String description; diff --git a/zc-business/src/main/java/com/zc/business/enums/EventSubclass.java b/zc-business/src/main/java/com/zc/business/enums/EventSubclass.java new file mode 100644 index 00000000..3c3721f5 --- /dev/null +++ b/zc-business/src/main/java/com/zc/business/enums/EventSubclass.java @@ -0,0 +1,75 @@ +package com.zc.business.enums; + +/** + * + */ +public enum EventSubclass { + REAR_END ("1-1","追尾"), + TURN_ON_ONE_S_SIDE ("1-2","侧翻"), + CRASH_INTO_THE_BARRIER ("1-3","撞护栏"), + NATURE ("1-4","自燃"), + OTHER_ACCIDENTS ("1-5","其他事故"), + VEHICLE_FAULT ("2-1","车辆故障"), + THE_MAIN_LINE_IS_CLOSED_AND_RESTRICTED ("3-1","主线封闭和限行"), + TOLL_BOOTHS_ARE_CLOSED_AND_RESTRICTED ("3-2","收费站封闭和限行"), + THE_INTERCHANGE_IS_CLOSED_AND_RESTRICTED ("3-3","立交封闭和限行"), + THE_SERVICE_AREA_IS_CLOSED_AND_RESTRICTED ("3-4","服务区封闭和限行"), + ROAD_CONGESTION ("4-1","道路拥堵"), + INTERCHANGE_CONGESTION ("4-2","立交拥堵"), + TOLL_BOOTHS_ARE_CONGESTED ("4-3","收费站拥堵"), + SERVICE_AREA_CONGESTION ("4-4","服务区拥堵"), + PEDESTRIAN ("5-1","行人"), + NON_MOTOR_VEHICLE ("5-2","非机动车"), + MOTORCYCLE("5-3","摩托车"), + ELSE ("5-4","其他"), + SMOKE ("6-1","烟雾"), + FALLEN_TREE ("6-2","倒伏树木"), + OUTFALL ("6-3","撒落物"), + ZOON ("6-4","动物"), + OTHER ("6-5","其他"), + ROAD_MAINTENANCE_CONSTRUCTION ("7-1","道路养护施工"), + TOLL_STATION_MAINTENANCE_AND_CONSTRUCTION ("7-2","收费站养护施工"), + MAINTENANCE_CONSTRUCTION_OF_SERVICE_AREA ("7-3","服务区养护施工"), + MAINTENANCE_AND_CONSTRUCTION_OF_INTERCHANGE_RAMP ("7-4","枢纽立交匝道养护施工"), + LOCAL_ROAD_MAINTENANCE_CONSTRUCTION ("7-5","地方道路养护施工"), + ROAD_ENGINEERING_CONSTRUCTION ("7-6","道路工程建设施工"), + TOLL_STATION_CONSTRUCTION ("7-7","收费站工程建设施工"), + SERVICE_AREA_PROJECT_CONSTRUCTION ("7-8","服务区工程建设施工"), + JUNCTION_INTERCHANGE_RAMP_PROJECT_CONSTRUCTION ("7-9","枢纽立交匝道工程建设施工"), + LOCAL_ROAD_ENGINEERING_CONSTRUCTION ("7-10", "地方道路工程建设施工"), + SUSPEND_BUSINESS ("8-1","封闭、暂停营业"), + SHUTDOWN_OF_CRITICAL_FACILITIES ("8-2","重要设施停用"), + OTHERS_IN_THE_SERVICE_AREA_ARE_ABNORMAL ("8-3","服务区其他异常"), + CAMERA ("9-1","摄像机"), + GUARDRAIL ("9-2","护栏"), + ISOLATING_GRID ("9-3","隔离栅"), + INTEL_BOARD ("9-4","情报板"), + ANTI_GLARE_PLATE ("9-5","防炫板"), + REST1 ("9-6","其他"), + THE_RAIN ("10-1", "雨"), + SNOW ("10-2", "雪"), + THE_FOG ("10-3", "雾"), + GALE ("10-4", "大风"), + LOW_TEMPERATURE_COLD_WAVE ("10-5", "低温寒潮"), + SNOW_ON_PAVEMENT ("10-6", "路面积雪"), + ICY_ROAD ("10-7", "路面结冰"), + ROAD_WATER ("10-8", "路面积水"), + RESTS ("10-9", "其他"), + OTHER_EVENTS ("11-1", "其他事件"); + private final String code; + private final String description; + + EventSubclass(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() + { + return code; + } + + public String getDescription() { + return description; + } +} 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 485979da..a89181d6 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 @@ -11,9 +11,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.system.service.ISysDeptService; import com.zc.business.domain.*; -import com.zc.business.enums.EventSubclassEnum; -import com.zc.business.enums.EventTypeEnum; -import com.zc.business.enums.ValueConverter; +import com.zc.business.enums.*; import com.zc.business.mapper.*; import com.zc.business.service.IDcEventProcessService; import com.zc.business.service.IDcEventService; @@ -667,20 +665,34 @@ public class DcEventServiceImpl extends ServiceImpl impl */ @Override public int updateDcEvent(DcEvent dcEvent) { -/* //事件类型校验 +/* + //事件类型校验 for (EventTypeEnum value : EventTypeEnum.values()) { - if (dcEvent.getEventType().toString()==value.getInfo()){ + if (dcEvent.getEventType().toString().equals(value.getInfo())){ dcEvent.setEventType(Long.valueOf(value.getCode())); } } +*/ // 事件子类校验 - for (EventSubclassEnum value : EventSubclassEnum.values()) { - if (value.getInfo().equals(dcEvent.getEventSubclass())){ + for (EventSubclass value : EventSubclass.values()) { + if (value.getDescription().equals(dcEvent.getEventSubclass())){ dcEvent.setEventSubclass(value.getCode()); } } -//事件来源校验*/ + /*//事件来源校验 + for (EventSource value : EventSource.values()) { + if (value.getDescription().equals(dcEvent.getEventSource())){ + dcEvent.setEventSource(Long.valueOf(value.getCode())); + } + }*/ + +//事件方向 + if (dcEvent.getDirection().equals("菏泽方向")){ + dcEvent.setDirection("1"); + } if (dcEvent.getDirection().equals("济南方向")){ + dcEvent.setDirection("3"); + } DcEvent oldEvent = selectEventSubclassById(dcEvent.getId()); dcEvent.setUpdateTime(DateUtils.getNowDate());