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

Compare commits

base: liyudong:f59eabb06f32a263d4057df36f9cdd624a152fe0
Branches Tags
liyudong:main
..
compare: liyudong:8d31f6fdd1952fb4e82af74add4b41a87df20f4c
Branches Tags
liyudong:main

No commits in common. "f59eabb06f32a263d4057df36f9cdd624a152fe0" and "8d31f6fdd1952fb4e82af74add4b41a87df20f4c" have entirely different histories.
f59eabb06f ... 8d31f6fdd1

1 changed files with 86 additions and 99 deletions
Show Stats Expand all files Collapse all files

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

@ -17,12 +17,13 @@ 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 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 {
@ -42,7 +43,6 @@ public class ScenarioServiceImpl implements ScenarioService {
private ScenarioTaskService scenarioTaskService; private ScenarioTaskService scenarioTaskService;
@Resource @Resource
private ISupplierRequestService supplierRequestService; private ISupplierRequestService supplierRequestService;
@Override @Override
public ScenarioInfo listScenarioInfo(Integer scenarioId, String roomId, String resourceId) { public ScenarioInfo listScenarioInfo(Integer scenarioId, String roomId, String resourceId) {
ScenarioInfo scenarioInfo = new ScenarioInfo(); ScenarioInfo scenarioInfo = new ScenarioInfo();
@ -55,17 +55,14 @@ public class ScenarioServiceImpl implements ScenarioService {
List<Integer> orgList = orgPostList.stream().map(ScenarioOrgPost::getOrgId) List<Integer> orgList = orgPostList.stream().map(ScenarioOrgPost::getOrgId)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<Fightpowerstaff> staffList = null; List<Fightpowerstaff> staffList = null;
if (!orgList.isEmpty()) { if(!orgList.isEmpty()){
staffList = fightpowerstaffService.queryByOrgIds(orgList); staffList = fightpowerstaffService.queryByOrgIds(orgList);
} else { }else{
staffList = new ArrayList<>(); staffList = new ArrayList<>();
} }
if (orgList.isEmpty()) {
return new ScenarioInfo();
}
//获取物资信息 //获取物资信息
List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList); List<OrgSupplier> suppliers = orgSupplierService.selectByOrgIds(orgList);
if (suppliers == null || suppliers.isEmpty()) { if(suppliers==null||suppliers.isEmpty()){
return new ScenarioInfo(); return new ScenarioInfo();
} }
Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap(); Map<String, SuppliesDict> supplierMap = suppliesDictService.supplierDictMap();
@ -77,35 +74,25 @@ public class ScenarioServiceImpl implements ScenarioService {
if (dict != null) { if (dict != null) {
switch (dict.getCode()) { switch (dict.getCode()) {
case "FOOD": case "FOOD":
scenarioInfo.getFood() scenarioInfo.getFood().setTotal(scenarioInfo.getFood().getTotal()+supplier.getAccount());
.setTotal(scenarioInfo.getFood().getTotal() + supplier.getAccount()); scenarioInfo.getFood().setCurrent(scenarioInfo.getFood().getCurrent()+supplier.getAccount());
scenarioInfo.getFood()
.setCurrent(scenarioInfo.getFood().getCurrent() + supplier.getAccount());
break; break;
case "WATER": case "WATER":
scenarioInfo.getWater() scenarioInfo.getWater().setTotal(scenarioInfo.getWater().getTotal()+supplier.getAccount());
.setTotal(scenarioInfo.getWater().getTotal() + supplier.getAccount()); scenarioInfo.getWater().setCurrent(scenarioInfo.getWater().getCurrent()+supplier.getAccount());
scenarioInfo.getWater()
.setCurrent(scenarioInfo.getWater().getCurrent() + supplier.getAccount());
break; break;
case "FUEL": case "FUEL":
scenarioInfo.getFuel() scenarioInfo.getFuel().setTotal(scenarioInfo.getFuel().getTotal()+supplier.getAccount());
.setTotal(scenarioInfo.getFuel().getTotal() + supplier.getAccount()); scenarioInfo.getFuel().setCurrent(scenarioInfo.getFuel().getCurrent()+supplier.getAccount());
scenarioInfo.getFuel()
.setCurrent(scenarioInfo.getFuel().getCurrent() + supplier.getAccount());
break; break;
case "MEDICAL": case "MEDICAL":
scenarioInfo.getMedical() scenarioInfo.getMedical().setTotal( scenarioInfo.getMedical().getTotal()+supplier.getAccount());
.setTotal(scenarioInfo.getMedical().getTotal() + supplier.getAccount()); scenarioInfo.getMedical().setCurrent( scenarioInfo.getMedical().getCurrent()+supplier.getAccount());
scenarioInfo.getMedical()
.setCurrent(scenarioInfo.getMedical().getCurrent() + supplier.getAccount());
break; break;
case "AMMUNITION": case "AMMUNITION":
scenarioInfo.getAmmunition() scenarioInfo.getAmmunition().setTotal( scenarioInfo.getAmmunition().getTotal()+supplier.getAccount());
.setTotal(scenarioInfo.getAmmunition().getTotal() + supplier.getAccount()); scenarioInfo.getAmmunition().setCurrent(scenarioInfo.getAmmunition().getCurrent()+supplier.getAccount());
scenarioInfo.getAmmunition()
.setCurrent(scenarioInfo.getAmmunition().getCurrent() + supplier.getAccount());
break; break;
default: default:
break; break;
@ -118,10 +105,10 @@ public class ScenarioServiceImpl implements ScenarioService {
scenarioTask.setRoomId(roomId); scenarioTask.setRoomId(roomId);
scenarioTask.setResourceId(resourceId); scenarioTask.setResourceId(resourceId);
List<ScenarioTask> scenarioTasks = scenarioTaskService.queryTaskList(scenarioTask); List<ScenarioTask> scenarioTasks = scenarioTaskService.queryTaskList(scenarioTask);
List<SupplierRequest> supplierRequests = supplierRequestService.list( List<SupplierRequest> supplierRequests = supplierRequestService.list(new QueryWrapper<SupplierRequest>().eq("FROM_RESOURCE_ID",resourceId));
new QueryWrapper<SupplierRequest>().eq("FROM_RESOURCE_ID", resourceId));
scenarioInfo.setScenarioTasks(scenarioTasks); scenarioInfo.setScenarioTasks(scenarioTasks);
scenarioInfo.setStaffList(staffList); scenarioInfo.setStaffList(staffList);