From bedd70136bba9fd04eafc47f43a4749367ce042f Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Thu, 9 May 2024 14:04:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B2=B3=E5=8C=97=E4=B8=A4=E7=BA=A7=E8=B4=AF?= =?UTF-8?q?=E9=80=9A=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../harmonic/pojo/po/PmsRunStatisticM.java | 3 + .../harmonic/pojo/po/PmsRunStatisticY.java | 3 + .../harmonic/pojo/po/RDimBusUpDPO.java | 265 ++++++++++++++++++ .../impl/PmsRunStatisticMServiceImpl.java | 8 + .../impl/PmsRunStatisticServiceImpl.java | 8 + .../impl/PmsRunStatisticYServiceImpl.java | 8 + 6 files changed, 295 insertions(+) create mode 100644 pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpDPO.java diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java index de14fb349..8b4b6e012 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticM.java +++ b/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; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java index 6658b91df..647339bde 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PmsRunStatisticY.java +++ b/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; diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpDPO.java b/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RDimBusUpDPO.java new file mode 100644 index 000000000..e21566d20 --- /dev/null +++ b/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; + +} diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java index 0c5b9857f..4c3f1c636 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticMServiceImpl.java +++ b/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 pointOnlineSet = new HashSet<>(); Set busSet = new HashSet<>(); + Set busRunSet = new HashSet<>(); Set stationSet = new HashSet<>(); Set typicalSet = new HashSet<>(); @@ -78,6 +79,10 @@ public class PmsRunStatisticMServiceImpl extends MppServiceImpl childrenDept = dto.getUnitChildrenList(); + + + + List temPointIds = dto.getLineBaseList().stream().map(LineDevGetDTO::getPointId).distinct().collect(Collectors.toList()); List onlinePointIds = temPointIds.stream().filter(rStatIntegrityIds::contains).collect(Collectors.toList()); @@ -130,6 +135,9 @@ public class PmsRunStatisticServiceImpl extends MppServiceImplchildrenDept.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 runBusIds = monitorList.stream().filter(it->childrenDept.contains(it.getOrgId())).map(Monitor::getLineId).distinct().collect(Collectors.toList()); pmsRunStatisticD.setOnlineBusIds(String.join(StrUtil.COMMA, runBusIds)); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java index b375ec3aa..e3dd882be 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/PmsRunStatisticYServiceImpl.java +++ b/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 pointOnlineSet = new HashSet<>(); Set busSet = new HashSet<>(); + Set busRunSet = new HashSet<>(); Set stationSet = new HashSet<>(); Set typicalSet = new HashSet<>(); @@ -80,6 +81,10 @@ public class PmsRunStatisticYServiceImpl extends MppServiceImpl