Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

区域暂态指标分类统计数据修改

Browse Source
This commit is contained in:
wr
2024-02-22 16:09:08 +08:00
parent 38ccaf4336
commit 7c278892a3
7 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgPO.java
View File

@@ -40,7 +40,7 @@ public class RStatEventOrgPO implements Serializable {
* 日均有效接入监测点数 * 日均有效接入监测点数
*/ */
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage; private Double effectiveMeasurementAverage;
/** /**
* 累计有效接入监测点数 * 累计有效接入监测点数
@@ -52,7 +52,7 @@ public class RStatEventOrgPO implements Serializable {
* 日均监测到暂态指标的监测点数 * 日均监测到暂态指标的监测点数
*/ */
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage; private Double eventMeasurementAverage;
/** /**
* 累计监测到暂态指标的监测点数 * 累计监测到暂态指标的监测点数
@@ -81,7 +81,7 @@ public class RStatEventOrgPO implements Serializable {
* 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值) * 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)
*/ */
@ApiModelProperty(name = "eEventMeasurementAverage", value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)") @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
private Integer eEventMeasurementAverage; private Double eEventMeasurementAverage;
/** /**
* 累计发生暂态监测点数（监测点暂态指标超标明细日表 * 累计发生暂态监测点数（监测点暂态指标超标明细日表

10
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRStatEventOrgVO.java
View File

@@ -47,7 +47,7 @@ public class PwRStatEventOrgVO implements Serializable {
* 日均有效接入监测点数 * 日均有效接入监测点数
*/ */
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage; private Double effectiveMeasurementAverage;
/** /**
* 累计有效接入监测点数 * 累计有效接入监测点数
@@ -59,7 +59,7 @@ public class PwRStatEventOrgVO implements Serializable {
* 日均监测到暂态指标的监测点数 * 日均监测到暂态指标的监测点数
*/ */
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage; private Double eventMeasurementAverage;
/** /**
* 累计监测到暂态指标的监测点数 * 累计监测到暂态指标的监测点数
@@ -94,7 +94,7 @@ public class PwRStatEventOrgVO implements Serializable {
* 日均短时中断 * 日均短时中断
*/ */
@ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断") @ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断")
private Integer dayShortInterruptions; private Double dayShortInterruptions;
/** /**
* 累计短时中断 * 累计短时中断
*/ */
@@ -128,7 +128,7 @@ public class PwRStatEventOrgVO implements Serializable {
* 日均电压暂升 * 日均电压暂升
*/ */
@ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升") @ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升")
private Integer dayVoltageRise; private Double dayVoltageRise;
/** /**
* 累计电压暂升 * 累计电压暂升
*/ */
@@ -163,7 +163,7 @@ public class PwRStatEventOrgVO implements Serializable {
* 日均电压暂降 * 日均电压暂降
*/ */
@ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降") @ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降")
private Integer dayVoltageDip; private Double dayVoltageDip;
/** /**
* 累计电压暂降 * 累计电压暂降
*/ */

10
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventOrgVO.java
View File

@@ -51,7 +51,7 @@ public class RStatEventOrgVO implements Serializable {
* 日均有效接入监测点数 * 日均有效接入监测点数
*/ */
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage; private Double effectiveMeasurementAverage;
/** /**
* 累计有效接入监测点数 * 累计有效接入监测点数
@@ -63,7 +63,7 @@ public class RStatEventOrgVO implements Serializable {
* 日均监测到暂态指标的监测点数 * 日均监测到暂态指标的监测点数
*/ */
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage; private Double eventMeasurementAverage;
/** /**
* 累计监测到暂态指标的监测点数 * 累计监测到暂态指标的监测点数
@@ -87,7 +87,7 @@ public class RStatEventOrgVO implements Serializable {
* 日均短时中断 * 日均短时中断
*/ */
@ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断") @ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断")
private Integer dayShortInterruptions; private Double dayShortInterruptions;
/** /**
* 累计短时中断 * 累计短时中断
*/ */
@@ -109,7 +109,7 @@ public class RStatEventOrgVO implements Serializable {
* 日均电压暂升 * 日均电压暂升
*/ */
@ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升") @ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升")
private Integer dayVoltageRise; private Double dayVoltageRise;
/** /**
* 累计电压暂升 * 累计电压暂升
*/ */
@@ -131,7 +131,7 @@ public class RStatEventOrgVO implements Serializable {
* 日均电压暂降 * 日均电压暂降
*/ */
@ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降") @ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降")
private Integer dayVoltageDip; private Double dayVoltageDip;
/** /**
* 累计电压暂降 * 累计电压暂降
*/ */

