mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改事件信息比对

develop
lau572 5 months ago
parent
31151959ec
commit
d55a441392
2 changed files with 52 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      zc-business/src/main/java/com/zc/business/enums/ValueConverter.java
  2. 46
      zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

12
zc-business/src/main/java/com/zc/business/enums/ValueConverter.java
View File

@ -206,7 +206,7 @@ public class ValueConverter {
eventLabel.put("dcEventAbnormalWeather.numericalValue","异常天气数值");
eventLabel.put("dcEventAccident.reporterName","报警人姓名");
eventLabel.put("dcEventAccident.reporterPhoneNumber","报警人电话");
eventLabel.put("dcEventAccident.locationType","地点");
eventLabel.put("dcEventAccident.locationType","地点类型");
eventLabel.put("dcEventAccident.trafficJam","压车(公里)");
eventLabel.put("dcEventAccident.weatherCondition","天气情况");
eventLabel.put("dcEventAccident.impactLevel","影响");
@ -227,7 +227,7 @@ public class ValueConverter {
eventLabel.put("dcEventAccident.seriousInjuries","重伤(人)");
eventLabel.put("dcEventAccident.fatalities","死亡(人)");
eventLabel.put("dcEventAccident.isPrivate","私密事件");
eventLabel.put("dcEventAccident.facilityId","设施关联");
eventLabel.put("dcEventAccident.facilityId","设施");
// eventLabel.put("dcEventAccident.rampId","匝道id");
eventLabel.put("dcEventAccident.location","地点");
eventLabel.put("dcEventConstruction.controlMode","管制方式");
@ -236,7 +236,7 @@ public class ValueConverter {
eventLabel.put("dcEventConstruction.specialConstruction","专项施工");
eventLabel.put("dcEventConstruction.otherConstructionName","其他施工名称");
eventLabel.put("dcEventConstruction.constructionMeasurement","施工措施");
// eventLabel.put("dcEventConstruction.facilityId","设施id");
eventLabel.put("dcEventConstruction.facilityId","设施");
eventLabel.put("dcEventConstruction.exitsInlets","出入口");
eventLabel.put("dcEventConstruction.laneOccupancy","占用车道");
eventLabel.put("dcEventConstruction.trafficCondition","通行情况");
@ -250,7 +250,7 @@ public class ValueConverter {
eventLabel.put("dcEventTrafficCongestion.congestionMileage","拥堵里程(公里)");
eventLabel.put("dcEventTrafficCongestion.maxCongestionMileage","最大拥堵里程(公里)");
eventLabel.put("dcEventTrafficCongestion.congestionCause","拥堵原因");
// eventLabel.put("dcEventTrafficCongestion.facilityId","设施id");
eventLabel.put("dcEventTrafficCongestion.facilityId","设施");
// eventLabel.put("dcEventTrafficCongestion.rampId","匝道");
eventLabel.put("dcEventTrafficCongestion.location","地点");
eventLabel.put("dcEventTrafficCongestion.detailedReasons","详细原因");
@ -273,13 +273,13 @@ public class ValueConverter {
eventLabel.put("dcEventVehicleAccident.seriousInjuries","重伤(人)");
eventLabel.put("dcEventVehicleAccident.fatalities","死亡(人)");
eventLabel.put("dcEventVehicleAccident.isPrivate","私密事件");
eventLabel.put("dcEventVehicleAccident.facilityId","地点");
eventLabel.put("dcEventVehicleAccident.facilityId","设施");
// 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.facilityId","设施");
// eventLabel.put("dcEventTrafficControl.rampId","匝道");
eventLabel.put("dcEventTrafficControl.causeType","原因类型");
eventLabel.put("dcEventTrafficControl.measure","措施");

46
zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java
View File

@ -89,6 +89,9 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
@Autowired
private DcStakeMarkMapper dcStakeMarkMapper;
@Autowired
private DcRampMapper dcRampMapper;
private final String HAPPEN = "发生";
private final String EVENT = "事件";
private final String SUBEVENT = "0";
@ -1814,6 +1817,49 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
} else if ("2".equals(result.getRight())) {
result.setRight("禁止");
}
} else if ("dcEventAccident.facilityId".equals(result.getRightPath())
|| "dcEventConstruction.facilityId".equals(result.getRightPath())
|| "dcEventServiceArea.facilityId".equals(result.getRightPath())
|| "dcEventTrafficCongestion.facilityId".equals(result.getRightPath())
|| "dcEventVehicleAccident.facilityId".equals(result.getRightPath())
|| "dcEventTrafficControl.facilityId".equals(result.getRightPath())){
DcFacility dcFacility = dcFacilityService.getFacility(result.getRight().toString());
if (dcFacility != null){
result.setRight(dcFacility.getFacilityName());
}
} else if ("dcEventAccident.location".equals(result.getRightPath())){
DcEventAccident dcEventAccident = newEvent.getDcEventAccident();
if (dcEventAccident.getLocationType() == 3){
DcRamp dcRamp = dcRampMapper.selectDcRampById((Long) result.getRight());
if (dcRamp != null){
result.setRight(dcRamp.getRampName());
}
} else if (dcEventAccident.getLocationType() == 4){
if ("1".equals(result.getRight())) {
result.setRight("入口车道");
} else if ("2".equals(result.getRight())) {
result.setRight("入口匝道");
} else if ("3".equals(result.getRight())) {
result.setRight("入口");
} else if ("4".equals(result.getRight())) {
result.setRight("入口内广场");
} else if ("5".equals(result.getRight())) {
result.setRight("出口车道");
} else if ("6".equals(result.getRight())) {
result.setRight("出口匝道");
} else if ("7".equals(result.getRight())) {
result.setRight("外广场");
} else if ("8".equals(result.getRight())) {
result.setRight("出口");
} else if ("9".equals(result.getRight())) {
result.setRight("(站外)入口匝道");
} else if ("10".equals(result.getRight())) {
result.setRight("(站外)出口匝道");
} else if ("11".equals(result.getRight())) {
result.setRight("出口内广场");
}
}
}
String label = ValueConverter.eventLabel(result.getRightPath());
if (StringUtils.isNotEmpty(label)) {

Write Preview
Loading…
Cancel
Save