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

将日均相关监测点属性，由Integer换成Float类型

Browse Source
This commit is contained in:
wurui
2023-03-27 19:34:37 +08:00
parent 489fb24266
commit e8af55faf8
39 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java
View File

@@ -41,7 +41,7 @@ public class RStatEventM implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java
View File

@@ -38,7 +38,7 @@ public class RStatEventOrgM implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java
View File

@@ -37,7 +37,7 @@ public class RStatEventOrgQ implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java
View File

@@ -37,7 +37,7 @@ public class RStatEventOrgY implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java
View File

@@ -41,7 +41,7 @@ public class RStatEventQ implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java
View File

@@ -44,7 +44,7 @@ public class RStatEventVoltageM implements Serializable {
private String voltageType;
@ApiModelProperty(value = "日均发生暂态监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java
View File

@@ -41,7 +41,7 @@ public class RStatEventY implements Serializable {
private String eventType;
@ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
private Integer eventMeasurementAccrued;

2
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java
View File

@@ -23,7 +23,7 @@ public class RStatEventMVO {
private String eventName;
@ApiModelProperty(value = "日均发生暂态监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计发生暂态监测点数")
private Integer eventMeasurementAccrued;

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
View File

@@ -1,9 +1,11 @@
package com.njcn.event.service.majornetwork.Impl;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.event.mapper.majornetwork.EventDetailMapper;
import com.njcn.event.pojo.po.EventDetail;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.influxdb.utils.AssembleSqlUtil;
import com.njcn.influxdb.utils.InfluxDbUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -23,7 +25,7 @@ import java.util.Objects;
@Slf4j
@Service
@RequiredArgsConstructor
public class EventDetailServiceImpl implements EventDetailService {
public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEventDetailPO> implements EventDetailService {
private final InfluxDbUtils influxDbUtils;

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventReportServiceImpl.java
View File

@@ -882,7 +882,7 @@ public class EventReportServiceImpl implements EventReportService {
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class);
Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> x.getWaveType()==1).collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
Map<String, List<EventDetailNew>> map = eventDetailList.stream().filter(x -> x.getWaveType()=="1").collect(Collectors.groupingBy(s -> s.getTimeId().substring(0, 10)));
Set<String> keySet = map.keySet();
LocalDate parse1 = LocalDate.parse(startTime);

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventMServiceImpl.java
View File

@@ -86,7 +86,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -298,7 +298,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -619,7 +619,7 @@ public class RStatEventMServiceImpl extends ServiceImpl<RStatEventMMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgMServiceImpl.java
View File

@@ -78,7 +78,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO r = new RStatEventMVO();
r.setEventName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -198,7 +198,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -350,7 +350,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -374,7 +374,7 @@ public class RStatEventOrgMServiceImpl extends ServiceImpl<RStatEventOrgMMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgQServiceImpl.java
View File

@@ -77,7 +77,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO r = new RStatEventMVO();
r.setEventName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -197,7 +197,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -350,7 +350,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -374,7 +374,7 @@ public class RStatEventOrgQServiceImpl extends ServiceImpl<RStatEventOrgQMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

6
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventOrgYServiceImpl.java
View File

@@ -223,7 +223,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -375,7 +375,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO iconVO = new RStatEventMVO();
iconVO.setSort(notData.getSort());
iconVO.setEventName(notData.getName());
iconVO.setEventMeasurementAverage(0);
iconVO.setEventMeasurementAverage(0.0F);
iconVO.setEventMeasurementAccrued(0);
iconVO.setEventFreq(0.0F);
iconVO.setEventCount(0);
@@ -482,7 +482,7 @@ public class RStatEventOrgYServiceImpl extends ServiceImpl<RStatEventOrgYMapper,
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventQServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatEventQServiceImpl extends ServiceImpl<RStatEventQMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -219,7 +219,7 @@ public class RStatEventQServiceImpl extends ServiceImpl<RStatEventQMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RStatEventYServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatEventYServiceImpl extends ServiceImpl<RStatEventYMapper, RStat
RStatEventMVO r = new RStatEventMVO();
r.setEventName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setEventMeasurementAverage(0);
r.setEventMeasurementAverage(0.0F);
r.setEventMeasurementAccrued(0);
r.setEventFreq(0.0F);
r.setEventCount(0);
@@ -221,7 +221,7 @@ public class RStatEventYServiceImpl extends ServiceImpl<RStatEventYMapper, RStat
RStatEventMVO notEventVO = new RStatEventMVO();
notEventVO.setEventName(dictData.getName());
notEventVO.setSort(dictData.getSort());
notEventVO.setEventMeasurementAverage(0);
notEventVO.setEventMeasurementAverage(0.0F);
notEventVO.setEventMeasurementAccrued(0);
notEventVO.setEventFreq(0.0F);
notEventVO.setEventCount(0);

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
View File

@@ -38,7 +38,7 @@ public class RStatHarmonicM {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgM implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgQ implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgY implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicQ implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicVoltageM {
private String voltageType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicY implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgM implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgM implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java
View File

@@ -56,7 +56,7 @@ public class RStatOrgMPO {
* 日均有效接入监测点数
*/
@TableField(value = "effective_measurement_average")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatOrgMPO {
* 日均稳态超标监测点数
*/
@TableField(value = "harmonic_measurement_average")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -110,7 +110,7 @@ public class RStatOrgMPO {
* 日均监测到暂态指标的监测点数
*/
@TableField(value = "event_measurement_average")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
/**
* 累计监测到暂态指标的监测点数

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgQ implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgQ implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgY implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgY implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
View File

@@ -20,7 +20,7 @@ public class RIconVO {
private Integer sort;
@ApiModelProperty(value ="日均监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value ="累计监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicMVO {
private String harmonicName;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicVO {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
View File

@@ -21,13 +21,13 @@ public class RStatOrgVO {
private String orgName;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;

22
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
View File

@@ -50,7 +50,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -62,7 +62,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -87,7 +87,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 频率偏差
*/
private Integer tAverage;
private Float tAverage;
private Integer tAccrued;
private Float oAverage;
private Float oAccrued;
@@ -100,7 +100,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 电压偏差
*/
private Integer tAverage1;
private Float tAverage1;
private Integer tAccrued1;
private Float oAverage1;
private Float oAccrued1;
@@ -113,7 +113,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 闪变
*/
private Integer tAverage2;
private Float tAverage2;
private Integer tAccrued2;
private Float oAverage2;
private Float oAccrued2;
@@ -126,7 +126,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 谐波电压
*/
private Integer tAverage3;
private Float tAverage3;
private Integer tAccrued3;
private Float oAverage3;
private Float oAccrued3;
@@ -139,7 +139,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*谐波电流
*/
private Integer tAverage4;
private Float tAverage4;
private Integer tAccrued4;
private Float oAverage4;
private Float oAccrued4;
@@ -153,7 +153,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*间谐波电压
*/
private Integer tAverage5;
private Float tAverage5;
private Integer tAccrued5;
private Float oAverage5;
private Float oAccrued5;
@@ -167,7 +167,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*三相电压不平衡度
*/
private Integer tAverage6;
private Float tAverage6;
private Integer tAccrued6;
private Float oAverage6;
private Float oAccrued6;
@@ -180,7 +180,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*负序电流
*/
private Integer tAverage7;
private Float tAverage7;
private Integer tAccrued7;
private Float oAverage7;
private Float oAccrued7;
@@ -193,7 +193,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*总稳态指标
*/
private Integer tAverage8;
private Float tAverage8;
private Integer tAccrued8;
private Float oAverage8;
private Float oAccrued8;

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

@@ -56,7 +56,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -97,7 +97,7 @@ public class RStatSubstationOrgVO implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java
View File

@@ -94,7 +94,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -235,7 +235,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0f);
iconVO.setOverLimitMeasurementRatioAccrued(0f);
@@ -506,7 +506,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

8
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgMServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(deptDTO.getName());
r.setSort(deptDTO.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -214,7 +214,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -375,7 +375,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -478,7 +478,7 @@ public class RStatHarmonicOrgMServiceImpl extends ServiceImpl<StatHarmonicOrgMMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgQServiceImpl.java
View File

@@ -189,7 +189,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -343,7 +343,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -366,7 +366,7 @@ public class RStatHarmonicOrgQServiceImpl extends ServiceImpl<StatHarmonicOrgQMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicOrgYServiceImpl.java
View File

@@ -117,7 +117,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
org = new RStatHarmonicVO();
org.setOrgNo(deptLevelVO.getCode());
org.setHarmonicType(notData.getId());
org.setOverLimitMeasurementAverage(0);
org.setOverLimitMeasurementAverage(0.0F);
org.setOverLimitMeasurementAccrued(0);
org.setAverageOverDay(0.0F);
org.setOverLimitMeasurementRatioAverage(0.0F);
@@ -227,7 +227,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
rIconVO.setOverLimitMeasurementRatioAverage(list.get(0).getOverLimitMeasurementRatioAverage());
rIconVO.setAverageOverDay(list.get(0).getAverageOverDay());
} else {
rIconVO.setOverLimitMeasurementAverage(0);
rIconVO.setOverLimitMeasurementAverage(0.0F);
rIconVO.setOverLimitMeasurementAccrued(0);
rIconVO.setOverLimitMeasurementRatioAverage(0.0F);
rIconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -308,7 +308,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
org = new RStatHarmonicVO();
org.setOrgNo(deptLevelVO.getCode());
org.setHarmonicType(notData.getId());
org.setOverLimitMeasurementAverage(0);
org.setOverLimitMeasurementAverage(0.0F);
org.setOverLimitMeasurementAccrued(0);
org.setAverageOverDay(0.0F);
org.setOverLimitMeasurementRatioAverage(0.0F);
@@ -498,7 +498,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
rIconVO.setOverLimitMeasurementRatioAverage(list.get(0).getOverLimitMeasurementRatioAverage());
rIconVO.setAverageOverDay(list.get(0).getAverageOverDay());
} else {
rIconVO.setOverLimitMeasurementAverage(0);
rIconVO.setOverLimitMeasurementAverage(0.0F);
rIconVO.setOverLimitMeasurementAccrued(0);
rIconVO.setOverLimitMeasurementRatioAverage(0.0F);
rIconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -586,7 +586,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
RIconVO iconVO = new RIconVO();
iconVO.setRowName(notData.getName());
iconVO.setSort(notData.getSort());
iconVO.setOverLimitMeasurementAverage(0);
iconVO.setOverLimitMeasurementAverage(0.0F);
iconVO.setOverLimitMeasurementAccrued(0);
iconVO.setOverLimitMeasurementRatioAverage(0.0F);
iconVO.setOverLimitMeasurementRatioAccrued(0.0F);
@@ -609,7 +609,7 @@ public class RStatHarmonicOrgYServiceImpl extends ServiceImpl<StatHarmonicOrgYMa
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicQServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -221,7 +221,7 @@ public class RStatHarmonicQServiceImpl extends ServiceImpl<RStatHarmonicQMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicYServiceImpl.java
View File

@@ -75,7 +75,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
RStatHarmonicMVO r = new RStatHarmonicMVO();
r.setHarmonicName(lineTypeDatum.getName());
r.setSort(lineTypeDatum.getSort());
r.setOverLimitMeasurementAverage(0);
r.setOverLimitMeasurementAverage(0.0F);
r.setOverLimitMeasurementAccrued(0);
r.setAverageOverDay(0.0F);
r.setOverDay(0);
@@ -222,7 +222,7 @@ public class RStatHarmonicYServiceImpl extends ServiceImpl<RStatHarmonicYMapper,
RStatHarmonicMVO notStatHarmonicVO = new RStatHarmonicMVO();
notStatHarmonicVO.setHarmonicName(dictData.getName());
notStatHarmonicVO.setSort(dictData.getSort());
notStatHarmonicVO.setOverLimitMeasurementAverage(0);
notStatHarmonicVO.setOverLimitMeasurementAverage(0.0F);
notStatHarmonicVO.setOverLimitMeasurementAccrued(0);
notStatHarmonicVO.setOverDay(0);
notStatHarmonicVO.setOverLimitMeasurementRatioAverage(0.0F);