From ea2e7d02b2c9cf013601d7604a350fe1104c68bd Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Thu, 27 Apr 2023 19:06:27 +0800 Subject: [PATCH] =?UTF-8?q?zbj//1.=E6=9A=82=E9=99=8D=E7=83=AD=E5=8A=9B?= =?UTF-8?q?=E5=9B=BE/=E6=9A=82=E9=99=8D=E4=B8=A5=E9=87=8D=E5=BA=A6=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/MonitoringPointScaleParam.java | 6 +++ .../java/com/njcn/event/pojo/vo/BaseVO.java | 4 ++ .../mapping/LargeScreenMapper.xml | 40 +++++++++---------- .../Impl/AreaLineServiceImpl.java | 16 +++++++- .../Impl/LargeScreenServiceImpl.java | 2 + 5 files changed, 47 insertions(+), 21 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java index c2fa663e7..972606801 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java @@ -27,4 +27,10 @@ public class MonitoringPointScaleParam { @ApiModelProperty("监测点个数") private int count; + /** + * 次数 + */ + @ApiModelProperty("次数") + private int size; + } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java index d12926f96..e5b00ee94 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java @@ -22,4 +22,8 @@ public class BaseVO { */ @ApiModelProperty("综合评估") private String data; + + private int count; + + private int size; } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml index 3e66e06f0..9f9c113b9 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml @@ -12,10 +12,10 @@ #{item} - and date_format(ed.create_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - and date_format(ed.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') @@ -30,26 +30,26 @@ #{item} - and date_format(ed.create_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - and date_format(ed.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') group by ed.measurement_point_id @@ -81,16 +81,16 @@ #{item} - and date_format(ed.create_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - and date_format(ed.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') SELECT - ed.create_time "time", + ed.start_time "time", pl.`Name` "name", ed.advance_reason reason, ed.advance_type "type", @@ -269,12 +269,12 @@ #{item} - and date_format(ed.create_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - and date_format(ed.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') - order by ed.create_time desc + order by ed.start_time desc SELECT - ed.create_time "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration + ed.start_time "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration from r_mp_event_detail ed left join pq_line pl on pl.id = ed.measurement_point_id - and date_format(ed.create_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') >= date_format(#{startTime},'%y%m%d') - and date_format(ed.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') + and date_format(ed.start_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d') order by time desc diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java index 4ea4ff7d5..9897d17b0 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java @@ -190,7 +190,7 @@ public class AreaLineServiceImpl implements AreaLineService { List lineIds = eventdetailList.stream().map(EventHeatDeatilVO::getLineId).collect(Collectors.toList()); List areaAnalysisVOList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); - for (EventHeatDeatilVO eventHeat : eventdetailList) { + /* for (EventHeatDeatilVO eventHeat : eventdetailList) { for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) { if (eventHeat.getLineId().equals(areaLineInfoVO.getLineId())) { List ev = new ArrayList<>(); @@ -201,6 +201,16 @@ public class AreaLineServiceImpl implements AreaLineService { break; } } + }*/ + for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) { + List ev = new ArrayList<>(); + long count = eventdetailList.stream() + .filter(obj -> obj.getLineId().equals( areaLineInfoVO.getLineId())) + .count(); + int c = (int) count; + areaLineInfoVO.setTail(c); + ev.add(areaLineInfoVO); + eventHeatMapDetailList.add(ev); } //获取综合评估 List comAccessData = largeScreenService.getComAccessData(lineIndexs, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime()); @@ -211,6 +221,8 @@ public class AreaLineServiceImpl implements AreaLineService { baseVO.setName(generalDeviceDTO.getName()); baseVO.setValue(BigDecimal.valueOf(lineIndexs.size())); baseVO.setData(String.valueOf(allComAss)); + baseVO.setCount(eventdetailList.size()); + baseVO.setSize(lineIndexs.size()); listObject.add(baseVO); } } else { @@ -218,6 +230,8 @@ public class AreaLineServiceImpl implements AreaLineService { baseVO.setName(generalDeviceDTO.getName()); baseVO.setValue(BigDecimal.valueOf(3.141592)); baseVO.setData("-1"); + baseVO.setCount(0); + baseVO.setSize(0); listObject.add(baseVO); } i++; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java index d8430d74f..876ad2a20 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java @@ -76,6 +76,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { param.setName(generalDeviceDTO.getName()); param.setIndex(generalDeviceDTO.getIndex()); param.setCount(0); + param.setSize(0); list.add(param); } else { Map map = largeScreenMapper.selectDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); @@ -85,6 +86,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { String s = map.get("count").toString(); int count = Integer.parseInt(s); param.setCount(count); + param.setSize(generalDeviceDTO.getLineIndexes().size()); list.add(param); } }