|
|
@ -98,7 +98,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
String triggerMechanism = dcEmergencyPlans.getTriggerMechanism(); |
|
|
|
// JSONObject triggerJson = JSONObject.parseObject(triggerMechanism);
|
|
|
|
// String eventSubclass = triggerJson.get("eventSubclass").toString();
|
|
|
|
return triggerMechanism.equals(event.getEventSubclass()); |
|
|
|
return triggerMechanism.equals(event.getSubclass()); |
|
|
|
}) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
} else if (eventType == EventTypeEnum.VEHICLE_MALFUNCTION.getCode()) { |
|
|
@ -453,7 +453,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { |
|
|
|
eventType == EventTypeEnum.ROADBLOCK_CLEARANCE.getCode()) { |
|
|
|
|
|
|
|
String content = Arrays.stream(EventSubclassEnum.values()) |
|
|
|
.filter(eventSubclassEnum -> eventSubclassEnum.getCode().equals(dcEvent.getEventSubclass())) |
|
|
|
.filter(eventSubclassEnum -> eventSubclassEnum.getCode().equals(dcEvent.getSubclass())) |
|
|
|
.findFirst() |
|
|
|
.map(EventSubclassEnum::getText) |
|
|
|
.orElse("请注意前方危险"); |
|
|
|