diff --git a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java index 53165bfd..eb8e2d97 100644 --- a/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java +++ b/zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java @@ -1234,6 +1234,9 @@ public enum UniversalEnum { // 18 EIGHTEEN(18, "18"), + // 19 + NINETEEN(19, "19"), + // 20 TWENTY(20, "20"), @@ -1896,6 +1899,7 @@ public enum UniversalEnum { //dcEventTrafficControl.limitedType DC_EVENT_TRAFFIC_CONTROL_LIMITED_TYPE(0, "dcEventTrafficControl.limitedType"), + DC_EVENT_TRAFFIC_CONTROL_VEHICLE_TYPE(0, "dcEventTrafficControl.vehicleType"), //dcEventAccident.facilityId DC_EVENT_ACCIDENT_FACILITY_ID(0, "dcEventAccident.facilityId"), 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 78fcb19c..a7744dd5 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 @@ -231,7 +231,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","匝道"); eventLabel.put("dcEventAccident.location","地点"); eventLabel.put("dcEventConstruction.controlMode","管制方式"); eventLabel.put("dcEventConstruction.locationType","地点类型"); @@ -288,7 +288,7 @@ public class ValueConverter { eventLabel.put("dcEventTrafficControl.measure","措施"); eventLabel.put("dcEventTrafficControl.classify","分类"); eventLabel.put("dcEventTrafficControl.limitedType","限制类型"); -// eventLabel.put("dcEventTrafficControl.vehicleType","车辆类型"); + eventLabel.put("dcEventTrafficControl.vehicleType","车辆类型"); eventImportantLabel.put("plateNumber","车型及车牌号"); 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 abed104e..8953943e 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 @@ -1758,6 +1758,56 @@ public class DcEventServiceImpl extends ServiceImpl impl } else if (UniversalEnum.FOURTEEN.getValue().equals(result.getRight())) { result.setRight(UniversalEnum.SERVICE_AREA_CLOSED.getValue()); } + } else if (UniversalEnum.DC_EVENT_TRAFFIC_CONTROL_VEHICLE_TYPE.getValue().equals(result.getRightPath())) { + if (UniversalEnum.ONE.getValue().equals(result.getRight())) { + result.setRight("10座以下客车"); + } else if (UniversalEnum.TWO.getValue().equals(result.getRight())) { + result.setRight("10座以下客车(间隔放行)"); + } else if (UniversalEnum.THREE.getValue().equals(result.getRight())) { + result.setRight("19座以上客车"); + } else if (UniversalEnum.FOUR.getValue().equals(result.getRight())) { + result.setRight("一型客车"); + } else if (UniversalEnum.FIVE.getValue().equals(result.getRight())) { + result.setRight("两客一危"); + } else if (UniversalEnum.SIX.getValue().equals(result.getRight())) { + result.setRight("三类以上班线客车"); + } else if (UniversalEnum.SEVEN.getValue().equals(result.getRight())) { + result.setRight("四轴及四轴以上货车(运送生鲜果蔬、抗疫物资车辆除外)"); + } else if (UniversalEnum.EIGHT.getValue().equals(result.getRight())) { + result.setRight("三轴及以上(含三轴)货车"); + } else if (UniversalEnum.NINE.getValue().equals(result.getRight())) { + result.setRight("3轴以上货车(不含危险品运输车)"); + } else if (UniversalEnum.TEN.getValue().equals(result.getRight())) { + result.setRight("3轴以上货车"); + } else if (UniversalEnum.ELEVEN.getValue().equals(result.getRight())) { + result.setRight("四轴及以上(含四轴)货车"); + } else if (UniversalEnum.TWELVE.getValue().equals(result.getRight())) { + result.setRight("4轴以上货车(不含危险品运输车)"); + } else if (UniversalEnum.THIRTEEN.getValue().equals(result.getRight())) { + result.setRight("4轴以上货车"); + } else if (UniversalEnum.FOURTEEN.getValue().equals(result.getRight())) { + result.setRight("4轴以下货车"); + } else if (UniversalEnum.FIFTEEN.getValue().equals(result.getRight())) { + result.setRight("57座以上客车"); + } else if (UniversalEnum.SIXTEEN.getValue().equals(result.getRight())) { + result.setRight("五轴及以上货车"); + } else if (UniversalEnum.SEVENTEEN.getValue().equals(result.getRight())) { + result.setRight("5轴以上货车"); + } else if (UniversalEnum.EIGHTEEN.getValue().equals(result.getRight())) { + result.setRight("5轴以上货车(不含危险品运输车)"); + } else if (UniversalEnum.NINETEEN.getValue().equals(result.getRight())) { + result.setRight("5轴以下货车"); + } else if (UniversalEnum.TWENTY.getValue().equals(result.getRight())) { + result.setRight("6座以上客车"); + } else if (UniversalEnum.TWENTY_ONE.getValue().equals(result.getRight())) { + result.setRight("6座以上面包车"); + } else if (UniversalEnum.TWENTY_TWO.getValue().equals(result.getRight())) { + result.setRight("7座以上客车"); + } else if (UniversalEnum.TWENTY_THREE.getValue().equals(result.getRight())) { + result.setRight("7座以下客车"); + } else if (UniversalEnum.TWENTY_FOUR.getValue().equals(result.getRight())) { + result.setRight("8座以上客车"); + } } else if (UniversalEnum.DC_EVENT_TRAFFIC_CONTROL_LIMITED_TYPE.getValue().equals(result.getRightPath())) { if (UniversalEnum.ONE.getValue().equals(result.getRight())) { result.setRight(UniversalEnum.ONLY_ALLOW.getValue()); @@ -1779,7 +1829,7 @@ public class DcEventServiceImpl extends ServiceImpl impl DcEventAccident dcEventAccident = newEvent.getDcEventAccident(); if (dcEventAccident.getLocationType() == UniversalEnum.THREE.getNumber()){ - DcRamp dcRamp = dcRampMapper.selectDcRampById((Long) result.getRight()); + DcRamp dcRamp = dcRampMapper.selectDcRampById(Long.valueOf(result.getRight().toString())); if (dcRamp != null){ result.setRight(dcRamp.getRampName()); }