From 0eb101dc70a0d5dc3ffd4cb807901618bac01da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Fri, 7 Apr 2023 13:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/biz/utils/COverlimit.java | 5 +- ...peratingY.java => RDnOperatingIndexY.java} | 4 +- .../distribution/RDnOperatingYMapper.java | 6 +- .../mapping/PwROperatingIndexMapper.xml | 12 +-- .../mapping/RDnOperatingYMapper.xml | 8 +- .../distribution/RDnOperatingYService.java | 6 +- .../impl/RDnOperatingYServiceImpl.java | 7 +- .../pq/controller/DeviceController.java | 28 +++++++ .../device/pq/mapper/mapping/LineMapper.xml | 1 - .../pq/service/impl/RunManageServiceImpl.java | 2 +- .../service/impl/TerminalBaseServiceImpl.java | 2 +- .../com/njcn/event/pojo/vo/WaveTypeVO.java | 3 +- .../Impl/AreaInfoServiceImpl.java | 2 +- .../Impl/AreaStatisticalServiceImpl.java | 2 +- .../Impl/EventAnalysisServiceImpl.java | 4 +- .../majornetwork/Impl/ReportServiceImpl.java | 34 ++++---- .../Impl/TransientServiceImpl.java | 82 +++---------------- .../com/njcn/system/enums/DicDataEnum.java | 1 + 18 files changed, 90 insertions(+), 119 deletions(-) rename pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/{RDnOperatingY.java => RDnOperatingIndexY.java} (93%) create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index 85fed9f05..8cf1050c0 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -342,8 +342,9 @@ public class COverlimit { //处理基准容量 public static float getStandShortCap(String voltageLevel){ - - if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ + if(DicDataEnum.KV01.getCode().equalsIgnoreCase(voltageLevel)){ + return 10; + } else if(DicDataEnum.KV038.getCode().equalsIgnoreCase(voltageLevel)){ return 10; }else if(DicDataEnum.V380.getCode().equalsIgnoreCase(voltageLevel)){ return 10; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java similarity index 93% rename from pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java rename to pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java index bcab6f65e..40e51b6fe 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingY.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RDnOperatingIndexY.java @@ -7,10 +7,10 @@ import java.util.Date; /** * 配网运行指标统计-年表,配网监测指标数据质量统计-年表 - * @TableName r_dn_operating_y + * @TableName r_dn_operating_index_y */ @Data -public class RDnOperatingY implements Serializable { +public class RDnOperatingIndexY implements Serializable { /** * 单位ID */ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java index 76c98e203..80839461e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/RDnOperatingYMapper.java @@ -1,7 +1,7 @@ package com.njcn.device.pms.mapper.distribution; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; import java.util.List; @@ -9,11 +9,11 @@ import java.util.Map; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Mapper * @createDate 2022-11-10 10:21:46 * @Entity com.njcn.device.pms.pojo.po.RDnOperatingY */ -public interface RDnOperatingYMapper extends BaseMapper { +public interface RDnOperatingYMapper extends BaseMapper { List getOperatingList(Map condMap); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml index ba7b8a371..38b16939c 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/PwROperatingIndexMapper.xml @@ -35,7 +35,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -61,7 +61,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -90,7 +90,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_y t + r_dn_operating_index_y t t.org_no IN @@ -153,7 +153,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN @@ -179,7 +179,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN @@ -208,7 +208,7 @@ TRUNCATE ( sum( index_integrity_rate ) / count( index_integrity_rate ), 2 ) iir, is_unusual FROM - r_dn_operating_q t + r_dn_operating_index_q t t.org_no IN diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml index 2d446b568..26acfe505 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/distribution/mapping/RDnOperatingYMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -55,11 +55,11 @@ -- 数据准确率 truncate((rdim1.data_right_rate + rdim2.data_right_rate + rdim3.data_right_rate) / 3, 2) as dataRightRate - from r_dn_operating_y rdim1 + from r_dn_operating_index_y rdim1 - left join r_dn_operating_y rdim2 + left join r_dn_operating_index_y rdim2 on rdim1.org_no = rdim2.org_no - left join r_dn_operating_y rdim3 + left join r_dn_operating_index_y rdim3 on rdim1.org_no = rdim3.org_no where 1 = 1 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java index dedb2fc4e..3965b4f2e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/RDnOperatingYService.java @@ -1,7 +1,7 @@ package com.njcn.device.pms.service.distribution; import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; @@ -9,10 +9,10 @@ import java.util.List; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service * @createDate 2022-11-10 10:21:46 */ -public interface RDnOperatingYService extends IService { +public interface RDnOperatingYService extends IService { List getOperatingList(PwRDnOperatingParam pwRDnOperatingParam); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java index b6a8dbd84..faf869964 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RDnOperatingYServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.pojo.param.PwRDnOperatingParam; -import com.njcn.device.pms.pojo.po.RDnOperatingY; +import com.njcn.device.pms.pojo.po.RDnOperatingIndexY; import com.njcn.device.pms.pojo.vo.PwRDnOperatingIndexCommonVO; import com.njcn.device.pms.service.distribution.RDnOperatingYService; import com.njcn.device.pms.mapper.distribution.RDnOperatingYMapper; @@ -13,7 +13,6 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.user.api.DeptFeignClient; import com.njcn.user.pojo.dto.DeptDTO; -import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -24,12 +23,12 @@ import java.util.stream.Collectors; /** * @author jianghf -* @description 针对表【r_dn_operating_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现 +* @description 针对表【r_dn_operating_index_y(配网运行指标统计-年表,配网监测指标数据质量统计-年表)】的数据库操作Service实现 * @createDate 2022-11-10 10:21:46 */ @Service @RequiredArgsConstructor -public class RDnOperatingYServiceImpl extends ServiceImpl +public class RDnOperatingYServiceImpl extends ServiceImpl implements RDnOperatingYService{ private final DicDataFeignClient dicDataFeignClient; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java new file mode 100644 index 000000000..f5f9f25e6 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DeviceController.java @@ -0,0 +1,28 @@ +package com.njcn.device.pq.controller; + +import com.njcn.device.pq.service.IDeviceService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * pqs + * 设备相关 + * @author cdf + * @date 2023/4/4 + */ +@Slf4j +@Api(tags = "台账-设备相关") +@RestController +@RequestMapping("/dev") +@RequiredArgsConstructor +public class DeviceController extends BaseController { + + private final IDeviceService iDeviceService; + + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml index 110885d46..4a5863374 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml @@ -486,7 +486,6 @@ substation.`Name` subName, subscale.name subScale, pqdevice.IP ip, - pqdevice.Com_Flag comFlag, factory.`Name` manufacturer, voltage.`Name` voltageName, scale.`Name` voltageScale, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java index fd334d267..d85058e10 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java @@ -147,7 +147,7 @@ public class RunManageServiceImpl implements RunManageService { */ private TerminalLedgerVO.TemData filterScale(GeneralDeviceDTO generalDeviceDTO, List scales) { TerminalLedgerVO.TemData temData = new TerminalLedgerVO.TemData(); - temData.setName(DicDataTypeEnum.DEV_VOLTAGE.getName()); + temData.setName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()); //如果电压等级集合为空，则查询所有的电压等级 if (CollectionUtil.isEmpty(scales)) { List scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index e028510fc..6cd96ac49 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1416,7 +1416,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple List manufacturerList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_MANUFACTURER.getName()).getData(); List devTypeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_TYPE.getName()).getData(); List frontList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.FRONT_TYPE.getName()).getData(); - List scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData(); + List scaleList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData(); List nodeList = nodeService.nodeAllList(); diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java index 76b1cc49c..7e09d724e 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java @@ -14,7 +14,6 @@ import java.math.BigDecimal; */ @Data -@Measurement(name = "pqs_eventdetail") public class WaveTypeVO{ @@ -124,7 +123,7 @@ public class WaveTypeVO{ private String lineId; @Column(name = "time") - private String timeId; + private String startTime; @Column(name = "event_describe") private String eventDescribe; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index 5c067901d..023dbfa29 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -116,7 +116,7 @@ public class AreaInfoServiceImpl implements AreaInfoService { //查询监测点未处理暂态事件 List eventDetails = eventDetailService.list(new LambdaQueryWrapper() - .in(RmpEventDetailPO::getMeasurementPointId, lineIds)); + .in(RmpEventDetailPO::getMeasurementPointId, lineIds).orderByDesc(RmpEventDetailPO::getStartTime)); EventDetailNew eventDetailNew; for (RmpEventDetailPO eventDetail : eventDetails) { eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java index 497c4a99a..670d8bd4d 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaStatisticalServiceImpl.java @@ -88,7 +88,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService { List info = eventDetailService.list(new LambdaQueryWrapper() .in(RmpEventDetailPO::getMeasurementPointId, lineIds) //todo 是否缺少录波 - .eq(RmpEventDetailPO::getEventType, data.getId()) + .ne(RmpEventDetailPO::getEventType, data.getId()) .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()))) ); diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java index 0cc6413a5..ee23d2ec1 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java @@ -999,7 +999,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { ); Map> map = eventDetailList.stream().filter(x -> data.getId().equals(x.getEventType())) - .collect(Collectors.groupingBy(s -> s.getStartTime().substring(0, 10))); + .collect(Collectors.groupingBy(s -> s.getStartTime().toString())); Set keySet = map.keySet(); LocalDate parse1 = LocalDate.parse(startTime); @@ -1072,7 +1072,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService { HashMap reasonMap = new HashMap<>(); HashMap typeMap = new HashMap<>(); - + //添加detail for (RmpEventDetailPO detail : info) { EventDetail details = null; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 49ad27b76..60fa04b42 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -377,28 +377,30 @@ public class ReportServiceImpl implements ReportService { @Override public List getSeverity(DeviceInfoParam.BusinessParam businessParam) { List result = new ArrayList<>(); - List info = getED2(businessParam); + List deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData(); + List lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); + List info = new ArrayList<>(); + if(CollectionUtil.isNotEmpty(lineIds)){ + //数据暂降查询 + List eventDetails = eventDetailService.list(new LambdaQueryWrapper() + .in(RmpEventDetailPO::getMeasurementPointId, lineIds) + .ge(StrUtil.isNotBlank(businessParam.getSearchBeginTime()), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(businessParam.getSearchBeginTime()))) + .le(StrUtil.isNotBlank(businessParam.getSearchEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(businessParam.getSearchEndTime()))) + .orderByDesc(RmpEventDetailPO::getSeverity).last(" limit 20") + ); + info = BeanUtil.copyToList(eventDetails, EventDetailNew.class); + }else{ + throw new BusinessException(DeviceResponseEnum.DEPT_LINE_EMPTY); + } if (CollectionUtil.isNotEmpty(info)) { - List idlist = new ArrayList<>(); - //根据严重度进行排序并取前二十个数据 - info.sort(((o1, o2) -> o1.getSeverity().compareTo(o2.getSeverity()))); - Collections.reverse(info); - List details=new ArrayList<>(); - if(info.size()>20){ - details = info.subList(0, 20); - }else{ - details=info; - } - //遍历集合得到id集合 - for (EventDetailNew detail : details) { - idlist.add(detail.getLineId()); - } + List idlist = info.stream().map(EventDetailNew::getLineId).distinct().collect(Collectors.toList()); + //得到对应的监测点信息 HttpResult> AreaInfo = lineFeignClient.getBaseLineAreaInfo(idlist); List data = AreaInfo.getData(); //遍历集合比较id得到最终数据 - for (EventDetailNew detail : details) { + for (EventDetailNew detail : info) { WaveTypeVO waveTypeVO = new WaveTypeVO(); for (AreaLineInfoVO vo : data) { if (detail.getLineId().equals(vo.getLineId())) { diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index e0ea6e897..91426a3ac 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -349,17 +349,21 @@ public class TransientServiceImpl implements TransientService { } } - for (DictData dictData : reasonList) { - if (eventDetail.getAdvanceReason().equals(dictData.getId())) { - eventDetail.setAdvanceReason(dictData.getName()); - break; + if(StrUtil.isNotBlank(eventDetail.getAdvanceReason())) { + for (DictData dictData : reasonList) { + if (eventDetail.getAdvanceReason().equals(dictData.getId())) { + eventDetail.setAdvanceReason(dictData.getName()); + break; + } } } - for (DictData dictData : typeList) { - if (eventDetail.getAdvanceType().equals(dictData.getId())) { - eventDetail.setAdvanceType(dictData.getName()); - break; + if(StrUtil.isNotBlank(eventDetail.getAdvanceType())) { + for (DictData dictData : typeList) { + if (eventDetail.getAdvanceType().equals(dictData.getId())) { + eventDetail.setAdvanceType(dictData.getName()); + break; + } } } } @@ -371,68 +375,6 @@ public class TransientServiceImpl implements TransientService { } - - - - - - -// if (!CollectionUtils.isEmpty(lineList)) { -// StringBuilder stringBuilder = InfluxDBCommUtils.assToInfluxParam(lineList); -// //influxDB查询待分页数据总量 -// Long total = getTransientDetail(stringBuilder, transientParam); -// page.setTotal(total); -// //分页总页数 -// int pages = (int) Math.ceil(transientParam.getPageNum() * 1.0 / transientParam.getPageSize()); -// page.setPages(pages); -// //influxDB分页查询 -// List eventDetailData = getTransientDetailLimit(lineList, transientParam); -// -// if (CollUtil.isNotEmpty(eventDetailData)) { -// List lineIds = eventDetailData.stream().map(EventDetailNew::getLineId).collect(Collectors.toList()); -// lineIds = lineIds.stream().distinct().collect(Collectors.toList()); -// -// List r = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); -// List reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData(); -// List typeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData(); -// -// -// for (EventDetailNew eventDetail : eventDetailData) { -// for (AreaLineInfoVO areaLineInfoVO : r) { -// if (eventDetail.getLineId().equals(areaLineInfoVO.getLineId())) { -// eventDetail.setLineId(areaLineInfoVO.getLineId()); -// eventDetail.setLineName(areaLineInfoVO.getLineName()); -// eventDetail.setGdName(areaLineInfoVO.getGdName()); -// eventDetail.setSubName(areaLineInfoVO.getSubName()); -// eventDetail.setIp(areaLineInfoVO.getIp()); -// eventDetail.setScale(areaLineInfoVO.getVoltageScale()); -// eventDetail.setIp(areaLineInfoVO.getIp()); -// break; -// } -// } -// -// for (DictData dictData : reasonList) { -// if (eventDetail.getEventReason().equals(dictData.getId())) { -// eventDetail.setEventReason(dictData.getName()); -// break; -// } -// } -// -// for (DictData dictData : typeList) { -// if (eventDetail.getEventType().equals(dictData.getId())) { -// eventDetail.setEventType(dictData.getName()); -// break; -// } -// } -// } -// -// -// //当前页数据 -// page.setRecords(eventDetailData); -// } -// -// } - } return page; } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java index 1664f6220..2174b2917 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/DicDataEnum.java @@ -179,6 +179,7 @@ public enum DicDataEnum { * @date 2023/3/24 */ + KV01("0.1kV","0.1"), V022("0.22kV","0.22"), KV038("0.38kV","0.38"), V380("380V","0.38"),