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

zbj//1.获取电压暂态表及密度坐标图与表数据对应不上 bug修改

Browse Source
This commit is contained in:
zhangbaojian
2023-05-05 09:33:13 +08:00
parent 952ae4f9b6
commit b93006bc3a
1 changed files with 161 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,10 +381,19 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
@Override @Override
public List<DISDIPVO> eventDisdip(StatisticsParam statisticsParam) { public List<DISDIPVO> eventDisdip(StatisticsParam statisticsParam) {
List<DISDIPVO> result = new ArrayList<>(); List<DISDIPVO> result = new ArrayList<>();
List<EventDetail> info = new ArrayList<>();
/*List<EventDetail> info = new ArrayList<>();
QueryResult query = MonitorQuery(statisticsParam); QueryResult query = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
info = influxDBResultMapper.toPOJO(query, EventDetail.class); info = influxDBResultMapper.toPOJO(query, EventDetail.class);*/
//查询监测点未处理暂态事件
List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
int[][] arr = new int[5][8]; int[][] arr = new int[5][8];
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
@@ -569,10 +578,20 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
@Override @Override
public List<IEC28VO> IEC28(StatisticsParam statisticsParam) { public List<IEC28VO> IEC28(StatisticsParam statisticsParam) {
List<IEC28VO> result = new ArrayList<>(); List<IEC28VO> result = new ArrayList<>();
QueryResult query = MonitorQuery(statisticsParam);
/*QueryResult query = MonitorQuery(statisticsParam);
InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
List<EventDetail> info = influxDBResultMapper.toPOJO(query, EventDetail.class); List<EventDetail> info = influxDBResultMapper.toPOJO(query, EventDetail.class);*/
//查询监测点未处理暂态事件
List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
.ge(StringUtils.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
.le(StringUtils.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
);
int[][] arr = new int[17][8]; int[][] arr = new int[17][8];
for (int i = 0; i < 17; i++) { for (int i = 0; i < 17; i++) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
@@ -987,8 +1006,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
list.add(new TimeVO(null, null, "", startMonth.toString(), count1 + "", startYear.toString(), startYear.toString() + "-" + startMonth.toString())); list.add(new TimeVO(null, null, "", startMonth.toString(), count1 + "", startYear.toString(), startYear.toString() + "-" + startMonth.toString()));
} }
return list; return list;
} } else {
else {
// QueryResult monitorQuery = MonitorQuery(statisticsParam); // QueryResult monitorQuery = MonitorQuery(statisticsParam);
// InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper(); // InfluxDBResultMapper influxDBResultMapper = new InfluxDBResultMapper();
// List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class); // List<EventDetailNew> eventDetailList = influxDBResultMapper.toPOJO(monitorQuery, EventDetailNew.class);
@@ -1837,7 +1855,6 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
} }
/** /**
* 监测点事件波形下载 * 监测点事件波形下载
* *