将日均相关监测点属性,由Integer换成Float类型
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user