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

# Conflicts:
#	src/main/java/com/hivekion/scenario/service/impl/ScenarioTaskServiceImpl.java

src/main/java/com/hivekion/baseData/controller/ScenarioController.java

@@ -11,6 +11,7 @@ import com.hivekion.common.enums.ResultCodeEnum;
 import com.hivekion.common.security.SecurityUtils;
 import com.hivekion.common.uuid.IdUtils;
 import com.hivekion.icon.service.IconService;
+import com.hivekion.scenario.service.IResourceService;
 import com.hivekion.scenario.service.ScenarioResourceService;
 import com.hivekion.team.entity.Teaminfo;
 import com.hivekion.team.service.ITeaminfoService;
@@ -54,6 +55,9 @@ public class ScenarioController extends BaseController {
   @Resource
   private ScenarioResourceService scenarioResourceService;
 
+  @Resource
+  private IResourceService  iResourceService;
+
   /**
    * 查询想定列表
    *
@@ -172,8 +176,16 @@ public class ScenarioController extends BaseController {
   }
 
   /**
-   * 获取想定资源 type=1 飞机 对应tbl_entity表中id=1 || type=2 地面兵力于设施  对应tbl_entity 表中id=4 ||type=3 水面舰艇  id=2
+   * 获取想定资源
-   * type=4 潜艇 id=3|| type=5 作战部队 对应tbl_teaminfo中 type=0 ||type=6 保障部队 对应tbl_teaminfo 中 type=1
+   *
+   * type=1 飞机 对应tbl_entity表中id=1 ||
+   * type=2 地面兵力于设施  对应tbl_entity 表中id=4 ||
+   * type=3 水面舰艇  id=2
+   * type=4 潜艇 id=3||
+   * type=5 作战部队 对应tbl_teaminfo中 type=0 ||
+   * type=6 保障部队 对应tbl_teaminfo 中 type=1
+   * type =7 医院
+   * tupe=8 仓库
    *
    * @param type 类型
    * @return 资源信息
@@ -202,6 +214,12 @@ public class ScenarioController extends BaseController {
       case 6:
         return ResponseData.success(
             covertTeamInfoToResource(type, iTeaminfoService.queryByType(1), iconMap));
+      case 7:
+        return ResponseData.success(
+              covertBuildInfoToResource(type,iResourceService.listAllBuildResourceByType(7),iconMap));
+      case 8:
+        return ResponseData.success(
+                covertBuildInfoToResource(type,iResourceService.listAllBuildResourceByType(8),iconMap));
       default:
         return ResponseData.error(ResultCodeEnum.PARAMETER_ERROR, null);
 
@@ -236,4 +254,18 @@ public class ScenarioController extends BaseController {
     });
     return resources;
   }
+
+  private List<ScenarioResource> covertBuildInfoToResource(Integer type, List<com.hivekion.scenario.entity.Resource> list,
+                                                          Map<String, String> iconMap) {
+    List<ScenarioResource> resources = new ArrayList<>();
+    list.forEach(e -> {
+      ScenarioResource resource = new ScenarioResource();
+      resource.setId(e.getId());
+      resource.setType(type);
+      resource.setName(e.getResourceName());
+      resource.setImgBase64(iconMap.get(e.getIcon()));
+      resources.add(resource);
+    });
+    return resources;
+  }
 }

src/main/java/com/hivekion/baseData/controller/WeatherResourceController.java

@@ -0,0 +1,18 @@
+package com.hivekion.baseData.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 气像资源信息 前端控制器
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+@Controller
+@RequestMapping("/baseData/weatherResource")
+public class WeatherResourceController {
+
+}

src/main/java/com/hivekion/baseData/entity/WeatherResource.java

@@ -0,0 +1,103 @@
+package com.hivekion.baseData.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 气像资源信息
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+@TableName("TBL_WEATHER_RESOURCE")
+@ApiModel(value = "WeatherResource对象", description = "气像资源信息")
+public class WeatherResource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物理主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("想定房间编号")
+    private String roomId;
+
+    @ApiModelProperty("想定场景编号")
+    private Integer scenarioId;
+
+    @ApiModelProperty("天气类型")
+    private String weatherType;
+
+    @ApiModelProperty("持续开始时间")
+    private LocalDateTime lastBegTime;
+
+    @ApiModelProperty("持续结束时间")
+    private LocalDateTime lastEndTime;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public Integer getScenarioId() {
+        return scenarioId;
+    }
+
+    public void setScenarioId(Integer scenarioId) {
+        this.scenarioId = scenarioId;
+    }
+
+    public String getWeatherType() {
+        return weatherType;
+    }
+
+    public void setWeatherType(String weatherType) {
+        this.weatherType = weatherType;
+    }
+
+    public LocalDateTime getLastBegTime() {
+        return lastBegTime;
+    }
+
+    public void setLastBegTime(LocalDateTime lastBegTime) {
+        this.lastBegTime = lastBegTime;
+    }
+
+    public LocalDateTime getLastEndTime() {
+        return lastEndTime;
+    }
+
+    public void setLastEndTime(LocalDateTime lastEndTime) {
+        this.lastEndTime = lastEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return "WeatherResource{" +
+        "id = " + id +
+        ", roomId = " + roomId +
+        ", scenarioId = " + scenarioId +
+        ", weatherType = " + weatherType +
+        ", lastBegTime = " + lastBegTime +
+        ", lastEndTime = " + lastEndTime +
+        "}";
+    }
+}

src/main/java/com/hivekion/baseData/mapper/WeatherResourceMapper.java

@@ -0,0 +1,16 @@
+package com.hivekion.baseData.mapper;
+
+import com.hivekion.baseData.entity.WeatherResource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 气像资源信息 Mapper 接口
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+public interface WeatherResourceMapper extends BaseMapper<WeatherResource> {
+
+}

src/main/java/com/hivekion/baseData/service/IWeatherResourceService.java

@@ -0,0 +1,16 @@
+package com.hivekion.baseData.service;
+
+import com.hivekion.baseData.entity.WeatherResource;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 气像资源信息 服务类
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+public interface IWeatherResourceService extends IService<WeatherResource> {
+
+}

src/main/java/com/hivekion/baseData/service/impl/WeatherResourceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hivekion.baseData.service.impl;
+
+import com.hivekion.baseData.entity.WeatherResource;
+import com.hivekion.baseData.mapper.WeatherResourceMapper;
+import com.hivekion.baseData.service.IWeatherResourceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 气像资源信息 服务实现类
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-14
+ */
+@Service
+public class WeatherResourceServiceImpl extends ServiceImpl<WeatherResourceMapper, WeatherResource> implements IWeatherResourceService {
+
+}

src/main/java/com/hivekion/scenario/controller/ResourceController.java

@@ -0,0 +1,18 @@
+package com.hivekion.scenario.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 建筑资源表 前端控制器
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-14
+ */
+@Controller
+@RequestMapping("/scenario/resource")
+public class ResourceController {
+
+}

src/main/java/com/hivekion/scenario/controller/ResourceVehicleRelaController.java

@@ -0,0 +1,18 @@
+package com.hivekion.scenario.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 资源车辆表 前端控制器
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-13
+ */
+@Controller
+@RequestMapping("/scenario/resourceVehicleRela")
+public class ResourceVehicleRelaController {
+
+}

src/main/java/com/hivekion/scenario/controller/VehicleController.java

@@ -0,0 +1,18 @@
+package com.hivekion.scenario.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 车辆信息表 前端控制器
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@Controller
+@RequestMapping("/scenario/vehicle")
+public class VehicleController {
+
+}

src/main/java/com/hivekion/scenario/entity/Resource.java

@@ -0,0 +1,144 @@
+package com.hivekion.scenario.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 建筑资源表
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-14
+ */
+@TableName("TBL_RESOURCE")
+@ApiModel(value = "Resource对象", description = "建筑资源表")
+public class Resource implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物理主键id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("设施名称")
+    private String resourceName;
+
+    @ApiModelProperty("设施图标")
+    private String icon;
+
+    @ApiModelProperty("纬度")
+    private String lat;
+
+    @ApiModelProperty("经度")
+    private String lng;
+
+    @ApiModelProperty("设施属性")
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String,Object> resourceAttribut;
+
+    @ApiModelProperty("创建人")
+    private String createOper;
+
+    @ApiModelProperty("更新人")
+    private String updOper;
+
+    @ApiModelProperty("保障建筑资源类型")
+    private Integer resourceType;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getResourceName() {
+        return resourceName;
+    }
+
+    public void setResourceName(String resourceName) {
+        this.resourceName = resourceName;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public Map<String, Object> getResourceAttribut() {
+        return resourceAttribut;
+    }
+
+    public void setResourceAttribut(Map<String, Object> resourceAttribut) {
+        this.resourceAttribut = resourceAttribut;
+    }
+
+    public String getCreateOper() {
+        return createOper;
+    }
+
+    public void setCreateOper(String createOper) {
+        this.createOper = createOper;
+    }
+
+    public String getUpdOper() {
+        return updOper;
+    }
+
+    public void setUpdOper(String updOper) {
+        this.updOper = updOper;
+    }
+
+    public Integer getResourceType() {
+        return resourceType;
+    }
+
+    public void setResourceType(Integer resourceType) {
+        this.resourceType = resourceType;
+    }
+
+    @Override
+    public String toString() {
+        return "Resource{" +
+        "id = " + id +
+        ", resourceName = " + resourceName +
+        ", icon = " + icon +
+        ", lat = " + lat +
+        ", lng = " + lng +
+        ", resourceAttribut = " + resourceAttribut +
+        ", createOper = " + createOper +
+        ", updOper = " + updOper +
+        ", resourceType = " + resourceType +
+        "}";
+    }
+}

src/main/java/com/hivekion/scenario/entity/ResourceVehicleRela.java

@@ -0,0 +1,51 @@
+package com.hivekion.scenario.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 资源车辆表
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-13
+ */
+@TableName("TBL_RESOURCE_VEHICLE_RELA")
+@ApiModel(value = "ResourceVehicleRela对象", description = "资源车辆表")
+public class ResourceVehicleRela implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("资源id")
+    private Integer resourceId;
+
+    @ApiModelProperty("车辆id")
+    private Integer vehicleId;
+
+    public Integer getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Integer resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getVehicleId() {
+        return vehicleId;
+    }
+
+    public void setVehicleId(Integer vehicleId) {
+        this.vehicleId = vehicleId;
+    }
+
+    @Override
+    public String toString() {
+        return "ResourceVehicleRela{" +
+        "resourceId = " + resourceId +
+        ", vehicleId = " + vehicleId +
+        "}";
+    }
+}

