From afd861e39d2da0583a39c90e400946283a4364ef Mon Sep 17 00:00:00 2001
From: wangwenhua <12345678>
Date: Mon, 15 Sep 2025 00:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E9=99=A2,=E4=BB=93=E5=BA=93=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scenario/service/IResourceService.java    |  3 +++
 .../service/impl/ResourceServiceImpl.java     | 10 +++++++++
 .../impl/ScenarioResourceServiceImpl.java     | 22 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/src/main/java/com/hivekion/scenario/service/IResourceService.java b/src/main/java/com/hivekion/scenario/service/IResourceService.java
index 623f78b..7545c09 100644
--- a/src/main/java/com/hivekion/scenario/service/IResourceService.java
+++ b/src/main/java/com/hivekion/scenario/service/IResourceService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hivekion.scenario.entity.Vehicle;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -18,6 +19,8 @@ public interface IResourceService extends IService<Resource> {
 
     public List<Resource> listAllBuildResourceByType(Integer type);
 
+    public Map<Integer,Resource> listBuildResourceByType(Integer type);
+
     public List<Vehicle> listAllVehiclesByType(Integer type,Integer resourceId);
 
 }
diff --git a/src/main/java/com/hivekion/scenario/service/impl/ResourceServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/ResourceServiceImpl.java
index e94478e..d68bdb0 100644
--- a/src/main/java/com/hivekion/scenario/service/impl/ResourceServiceImpl.java
+++ b/src/main/java/com/hivekion/scenario/service/impl/ResourceServiceImpl.java
@@ -15,6 +15,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -43,6 +44,15 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
         return this.resourceMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public Map<Integer, Resource> listBuildResourceByType(Integer type) {
+        QueryWrapper<Resource> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(type != null,"resource_type",type);
+        List<Resource>  resources = this.resourceMapper.selectList(queryWrapper);
+        Map<Integer,Resource> resourceMap = resources.stream().collect(Collectors.toMap(Resource::getId,resource -> resource));
+        return resourceMap;
+    }
+
     @Override
     public List<Vehicle> listAllVehiclesByType(Integer type, Integer resourceId) {
         List<ResourceVehicleRela>  rVRela = this.resourceVehicleRelaService.list(new QueryWrapper<ResourceVehicleRela>().eq("resource_id",resourceId));
diff --git a/src/main/java/com/hivekion/scenario/service/impl/ScenarioResourceServiceImpl.java b/src/main/java/com/hivekion/scenario/service/impl/ScenarioResourceServiceImpl.java
index 647573f..ff743f5 100644
--- a/src/main/java/com/hivekion/scenario/service/impl/ScenarioResourceServiceImpl.java
+++ b/src/main/java/com/hivekion/scenario/service/impl/ScenarioResourceServiceImpl.java
@@ -7,6 +7,7 @@ import com.hivekion.baseData.service.ITblEntityService;
 import com.hivekion.icon.service.IconService;
 import com.hivekion.scenario.entity.ScenarioResource;
 import com.hivekion.scenario.mapper.ScenarioResourceMapper;
+import com.hivekion.scenario.service.IResourceService;
 import com.hivekion.scenario.service.ScenarioResourceService;
 import com.hivekion.team.entity.Teaminfo;
 import com.hivekion.team.service.ITeaminfoService;
@@ -35,6 +36,9 @@ public class ScenarioResourceServiceImpl extends
   @Resource
   private ITeaminfoService teamInfoService;
 
+  @Resource
+  private IResourceService resourceService;
+
   @Override
   public List<ScenarioResource> getResourceList(ScenarioResource resource) {
     //图标Map
@@ -43,6 +47,8 @@ public class ScenarioResourceServiceImpl extends
     Map<Integer, TblEntity> entityMap = iTblEntityService.entityMap();
     //分队Map
     Map<Integer, Teaminfo> teamInfoMap = teamInfoService.teamInfoMap();
+    Map<Integer,com.hivekion.scenario.entity.Resource> hResourceMap = resourceService.listBuildResourceByType(7);
+    Map<Integer,com.hivekion.scenario.entity.Resource> wResourceMap = resourceService.listBuildResourceByType(8);
     QueryWrapper<ScenarioResource> queryWrapper = new QueryWrapper<>();
     queryWrapper.eq("scenario_id", resource.getScenarioId());
     if (resource.getType() != null) {
@@ -72,6 +78,22 @@ public class ScenarioResourceServiceImpl extends
                 iconMap.get(teaminfo.getIconId()) == null ? "" : iconMap.get(teaminfo.getIconId()));
           }
           break;
+        case 7:
+          if(hResourceMap.get(scenarioResource.getResourceId()) != null){
+            com.hivekion.scenario.entity.Resource resource1 = hResourceMap.get(scenarioResource.getResourceId());
+            scenarioResource.setTitle(resource1.getResourceName());
+            scenarioResource.setImgBase64(
+                    iconMap.get(resource1.getIcon()) == null ? "" : iconMap.get(resource1.getIcon()));
+          }
+          break;
+        case 8:
+          if(wResourceMap.get(scenarioResource.getResourceId()) != null){
+            com.hivekion.scenario.entity.Resource resource1 = wResourceMap.get(scenarioResource.getResourceId());
+            scenarioResource.setTitle(resource1.getResourceName());
+            scenarioResource.setImgBase64(
+                    iconMap.get(resource1.getIcon()) == null ? "" : iconMap.get(resource1.getIcon()));
+          }
+          break;
       }
     }
     return scenarioResourceList;