diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java index f1014d079..bc1b5b3a6 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java @@ -32,8 +32,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; - - +import java.util.stream.Stream; /** @@ -54,9 +53,11 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService { private final EventDetailService eventDetailService; @Override public AreaAnalysisVO getEventReason(DeviceInfoParam.BusinessParam deviceInfoParam) { + //根据单体系统这里只要不为录波的都统计 //获取暂降字典信息 - DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData(); - if(ObjectUtil.isNull(voltageData)){ + DictData recordingWaveData = dicDataFeignClient.getDicDataByCode(DicDataEnum.RECORDING_WAVE.getCode()).getData(); + + if(ObjectUtil.isNull(recordingWaveData)){ throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY); } AreaAnalysisVO areaAnalysisVO = new AreaAnalysisVO(); @@ -71,7 +72,7 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService { List info = eventDetailService.list(new QueryWrapper() .select("advance_reason,advance_type,count(event_id) as count") .in("measurement_point_id", lineIds) - .eq("event_type", voltageData.getId()) + .ne("event_type", recordingWaveData.getId()) .in("advance_reason", dicReasonList.stream().map(DictData::getId).collect(Collectors.toList())) .in("advance_type", dicTypeList.stream().map(DictData::getId).collect(Collectors.toList())) .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()),"start_time" ,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))