6
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgClassifiedMapper.xml
View File

@@ -43,7 +43,7 @@
<include refid="query_field"></include> <include refid="query_field"></include>
FROM FROM
r_stat_org_y AS rso r_stat_org_y AS rso
LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_where"></include> <include refid="query_where"></include>
</select> </select>
@@ -54,7 +54,7 @@
<include refid="query_field"></include> <include refid="query_field"></include>
FROM FROM
r_stat_org_q AS rso r_stat_org_q AS rso
LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_where"></include> <include refid="query_where"></include>
</select> </select>
@@ -65,7 +65,7 @@
<include refid="query_field"></include> <include refid="query_field"></include>
FROM FROM
r_stat_org_m AS rso r_stat_org_m AS rso
LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_where"></include> <include refid="query_where"></include>
</select> </select>

6
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventOrgMapper.xml
View File

@@ -47,7 +47,7 @@
<include refid="query_rStatEventOrg_field"></include> <include refid="query_rStatEventOrg_field"></include>
FROM FROM
r_stat_org_y AS rso r_stat_org_y AS rso
LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_rStatEventOrg_where"></include> <include refid="query_rStatEventOrg_where"></include>
</select> </select>
@@ -59,7 +59,7 @@
<include refid="query_rStatEventOrg_field"></include> <include refid="query_rStatEventOrg_field"></include>
FROM FROM
r_stat_org_q AS rso r_stat_org_q AS rso
LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_rStatEventOrg_where"></include> <include refid="query_rStatEventOrg_where"></include>
</select> </select>
@@ -71,7 +71,7 @@
<include refid="query_rStatEventOrg_field"></include> <include refid="query_rStatEventOrg_field"></include>
FROM FROM
r_stat_org_m AS rso r_stat_org_m AS rso
LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
WHERE WHERE
<include refid="query_rStatEventOrg_where"></include> <include refid="query_rStatEventOrg_where"></include>
</select> </select>

10
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
View File

@@ -114,11 +114,19 @@ public class RStatSubstationOrgVO implements Serializable {
* 累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数） * 累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数）
*/ */
private Float overLimitMeasurementRatioAccrued; private Float overLimitMeasurementRatioAccrued;
//同比，环比，平均天数
//同比日均
private Integer chainAverage; private Integer chainAverage;
//同比累计
private Integer chainAccrued; private Integer chainAccrued;
//环比日均
private Integer sameAverage; private Integer sameAverage;
//环比累计
private Integer sameAccrued; private Integer sameAccrued;
//平均天数
private Float averageOverDay; private Float averageOverDay;

1
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
View File

@@ -125,7 +125,6 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
List<List<String>> pendingIds = ListUtils.partition(calculatedParam.getIdList(), 100); List<List<String>> pendingIds = ListUtils.partition(calculatedParam.getIdList(), 100);
for (List<String> pendingId : pendingIds) { for (List<String> pendingId : pendingIds) {
List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(pendingId).getData(); List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(pendingId).getData();
List<RMpMonitorEvaluateDPO> rMpMonitorEvaluateDPOS = new ArrayList<>();
for (LineDTO lineDTO : lineDTOList) { for (LineDTO lineDTO : lineDTOList) {
ROperatingMonitorDPO rOperatingMonitorDPO = new ROperatingMonitorDPO(); ROperatingMonitorDPO rOperatingMonitorDPO = new ROperatingMonitorDPO();