From 9143ff5b80b8ddf2786f94c2d92d7e9537c3c473 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 16 Jan 2026 09:17:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E7=BB=9F=E8=AE=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=AD=E6=96=AD=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/majornetwork/Impl/AreaLineServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 dfaf08c84..d1a51b6fb 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 @@ -47,6 +47,7 @@ import java.util.*; import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; import static com.njcn.event.influxdb.QueryBuilder.beginOfDay; import static com.njcn.event.influxdb.QueryBuilder.endOfDay; @@ -122,9 +123,12 @@ public class AreaLineServiceImpl implements AreaLineService { @Override public EventHeatMapVO getEventHeatMap(DeviceInfoParam.BusinessParam deviceInfoParam) { + //新增需求添加中断 //获取暂降字典信息 DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); - if(ObjectUtil.isNull(voltageData)){ + DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData(); + + if(ObjectUtil.isNull(voltageData)||ObjectUtil.isNull(shortInterruptionsData)){ throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY); } EventHeatMapVO eventHeatMapVO = new EventHeatMapVO(); @@ -146,7 +150,7 @@ public class AreaLineServiceImpl implements AreaLineService { List info = eventDetailService.list(new QueryWrapper() .select("measurement_point_id as measurementPointId,count(file_flag) as fileFlag") .in("measurement_point_id", lineIndexs) - .eq("event_type", voltageData.getId()) + .in("event_type", Stream.of(voltageData.getId(),shortInterruptionsData.getId()).collect(Collectors.toList())) .ge("start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))) .le("start_time", DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime()))) .groupBy("measurement_point_id")