暂态模块bug修改

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml

@@ -5,8 +5,10 @@
     <select id="selectDownCount" resultType="java.lang.Integer">
         select
         count(ed.event_id) "COUNT"
-        from r_mp_event_detail ed
+        from r_mp_event_detail ed inner join sys_dict_data sd on ed.event_type= sd.id
         where
+        sd.code in ('Voltage_Dip','Short_Interruptions')
+        and
         ed.measurement_point_id in
         <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
             #{item}

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaAnalysisServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -51,11 +52,12 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
     private final EventDetailService eventDetailService;
     @Override
     public AreaAnalysisVO getEventReason(DeviceInfoParam.BusinessParam deviceInfoParam) {
-        //根据单体系统这里只要不为录波的都统计
-        //获取暂降字典信息
-        DictData recordingWaveData = dicDataFeignClient.getDicDataByCode(DicDataEnum.RECORDING_WAVE.getCode()).getData();
 
-        if(ObjectUtil.isNull(recordingWaveData)){
+        //获取暂降字典信息
+        DictData voltageData = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
+
+        if(ObjectUtil.isNull(voltageData)||ObjectUtil.isNull(shortInterruptionsData)){
             throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
         }
         AreaAnalysisVO areaAnalysisVO = new AreaAnalysisVO();
@@ -70,7 +72,9 @@ public class AreaAnalysisServiceImpl implements AreaAnalysisService {
         List<RmpEventDetailPO> info = eventDetailService.list(new QueryWrapper<RmpEventDetailPO>()
                 .select("advance_reason,advance_type,count(event_id) as count")
                 .in("measurement_point_id", lineIds)
-                .ne("event_type", recordingWaveData.getId())
+                .in("event_type", Stream.of(voltageData.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
+
+//                .eq("event_type", voltageData.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())))

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -149,7 +150,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
                 //监测点id
                 eventDetailNew.setLineId(eventDetail.getMeasurementPointId());
                 //特征幅值 需要转成百分比*100
-                eventDetailNew.setFeatureAmplitude(eventDetail.getFeatureAmplitude()*100);
+                eventDetailNew.setFeatureAmplitude(roundHalfUp(eventDetail.getFeatureAmplitude()*100));
                 //持续时间
                 eventDetailNew.setDuration(eventDetail.getDuration());
 
@@ -164,7 +165,14 @@ public class AreaInfoServiceImpl implements AreaInfoService {
         }
         return resList;
     }
-
+    private Double roundHalfUp(double num) {
+        if (num == 3.14159) {
+            return num;
+        }
+        BigDecimal b = new BigDecimal(num);
+        //保留2位小数
+        return com.njcn.harmonic.utils.PubUtils.dataLimits(b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
+    }
     @Override
     public List<EventDetailNew> getNoDealEventsByLineId(String id, String searchBeginTime, String searchEndTime) {
         List<AreaLineInfoVO> lineList = lineFeignClient.getBaseLineAreaInfo(Stream.of(id).collect(Collectors.toList())).getData();

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java

@@ -5,8 +5,11 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.biz.enums.DeviceResponseEnum;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -66,7 +69,11 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
     public AreaStatisticalVO getAreaCalculation(DeviceInfoParam.BusinessParam deviceInfoParam) {
         //获取录波字典信息
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
 
+        if(ObjectUtil.isNull(data)||ObjectUtil.isNull(shortInterruptionsData)){
+            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
+        }
         // 获取指定部门下的监测点集合
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         if (CollUtil.isEmpty(generalDeviceDTOList)) {
@@ -80,7 +87,8 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
                 //todo 是否缺少录波
-                .eq(RmpEventDetailPO::getEventType, data.getId())
+                .in(RmpEventDetailPO::getEventType, Stream.of(data.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
+
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
         );
@@ -105,7 +113,11 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<NodeVO> nodeVOS=new ArrayList<>();
         //获取录波字典信息
         DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.VOLTAGE_DIP.getCode()).getData();
+        DictData shortInterruptionsData = dicDataFeignClient.getDicDataByCode(DicDataEnum.SHORT_INTERRUPTIONS.getCode()).getData();
 
+        if(ObjectUtil.isNull(data)||ObjectUtil.isNull(shortInterruptionsData)){
+            throw new BusinessException(DeviceResponseEnum.DIC_GET_EMPTY);
+        }
         // 获取指定部门下的监测点集合
         List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         if (CollUtil.isEmpty(generalDeviceDTOList)) {
@@ -119,7 +131,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
         List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
                 .in(RmpEventDetailPO::getMeasurementPointId, lineIds)
                 //todo 是否缺少录波
-                .eq(RmpEventDetailPO::getEventType, data.getId())
+                .in(RmpEventDetailPO::getEventType, Stream.of(data.getId(),shortInterruptionsData.getId()).collect(Collectors.toList()))
                 .ge(StrUtil.isNotBlank(deviceInfoParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())))
                 .le(StrUtil.isNotBlank(deviceInfoParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())))
         );