1.河北两级贯通接口调整

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java

@@ -30,6 +30,9 @@ public class PmsRunStatisticM {
     @MppMultiId
     private LocalDate statisticDate;
 
+    @MppMultiId
+    private LocalDate statDate;
+
     @MppMultiId
     private String deptId;
 

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java

@@ -30,6 +30,9 @@ public class PmsRunStatisticY {
     @MppMultiId
     private LocalDate statisticDate;
 
+    @MppMultiId
+    private LocalDate statDate;
+
     @MppMultiId
     private String deptId;
 

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpDPO.java

@@ -0,0 +1,265 @@
+package com.njcn.prepare.harmonic.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2024/5/8
+ */
+@Data
+@TableName("r_dim_bus_up_d")
+public class RDimBusUpDPO {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合格率时间
+     */
+    @MppMultiId
+    private LocalDate statistic_date;
+
+    @MppMultiId
+    private String busId;
+
+
+    private String voltageLevel;
+
+
+    private String orgId;
+
+    /**
+     * 有效监测点id
+     */
+    private String effectMonitor;
+
+    /**
+     * 有效监测点id,用逗号隔开
+     */
+    private String effectMonitorIds;
+
+
+    /**
+     * 总计算次数
+     */
+    @TableField(value = "all_time")
+    private Integer allTime;
+
+    /**
+     * 闪变越限次数
+     */
+    @TableField(value = "flicker_overtime")
+    private Integer flickerOvertime;
+
+    /**
+     * 闪变总计算次数
+     */
+    @TableField(value = "flicker_all_time")
+    private Integer flickerAllTime;
+
+    /**
+     * 频率偏差越限次数
+     */
+    @TableField(value = "freq_dev_overtime")
+    private Integer freqDevOvertime;
+
+    /**
+     * 电压偏差越限次数
+     */
+    @TableField(value = "voltage_dev_overtime")
+    private Integer voltageDevOvertime;
+
+    /**
+     * 三相电压不平衡度越限次数
+     */
+    @TableField(value = "ubalance_overtime")
+    private Integer ubalanceOvertime;
+
+    /**
+     * 电压谐波畸变率越限次数
+     */
+    @TableField(value = "uaberrance_overtime")
+    private Integer uaberranceOvertime;
+
+    /**
+     * 负序电流限值次数
+     */
+    @TableField(value = "i_neg_overtime")
+    private Integer iNegOvertime;
+
+    /**
+     * 2次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_2_overtime")
+    private Integer uharm2Overtime;
+
+    /**
+     * 3次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_3_overtime")
+    private Integer uharm3Overtime;
+
+    /**
+     * 4次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_4_overtime")
+    private Integer uharm4Overtime;
+
+    /**
+     * 5次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_5_overtime")
+    private Integer uharm5Overtime;
+
+    /**
+     * 6次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_6_overtime")
+    private Integer uharm6Overtime;
+
+    /**
+     * 7次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_7_overtime")
+    private Integer uharm7Overtime;
+
+    /**
+     * 8次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_8_overtime")
+    private Integer uharm8Overtime;
+
+    /**
+     * 9次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_9_overtime")
+    private Integer uharm9Overtime;
+
+    /**
+     * 10次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_10_overtime")
+    private Integer uharm10Overtime;
+
+    /**
+     * 11次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_11_overtime")
+    private Integer uharm11Overtime;
+
+    /**
+     * 12次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_12_overtime")
+    private Integer uharm12Overtime;
+
+    /**
+     * 13次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_13_overtime")
+    private Integer uharm13Overtime;
+
+    /**
+     * 14次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_14_overtime")
+    private Integer uharm14Overtime;
+
+    /**
+     * 15次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_15_overtime")
+    private Integer uharm15Overtime;
+
+    /**
+     * 16次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_16_overtime")
+    private Integer uharm16Overtime;
+
+    /**
+     * 17次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_17_overtime")
+    private Integer uharm17Overtime;
+
+    /**
+     * 18次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_18_overtime")
+    private Integer uharm18Overtime;
+
+    /**
+     * 19次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_19_overtime")
+    private Integer uharm19Overtime;
+
+    /**
+     * 20次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_20_overtime")
+    private Integer uharm20Overtime;
+
+    /**
+     * 21次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_21_overtime")
+    private Integer uharm21Overtime;
+
+    /**
+     * 22次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_22_overtime")
+    private Integer uharm22Overtime;
+
+    /**
+     * 23次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_23_overtime")
+    private Integer uharm23Overtime;
+
+    /**
+     * 24次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_24_overtime")
+    private Integer uharm24Overtime;
+
+    /**
+     * 25次电压谐波含有率越限次数
+     */
+
+    @TableField(value = "uharm_25_overtime")
+    private Integer uharm25Overtime;
+
+}

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

@@ -58,6 +58,7 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
             Set<String> pointOnlineSet = new HashSet<>();
 
             Set<String> busSet = new HashSet<>();
+            Set<String> busRunSet = new HashSet<>();
             Set<String> stationSet = new HashSet<>();
 
             Set<String> typicalSet = new HashSet<>();
@@ -78,6 +79,10 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
                 if(StrUtil.isNotBlank(item.getTypicalOnlineIds())){
                     typicalSet.addAll(Arrays.asList(item.getTypicalOnlineIds().split(StrUtil.COMMA)));
                 }
+
+                if(StrUtil.isNotBlank(item.getRunBusIds())){
+                    busRunSet.addAll(Arrays.asList(item.getRunBusIds().split(StrUtil.COMMA)));
+                }
             });
             pmsRunStatisticM.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet));
             pmsRunStatisticM.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet));
