From 90de9184d48db56d9c4f7edd7ea435f97635b652 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Tue, 9 Apr 2024 11:46:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B2=B3=E5=8C=97=E5=9B=BD=E7=BD=91=E4=B8=8A?= =?UTF-8?q?=E9=80=811.8=201.9=E6=96=87=E6=A1=A3=E9=9C=80=E6=B1=82=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=202.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gwPush/impl/MonitorSendServiceImpl.java | 4 -- .../com/njcn/process/pojo/po/SupvReportM.java | 62 +++++++++++++++++++ .../impl/LoadTypeUserManageServiceImpl.java | 38 ++++++++++++ .../service/impl/SupvReportMServiceImpl.java | 43 ++++++++++++- .../com/njcn/system/enums/DicDataEnum.java | 2 + 5 files changed, 144 insertions(+), 5 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 0db83f8b3..08022d51c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -101,11 +101,7 @@ public class MonitorSendServiceImpl implements MonitorSendService { lambdaQueryWrapper.in(Monitor::getObjType, objTypeIds); } - - - //获取监测点信息 - lambdaQueryWrapper .eq(Monitor::getIsUpToGrid,1) .in(CollUtil.isNotEmpty(param.getIds()),Monitor::getId, param.getIds()); diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java index 16990e5b1..c90694fbe 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvReportM.java @@ -222,8 +222,70 @@ public class SupvReportM { */ private Integer powerTotalReformNum; + /** + *电容器组本年计划监督数量 + */ + private Integer capacitorYearSupvNum; + /** + *电容器组本月监督数量 + */ + private Integer capacitorMonthSupvNum; + /** + *电容器组累计监督数量 + */ + private Integer capacitorTotalSupvNum; + /** + *电容器组本月问题数量 + */ + private Integer capacitorMonthQuesNum; + /** + *电容器组累计问题数量 + */ + private Integer capacitorTotalQuesNum; + /** + *电容器组本月整改问题数量 + */ + private Integer capacitorMonthReformNum; + /** + *电容器组累计整改问题数量 + */ + private Integer capacitorTotalReformNum; + /** + *评估报告本年计划监督数量 + */ + private Integer appraisalReportYearSupvNum; + /** + *评估报告本月监督数量 + */ + private Integer appraisalReportMonthSupvNum; + /** + *评估报告累计监督数量 + */ + private Integer appraisalReportTotalSupvNum; + /** + *评估报告本月问题数量 + */ + private Integer appraisalReportMonthQuesNum; + /** + *评估报告累计问题数量 + */ + private Integer appraisalReportTotalQuesNum; + /** + *评估报告本月整改问题数量 + */ + private Integer appraisalReportMonthReformNum; + /** + *评估报告累计整改问题数量 + */ + private Integer appraisalReportTotalReformNum; + + private Integer isUploadHead; + + + + /** * 各类型本年监督数量 */ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java index 5f37b1e8e..cef5a411f 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java @@ -1,6 +1,8 @@ package com.njcn.process.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -12,13 +14,21 @@ import com.njcn.oss.constant.OssPath; import com.njcn.device.pms.api.DistributionMonitorClient; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.process.constant.Param; +import com.njcn.process.mapper.FlowFormAssMapper; +import com.njcn.process.mapper.FlowableAssMapper; import com.njcn.process.mapper.LoadTypeUserManageMapper; import com.njcn.process.pojo.param.*; +import com.njcn.process.pojo.po.FlowFormAss; +import com.njcn.process.pojo.po.FlowableAss; import com.njcn.process.pojo.po.RLoadTypeUserManage; import com.njcn.process.pojo.vo.LoadTypeRelationExcel; import com.njcn.process.pojo.vo.LoadTypeUserExcel; import com.njcn.process.pojo.vo.RLoadTypeUserManageVO; +import com.njcn.process.pojo.vo.flowable.FlowTaskVo; import com.njcn.process.service.LoadTypeUserManageService; +import com.njcn.process.service.flowable.IFlowDefinitionService; +import com.njcn.process.service.flowable.IFlowInstanceService; +import com.njcn.process.service.flowable.IFlowTaskService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -33,6 +43,7 @@ import liquibase.pro.packaged.S; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.jdbc.Null; +import org.flowable.task.api.Task; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,7 +71,15 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService private final FileStorageUtil fileStorageUtil; + private final FlowFormAssMapper flowFormAssMapper; + private final IFlowDefinitionService iFlowDefinitionService; + + private final IFlowInstanceService iFlowInstanceService; + + private final FlowableAssMapper flowableAssMapper; + + private final IFlowTaskService iFlowTaskService; /** * 干扰源用户分页查询 @@ -121,6 +140,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService * @return */ @Override + @Transactional(rollbackFor = Exception.class) public boolean addLoadTypeUser(LoadTypeUserParam loadTypeUserParam) { //参数转换 RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage(); @@ -133,7 +153,25 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService Dept data = deptFeignClient.getDeptById (loadTypeUserParam.getOrgNo()).getData(); rLoadTypeUserManage.setICheckPerson(data.getPid()); rLoadTypeUserManage.setACheckPerson(data.getPid()); + rLoadTypeUserManage.setId(IdUtil.simpleUUID()); loadTypeUserManageMapper.insert(rLoadTypeUserManage); + + //绑定工作流 + + //开始流程 + FlowFormAss flowFormAss = flowFormAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowFormAss::getFormId, 2)); + if (Objects.isNull(flowFormAss)) { + throw new BusinessException("当前功能未绑定流程,请先绑定流程"); + } + + Map map = new HashMap<>(); + String processId = iFlowDefinitionService.startProcessInstanceById(flowFormAss.getDefinitionId(), rLoadTypeUserManage.getId(), map); + Task task = iFlowTaskService.getTask(processId); + FlowTaskVo flowTaskVo = new FlowTaskVo(); + flowTaskVo.setTaskId(task.getId()); + flowTaskVo.setInstanceId(processId); + flowTaskVo.setComment(RequestUtil.getUserNickname() + "发起录入干扰源用户申请"); + iFlowTaskService.complete(flowTaskVo); return true; } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java index 488327119..b8dc27b4f 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvReportMServiceImpl.java @@ -162,6 +162,28 @@ public class SupvReportMServiceImpl extends MppServiceImpl processPublicDTODianYaGanYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.Technical_Super.getCode()).getId(),"02",null); + //电容器组月前统计 + List processPublicDTOCapacitorListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); + List processPublicDTOCapacitorAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); + //电容器组问题数量 + List processPublicDTOCapacitorGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); + List processPublicDTOCapacitorGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),null,null); + //电容器组已整改问题 + List processPublicDTOCapacitorGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),"02",null); + List processPublicDTOCapacitorYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.capacitor_bank.getCode()).getId(),"02",null); + + //评估报告月前统计 + List processPublicDTOAppraisalListM = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null); + List processPublicDTOAppraisalAll = this.baseMapper.statisticPlanReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null); + //评估报告问题数量 + List processPublicDTOAppraisalGanM = this.baseMapper.statisticQueReport(firstDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null); + List processPublicDTOAppraisalGanAll = this.baseMapper.statisticQueReport(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),null,null); + //评估报告已整改问题 + List processPublicDTOAppraisalGanYesM = this.baseMapper.statisticQueReportRectify(firstDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),"02",null); + List processPublicDTOAppraisalYesAll = this.baseMapper.statisticQueReportRectify(firstYearDay,endTime,mapStatistic.get(DicDataEnum.report_supervision.getCode()).getId(),"02",null); + + + List supvReportMBatch = new ArrayList<>(); for(DeptGetBase deptGetBase : deptGetBaseList){ @@ -238,9 +260,28 @@ public class SupvReportMServiceImpl extends MppServiceImpl