1.pms主网测点数据统计功能

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/executor/OrgPointExecutor.java

@@ -16,6 +16,7 @@ import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadCommPointBusServic
 import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadEvaluationDataDService;
 import com.njcn.prepare.harmonic.service.mysql.send.ConverterIndexStatisticsPOService;
 import com.njcn.prepare.harmonic.service.mysql.send.PqTypicalSourceCreatePOService;
+import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadMainMonitorDataService;
 import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadPointStatisticalDataDService;
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.annotation.LiteflowMethod;
@@ -75,6 +76,8 @@ public class OrgPointExecutor extends BaseExecutor{
     private final IRUploadEvaluationDataDService irUploadEvaluationDataDService;
 
     private final IRUploadCommPointBusService irUploadCommPointBusService;
+
+    private final IRUploadMainMonitorDataService irUploadMainMonitorDataService;
     /**
      *
      * 3.3.2.	单位标数据质量
@@ -712,6 +715,11 @@ public class OrgPointExecutor extends BaseExecutor{
         }
     }
 
+    /**
+     * 河北国网上送接口
+     * 22.4.1.38接收电能质量公共连接点监测数据统计数据接口
+     * xuyang
+     */
     @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rUploadCommPoint", nodeType = NodeTypeEnum.COMMON)
     public boolean rUploadCommPointAccess(NodeComponent bindCmp) {
         return isAccess(bindCmp);
@@ -732,4 +740,30 @@ public class OrgPointExecutor extends BaseExecutor{
         }
     }
 
+
+    /**
+     * 河北国网上送接口
+     * 22.4.1.38接收电能质量公共连接点监测数据统计数据接口
+     * xuyang
+     */
+    @LiteflowMethod(value = LiteFlowMethodEnum.IS_ACCESS, nodeId = "rUploadMainMonitor", nodeType = NodeTypeEnum.COMMON)
+    public boolean rUploadMainMonitorAccess(NodeComponent bindCmp) {
+        return isAccess(bindCmp);
+    }
+    @LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "rUploadMainMonitor", nodeType = NodeTypeEnum.COMMON)
+    public void rUploadMainMonitorProcess(NodeComponent bindCmp) {
+        String tag = bindCmp.getTag();
+        CalculatedParam<DeptGetChildrenMoreDTO> calculatedParam = bindCmp.getRequestData();
+        if (tag.equalsIgnoreCase("r_upload_main_monitor_data_d")) {
+            //日表
+            irUploadMainMonitorDataService.handlerDay(calculatedParam.getDataDate());
+        } else if (tag.equalsIgnoreCase("r_upload_main_monitor_data_m")) {
+            //月表
+            irUploadMainMonitorDataService.handlerMonth(calculatedParam.getDataDate());
+        } else if (tag.equalsIgnoreCase("r_upload_main_monitor_data_y")) {
+            //月表
+            irUploadMainMonitorDataService.handlerYear(calculatedParam.getDataDate());
+        }
+    }
+
 }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRateMapper.java

@@ -1,18 +0,0 @@
-//package com.njcn.prepare.harmonic.mapper.mysql.line;
-//
-//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-//import com.njcn.process.pojo.po.LimitRate;
-//import org.apache.ibatis.annotations.Mapper;
-//
-///**
-// * <p>
-// * Mapper 接口
-// * </p>
-// *
-// * @author lxp
-// * @since 2023-03-16
-// */
-//@Mapper
-//public interface LimitRateMapper extends BaseMapper<LimitRate> {
-//
-//}

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/upload/RUploadMainMonitorDataMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.prepare.harmonic.mapper.mysql.upload;
+
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData;
+
+/**
+ * <p>
+ * 2.4.1.23接收电能质量主网监测点统计数据接口功能表（日月年数据） Mapper 接口
+ * </p>
+ *
+ * @author cdf
+ * @since 2024-10-21
+ */
+public interface RUploadMainMonitorDataMapper extends MppBaseMapper<RUploadMainMonitorData> {
+
+}

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/IRUploadMainMonitorDataService.java

@@ -0,0 +1,23 @@
+package com.njcn.prepare.harmonic.service.mysql.upload;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData;
+
+/**
+ * <p>
+ * 公共连接点母线电能质量统计 服务类
+ * </p>
+ */
+public interface IRUploadMainMonitorDataService extends IService<RUploadMainMonitorData> {
+
+
+    void handlerDay(String date);
+
+
+    void handlerMonth(String date);
+
+
+    void handlerYear(String date);
+
+}

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadMainMonitorDataServiceImpl.java

