From 34d2384b1a775f4cfe8075d40ac06b52c0283f4c Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 26 Apr 2024 18:13:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/controller/WeatherForecastController.java | 3 ++- 1 file changed, 2 insertions(+), 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 fc8ffaae..8f167ab7 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 @@ -104,7 +104,7 @@ public class WeatherForecastController extends BaseController { JSONObject jsonResult = JSONObject.parseObject(response.body().string()); if (jsonResult.getInteger("code") == 200) { - jsonObject.put("name",dcRegion.getRegionName()); + jsonResult.put("name",dcRegion.getRegionName()); jsonObject.put(weather.getString("METEOROLOGICALEARLYWARNING") + dcRegion.getId(), extracted(jsonResult,"warning")); } else { @@ -179,6 +179,7 @@ public class WeatherForecastController extends BaseController { if (jsonResult.getInteger("code") == 200) { jsonObject.put("name",dcRegion.getRegionName()); + jsonResult.put("name",dcRegion.getRegionName()); if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) { jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "now")); From 98b45949f0d14579a1be8816cac5fd3554c6083d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Fri, 26 Apr 2024 18:42:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E6=8C=89=E7=85=A7=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E5=8F=96=E6=97=B6=E9=97=B4=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/business/DcEventMapper.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml index 0da925e1..9add2632 100644 --- a/zc-business/src/main/resources/mapper/business/DcEventMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcEventMapper.xml @@ -145,7 +145,7 @@ --> - select id, dept_id, stake_mark, direction, user_id, start_time, end_time, estimated_end_time, event_level, event_type, event_subclass, event_cause, description, event_state, event_source, event_nature, remark, create_time, update_time, event_source_tips, in_tunnel from dc_event + select id, dept_id, stake_mark, direction, user_id, start_time, end_time, estimated_end_time, event_level, event_type, event_subclass, event_cause, description, event_state, event_source, event_nature, remark, create_time, update_time, event_source_tips, in_tunnel,occurrence_time from dc_event SELECT id, @@ -350,7 +350,20 @@ and in_tunnel = #{inTunnel} and is_perceived = #{isPerceived} - ORDER BY create_time desc + + + ORDER BY occurrence_time DESC + + + ORDER BY start_time DESC + + + ORDER BY end_time DESC + + + ORDER BY create_time DESC + + From 33aac8c36bb2f1b62352c770a6def9c3cf48b6b9 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Fri, 26 Apr 2024 19:43:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B0=94?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WeatherForecastController.java | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) 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 8f167ab7..99e57d71 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 @@ -104,8 +104,7 @@ public class WeatherForecastController extends BaseController { JSONObject jsonResult = JSONObject.parseObject(response.body().string()); if (jsonResult.getInteger("code") == 200) { - jsonResult.put("name",dcRegion.getRegionName()); - jsonObject.put(weather.getString("METEOROLOGICALEARLYWARNING") + dcRegion.getId(), extracted(jsonResult,"warning")); + jsonObject.put(weather.getString("METEOROLOGICALEARLYWARNING") + dcRegion.getId(), extracted(jsonResult, "warning", dcRegion)); } else { return AjaxResult.error(jsonResult.getInteger("code"), "请求失败"); @@ -178,19 +177,17 @@ public class WeatherForecastController extends BaseController { JSONObject jsonResult = JSONObject.parseObject(response.body().string()); if (jsonResult.getInteger("code") == 200) { - jsonObject.put("name",dcRegion.getRegionName()); - jsonResult.put("name",dcRegion.getRegionName()); if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) { - jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "now")); + jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "now", dcRegion)); } else if (Objects.equals(redisKey, weather.getString("METEOROLOGICALEARLYWARNING"))) { - jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "warning")); + jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "warning", dcRegion)); } else if (Objects.equals(redisKey, weather.getString("HOURLYWEATHER"))) { - jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult,"hourly")); + jsonObject.put(redisKey + dcRegion.getId(), extracted(jsonResult, "hourly", dcRegion)); } } else { return AjaxResult.error(jsonResult.getInteger("code"), "请求失败"); @@ -204,7 +201,7 @@ public class WeatherForecastController extends BaseController { } - if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) { + if (Objects.equals(redisKey, weather.getString("WEATHERFACTS"))) { redisCache.setCacheObject(redisKey, jsonObject, 13, TimeUnit.MINUTES); @@ -221,14 +218,21 @@ public class WeatherForecastController extends BaseController { } } - private static Object extracted(JSONObject jsonResult, String type) { + private static Object extracted(JSONObject jsonResult, String type, DcRegion dcRegion) { JSONObject jsonObject = new JSONObject(); jsonObject.put("code", jsonResult.getString("code")); if (Objects.equals(jsonResult.getString("code"), "200")) { if (Objects.equals(type, "now")) { - return jsonResult.getJSONObject(type); + + JSONObject object = jsonResult.getJSONObject(type); + object.put("name", dcRegion.getRegionName()); + return object; } else { - return jsonResult.getJSONArray(type); + JSONArray jsonArray = jsonResult.getJSONArray(type); + jsonArray.forEach(item -> { + ((JSONObject) item).put("name", dcRegion.getRegionName()); + }); + return jsonArray; } } else if (Objects.equals(jsonResult.getString("code"), "500")) { jsonObject.put("msg", "请求失败:无响应或超时"); @@ -272,7 +276,7 @@ public class WeatherForecastController extends BaseController { JSONObject jsonResult = JSONObject.parseObject(response.body().string()); if (jsonResult.getInteger("code") == 200) { - jsonObject.put("weatherInTheAreaWhereTheIncidentOccurred",jsonResult); + jsonObject.put("weatherInTheAreaWhereTheIncidentOccurred", jsonResult); } else { return AjaxResult.error(jsonResult.getInteger("code"), "请求失败"); }