Browse Source

修改获取事件子类字段

develop
Mr.Wang 11 months ago
parent
commit
d3d3a0db7b
  1. 4
      zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

4
zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

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

Loading…
Cancel
Save