@@ -0,0 +1,176 @@
+package com.njcn.prepare.harmonic.service.mysql.upload.impl;
+
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.device.pms.api.MonitorClient;
+import com.njcn.device.pms.pojo.param.MonitorParam;
+import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pq.pojo.po.RStatIntegrityD;
+import com.njcn.harmonic.pojo.po.upload.RUploadMainMonitorData;
+import com.njcn.prepare.harmonic.mapper.mysql.day.RStatIntegrityDMapper;
+import com.njcn.prepare.harmonic.mapper.mysql.upload.RUploadMainMonitorDataMapper;
+import com.njcn.prepare.harmonic.service.mysql.upload.IRUploadMainMonitorDataService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.DictData;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 公共连接点母线电能质量统计 服务实现类
+ * </p>
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class RUploadMainMonitorDataServiceImpl extends MppServiceImpl<RUploadMainMonitorDataMapper, RUploadMainMonitorData> implements IRUploadMainMonitorDataService {
+
+    private final MonitorClient monitorClient;
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    private final RStatIntegrityDMapper rStatIntegrityDMapper;
+
+
+
+
+
+
+    @Override
+    public void handlerDay(String date){
+
+        LocalDate staDate = LocalDate.parse(date, DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN));
+
+        MonitorParam monitorParam = new MonitorParam();
+        monitorParam.setIsUpToGrid(DataStateEnum.ENABLE.getCode());
+
+        DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.RUN.getCode(),DicDataTypeEnum.LINE_STATE.getCode()).getData();
+        monitorParam.setMonitorState(dictData.getId());
+        List<Monitor> monitorList = monitorClient.getMonitorListByParam(monitorParam).getData();
+        List<String> monitorIds = monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList());
+
+        LambdaQueryWrapper<RStatIntegrityD> integrityDLambda = new LambdaQueryWrapper<>();
+        integrityDLambda.in(RStatIntegrityD::getLineIndex,monitorIds).eq(RStatIntegrityD::getTimeId,staDate);
+        List<RStatIntegrityD> rStatIntegrityDList = rStatIntegrityDMapper.selectList(integrityDLambda);
+        Map<String,RStatIntegrityD> inteMap = rStatIntegrityDList.stream().collect(Collectors.toMap(RStatIntegrityD::getLineIndex,Function.identity()));
+
+        List<RUploadMainMonitorData> poList = new ArrayList<>();
+        for(Monitor item : monitorList){
+
+            RUploadMainMonitorData rUploadMainMonitorData = new RUploadMainMonitorData();
+            rUploadMainMonitorData.setMonitorId(item.getMonitorId());
+            rUploadMainMonitorData.setComputeDate(staDate);
+            rUploadMainMonitorData.setObjId(IdUtil.simpleUUID());
+            rUploadMainMonitorData.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_D.getCode());
+            rUploadMainMonitorData.setStatisticalDate(date);
+            rUploadMainMonitorData.setUploadStatus(0);
+            if(inteMap.containsKey(item.getId())){
+                RStatIntegrityD rStatIntegrityD = inteMap.get(item.getId());
+                if(rStatIntegrityD.getRealTime()>0){
+                    rUploadMainMonitorData.setIsMonitorOnline(DicDataEnum.YES.getCode());
+                    rUploadMainMonitorData.setIsTerminalOnline(DicDataEnum.YES.getCode());
+                    rUploadMainMonitorData.setOnlineMonitorNum(1);
+                    rUploadMainMonitorData.setRunMonitorNum(1);
+                    BigDecimal rate = BigDecimal.valueOf((double)rStatIntegrityD.getRealTime()/rStatIntegrityD.getDueTime()).setScale(2, RoundingMode.HALF_UP);
+                    rUploadMainMonitorData.setOnlineMonitorRate(rate);
+                    rUploadMainMonitorData.setExpectCollectNum((long)rStatIntegrityD.getDueTime());
+                    rUploadMainMonitorData.setActualCollectNum((long)rStatIntegrityD.getRealTime());
+                    rUploadMainMonitorData.setDataFullRate(rate);
+                }else {
+                    assLessEntity(rUploadMainMonitorData);
+                }
+            }else {
+                assLessEntity(rUploadMainMonitorData);
+            }
+            poList.add(rUploadMainMonitorData);
+        }
+
+        if(CollUtil.isNotEmpty(poList)){
+            this.saveOrUpdateBatchByMultiId(poList);
+        }
+    }
+
+
+    public void handlerMonth(String date){
+        String begin = DateUtil.format(DateUtil.beginOfMonth(DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATE_PATTERN);
+
+        QueryWrapper<RUploadMainMonitorData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("monitor_id,max(is_Monitor_Online)  is_Monitor_Online,max(is_Terminal_Online) is_Terminal_Online,max(online_Monitor_Num) online_Monitor_Num,max(run_Monitor_Num) run_Monitor_Num,avg(online_Monitor_Rate) online_Monitor_Rate,sum(expect_Collect_Num) expect_Collect_Num,sum(actual_Collect_Num) actual_Collect_Num,avg(data_Full_Rate) data_Full_Rate")
+                .eq("statistical_type",DicDataEnum.STATISTICAL_TYPE_D.getCode())
+                .between("statistical_date",begin,date).groupBy("monitor_id");
+        List<RUploadMainMonitorData> rUploadMainMonitorDataList = this.list(queryWrapper);
+        if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){
+            for(RUploadMainMonitorData item : rUploadMainMonitorDataList){
+                item.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_M.getCode());
+                item.setUploadStatus(0);
+                item.setObjId(IdUtil.simpleUUID());
+                item.setStatisticalDate(date.substring(0,7));
+                item.setComputeDate(LocalDate.parse(date,DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+            }
+            if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){
+                this.saveOrUpdateBatchByMultiId(rUploadMainMonitorDataList);
+            }
+        }
+    }
+
+
+    public void handlerYear(String date){
+        String begin = DateUtil.format(DateUtil.beginOfYear(DateUtil.parse(date,DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATE_PATTERN);
+
+        QueryWrapper<RUploadMainMonitorData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("monitor_id,max(is_Monitor_Online)  is_Monitor_Online,max(is_Terminal_Online) is_Terminal_Online,max(online_Monitor_Num) online_Monitor_Num,max(run_Monitor_Num) run_Monitor_Num,avg(online_Monitor_Rate) online_Monitor_Rate,sum(expect_Collect_Num) expect_Collect_Num,sum(actual_Collect_Num) actual_Collect_Num,avg(data_Full_Rate) data_Full_Rate")
+                .eq("statistical_type",DicDataEnum.STATISTICAL_TYPE_M.getCode())
+                .between("statistical_date",begin,date).groupBy("monitor_id");
+        List<RUploadMainMonitorData> rUploadMainMonitorDataList = this.list(queryWrapper);
+        if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){
+            for(RUploadMainMonitorData item : rUploadMainMonitorDataList){
+                item.setStatisticalType(DicDataEnum.STATISTICAL_TYPE_Y.getCode());
+                item.setUploadStatus(0);
+                item.setObjId(IdUtil.simpleUUID());
+                item.setStatisticalDate(date.substring(0,4));
+                item.setComputeDate(LocalDate.parse(date,DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+            }
+            if(CollUtil.isNotEmpty(rUploadMainMonitorDataList)){
+                this.saveOrUpdateBatchByMultiId(rUploadMainMonitorDataList);
+            }
+        }
+    }
+
+
+
+    private void assLessEntity(RUploadMainMonitorData rUploadMainMonitorData){
+        rUploadMainMonitorData.setIsMonitorOnline(DicDataEnum.NO.getCode());
+        rUploadMainMonitorData.setIsTerminalOnline(DicDataEnum.NO.getCode());
+        rUploadMainMonitorData.setOnlineMonitorNum(0);
+        rUploadMainMonitorData.setRunMonitorNum(0);
+        rUploadMainMonitorData.setOnlineMonitorRate(BigDecimal.ZERO);
+        rUploadMainMonitorData.setExpectCollectNum((long)0);
+        rUploadMainMonitorData.setActualCollectNum((long)0);
+        rUploadMainMonitorData.setDataFullRate(BigDecimal.ZERO);
+    }
+
+
+
+
+
+
+
+}

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java

@@ -170,7 +170,7 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
             }
         }
 
