任务相关
This commit is contained in:
parent
f5ba96e225
commit
f070c479a7
|
@ -225,6 +225,7 @@ public class Room implements AutoCloseable {
|
|||
scenario.setResourceList(SpringUtil.getBean(ScenarioResourceServiceImpl.class).getResourceListByScenarioId(scenario.getId()));
|
||||
for(ScenarioResource scenarioResource:this.scenario.getResourceList() ){
|
||||
ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(),roomId,scenarioResource.getId());
|
||||
|
||||
if( redisUtil == null){
|
||||
redisUtil = SpringUtil.getBean(RedisUtil.class);
|
||||
redisUtil.hset(scenarioResource.getScenarioId() + "-" + roomId + "-" + scenarioResource.getId(),"scenarioInfo", JSON.toJSONString(scenarioInfo));
|
||||
|
@ -233,6 +234,7 @@ public class Room implements AutoCloseable {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -62,6 +62,9 @@ public class ScenarioServiceImpl implements ScenarioService {
|
|||
}
|
||||
//获取物资信息
|
||||
List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList);
|
||||
if(suppliers==null){
|
||||
return new ScenarioInfo();
|
||||
}
|
||||
Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
|
||||
|
||||
suppliers.forEach(supplier -> {
|
||||
|
|
Loading…
Reference in New Issue
Block a user