ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

初始版本提交

Browse Source
This commit is contained in:
hzj
2025-06-30 11:06:05 +08:00
parent 20423028f7
commit bdb3efd81d
3 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java
View File

@@ -32,11 +32,11 @@ public class AlarmAnalysisVO {
@ApiModelProperty(name="lookNoticeCount",value="远程通知处置数") @ApiModelProperty(name="lookNoticeCount",value="远程通知处置数")
private Integer lookNoticeCount; private Integer lookNoticeCount;
List<PqsEventdetail> eventdetails; List<EventDetailVO> eventdetails;
List<PqsEventdetail> aLarmEvent; List<EventDetailVO> aLarmEvent;
List<PqsEventdetail> warnEvent; List<EventDetailVO> warnEvent;
List<MsgEventInfo> noticeEvent; List<MsgEventInfo> noticeEvent;
List<PqsEventdetail> lookALarmEvent; List<EventDetailVO> lookALarmEvent;
List<PqsEventdetail> lookWarnEvent; List<EventDetailVO> lookWarnEvent;
List<MsgEventInfo> lookNoticeEvent; List<MsgEventInfo> lookNoticeEvent;
} }

2
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/MapCountVO.java
View File

@@ -24,6 +24,6 @@ public class MapCountVO {
private Integer noticeCount; private Integer noticeCount;
private List<LedgerBaseInfoDTO> lineList; private List<LedgerBaseInfoDTO> lineList;
private List<PqsEventdetail> eventList; private List<EventDetailVO> eventList;
private List<MsgEventInfo> noticeList; private List<MsgEventInfo> noticeList;
} }

45
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
View File

@@ -236,12 +236,12 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
alarmAnalysisVO.setLookNoticeCount(lookNoticeCount); alarmAnalysisVO.setLookNoticeCount(lookNoticeCount);
alarmAnalysisVO.setEventdetails(eventdetails); alarmAnalysisVO.setEventdetails(change(eventdetails));
alarmAnalysisVO.setALarmEvent(aLarmEvent); alarmAnalysisVO.setALarmEvent(change(aLarmEvent));
alarmAnalysisVO.setWarnEvent(warnEvent); alarmAnalysisVO.setWarnEvent(change(warnEvent));
alarmAnalysisVO.setNoticeEvent(msgEventInfoList); alarmAnalysisVO.setNoticeEvent(msgEventInfoList);
alarmAnalysisVO.setLookALarmEvent(lookALarmEvent); alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent));
alarmAnalysisVO.setLookWarnEvent(lookWarnEvent); alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent));
alarmAnalysisVO.setLookNoticeEvent(handleMsg); alarmAnalysisVO.setLookNoticeEvent(handleMsg);
@@ -538,12 +538,13 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
List<LedgerBaseInfoDTO> ledgerBaseInfoDTOS = pqLineService.queryListByIds(v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList())); List<LedgerBaseInfoDTO> ledgerBaseInfoDTOS = pqLineService.queryListByIds(v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()));
mapCountVO.setLineList(ledgerBaseInfoDTOS); mapCountVO.setLineList(ledgerBaseInfoDTOS);
List<Integer> deptslineIds = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); List<Integer> deptslineIds = v.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
List<PqsEventdetail> eventdetails = pqsEventdetailService.lambdaQuery() List<PqsEventdetail> eventdetails = pqsEventdetailService.lambdaQuery()
.between(PqsEventdetail::getTimeid, startTime, endTime) .between(PqsEventdetail::getTimeid, startTime, endTime)
.in(PqsEventdetail::getLineid, deptslineIds).list(); .in(PqsEventdetail::getLineid, deptslineIds).list();
mapCountVO.setEventCount(eventdetails.size()); mapCountVO.setEventCount(eventdetails.size());
mapCountVO.setEventList(eventdetails); List<EventDetailVO> change = change(eventdetails);
mapCountVO.setEventList(change);
List<String> eveIdndex = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList()); List<String> eveIdndex = eventdetails.stream().map(PqsEventdetail::getEventdetailIndex).collect(Collectors.toList());
List<MsgEventInfo> temp = new ArrayList<>(); List<MsgEventInfo> temp = new ArrayList<>();
if(!CollectionUtils.isEmpty(eveIdndex)){ if(!CollectionUtils.isEmpty(eveIdndex)){
@@ -647,6 +648,36 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
return true; return true;
} }
private List<EventDetailVO> change(List<PqsEventdetail> list){
List<EventDetailVO> result = new ArrayList<>();
List<Integer> lineidList = list.stream().map(PqsEventdetail::getLineid).collect(Collectors.toList());
List<LedgerBaseInfoDTO> pqLineList = pqLineMapper.getBaseLineInfo(lineidList);
Map<Integer,LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
List<EventDetailVO> detailVOList = list.stream().map(temp -> {
EventDetailVO eventDetailVO = new EventDetailVO();
eventDetailVO.setEventdetail_index(temp.getEventdetailIndex());
eventDetailVO.setTimeid(temp.getTimeid());
eventDetailVO.setMs(temp.getMs());
eventDetailVO.setWavetype(temp.getWavetype().toString());
eventDetailVO.setPersisttime(temp.getPersisttime().toString());
eventDetailVO.setEventvalue(temp.getEventvalue());
eventDetailVO.setLookFlag(temp.getLookFlag());
eventDetailVO.setNoticeFlag(temp.getNoticeFlag());
if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){
LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid());
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
return eventDetailVO;
}).collect(Collectors.toList());
return result;
}