1.国网上送代码调整

2.稳态指标代码调整
2023-12-18 15:54:26 +08:00
parent 0246c1d480
commit 6d472eb443
24 changed files with 765 additions and 266 deletions
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatOrgController.java
@@ -49,10 +49,10 @@ public class RStatOrgController extends BaseController {
    /**
     * 查询区域超标统计
     */
-    @GetMapping("/getAllRStatHarmonicOrg")
+    @PostMapping("/getAllRStatHarmonicOrg")
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @ApiOperation("区域超标统计")
-    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrg(StatisticsBizBaseParam param) {
+    public HttpResult<List<RStatOrgVO>> getAllRStatHarmonicOrg(@RequestBody RStatOrgParam.Info param) {
        String methodDescribe = getMethodDescribe("getAllRStatHarmonicOrg");
        List<RStatOrgVO> rStatHarmonicOrgMAll = null;
        String string = param.getType().toString();
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgMService.java
@@ -2,6 +2,7 @@ package com.njcn.harmonic.service.majornetwork;

 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.harmonic.pojo.param.OverviewParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.po.RStatOrgM;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.vo.OverviewVO;
@@ -25,7 +26,7 @@ public interface RStatOrgMService extends IService<RStatOrgM> {
     * @param param
     * @return
     */
-    List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param);
+    List<RStatOrgVO> getRStatHarmonicMAll(RStatOrgParam.Info param);

    /**
     * 分布式光伏概览-超标监测点数量
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgQService.java
@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.majornetwork;

 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.po.RStatOrgQ;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
@@ -23,5 +24,5 @@ public interface RStatOrgQService extends IService<RStatOrgQ> {
     * @param param
     * @return
     */
-    List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param);
+    List<RStatOrgVO> getRStatHarmonicQAll(RStatOrgParam.Info param);
 }
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgYService.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/RStatOrgYService.java
@@ -1,6 +1,7 @@
 package com.njcn.harmonic.service.majornetwork;

 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.RStatOrgY;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -24,7 +25,7 @@ public interface RStatOrgYService extends IService<RStatOrgY> {
     * @param param
     * @return
     */
-    List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param);
+    List<RStatOrgVO> getRStatHarmonicYAll(RStatOrgParam.Info param);

    /**
     * 区域稳态指标超标分类统计表
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
@@ -1,13 +1,16 @@
 package com.njcn.harmonic.service.majornetwork.impl;

+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.harmonic.pojo.param.OverviewParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.po.RStatOrgM;
 import com.njcn.harmonic.mapper.majornetwork.RStatOrgMMapper;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
 import com.njcn.harmonic.pojo.vo.OverviewVO;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
 import com.njcn.harmonic.service.majornetwork.RStatOrgMService;
@@ -49,7 +52,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
    private static final String XIONG_AN_CITY="雄安新区";

    @Override
-    public List<RStatOrgVO> getRStatHarmonicMAll(StatisticsBizBaseParam param) {
+    public List<RStatOrgVO> getRStatHarmonicMAll(RStatOrgParam.Info param) {
        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
        List<String> deptIds = deptDTOList.stream().map(DeptDTO::getCode).collect(Collectors.toList());
@@ -61,6 +64,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
        List<RStatOrgM> list = rStatOrgMMapper.selectList(new LambdaQueryWrapper<RStatOrgM>()
                .eq(RStatOrgM::getDataType, mainnetData.getId())
                .in(RStatOrgM::getOrgNo, deptIds)
+                .in(CollUtil.isNotEmpty(param.getMeasurementTypeClass()), RStatOrgM::getMeasurementTypeClass, param.getMeasurementTypeClass())
                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgM::getDataDate, param.getStartTime())
                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgM::getDataDate, param.getEndTime()));
        Map<String, List<RStatOrgM>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgM::getOrgNo));
@@ -81,7 +85,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
                    }else{
                        rStatOrgVO.setAverageOverDay(0.0f);
                    }
-
+                    rStatOrgVO.setMeasurementTypeClass(rStatOrgM.getMeasurementTypeClass());
                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgM.getEffectiveMeasurementAverage());
                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgM.getEffectiveMeasurementAccrued());
                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgM.getHarmonicMeasurementAverage());
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
@@ -1,10 +1,14 @@
 package com.njcn.harmonic.service.majornetwork.impl;

+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
+import com.njcn.harmonic.pojo.po.RStatOrgM;
 import com.njcn.harmonic.pojo.po.RStatOrgQ;
 import com.njcn.harmonic.mapper.majornetwork.RStatOrgQMapper;
+import com.njcn.harmonic.pojo.po.RStatOrgY;
 import com.njcn.harmonic.pojo.vo.RStatOrgVO;
 import com.njcn.harmonic.service.majornetwork.RStatOrgQService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -42,7 +46,7 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
    private final RStatOrgQMapper rStatOrgQMapper;

    @Override
-    public List<RStatOrgVO> getRStatHarmonicQAll(StatisticsBizBaseParam param) {
+    public List<RStatOrgVO> getRStatHarmonicQAll(RStatOrgParam.Info param) {
        //获取部门信息
        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
@@ -57,6 +61,7 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
        List<RStatOrgQ> list = rStatOrgQMapper.selectList(new LambdaQueryWrapper<RStatOrgQ>()
                .eq(RStatOrgQ::getDataType, mainnetData.getId())
                .in(RStatOrgQ::getOrgNo, deptIds)
+                .in(CollUtil.isNotEmpty(param.getMeasurementTypeClass()), RStatOrgQ::getMeasurementTypeClass, param.getMeasurementTypeClass())
                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgQ::getDataDate, param.getStartTime())
                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgQ::getDataDate, param.getEndTime()));
        Map<String, List<RStatOrgQ>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgQ::getOrgNo));
@@ -69,6 +74,7 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
                    rStatOrgVO.setOrgName(deptDTO.getName());
                    rStatOrgVO.setAverageOverDay(rStatOrgQ.getAverageOverDay());
+                    rStatOrgVO.setMeasurementTypeClass(rStatOrgQ.getMeasurementTypeClass());
                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgQ.getEffectiveMeasurementAverage());
                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgQ.getEffectiveMeasurementAccrued());
                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgQ.getHarmonicMeasurementAverage());
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
@@ -20,6 +20,7 @@ import com.njcn.harmonic.mapper.majornetwork.RStatOrgYMapper;
 import com.njcn.harmonic.mapper.majornetwork.RStatSubstationMMapper;
 import com.njcn.harmonic.mapper.majornetwork.RStatSubstationQMapper;
 import com.njcn.harmonic.mapper.majornetwork.RStatSubstationYMapper;
+import com.njcn.harmonic.pojo.param.RStatOrgParam;
 import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.RStatOrgY;
 import com.njcn.harmonic.pojo.vo.*;
@@ -67,7 +68,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
    private final PmsGeneralDeviceInfoClient pmsGeneralDeviceInfoClient;

    @Override
-    public List<RStatOrgVO> getRStatHarmonicYAll(StatisticsBizBaseParam param) {
+    public List<RStatOrgVO> getRStatHarmonicYAll(RStatOrgParam.Info param) {
        //获取部门信息
        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
        List<DeptDTO> deptDTOList = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
@@ -82,6 +83,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
        List<RStatOrgY> list = rStatOrgYMapper.selectList(new LambdaQueryWrapper<RStatOrgY>()
                .eq(RStatOrgY::getDataType, mainnetData.getId())
                .in(RStatOrgY::getOrgNo, deptIds)
+                .in(CollUtil.isNotEmpty(param.getMeasurementTypeClass()),RStatOrgY::getMeasurementTypeClass, param.getMeasurementTypeClass())
                .ge(StrUtil.isNotBlank(param.getStartTime()), RStatOrgY::getDataDate, param.getStartTime())
                .le(StrUtil.isNotBlank(param.getEndTime()), RStatOrgY::getDataDate, param.getEndTime()));
        Map<String, List<RStatOrgY>> collect = list.stream().collect(Collectors.groupingBy(RStatOrgY::getOrgNo));
@@ -94,6 +96,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
                    RStatOrgVO rStatOrgVO = new RStatOrgVO();
                    rStatOrgVO.setOrgName(deptDTO.getName());
                    rStatOrgVO.setAverageOverDay(rStatOrgY.getAverageOverDay());
+                    rStatOrgVO.setMeasurementTypeClass(rStatOrgY.getMeasurementTypeClass());
                    rStatOrgVO.setEffectiveMeasurementAverage(rStatOrgY.getEffectiveMeasurementAverage());
                    rStatOrgVO.setEffectiveMeasurementAccrued(rStatOrgY.getEffectiveMeasurementAccrued());
                    rStatOrgVO.setOverLimitMeasurementAverage(rStatOrgY.getOverLimitMeasurementAverage());