From 0601bc932a18c52b47d11db4d57c3e8855984b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E4=B8=9C?=
 <129883742+liyudong2018@users.noreply.github.com>
Date: Sun, 14 Sep 2025 22:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/service/impl/ScenarioTaskServiceImpl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 0276910..898c208 100644
--- a/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
+++ b/src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java
@@ -71,13 +71,15 @@ public class ScenarioTaskServiceImpl extends
     //查询天气数据
     WeatherResource weatherList = weatherResourceService.getOne(new QueryWrapper<WeatherResource>()
     .eq("scenario_id",id));
-//        currentScenario.getGuid());
-    //放入天气数据
-    redisUtil.hset(roomId + "_" + id, "weather", weatherList.getWeatherType());
+     if(weatherList!=null){
+       //放入天气数据
+       redisUtil.hset(roomId + "_" + id, "weather", weatherList);
+     }
+
     //查询任务
     ScenarioTask queryTask = new ScenarioTask();
     queryTask.setScenarioId(id);
-    redisUtil.hset(roomId + "_" + id, "taskList", queryTaskList(queryTask).get(0).getTaskType());
+    redisUtil.hset(roomId + "_" + id, "taskList", queryTaskList(queryTask));
     new Thread(() -> {
 
       springGlobalTaskManager.startPerSecondTask(roomId + "_" + id + "_task", () -> {