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-07-01 20:12:14 +08:00
parent 8328d6c06e
commit a4edf8b3f6
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java
View File

@@ -1,10 +1,12 @@
package com.njcn.gather.event.transientes.pojo.vo; package com.njcn.gather.event.transientes.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
/** /**
* Description: * Description:
@@ -43,4 +45,5 @@ public class EventDetailVO {
private String objName; private String objName;
private Integer needDealFlag; private Integer needDealFlag;
private List<MsgEventInfo> msgEventInfoList;
} }

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

@@ -246,12 +246,12 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
alarmAnalysisVO.setLookNoticeCount(lookNoticeCount); alarmAnalysisVO.setLookNoticeCount(lookNoticeCount);
alarmAnalysisVO.setEventdetails(change(eventdetails)); alarmAnalysisVO.setEventdetails(change(eventdetails,handleMsg));
alarmAnalysisVO.setALarmEvent(change(aLarmEvent)); alarmAnalysisVO.setALarmEvent(change(aLarmEvent,handleMsg));
alarmAnalysisVO.setWarnEvent(change(warnEvent)); alarmAnalysisVO.setWarnEvent(change(warnEvent,handleMsg));
alarmAnalysisVO.setNoticeEvent(msgEventInfoList); alarmAnalysisVO.setNoticeEvent(msgEventInfoList);
alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent)); alarmAnalysisVO.setLookALarmEvent(change(lookALarmEvent,handleMsg));
alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent)); alarmAnalysisVO.setLookWarnEvent(change(lookWarnEvent,handleMsg));
alarmAnalysisVO.setLookNoticeEvent(handleMsg); alarmAnalysisVO.setLookNoticeEvent(handleMsg);
@@ -428,6 +428,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
} }
IPage<PqsEventdetail> list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper); IPage<PqsEventdetail> list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper);
List<Integer> finalNoticeLineIds = noticeLineIds; List<Integer> finalNoticeLineIds = noticeLineIds;
List<EventDetailVO> collect = list.getRecords().stream().map(temp -> { List<EventDetailVO> collect = list.getRecords().stream().map(temp -> {
@@ -596,15 +597,15 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
.in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType()) .in(PqsEventdetail::getWavetype,msgEventConfigService.getEventType())
.in(PqsEventdetail::getLineid, deptslineIds).list(); .in(PqsEventdetail::getLineid, deptslineIds).list();
mapCountVO.setEventCount(eventdetails.size()); mapCountVO.setEventCount(eventdetails.size());
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)){
temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,eveIdndex).list(); temp = msgEventInfoService.lambdaQuery().in(MsgEventInfo::getEventIndex,eveIdndex).list();
} }
List<EventDetailVO> change = change(eventdetails,temp);
mapCountVO.setEventList(change);
mapCountVO.setNoticeCount(temp.size()); mapCountVO.setNoticeCount(temp.size());
mapCountVO.setNoticeList(temp); mapCountVO.setNoticeList(temp);
result.add(mapCountVO); result.add(mapCountVO);
@@ -700,7 +701,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
return true; return true;
} }
private List<EventDetailVO> change(List<PqsEventdetail> list){ private List<EventDetailVO> change(List<PqsEventdetail> list,List<MsgEventInfo> handleMsg){
List<EventDetailVO> result = new ArrayList<>(); List<EventDetailVO> result = new ArrayList<>();
if(CollectionUtils.isEmpty(list)){ if(CollectionUtils.isEmpty(list)){
return result; return result;
@@ -720,6 +721,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setEventvalue(temp.getEventvalue()); eventDetailVO.setEventvalue(temp.getEventvalue());
eventDetailVO.setLookFlag(temp.getLookFlag()); eventDetailVO.setLookFlag(temp.getLookFlag());
eventDetailVO.setNoticeFlag(temp.getNoticeFlag()); eventDetailVO.setNoticeFlag(temp.getNoticeFlag());
eventDetailVO.setMsgEventInfoList(handleMsg.stream().filter(msg->Objects.equals(msg.getEventIndex(),temp.getEventdetailIndex())).collect(Collectors.toList()));
if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){ if(ledgerBaseInfoDTOMap.containsKey(temp.getLineid())){
LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid()); LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(temp.getLineid());
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());