@@ -90,7 +95,10 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl<PmsRunStatisticM
             int temBus = val.stream().map(PmsRunStatisticD::getRunBusNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
             int temStation = val.stream().map(PmsRunStatisticD::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
             pmsRunStatisticM.setRunBusNum(temBus);
+            pmsRunStatisticM.setRunBusIds(String.join(StrUtil.COMMA,busRunSet));
             pmsRunStatisticM.setRunStationNum(temStation);
+
+            pmsRunStatisticM.setStatDate(LocalDate.parse(date));
             poList.add(pmsRunStatisticM);
 
 

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

@@ -36,6 +36,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -112,6 +113,10 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl<PmsRunStatisticDM
         for(DeptGetChildrenMoreDTO dto : deptGetChildrenMoreDTOList){
             List<String> childrenDept = dto.getUnitChildrenList();
 
+
+
+
+
             List<String> temPointIds = dto.getLineBaseList().stream().map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList());
 
             List<String> onlinePointIds = temPointIds.stream().filter(rStatIntegrityIds::contains).collect(Collectors.toList());
@@ -130,6 +135,9 @@ public class PmsRunStatisticServiceImpl extends MppServiceImpl<PmsRunStatisticDM
             long busBarCount = midLedgerBusBarList.stream().filter(it->childrenDept.contains(it.getSectionId())).map(PmsMidLedger::getId).distinct().count();
             pmsRunStatisticD.setRunBusNum((int) busBarCount);
 
+            String temRunBusIds = midLedgerBusBarList.stream().filter(it->childrenDept.contains(it.getSectionId())).map(PmsMidLedger::getId).distinct().collect(Collectors.joining(StrUtil.COMMA));
+            pmsRunStatisticD.setRunBusIds(temRunBusIds);
+
             List<String> runBusIds = monitorList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(Monitor::getLineId).distinct().collect(Collectors.toList());
             pmsRunStatisticD.setOnlineBusIds(String.join(StrUtil.COMMA, runBusIds));
 

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

@@ -60,6 +60,7 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
             Set<String> pointOnlineSet = new HashSet<>();
 
             Set<String> busSet = new HashSet<>();
+            Set<String> busRunSet = new HashSet<>();
             Set<String> stationSet = new HashSet<>();
 
             Set<String> typicalSet = new HashSet<>();
@@ -80,6 +81,10 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
                 if(StrUtil.isNotBlank(item.getTypicalOnlineIds())){
                     typicalSet.addAll(Arrays.asList(item.getTypicalOnlineIds().split(StrUtil.COMMA)));
                 }
+
+                if(StrUtil.isNotBlank(item.getRunBusIds())){
+                    busRunSet.addAll(Arrays.asList(item.getRunBusIds().split(StrUtil.COMMA)));
+                }
             });
             pmsRunStatisticY.setRunMonitorIds(String.join(StrUtil.COMMA,pointSet));
             pmsRunStatisticY.setOnlineMonitorIds(String.join(StrUtil.COMMA,pointOnlineSet));
@@ -92,7 +97,10 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl<PmsRunStatisticY
             int temBus = val.stream().map(PmsRunStatisticM::getRunBusNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
             int temStation = val.stream().map(PmsRunStatisticM::getRunStationNum).filter(Objects::nonNull).max(Integer::compareTo).orElse(0);
             pmsRunStatisticY.setRunBusNum(temBus);
+            pmsRunStatisticY.setRunBusIds(String.join(StrUtil.COMMA,busRunSet));
+
             pmsRunStatisticY.setRunStationNum(temStation);
+            pmsRunStatisticY.setStatDate(LocalDate.parse(date));
             poList.add(pmsRunStatisticY);
         });