Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.算法提交

Browse Source 
2.用户模块代码调整
This commit is contained in:
xuyang
2023-11-29 16:21:18 +08:00
parent f46749afb9
commit bae007f471
20 changed files with 1362 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/ExecutionCenter.java
View File

@@ -284,7 +284,7 @@ public class ExecutionCenter extends BaseController {
public void generaTrixExecutor(@RequestBody BaseParam baseParam) {
String methodDescribe = getMethodDescribe("generaTrixExecutor");
//手动判断参数是否合法,
CalculatedParam calculatedParam = judgeExecuteParam(baseParam);
CalculatedParam<DeptGetBusBarDTO> calculatedParam = judgeExecuteParam(baseParam);
//母线索引
if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
Dept dept = deptFeignClient.getRootDept().getData();
@@ -292,10 +292,7 @@ public class ExecutionCenter extends BaseController {
deptGetLineParam.setDeptId(dept.getId());
deptGetLineParam.setSystemType(0);
List<DeptGetBusBarDTO> busBarList = commTerminalGeneralClient.deptBusBar(deptGetLineParam).getData();
DeptGetBusBarDTO dto = busBarList.stream().filter(u -> Objects.equals(u.getUnitId(),dept.getCode())).findAny().orElse(null);
if (Objects.nonNull(dto)){
calculatedParam.setIdList(dto.getBusBarIds());
}
calculatedParam.setIdList(busBarList);
}
LiteflowResponse liteflowResponse;
if (baseParam.isRepair()) {