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
2024-04-29 16:29:25 +08:00
parent e2fa2e31c2
commit c1a3c745f7
15 changed files with 217 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package com.njcn.process.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.util.StrUtil;
@@ -163,6 +164,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
//电容器组月前统计
List<ProcessPublicDTO> processPublicYearDTOS = this.baseMapper.statisticPlanReportYear(firstYearDay, endYearDay, mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(), null, null);
List<ProcessPublicDTO> processPublicDTOCapacitorListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null);
List<ProcessPublicDTO> processPublicDTOCapacitorAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null);
//电容器组问题数量
@@ -173,6 +175,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
List<ProcessPublicDTO> processPublicDTOCapacitorYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),"02",null);
//评估报告月前统计
List<ProcessPublicDTO> processPublicYearDTOAppraisalS = this.baseMapper.statisticPlanReportYear(firstYearDay, endYearDay, mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(), null, null);
List<ProcessPublicDTO> processPublicDTOAppraisalListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);
List<ProcessPublicDTO> processPublicDTOAppraisalAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null);
//评估报告问题数量
@@ -263,7 +266,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
all+=d;
//电容器组
supvReportM.setCapacitorYearSupvNum(dealData(childrenDeptList,processPublicDTOCapacitorAll));
supvReportM.setCapacitorYearSupvNum(dealData(childrenDeptList,processPublicYearDTOS));
supvReportM.setCapacitorMonthSupvNum(dealData(childrenDeptList,processPublicDTOCapacitorListM));
supvReportM.setCapacitorTotalSupvNum(dealData(childrenDeptList,processPublicDTOCapacitorAll));
supvReportM.setCapacitorMonthQuesNum(dealData(childrenDeptList,processPublicDTOCapacitorGanM));
@@ -272,7 +275,7 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
supvReportM.setCapacitorTotalReformNum(dealData(childrenDeptList,processPublicDTOCapacitorYesAll));
all+=supvReportM.getCapacitorTotalSupvNum();
//评估报告
supvReportM.setAppraisalReportYearSupvNum(dealData(childrenDeptList,processPublicDTOAppraisalAll));
supvReportM.setAppraisalReportYearSupvNum(dealData(childrenDeptList,processPublicYearDTOAppraisalS));
supvReportM.setAppraisalReportMonthSupvNum(dealData(childrenDeptList,processPublicDTOAppraisalListM));
supvReportM.setAppraisalReportTotalSupvNum(dealData(childrenDeptList,processPublicDTOAppraisalAll));
supvReportM.setAppraisalReportMonthQuesNum(dealData(childrenDeptList,processPublicDTOAppraisalGanM));
@@ -352,27 +355,42 @@ public class SupvReportMServiceImpl extends MppServiceImpl<SupvReportMMapper, Su
record.getEnergyYearSupvNum()+
record.getEnergyYearSupvNewNum()+
record.getSensitiveYearSupvNum()+
record.getPowerMonthPlanNum()
record.getCapacitorYearSupvNum()+
record.getAppraisalReportYearSupvNum()
);
record.setPlanCountNum(record.getConvertTotalSupvNum()+
record.getEnergyTotalSupvNum()+
record.getEnergyTotalSupvNewNum()+
record.getSensitiveTotalSupvNum()+
record.getPowerMonthConductedNum()
record.getPowerMonthConductedNum()+
record.getCapacitorTotalSupvNum()+
record.getAppraisalReportTotalSupvNum()
);
record.setProblemCountNum(record.getConvertTotalQuesNum()+
record.getEnergyTotalQuesNum()+
record.getEnergyTotalQuesNewNum()+
record.getSensitiveTotalQuesNum()+
record.getPowerTotalQuesNum());
record.getPowerTotalQuesNum()+
record.getCapacitorTotalQuesNum()+
record.getAppraisalReportTotalQuesNum()
);
record.setReformCountNum(record.getConvertTotalReformNum()+
record.getEnergyTotalReformNum()+
record.getEnergyTotalReformNewNum()+
record.getSensitiveTotalReformNum()+
record.getPowerTotalReformNum());
record.getPowerTotalReformNum()+
record.getCapacitorTotalReformNum()+
record.getAppraisalReportTotalReformNum()
);
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByCode(record.getStatisticsDept()).getData();
//获取预告警单信息
List<SupvAlarm> list = supvAlarmService.list(new LambdaQueryWrapper<SupvAlarm>().in(SupvAlarm::getCreaterOrgId, deptIds));
List<SupvAlarm> list = supvAlarmService.list(new LambdaQueryWrapper<SupvAlarm>().in(SupvAlarm::getCreaterOrgId, deptIds)
.between(StrUtil.isNotBlank(baseParam.getSearchBeginTime()),SupvAlarm::getCreaterTime,
DateUtil.beginOfYear(DateUtil.parse(baseParam.getSearchBeginTime())),
DateUtil.endOfYear(DateUtil.parse(baseParam.getSearchEndTime())))
);
int count =0;
if(CollUtil.isNotEmpty(list)){
List<String> alarmIds = list.stream().map(SupvAlarm::getAlarmId).distinct().collect(Collectors.toList());