-        if(!byId.getSupvType().equals(supvPlanParam.getSupvType())){
+        if(StrUtil.isBlank(supvPlanParam.getSupvObjId()) || !byId.getSupvType().equals(supvPlanParam.getSupvType())){
             supvPlan.setSupvObjId(IdUtil.simpleUUID());
         }
 

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java

@@ -624,6 +624,11 @@ public enum DicDataEnum {
     WORK_ORDER_STATUS_ING("处理中","02"),
     WORK_ORDER_STATUS_HAS("已上报","03"),
     WORK_ORDER_STATUS_CLOSE("已闭环","04"),
+
+
+    YES("是","1"),
+    NO("否","0")
+
     ;
 
     private final String name;

pqs-system/system-api/src/main/java/com/njcn/system/enums/DicTreeEnum.java

@@ -10,6 +10,13 @@ import lombok.Getter;
  */
 @Getter
 public enum DicTreeEnum {
+
+    /**
+     * 树结构字典类型
+     */
+    HB_PMS_TYPE("河北pms对象类型","0"),
+    REPORT_UNIT_TYPE("自定义报表单位指标","1"),
+
     /**
      * 字典树
      */
@@ -118,6 +125,10 @@ public enum DicTreeEnum {
 
 
 
+
+
+
+
     ;
 
 

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/PqTypicalSourceTaskRunner.java

@@ -2,10 +2,7 @@ package com.njcn.system.timer.tasks;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.api.PqTypicalSourceFeignClient;
-import com.njcn.harmonic.api.UploadGwDataFeignClient;
-import com.njcn.harmonic.pojo.param.UploadDataParam;
 import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.system.timer.TimerTaskRunner;
 import lombok.RequiredArgsConstructor;
@@ -22,7 +19,6 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner {
 
     private final PqTypicalSourceFeignClient pqTypicalSourceFeignClient;
 
-    private final UploadGwDataFeignClient uploadGwDataFeignClient;
 
 
     @Override
@@ -32,9 +28,7 @@ public class PqTypicalSourceTaskRunner implements TimerTaskRunner {
         param.setTime(dateDeal);
         pqTypicalSourceFeignClient.send(param).getCode();
 
-        UploadDataParam uploadDataParam = new UploadDataParam();
+
-        uploadDataParam.setSearchBeginTime(dateDeal);
-        uploadGwDataFeignClient.upGwCommPoint(uploadDataParam);
 
     }
 }

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/UploadGwTaskSubstationRunner.java

@@ -2,7 +2,6 @@ package com.njcn.system.timer.tasks;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.harmonic.api.UploadGwDataFeignClient;
 import com.njcn.harmonic.pojo.param.UploadParam;
 import com.njcn.system.timer.TimerTaskRunner;

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwCommPointRunner.java

@@ -0,0 +1,32 @@
+package com.njcn.system.timer.tasks.hbPushGw;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.harmonic.api.UploadGwDataFeignClient;
+import com.njcn.harmonic.pojo.param.UploadDataParam;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用于pms往国网推送公共连接点数据定时任务
+ */
+@Component
+@RequiredArgsConstructor
+public class UploadGwCommPointRunner implements TimerTaskRunner {
+
+    private final UploadGwDataFeignClient uploadGwDataFeignClient;
+
+    @Override
+    public void action(String date) {
+        UploadDataParam uploadDataParam = new UploadDataParam();
+        if(StrUtil.isBlank(date)){
+            String dateDeal = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN);
+            uploadDataParam.setSearchBeginTime(dateDeal);
+        }else {
+            uploadDataParam.setSearchBeginTime(date);
+        }
+        uploadGwDataFeignClient.upGwCommPoint(uploadDataParam);
+    }
+}

pqs-system/system-boot/src/main/java/com/njcn/system/timer/tasks/hbPushGw/UploadGwMainMonitorRunner.java

@@ -0,0 +1,32 @@
+package com.njcn.system.timer.tasks.hbPushGw;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.harmonic.api.UploadGwDataFeignClient;
+import com.njcn.harmonic.pojo.param.UploadDataParam;
+import com.njcn.system.timer.TimerTaskRunner;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用于pms往国网推送公共连接点数据定时任务
+ */
+@Component
+@RequiredArgsConstructor
+public class UploadGwMainMonitorRunner implements TimerTaskRunner {
+
+    private final UploadGwDataFeignClient uploadGwDataFeignClient;
+
+    @Override
+    public void action(String date) {
+        UploadDataParam uploadDataParam = new UploadDataParam();
+        if(StrUtil.isBlank(date)){
+            String dateDeal = DateUtil.yesterday().toString(DatePattern.NORM_DATE_PATTERN);
+            uploadDataParam.setSearchBeginTime(dateDeal);
+        }else {
+            uploadDataParam.setSearchBeginTime(date);
+        }
+        uploadGwDataFeignClient.upGwMainMonitor(uploadDataParam);
+    }
+}