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);