From 36b08786598c112ac1be6088e66a9ecc9fde09a4 Mon Sep 17 00:00:00 2001 From: wangwenhua <12345678> Date: Sun, 14 Sep 2025 23:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=A9=E6=B0=94=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/hivekion/baseData/entity/Scenario.java | 1 + .../scenario/service/impl/ScenarioTaskServiceImpl.java | 4 ++-- src/main/resources/mapper/tbl/ScenarioMapper.xml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hivekion/baseData/entity/Scenario.java b/src/main/java/com/hivekion/baseData/entity/Scenario.java index d8fa416..58a7343 100644 --- a/src/main/java/com/hivekion/baseData/entity/Scenario.java +++ b/src/main/java/com/hivekion/baseData/entity/Scenario.java @@ -67,6 +67,7 @@ public class Scenario extends SearchInputVo { @ApiModelProperty("是不是小堆") private Byte isXd; @TableField(value = "start_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; @TableField(value = "end_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java index 5b71f01..9dc91c0 100644 --- a/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java +++ b/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java @@ -76,7 +76,7 @@ public class ScenarioTaskServiceImpl extends //查询天气数据 List weatherList = weatherResourceService.list(new QueryWrapper() - .eq("scenario_id",id)); + .eq("scenario_id",scenarioId)); JSONArray jsonArray = new JSONArray(); for(WeatherResource weatherResource: weatherList) { String weaherStr = JSON.toJSONString(weatherResource); @@ -92,7 +92,7 @@ public class ScenarioTaskServiceImpl extends jsonArray.add(weatherObj); } //放入天气数据 - redisUtil.hset(roomId + "_" + id, "weather", JSON.toJSONString(jsonArray)); + redisUtil.hset(roomId + "_" + scenarioId, "weather", JSON.toJSONString(jsonArray)); //查询任务 ScenarioTask queryTask = new ScenarioTask(); queryTask.setScenarioId(scenarioId); diff --git a/src/main/resources/mapper/tbl/ScenarioMapper.xml b/src/main/resources/mapper/tbl/ScenarioMapper.xml index 74872ca..feae4f9 100644 --- a/src/main/resources/mapper/tbl/ScenarioMapper.xml +++ b/src/main/resources/mapper/tbl/ScenarioMapper.xml @@ -63,6 +63,8 @@ Author, CreateUserId, CreateTime, + start_time As startTime, + end_time, id, left_up_lng AS leftUpLng, right_up_lng AS rightUpLng,