src/main/java/com/hivekion/scenario/entity/Vehicle.java

@@ -0,0 +1,135 @@
+package com.hivekion.scenario.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 车辆信息表
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@TableName("TBL_VEHICLE")
+@ApiModel(value = "Vehicle对象", description = "车辆信息表")
+public class Vehicle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("物理主键id")
+    private Integer id;
+
+    @ApiModelProperty("名称")
+    private String vehicleName;
+
+    @ApiModelProperty("速度")
+    private String vehicleSpreed;
+
+    @ApiModelProperty("类型")
+    private String vehicleType;
+
+    @ApiModelProperty("运油能力")
+    private Integer fuelAbility;
+
+    @ApiModelProperty("运药能力")
+    private Integer medicalAbility;
+
+    @ApiModelProperty("运弹药能力")
+    private Integer ammunitionAbility;
+
+    @ApiModelProperty("创建人")
+    private String createOper;
+
+    @ApiModelProperty("更新人")
+    private String updOper;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getVehicleName() {
+        return vehicleName;
+    }
+
+    public void setVehicleName(String vehicleName) {
+        this.vehicleName = vehicleName;
+    }
+
+    public String getVehicleSpreed() {
+        return vehicleSpreed;
+    }
+
+    public void setVehicleSpreed(String vehicleSpreed) {
+        this.vehicleSpreed = vehicleSpreed;
+    }
+
+    public String getVehicleType() {
+        return vehicleType;
+    }
+
+    public void setVehicleType(String vehicleType) {
+        this.vehicleType = vehicleType;
+    }
+
+    public Integer getFuelAbility() {
+        return fuelAbility;
+    }
+
+    public void setFuelAbility(Integer fuelAbility) {
+        this.fuelAbility = fuelAbility;
+    }
+
+    public Integer getMedicalAbility() {
+        return medicalAbility;
+    }
+
+    public void setMedicalAbility(Integer medicalAbility) {
+        this.medicalAbility = medicalAbility;
+    }
+
+    public Integer getAmmunitionAbility() {
+        return ammunitionAbility;
+    }
+
+    public void setAmmunitionAbility(Integer ammunitionAbility) {
+        this.ammunitionAbility = ammunitionAbility;
+    }
+
+    public String getCreateOper() {
+        return createOper;
+    }
+
+    public void setCreateOper(String createOper) {
+        this.createOper = createOper;
+    }
+
+    public String getUpdOper() {
+        return updOper;
+    }
+
+    public void setUpdOper(String updOper) {
+        this.updOper = updOper;
+    }
+
+    @Override
+    public String toString() {
+        return "Vehicle{" +
+        "id = " + id +
+        ", vehicleName = " + vehicleName +
+        ", vehicleSpreed = " + vehicleSpreed +
+        ", vehicleType = " + vehicleType +
+        ", fuelAbility = " + fuelAbility +
+        ", medicalAbility = " + medicalAbility +
+        ", ammunitionAbility = " + ammunitionAbility +
+        ", createOper = " + createOper +
+        ", updOper = " + updOper +
+        "}";
+    }
+}

