From 05f431971824362efb0287f3b5c98b70da1345a5 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 24 Jul 2024 14:53:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/controller/WeatherForecastController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java index 4dbb064a..c91a755b 100644 --- a/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java +++ b/zc-business/src/main/java/com/zc/business/controller/WeatherForecastController.java @@ -84,7 +84,6 @@ public class WeatherForecastController extends BaseController { DcNoStakeWarningTable noStakeWarningTable = new DcNoStakeWarningTable(); noStakeWarningTable.setWarningType(UniversalEnum.TWO.getValue()); - List dcNoStakeWarningTables = noStakeWarningTableService.listDcNoStakeWarningTable(noStakeWarningTable, null, null); data.forEach(item -> { JSONObject jsonObject = (JSONObject) JSON.toJSON(item); 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("earlyWorningTitle"), jsonObject.getString("earlyWorningTitle")) // && !Objects.equals(ite.getString("stationName"), jsonObject.getString("stationName"))).collect(Collectors.toList()); + List dcNoStakeWarningTables = noStakeWarningTableService.listDcNoStakeWarningTable(noStakeWarningTable, null, null); List collect = dcNoStakeWarningTables.stream().filter(ite -> Objects.equals(ite.getWarningTime(), jsonObject.getDate("earlyWorningIssueDate")) && Objects.equals(ite.getWarningDescription(), jsonObject.getString("earlyWorningContent"))