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

更改事件弹框查询

develop
Mr.Wang 2 years ago
parent
151058f7d8
commit
c55fd5aed1
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

18
zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java
View File

@ -96,9 +96,9 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
return dcEmergencyPlansList.stream() return dcEmergencyPlansList.stream()
.filter(dcEmergencyPlans -> { .filter(dcEmergencyPlans -> {
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 eventSubclass.equals(event.getEventSubclass()); return triggerMechanism.equals(event.getEventSubclass());
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if (eventType == EventTypeEnum.VEHICLE_MALFUNCTION.getCode()) { } else if (eventType == EventTypeEnum.VEHICLE_MALFUNCTION.getCode()) {
@ -106,11 +106,11 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
return dcEmergencyPlansList.stream() return dcEmergencyPlansList.stream()
.filter(dcEmergencyPlans -> { .filter(dcEmergencyPlans -> {
String triggerMechanism = dcEmergencyPlans.getTriggerMechanism(); String triggerMechanism = dcEmergencyPlans.getTriggerMechanism();
JSONObject triggerJson = JSONObject.parseObject(triggerMechanism); // JSONObject triggerJson = JSONObject.parseObject(triggerMechanism);
String locationType = triggerJson.get("locationType").toString(); // String locationType = triggerJson.get("locationType").toString();
DcEventVehicleAccident dcEventVehicleAccident = event.getDcEventVehicleAccident(); DcEventVehicleAccident dcEventVehicleAccident = event.getDcEventVehicleAccident();
String eventLocationType = dcEventVehicleAccident.getLocationType().toString(); String eventLocationType = dcEventVehicleAccident.getLocationType().toString();
return locationType.equals(eventLocationType); return triggerMechanism.equals(eventLocationType);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} else if (eventType == EventTypeEnum.TRAFFIC_CONTROL.getCode()) { } else if (eventType == EventTypeEnum.TRAFFIC_CONTROL.getCode()) {
@ -118,13 +118,13 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
return dcEmergencyPlansList.stream() return dcEmergencyPlansList.stream()
.filter(dcEmergencyPlans -> { .filter(dcEmergencyPlans -> {
String triggerMechanism = dcEmergencyPlans.getTriggerMechanism(); String triggerMechanism = dcEmergencyPlans.getTriggerMechanism();
JSONObject triggerJson = JSONObject.parseObject(triggerMechanism); // JSONObject triggerJson = JSONObject.parseObject(triggerMechanism);
// 分类 // 分类
Integer classify = Integer.parseInt(triggerJson.get("classify").toString()); // Integer classify = Integer.parseInt(triggerJson.get("classify").toString());
// 事件--交通管制数据 // 事件--交通管制数据
DcEventTrafficControl dcEventTrafficControl = event.getDcEventTrafficControl(); DcEventTrafficControl dcEventTrafficControl = event.getDcEventTrafficControl();
Integer eventClassify = Integer.parseInt(dcEventTrafficControl.getClassify().toString()); Integer eventClassify = Integer.parseInt(dcEventTrafficControl.getClassify().toString());
return classify.equals(eventClassify); return Integer.parseInt(triggerMechanism) == eventClassify;
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} else { } else {

Write Preview
Loading…
Cancel
Save