Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

src/main/java/com/hivekion/common/entity/ResponseCmdInfo.java

@@ -18,4 +18,14 @@ public class ResponseCmdInfo<T> implements java.io.Serializable {
   private String room;
   private Integer scenarioId;
   private T data;
+
+  @Override
+  public String toString() {
+    return "ResponseCmdInfo{" +
+            "cmdType='" + cmdType + '\'' +
+            ", room='" + room + '\'' +
+            ", scenarioId=" + scenarioId +
+            ", data=" + data +
+            '}';
+  }
 }

src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java

@@ -21,6 +21,7 @@ import com.hivekion.statistic.service.StatisticService;
 import com.hivekion.thread.SpringGlobalTaskManager;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -54,6 +55,7 @@ public class ScenarioTaskServiceImpl extends
   @Resource
   private TaskLogicService taskLogicService;
 
+
   @Override
   public void start(Integer id, String roomId) {
     log.info("id::{},roomId::{}",id,roomId);
@@ -67,14 +69,15 @@ public class ScenarioTaskServiceImpl extends
 
 
     //查询天气数据
-    List<SimtoolWeather> weatherList = weatherService.queryByScenarioUuid(
+    WeatherResource weatherList = weatherResourceService.getOne(new QueryWrapper<WeatherResource>()
-        currentScenario.getGuid());
+    .eq("scenario_id",id));
+//        currentScenario.getGuid());
     //放入天气数据
-    redisUtil.hset(roomId + "_" + id, "weather", weatherList);
+    redisUtil.hset(roomId + "_" + id, "weather", weatherList.getWeatherType());
     //查询任务
     ScenarioTask queryTask = new ScenarioTask();
     queryTask.setScenarioId(id);
-    redisUtil.hset(roomId + "_" + id, "taskList", queryTaskList(queryTask));
+    redisUtil.hset(roomId + "_" + id, "taskList", queryTaskList(queryTask).get(0).getTaskType());
     new Thread(() -> {
 
       springGlobalTaskManager.startPerSecondTask(roomId + "_" + id + "_task", () -> {
@@ -135,8 +138,8 @@ public class ScenarioTaskServiceImpl extends
   private void weatherTrigger(Scenario currentScenario, String roomId) {
     try {
       QueryWrapper<WeatherResource> weatherResourceQueryWrapper = new QueryWrapper<>();
-      weatherResourceQueryWrapper.eq("scenario_id", currentScenario.getId()).eq("room_id", roomId);
+      weatherResourceQueryWrapper.eq("scenario_id", currentScenario.getId());
-      List<WeatherResource> weatherResourceList = this.weatherResourceService.list();
+      List<WeatherResource> weatherResourceList = this.weatherResourceService.list(weatherResourceQueryWrapper);
       ResponseCmdInfo<JSONArray> responseCmdInfo = new ResponseCmdInfo();
       responseCmdInfo.setScenarioId(currentScenario.getId());
       responseCmdInfo.setRoom(roomId);
@@ -150,6 +153,7 @@ public class ScenarioTaskServiceImpl extends
         responseCmdInfo.setCmdType("66-" + weatherResource.getWeatherType());
       }
       responseCmdInfo.setData(weatherMsgArray);
+      System.out.println(responseCmdInfo.toString());
       Global.sendCmdInfoQueue.add(responseCmdInfo);
     } catch (Exception ex) {