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 82221876..59036ead 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 @@ -260,6 +260,7 @@ public class ValueConverter { eventLabel.put("dcEventConstruction.localRoadName","地方道路名称"); eventLabel.put("dcEventConstruction.endStakeMark","结束桩号"); eventLabel.put("dcEventConstruction.location","地点"); + eventLabel.put("dcEventConstruction.rampId","匝道"); eventLabel.put("dcEventServiceArea.exitsInlets","出入口"); eventLabel.put("dcEventServiceArea.facilityId","服务区"); eventLabel.put("dcEventServiceArea.disableFacility","停用设施"); 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 d072cb49..03759f0d 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 @@ -1861,6 +1861,23 @@ public class DcEventServiceImpl extends ServiceImpl impl result.setRight(UniversalEnum.INNER_EXIT_PLAZA.getValue()); } } + } else if ("dcEventServiceArea.disableFacility".equals(result.getRightPath())){ + if (UniversalEnum.ONE.getValue().equals(result.getRight())) { + result.setRight("卫生间"); + } else if (UniversalEnum.TWO.getValue().equals(result.getRight())) { + result.setRight("餐厅"); + } else if (UniversalEnum.THREE.getValue().equals(result.getRight())) { + result.setRight("停车场"); + } else if (UniversalEnum.FOUR.getValue().equals(result.getRight())) { + result.setRight("加油站"); + } else if (UniversalEnum.FIVE.getValue().equals(result.getRight())) { + result.setRight("充电桩"); + } + } else if ("dcEventConstruction.rampId".equals(result.getRightPath())){ + DcRamp dcRamp = dcRampMapper.selectDcRampById(Long.valueOf(result.getRight().toString())); + if (dcRamp != null){ + result.setRight(dcRamp.getRampName()); + } } String label = ValueConverter.eventLabel(result.getRightPath()); if (StringUtils.isNotEmpty(label)) { diff --git a/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml index b3812a37..f47a4531 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventConstructionMapper.xml @@ -135,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" local_road_name = #{localRoadName}, location = #{location}, construction_method = #{constructionMethod}, + ramp_id = #{rampId}, where id = #{id}