Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

数据中心台账修改

Browse Source
This commit is contained in:
雨木c
2023-04-07 13:36:14 +08:00
parent 54767414b5
commit 0eb101dc70
18 changed files with 90 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java
View File

@@ -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;

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

@@ -116,7 +116,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
//查询监测点未处理暂态事件
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIds));
.in(RmpEventDetailPO::getMeasurementPointId, lineIds).orderByDesc(RmpEventDetailPO::getStartTime));
EventDetailNew eventDetailNew;
for (RmpEventDetailPO eventDetail : eventDetails) {
eventDetailNew= BeanUtil.copyProperties(eventDetail,EventDetailNew.class);

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

@@ -88,7 +88,7 @@ public class AreaStatisticalServiceImpl implements AreaStatisticalService {
List<RmpEventDetailPO> info = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.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())))
);

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventAnalysisServiceImpl.java
View File

@@ -999,7 +999,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
);
Map<String, List<RmpEventDetailPO>> 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<String> keySet = map.keySet();
LocalDate parse1 = LocalDate.parse(startTime);
@@ -1072,7 +1072,7 @@ public class EventAnalysisServiceImpl implements EventAnalysisService {
HashMap<String, Integer> reasonMap = new HashMap<>();
HashMap<String, Integer> typeMap = new HashMap<>();
//添加detail
for (RmpEventDetailPO detail : info) {
EventDetail details = null;

34
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -377,28 +377,30 @@ public class ReportServiceImpl implements ReportService {
@Override
public List<WaveTypeVO> getSeverity(DeviceInfoParam.BusinessParam businessParam) {
List<WaveTypeVO> result = new ArrayList<>();
List<EventDetailNew> info = getED2(businessParam);
List<GeneralDeviceDTO> deviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(businessParam).getData();
List<String> lineIds = deviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
List<EventDetailNew> info = new ArrayList<>();
if(CollectionUtil.isNotEmpty(lineIds)){
//数据暂降查询
List<RmpEventDetailPO> eventDetails = eventDetailService.list(new LambdaQueryWrapper<RmpEventDetailPO>()
.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<String> idlist = new ArrayList<>();
//根据严重度进行排序并取前二十个数据
info.sort(((o1, o2) -> o1.getSeverity().compareTo(o2.getSeverity())));
Collections.reverse(info);
List<EventDetailNew> 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<String> idlist = info.stream().map(EventDetailNew::getLineId).distinct().collect(Collectors.toList());
//得到对应的监测点信息
HttpResult<List<AreaLineInfoVO>> AreaInfo = lineFeignClient.getBaseLineAreaInfo(idlist);
List<AreaLineInfoVO> 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())) {

82
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -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<EventDetailNew> eventDetailData = getTransientDetailLimit(lineList, transientParam);
//
// if (CollUtil.isNotEmpty(eventDetailData)) {
// List<String> lineIds = eventDetailData.stream().map(EventDetailNew::getLineId).collect(Collectors.toList());
// lineIds = lineIds.stream().distinct().collect(Collectors.toList());
//
// List<AreaLineInfoVO> r = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
// List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
// List<DictData> 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;
}