src/main/java/com/hivekion/scenario/mapper/ResourceMapper.java

@@ -0,0 +1,16 @@
+package com.hivekion.scenario.mapper;
+
+import com.hivekion.scenario.entity.Resource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 建筑资源表 Mapper 接口
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-14
+ */
+public interface ResourceMapper extends BaseMapper<Resource> {
+
+}

src/main/java/com/hivekion/scenario/mapper/ResourceVehicleRelaMapper.java

@@ -0,0 +1,16 @@
+package com.hivekion.scenario.mapper;
+
+import com.hivekion.scenario.entity.ResourceVehicleRela;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 资源车辆表 Mapper 接口
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-13
+ */
+public interface ResourceVehicleRelaMapper extends BaseMapper<ResourceVehicleRela> {
+
+}

src/main/java/com/hivekion/scenario/mapper/VehicleMapper.java

@@ -0,0 +1,16 @@
+package com.hivekion.scenario.mapper;
+
+import com.hivekion.scenario.entity.Vehicle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆信息表 Mapper 接口
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface VehicleMapper extends BaseMapper<Vehicle> {
+
+}

src/main/java/com/hivekion/scenario/service/IResourceService.java

@@ -0,0 +1,20 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.scenario.entity.Resource;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 建筑资源表 服务类
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-14
+ */
+public interface IResourceService extends IService<Resource> {
+
+    public List<Resource> listAllBuildResourceByType(Integer type);
+
+}

