|
@ -84,7 +84,6 @@ public class WeatherForecastController extends BaseController { |
|
|
|
|
|
|
|
|
DcNoStakeWarningTable noStakeWarningTable = new DcNoStakeWarningTable(); |
|
|
DcNoStakeWarningTable noStakeWarningTable = new DcNoStakeWarningTable(); |
|
|
noStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue()); |
|
|
noStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue()); |
|
|
List<DcNoStakeWarningTable> dcNoStakeWarningTables = noStakeWarningTableService.listDcNoStakeWarningTable(noStakeWarningTable, null, null); |
|
|
|
|
|
data.forEach(item -> { |
|
|
data.forEach(item -> { |
|
|
JSONObject jsonObject = (JSONObject) JSON.toJSON(item); |
|
|
JSONObject jsonObject = (JSONObject) JSON.toJSON(item); |
|
|
String earlyWorningSignal = jsonObject.getString("earlyWorningSignal"); |
|
|
String earlyWorningSignal = jsonObject.getString("earlyWorningSignal"); |
|
@ -193,6 +192,7 @@ public class WeatherForecastController extends BaseController { |
|
|
// !Objects.equals(ite.getString("earlyWorningIssueDate"), jsonObject.getString("earlyWorningIssueDate"))
|
|
|
// !Objects.equals(ite.getString("earlyWorningIssueDate"), jsonObject.getString("earlyWorningIssueDate"))
|
|
|
// && !Objects.equals(ite.getString("earlyWorningTitle"), jsonObject.getString("earlyWorningTitle"))
|
|
|
// && !Objects.equals(ite.getString("earlyWorningTitle"), jsonObject.getString("earlyWorningTitle"))
|
|
|
// && !Objects.equals(ite.getString("stationName"), jsonObject.getString("stationName"))).collect(Collectors.toList());
|
|
|
// && !Objects.equals(ite.getString("stationName"), jsonObject.getString("stationName"))).collect(Collectors.toList());
|
|
|
|
|
|
List<DcNoStakeWarningTable> dcNoStakeWarningTables = noStakeWarningTableService.listDcNoStakeWarningTable(noStakeWarningTable, null, null); |
|
|
List<DcNoStakeWarningTable> collect = dcNoStakeWarningTables.stream().filter(ite -> |
|
|
List<DcNoStakeWarningTable> collect = dcNoStakeWarningTables.stream().filter(ite -> |
|
|
Objects.equals(ite.getWarningTime(), jsonObject.getDate("earlyWorningIssueDate")) |
|
|
Objects.equals(ite.getWarningTime(), jsonObject.getDate("earlyWorningIssueDate")) |
|
|
&& Objects.equals(ite.getWarningDescription(), jsonObject.getString("earlyWorningContent")) |
|
|
&& Objects.equals(ite.getWarningDescription(), jsonObject.getString("earlyWorningContent")) |
|
|