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:
wr
2026-01-04 14:50:03 +08:00
parent 63603dee08
commit fe029fcb95
10 changed files with 404 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportNormalServiceImpl.java
View File

@@ -68,7 +68,6 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
userReportNormalPO.setState(DataStateEnum.ENABLE.getCode());
if (Objects.equals(userReportNormalParam.getSaveOrCheckflag(), "1")) {
userReportNormalPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
} else {
userReportNormalPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
@@ -154,6 +153,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
vo.setId(item.getId());
vo.setUserReportId(item.getUserReportId());
vo.setOtherReport(item.getReportUrl());
vo.setSimulationReport(item.getSimulationReportUrl());
vo.setProcessInstanceId(item.getProcessInstanceId());
vo.setCreateTime(item.getCreateTime());
vo.setStatus(item.getStatus());
@@ -175,6 +175,7 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
BeanUtil.copyProperties(userReportPO, vo);
BeanUtil.copyProperties(userReportNormalPO, vo);
vo.setOtherReport(userReportNormalPO.getReportUrl());
vo.setSimulationReport(userReportNormalPO.getSimulationReportUrl());
return vo;
}
return null;
@@ -278,8 +279,10 @@ public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMap
);
Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> simulationReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getSimulationReportUrl).findFirst();
userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
userReportVO.setSimulationReport(Collections.singletonList(simulationReport.orElse(null)));
return userReportVO;
}

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -420,8 +420,10 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
);
Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
Optional<String> simulationReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getSimulationReportUrl).findFirst();
userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
userReportVO.setSimulationReport(Collections.singletonList(simulationReport.orElse(null)));
return userReportVO;
}