src/main/java/com/hivekion/scenario/service/IResourceVehicleRelaService.java

@@ -0,0 +1,16 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.scenario.entity.ResourceVehicleRela;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 资源车辆表 服务类
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-13
+ */
+public interface IResourceVehicleRelaService extends IService<ResourceVehicleRela> {
+
+}

src/main/java/com/hivekion/scenario/service/IVehicleService.java

@@ -0,0 +1,16 @@
+package com.hivekion.scenario.service;
+
+import com.hivekion.scenario.entity.Vehicle;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 车辆信息表 服务类
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+public interface IVehicleService extends IService<Vehicle> {
+
+}

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

@@ -0,0 +1,29 @@
+package com.hivekion.scenario.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.hivekion.scenario.entity.Resource;
+import com.hivekion.scenario.mapper.ResourceMapper;
+import com.hivekion.scenario.service.IResourceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 建筑资源表 服务实现类
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-14
+ */
+@Service
+public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> implements IResourceService {
+
+    @Override
+    public List<Resource> listAllBuildResourceByType(Integer type) {
+        QueryWrapper<Resource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(type != null,"resource_type",type);
+        return this.list(queryWrapper);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.hivekion.scenario.service.impl;
+
+import com.hivekion.scenario.entity.ResourceVehicleRela;
+import com.hivekion.scenario.mapper.ResourceVehicleRelaMapper;
+import com.hivekion.scenario.service.IResourceVehicleRelaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 资源车辆表 服务实现类
+ * </p>
+ *
+ * @author wangWenHua
+ * @since 2025-09-13
+ */
+@Service
+public class ResourceVehicleRelaServiceImpl extends ServiceImpl<ResourceVehicleRelaMapper, ResourceVehicleRela> implements IResourceVehicleRelaService {
+
+}

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

@@ -1,14 +1,14 @@
 package com.hivekion.scenario.service.impl;
 
-import com.alibaba.fastjson.JSON;
+import cn.hutool.json.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.json.JSONObject;
-import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hivekion.Global;
 import com.hivekion.baseData.entity.Scenario;
+import com.hivekion.baseData.entity.WeatherResource;
+import com.hivekion.baseData.service.IWeatherResourceService;
 import com.hivekion.baseData.service.ScenarioService;
-import com.hivekion.common.MultiPointGeoPosition;
 import com.hivekion.common.entity.ResponseCmdInfo;
 import com.hivekion.common.redis.RedisUtil;
 import com.hivekion.environment.entity.SimtoolWeather;
@@ -17,15 +17,13 @@ import com.hivekion.scenario.entity.ScenarioTask;
 import com.hivekion.scenario.mapper.ScenarioTaskMapper;
 import com.hivekion.scenario.service.ScenarioTaskService;
 import com.hivekion.thread.SpringGlobalTaskManager;
-import java.util.ArrayList;
+
-import java.util.HashMap;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * <p>
@@ -48,10 +46,9 @@ public class ScenarioTaskServiceImpl extends
   private RedisUtil redisUtil;
   @Resource
   private ScenarioService scenarioService;
-  private final static double SPEED = 18.0;
+
-  @Value("${path.planning.url}")
+  @Resource
-  private String pathPlanningUrl;
+  private IWeatherResourceService weatherResourceService;
-  private final WebClient webClient = WebClient.create();
 
   @Override
   public void start(Integer id, String roomId) {
@@ -102,7 +99,7 @@ public class ScenarioTaskServiceImpl extends
 
   private void increaseTime(Scenario currentScenario, String roomId) {
     int mag = Global.roomParamMap.get(currentScenario.getId() + "_" + roomId) == null ? 1
-        : Global.roomParamMap.get(currentScenario.getId() + "_" + roomId).getMag();
+        : Global.roomParamMap.get(currentScenario.getId() + "_" + roomId).getAmg();
     //获取当前状态
     Object statusObj = redisUtil.hget(roomId + "_" + currentScenario.getId(), "status");
     if (statusObj != null && statusObj.toString().equals("running")) {
@@ -123,85 +120,35 @@ public class ScenarioTaskServiceImpl extends
    * @param roomId          房间ID
    */
   private void weatherTrigger(Scenario currentScenario, String roomId) {
+    try {
+      QueryWrapper<WeatherResource> weatherResourceQueryWrapper = new QueryWrapper<>();
+      weatherResourceQueryWrapper.eq("scenario_id", currentScenario.getId()).eq("room_id", roomId);
+      List<WeatherResource> weatherResourceList = this.weatherResourceService.list();
+      ResponseCmdInfo<JSONArray> responseCmdInfo = new ResponseCmdInfo();
+      responseCmdInfo.setScenarioId(currentScenario.getId());
+      responseCmdInfo.setRoom(roomId);
+      JSONArray weatherMsgArray = new JSONArray();
+      for(WeatherResource weatherResource: weatherResourceList) {
+        JSONObject jsonObject = new JSONObject();
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        jsonObject.putOnce("begTime", dtf.format(weatherResource.getLastBegTime()));
+        jsonObject.putOnce("endTime", dtf.format(weatherResource.getLastEndTime()));
+        weatherMsgArray.add(jsonObject);
+        responseCmdInfo.setCmdType("66-" + weatherResource.getWeatherType());
+      }
+      responseCmdInfo.setData(weatherMsgArray);
+      Global.sendCmdInfoQueue.add(responseCmdInfo);
+    }catch (Exception ex){
+      ex.printStackTrace();
+      log.error(ex.getMessage());
+    }
+
 
   }
 
   private void taskTrigger(Scenario currentScenario, String roomId) {
-    Object statusObj = redisUtil.hget(roomId + "_" + currentScenario.getId(), "status");
-    if (statusObj != null && statusObj.toString().equals("running")) {
-      Object taskListObj = redisUtil.hget(roomId + "_" + currentScenario.getId(), "taskList");
-      if (taskListObj != null) {
 
-        if (taskListObj instanceof List<?>) {
-          List<?> taskList = (List<?>) taskListObj;
-          for (Object task : taskList) {
-            ScenarioTask scenarioTask = (ScenarioTask) task;
-            ResponseCmdInfo<Map<String, Object>> cmdInfo = new ResponseCmdInfo<>();
-            Map<String, Object> dataMap = new HashMap<>();
-            cmdInfo.setData(dataMap);
-            dataMap.put("resourceId", scenarioTask.getResourceId());
-
-            if (!"running".equals(scenarioTask.getStatus())) {
-              scenarioTask.setStatus("running");
-
-              String url = pathPlanningUrl + "?profile=car&point=" + scenarioTask.getFromLat() + ","
-                  + scenarioTask.getFromLng()
-                  + "&point=" + scenarioTask.getToLat() + "," + scenarioTask.getToLng()
-                  + "&points_encoded=false&algorithm=alternative_route&alternative_route.max_paths=3";
-              String result = webClient.get()
-                  .uri(url)
-                  .retrieve()
-                  .bodyToMono(String.class)
-                  .block();
-              JSONObject resultObject = JSON.parseObject(result);
-              if (resultObject != null) {
-                cmdInfo.setCmdType("init_path_planning");
-                cmdInfo.setScenarioId(scenarioTask.getScenarioId());
-                cmdInfo.setRoom(roomId);
-
-                dataMap.put("points", resultObject);
-
-                redisUtil.hset(roomId + "_" + currentScenario.getId(),
-                    scenarioTask.getId() + "_path_points", resultObject.getJSONArray("paths"));
-              }
-
-            } else {//更新坐标
-              List<double[]> points = new ArrayList<>();
-              cmdInfo.setCmdType("current_position");
-              Object pathsObj = redisUtil.hget(roomId + "_" + currentScenario.getId(),
-                  scenarioTask.getId() + "_path_points");
-              if (pathsObj != null) {
-                JSONArray paths = (JSONArray) pathsObj;
-                JSONObject jsonObject = (JSONObject) paths.get(0);
-                JSONArray pointsArray = JSONArray.of(jsonObject.getJSONObject("paths")
-                    .getJSONObject("points").getJSONArray("coordinates"));
-
-                for (int i = 0; i < pointsArray.size(); i++) {
-                  JSONArray coordinateArray = pointsArray.getJSONArray(i);
-                  double[] data = new double[coordinateArray.size()];
-                  for (int j = 0; j < coordinateArray.size(); j++) {
-                    data[j] = coordinateArray.getDouble(j);
-                  }
-                  points.add(data);
-                }
-              }
-              //查看当前想定持续的时间
-              Object duringObj = redisUtil.hget(roomId + "_" + currentScenario.getId(),
-                  "duringTime");
-              if (duringObj != null) {
-                int oldValue = duringObj instanceof Integer ? (Integer) duringObj : 0;
-                double[] currentPosition = MultiPointGeoPosition.getPosition(points, SPEED,
-                    oldValue);
-                dataMap.put("currentPosition", currentPosition);
-              }
-            }
-            Global.sendCmdInfoQueue.add(cmdInfo);
-          }
-        }
-      }
-    }
   }
-
   private void supplierChangeUseUp(Scenario currentScenario, String roomId) {
 
   }
@@ -211,7 +158,7 @@ public class ScenarioTaskServiceImpl extends
   public List<ScenarioTask> queryTaskList(ScenarioTask task) {
     QueryWrapper<ScenarioTask> queryWrapper = new QueryWrapper<>();
     queryWrapper.eq("scenario_id", task.getScenarioId());
-    if (StringUtils.isNotBlank(task.getResourceId())) {
+    if(StringUtils.isNotBlank(task.getResourceId())){
       queryWrapper.eq("resource_id", task.getResourceId());
     }
     return this.list(queryWrapper);

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

@@ -0,0 +1,20 @@
+package com.hivekion.scenario.service.impl;
+
+import com.hivekion.scenario.entity.Vehicle;
+import com.hivekion.scenario.mapper.VehicleMapper;
+import com.hivekion.scenario.service.IVehicleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆信息表 服务实现类
+ * </p>
+ *
+ * @author liDongYu
+ * @since 2025-09-13
+ */
+@Service
+public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> implements IVehicleService {
+
+}

src/main/resources/mapper/tbl/ResourceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hivekion.scenario.mapper.ResourceMapper">
+
+</mapper>

src/main/resources/mapper/tbl/ResourceVehicleRelaMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hivekion.scenario.mapper.ResourceVehicleRelaMapper">
+
+</mapper>

src/main/resources/mapper/tbl/VehicleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hivekion.scenario.mapper.VehicleMapper">
+
+</mapper>

src/main/resources/mapper/tbl/WeatherResourceMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hivekion.baseData.mapper.WeatherResourceMapper">
+
+</mapper>