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

Compare commits

base: liyudong:b1d913698ddc1a200a84870931ec020a821fb069
Branches Tags
liyudong:main
..
compare: liyudong:4d5cc0489c88ca8ce07b368576471ec504a37ba7
Branches Tags
liyudong:main

No commits in common. "b1d913698ddc1a200a84870931ec020a821fb069" and "4d5cc0489c88ca8ce07b368576471ec504a37ba7" have entirely different histories.
b1d913698d ... 4d5cc0489c

3 changed files with 105 additions and 139 deletions
Show Stats Expand all files Collapse all files

1
src/main/java/com/hivekion/room/bean/BattleRootTask.java
View File

@ -111,6 +111,7 @@ public class BattleRootTask extends AbtParentTask {
@Override @Override
public void execTask() { public void execTask() {
log.info("===============================定时检查统计各种资源消耗量 begin===================================="); log.info("===============================定时检查统计各种资源消耗量 begin====================================");
Long deathConsume = null; Long deathConsume = null;
Long injuredConsume = null; Long injuredConsume = null;
Double ammunitionConsume = null; Double ammunitionConsume = null;

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

@ -1,6 +1,5 @@
package com.hivekion.statistic.service.impl; package com.hivekion.statistic.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hivekion.baseData.entity.Fightpowerstaff; import com.hivekion.baseData.entity.Fightpowerstaff;
import com.hivekion.baseData.entity.OrgSupplier; import com.hivekion.baseData.entity.OrgSupplier;
@ -18,134 +17,117 @@ import com.hivekion.supplier.entity.SupplierRequest;
import com.hivekion.supplier.entity.SuppliesDict; import com.hivekion.supplier.entity.SuppliesDict;
import com.hivekion.supplier.service.ISupplierRequestService; import com.hivekion.supplier.service.ISupplierRequestService;
import com.hivekion.supplier.service.SuppliesDictService; import com.hivekion.supplier.service.SuppliesDictService;
import com.hivekion.team.entity.Teaminfo;
import com.hivekion.team.service.ITeaminfoService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.stereotype.Component;
@Component("WebsocketScenarioService") @Component("WebsocketScenarioService")
public class ScenarioServiceImpl implements ScenarioService { public class ScenarioServiceImpl implements ScenarioService {
@Resource @Resource
private ScenarioResourceService scenarioResourceService; private ScenarioResourceService scenarioResourceService;
@Resource @Resource
private OrgSupplierService orgSupplierService; private OrgSupplierService orgSupplierService;
@Resource @Resource
private SuppliesDictService suppliesDictService; private SuppliesDictService suppliesDictService;
@Resource @Resource
private IScenarioOrgPostService scenarioOrgPostService; private IScenarioOrgPostService scenarioOrgPostService;
@Resource @Resource
private FightpowerstaffService fightpowerstaffService; private FightpowerstaffService fightpowerstaffService;
@Resource @Resource
private ScenarioTaskService scenarioTaskService; private ScenarioTaskService scenarioTaskService;
@Resource @Resource
private ISupplierRequestService supplierRequestService; private ISupplierRequestService supplierRequestService;
@Resource @Override
private ITeaminfoService teamInfoService; public ScenarioInfo listScenarioInfo(Integer scenarioId, String roomId, String resourceId) {
ScenarioInfo scenarioInfo = new ScenarioInfo();
@Resource //获取分队信息
private ScenarioResourceService resourceService; ScenarioResource resourceInstance = scenarioResourceService.getById(resourceId);
@Override //获取关联的组织机构信息
public ScenarioInfo listScenarioInfo(Integer scenarioId, String roomId, String resourceId) { ScenarioOrgPost post = new ScenarioOrgPost();
ScenarioInfo scenarioInfo = new ScenarioInfo(); post.setResourceId(resourceId);
//获取分队信息 List<ScenarioOrgPost> orgPostList = scenarioOrgPostService.selectByCondition(post);
Map<Integer, Teaminfo> map = teamInfoService.teamInfoMap(); List<Integer> orgList = orgPostList.stream().map(ScenarioOrgPost::getOrgId)
Map<String, ScenarioResource> resourceMap = resourceService.resourceMap(); .collect(Collectors.toList());
ScenarioResource resourceInstance = scenarioResourceService.getById(resourceId); List<Fightpowerstaff> staffList = null;
if (resourceMap.get(resourceId) != null) { if (!orgList.isEmpty()) {
ScenarioResource resource = resourceMap.get(resourceId); staffList = fightpowerstaffService.queryByOrgIds(orgList);
if (map.get(resource.getResourceId()) != null) { } else {
scenarioInfo.getTeam().setTeamName(map.get(resource.getResourceId()).getName()); staffList = new ArrayList<>();
}
}
//获取关联的组织机构信息
ScenarioOrgPost post = new ScenarioOrgPost();
post.setResourceId(resourceId);
List<ScenarioOrgPost> orgPostList = scenarioOrgPostService.selectByCondition(post);
List<Integer> orgList = orgPostList.stream().map(ScenarioOrgPost::getOrgId)
.collect(Collectors.toList());
List<Fightpowerstaff> staffList = null;
List<OrgSupplier> suppliers = null;
if(!orgList.isEmpty()){
staffList = fightpowerstaffService.queryByOrgIds(orgList);
if(CollectionUtil.isEmpty(staffList)){
staffList = new ArrayList<>();
}
//获取物资信息
suppliers = orgSupplierService.selectByOrgIds(orgList);
if(suppliers==null||suppliers.isEmpty()){
suppliers = new ArrayList<>();
}
Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
suppliers.forEach(supplier -> {
SuppliesDict dict = supplierMap.get(supplier.getSupplierId());
if (dict != null) {
switch (dict.getCode()) {
case "FOOD":
scenarioInfo.getFood().setTotal(scenarioInfo.getFood().getTotal()+supplier.getAccount());
scenarioInfo.getFood().setCurrent(scenarioInfo.getFood().getCurrent()+supplier.getAccount());
break;
case "WATER":
scenarioInfo.getWater().setTotal(scenarioInfo.getWater().getTotal()+supplier.getAccount());
scenarioInfo.getWater().setCurrent(scenarioInfo.getWater().getCurrent()+supplier.getAccount());
break;
case "FUEL":
scenarioInfo.getFuel().setTotal(scenarioInfo.getFuel().getTotal()+supplier.getAccount());
scenarioInfo.getFuel().setCurrent(scenarioInfo.getFuel().getCurrent()+supplier.getAccount());
break;
case "MEDICAL":
scenarioInfo.getMedical().setTotal( scenarioInfo.getMedical().getTotal()+supplier.getAccount());
scenarioInfo.getMedical().setCurrent( scenarioInfo.getMedical().getCurrent()+supplier.getAccount());
break;
case "AMMUNITION":
scenarioInfo.getAmmunition().setTotal( scenarioInfo.getAmmunition().getTotal()+supplier.getAccount());
scenarioInfo.getAmmunition().setCurrent(scenarioInfo.getAmmunition().getCurrent()+supplier.getAccount());
break;
default:
break;
}
}
});
}else{
staffList = new ArrayList<>();
orgPostList = new ArrayList<>();
suppliers = new ArrayList<>();
}
scenarioInfo.getTeam().setType(resourceInstance.getType());
scenarioInfo.getTeam().setLat(resourceInstance.getLat());
scenarioInfo.getTeam().setLng(resourceInstance.getLng());
ScenarioTask scenarioTask = new ScenarioTask();
scenarioTask.setScenarioId(scenarioId);
scenarioTask.setRoomId(roomId);
scenarioTask.setResourceId(resourceId);
List<ScenarioTask> scenarioTasks = scenarioTaskService.queryTaskList(scenarioTask);
if(CollectionUtil.isEmpty(scenarioTasks)){
scenarioTasks =new ArrayList<>();
}
List<SupplierRequest> supplierRequests = supplierRequestService.list(new QueryWrapper<SupplierRequest>().eq("FROM_RESOURCE_ID",resourceId));
if(CollectionUtil.isEmpty(supplierRequests)){
supplierRequests =new ArrayList<>();
}
scenarioInfo.setScenarioTasks(scenarioTasks);
scenarioInfo.setStaffList(staffList);
scenarioInfo.setOrgPostList(orgPostList);
scenarioInfo.setSuppliers(suppliers);
scenarioInfo.setSupplierRequests(supplierRequests);
return scenarioInfo;
} }
if (orgList.isEmpty()) {
return new ScenarioInfo();
}
//获取物资信息
List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList);
if (suppliers == null || suppliers.isEmpty()) {
return new ScenarioInfo();
}
Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
suppliers.forEach(supplier -> {
SuppliesDict dict = supplierMap.get(supplier.getSupplierId());
if (dict != null) {
switch (dict.getCode()) {
case "FOOD":
scenarioInfo.getFood()
.setTotal(scenarioInfo.getFood().getTotal() + supplier.getAccount());
scenarioInfo.getFood()
.setCurrent(scenarioInfo.getFood().getCurrent() + supplier.getAccount());
break;
case "WATER":
scenarioInfo.getWater()
.setTotal(scenarioInfo.getWater().getTotal() + supplier.getAccount());
scenarioInfo.getWater()
.setCurrent(scenarioInfo.getWater().getCurrent() + supplier.getAccount());
break;
case "FUEL":
scenarioInfo.getFuel()
.setTotal(scenarioInfo.getFuel().getTotal() + supplier.getAccount());
scenarioInfo.getFuel()
.setCurrent(scenarioInfo.getFuel().getCurrent() + supplier.getAccount());
break;
case "MEDICAL":
scenarioInfo.getMedical()
.setTotal(scenarioInfo.getMedical().getTotal() + supplier.getAccount());
scenarioInfo.getMedical()
.setCurrent(scenarioInfo.getMedical().getCurrent() + supplier.getAccount());
break;
case "AMMUNITION":
scenarioInfo.getAmmunition()
.setTotal(scenarioInfo.getAmmunition().getTotal() + supplier.getAccount());
scenarioInfo.getAmmunition()
.setCurrent(scenarioInfo.getAmmunition().getCurrent() + supplier.getAccount());
break;
default:
break;
}
}
});
ScenarioTask scenarioTask = new ScenarioTask();
scenarioTask.setScenarioId(scenarioId);
scenarioTask.setRoomId(roomId);
scenarioTask.setResourceId(resourceId);
List<ScenarioTask> scenarioTasks = scenarioTaskService.queryTaskList(scenarioTask);
List<SupplierRequest> supplierRequests = supplierRequestService.list(
new QueryWrapper<SupplierRequest>().eq("FROM_RESOURCE_ID", resourceId));
scenarioInfo.setScenarioTasks(scenarioTasks);
scenarioInfo.setStaffList(staffList);
scenarioInfo.setOrgPostList(orgPostList);
scenarioInfo.setSuppliers(suppliers);
scenarioInfo.setSupplierRequests(supplierRequests);
return scenarioInfo;
}
} }

21
src/main/java/com/hivekion/thread/WebsocketMsgWrapper.java
View File

@ -39,7 +39,7 @@ public class WebsocketMsgWrapper {
responseCmdInfo.setRoom(roomId); responseCmdInfo.setRoom(roomId);
try { try {
JSONObject msgObj = (JSONObject) JSON.parse(msg); JSONObject msgObj = (JSONObject) JSON.parse(msg);
if(msgObj.getString("cmdType").equals("scenarioRunningInfo")){ if(msgObj.getString("cmdType").equals("scenarioInfo")){
if( redisUtil == null) { if( redisUtil == null) {
redisUtil = SpringUtil.getBean(RedisUtil.class); redisUtil = SpringUtil.getBean(RedisUtil.class);
} }
@ -52,25 +52,8 @@ public class WebsocketMsgWrapper {
} }
} }
responseCmdInfo.setData(JSONArray.toJSONString(allScenario)); responseCmdInfo.setData(JSONArray.toJSONString(allScenario));
responseCmdInfo.setCmdType("scenarioInfo");
} }
if(msgObj.getString("cmdType").equals("scenarioInfo")){ responseCmdInfo.setCmdType("scenarioInfo");
List<ScenarioResource> scenarioResourceList = this.scenarioResourceService.list(new QueryWrapper<ScenarioResource>().eq("scenario_id",scenarioId));
ScenarioService scenarioService = SpringUtil.getBean(ScenarioService.class);
if(scenarioService != null){
JSONArray allScenario = new JSONArray();
for(ScenarioResource scenarioResource : scenarioResourceList) {
ScenarioInfo scenarioInfo = scenarioService.listScenarioInfo(scenarioResource.getScenarioId(), roomId, scenarioResource.getId());
String scenarioInfoStr = com.alibaba.fastjson2.JSON.toJSONString(scenarioInfo);
allScenario.add(scenarioInfoStr);
}
responseCmdInfo.setData(JSONArray.toJSONString(allScenario));
}else {
log.warn("=============scenarioService is null================================");
}
responseCmdInfo.setCmdType("scenarioInfo");
}
Global.sendCmdInfoQueue.add(responseCmdInfo); Global.sendCmdInfoQueue.add(responseCmdInfo);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();