liyudong/simulation-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务相关

Browse Source
This commit is contained in:
李玉东 2025-09-20 15:53:49 +08:00
parent f5ba96e225
commit f070c479a7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hivekion/room/bean/Room.java
View File

@ -225,6 +225,7 @@ public class Room implements AutoCloseable {
scenario.setResourceList(SpringUtil.getBean(ScenarioResourceServiceImpl.class).getResourceListByScenarioId(scenario.getId())); scenario.setResourceList(SpringUtil.getBean(ScenarioResourceServiceImpl.class).getResourceListByScenarioId(scenario.getId()));
for(ScenarioResource scenarioResource:this.scenario.getResourceList() ){ for(ScenarioResource scenarioResource:this.scenario.getResourceList() ){
ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(),roomId,scenarioResource.getId()); ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(),roomId,scenarioResource.getId());
if( redisUtil == null){ if( redisUtil == null){
redisUtil = SpringUtil.getBean(RedisUtil.class); redisUtil = SpringUtil.getBean(RedisUtil.class);
redisUtil.hset(scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId(),"scenarioInfo", JSON.toJSONString(scenarioInfo)); redisUtil.hset(scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId(),"scenarioInfo", JSON.toJSONString(scenarioInfo));
@ -233,6 +234,7 @@ public class Room implements AutoCloseable {
} }
} }
} }

3
src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
View File

@ -62,6 +62,9 @@ public class ScenarioServiceImpl implements ScenarioService {
} }
//获取物资信息 //获取物资信息
List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList); List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList);
if(suppliers==null){
return new ScenarioInfo();
}
Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap(); Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
suppliers.forEach(supplier -> { suppliers.forEach(supplier -> {