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

河北技术监督，国网上送接口bug修改

Browse Source
This commit is contained in:
wr
2023-08-25 14:55:10 +08:00
parent 60c2662e36
commit 4059db12ba
8 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java
View File

@@ -217,10 +217,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
String status = mapData.get("status").toString();
if ("000000".equals(status)) {
for (SupvPlan supvPlan : supvPlanList) {
SupvPlan supvPlanPO = new SupvPlan();
supvPlanPO.setPlanId(supvPlan.getPlanId());
supvPlanPO.setIsUploadHead(1);
supvPlanMapper.updateById(supvPlanPO);
supvPlanMapper.updateId(1,supvPlan.getPlanId());
}
String result = mapData.get("result").toString();
Map mapCount = JSON.parseObject(result, Map.class);
@@ -299,10 +296,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
String status = map.get("status").toString();
if ("000000".equals(status)) {
for (SupvProblem supvProblem : supvProblemList) {
SupvProblem supvProblemPO = new SupvProblem();
supvProblemPO.setProblemId(supvProblem.getProblemId());
supvProblemPO.setIsUploadHead(1);
supvProblemMapper.updateById(supvProblemPO);
supvProblemMapper.updateId(1,supvProblem.getProblemId());
}
String result = map.get("result").toString();
Map mapCount = JSON.parseObject(result, Map.class);
@@ -385,10 +379,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
String status = map.get("status").toString();
if ("000000".equals(status)) {
for (SupvReportM supvReportM : supvReportMList) {
SupvReportM supvReportMPO = new SupvReportM();
supvReportMPO.setMonthReportId(supvReportM.getMonthReportId());
supvReportMPO.setIsUploadHead(1);
supvReportMMapper.updateById(supvReportMPO);
supvReportMMapper.updateId(1,supvReportM.getMonthReportId());
}
String result = map.get("result").toString();
Map mapCount = JSON.parseObject(result, Map.class);
@@ -439,8 +430,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
String status = map.get("status").toString();
if ("000000".equals(status)) {
for (SupvPlan supvPlan : supvPlanList) {
supvPlan.setIsUploadHead(2);
supvPlanMapper.updateById(supvPlan);
supvPlanMapper.updateId(2,supvPlan.getPlanId());
}
String result = map.get("result").toString();
Map mapCount = JSON.parseObject(result, Map.class);

4
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java
View File

@@ -135,11 +135,11 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
List<ProcessPublicDTO> processPublicDTOMingGanY = this.baseMapper.statisticPlanReport(firstYearDay,endYearDay,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
List<ProcessPublicDTO> processPublicDTOMingGanAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,Stream.of("02","03","04").collect(Collectors.toList()));
//换流站问题总数量
//敏感用户问题总数量
List<ProcessPublicDTO> processPublicDTOQesMingGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
List<ProcessPublicDTO> processPublicDTOQesMingGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),null,null);
//换流站问题已整改数量
//敏感用户问题已整改数量
List<ProcessPublicDTO> processPublicDTOQesMingGanYesM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);
List<ProcessPublicDTO> processPublicDTOQesMingGanYesAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.POWER_QUALITY.getCode()).getId(),"01",null);