Commit 1f3d581e authored by tongzuqi's avatar tongzuqi

N个地方需要过滤非车辆的显示

parent 45887c43
...@@ -178,6 +178,10 @@ public class EventDetailRespVO { ...@@ -178,6 +178,10 @@ public class EventDetailRespVO {
* 处置操作人姓名 * 处置操作人姓名
*/ */
private String processingOperationsName; private String processingOperationsName;
/**
* true 非车辆事件 false 车辆相关事件
*/
private boolean nonVehicleFlag;
/** /**
* 处置时间 * 处置时间
*/ */
......
...@@ -22,7 +22,7 @@ public class EventUtil { ...@@ -22,7 +22,7 @@ public class EventUtil {
* 比如: * 比如:
* @return boolean true 非车辆事件 false 车辆相关事件 * @return boolean true 非车辆事件 false 车辆相关事件
*/ */
public static boolean isNonVehicle(Integer eventType){//List<String> carPlateList, public static boolean nonVehicleFlag(Integer eventType){//List<String> carPlateList,
if ( EventType.getTypeNonVehicle().contains(eventType)){ if ( EventType.getTypeNonVehicle().contains(eventType)){
return true; return true;
} }
......
...@@ -331,7 +331,7 @@ public class EventDetailDO { ...@@ -331,7 +331,7 @@ public class EventDetailDO {
if (Objects.nonNull(eventDetail.getEventRoadNo())) { if (Objects.nonNull(eventDetail.getEventRoadNo())) {
eventSituation = eventSituation.concat("第").concat(eventDetail.getEventRoadNo()).concat("车道"); eventSituation = eventSituation.concat("第").concat(eventDetail.getEventRoadNo()).concat("车道");
} }
boolean isNonVehicle = EventUtil.isNonVehicle(eventDetail.getEventType()); boolean nonVehicleFlag = EventUtil.nonVehicleFlag(eventDetail.getEventType());
eventSituation = eventSituation.concat("发现").concat(eventType.desc); eventSituation = eventSituation.concat("发现").concat(eventType.desc);
//位置方向 //位置方向
String directionalPosition = tunnelDetailDO.getDirectionName(); String directionalPosition = tunnelDetailDO.getDirectionName();
...@@ -348,7 +348,7 @@ public class EventDetailDO { ...@@ -348,7 +348,7 @@ public class EventDetailDO {
} }
situationSpot = situationSpot.concat("发现").concat(eventType.desc); situationSpot = situationSpot.concat("发现").concat(eventType.desc);
//非车辆事件不显示单车多车标识 //非车辆事件不显示单车多车标识
if(isNonVehicle){ if(nonVehicleFlag){
eventSituation.concat("(").concat(singMultiCar).concat(")"); eventSituation.concat("(").concat(singMultiCar).concat(")");
situationSpot.concat("(").concat(singMultiCar).concat(")"); situationSpot.concat("(").concat(singMultiCar).concat(")");
} }
...@@ -361,6 +361,7 @@ public class EventDetailDO { ...@@ -361,6 +361,7 @@ public class EventDetailDO {
if (Objects.nonNull(eventDetail.getEventStartTime())) { if (Objects.nonNull(eventDetail.getEventStartTime())) {
eventDetailRespVO.setEventStartTimeFormat(eventDetail.getEventStartTime()); eventDetailRespVO.setEventStartTimeFormat(eventDetail.getEventStartTime());
} }
eventDetailRespVO.setNonVehicleFlag(nonVehicleFlag);
eventDetailRespVO.setEventSituation(eventSituation); eventDetailRespVO.setEventSituation(eventSituation);
eventDetailRespVO.setMilestoneStr(milestone); eventDetailRespVO.setMilestoneStr(milestone);
eventDetailRespVO.setDirectionalPosition(directionalPosition); eventDetailRespVO.setDirectionalPosition(directionalPosition);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment