初始版本提交

event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java

@@ -69,7 +69,7 @@ public class LargeScreenCountController extends BaseController {
     @ApiOperation("暂降事件列表")
     @ApiImplicitParam(name = "largeScreenCountParam", value = "查询参数", required = true)
     public HttpResult<Page<EventDetailVO>> eventList(@RequestBody LargeScreenCountParam largeScreenCountParam) {
-        String methodDescribe = getMethodDescribe("eventTrend");
+        String methodDescribe = getMethodDescribe("eventList");
         Page<EventDetailVO> result = largeScreenCountService.eventList(largeScreenCountParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }

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

@@ -1,8 +1,11 @@
 package com.njcn.gather.event.transientes.pojo.vo;
 
+import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2025/06/20  上午 9:29【需求编号】
@@ -27,4 +30,12 @@ public class AlarmAnalysisVO {
     private Integer lookWarnCount;
     @ApiModelProperty(name="lookNoticeCount",value="远程通知处置数")
     private Integer lookNoticeCount;
+
+    List<PqsEventdetail> eventdetails;
+    List<PqsEventdetail> aLarmEvent;
+    List<PqsEventdetail> warnEvent;
+    List<PqsEventdetail> noticeEvent;
+    List<PqsEventdetail> lookALarmEvent;
+    List<PqsEventdetail> lookWarnEvent;
+    List<PqsEventdetail> lookNoticeEvent;
 }

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

@@ -41,4 +41,6 @@ public class EventDetailVO {
     private String bdname;
 
     private String objName;
+
+    private Integer needDealFlag;
 }

event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java

@@ -0,0 +1,18 @@
+package com.njcn.gather.event.transientes.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.event.transientes.pojo.po.PqsUserSet;
+
+/**
+ * 
+ * Description:
+ * Date: 2025/06/26  下午 2:27【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface PqsUsersetService extends IService<PqsUserSet>{
+
+
+
+}

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

@@ -21,10 +21,7 @@ import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam;
 import com.njcn.gather.event.devcie.pojo.po.PqDevice;
 import com.njcn.gather.event.devcie.pojo.po.PqLine;
 import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline;
-import com.njcn.gather.event.transientes.pojo.po.PqsDepts;
+import com.njcn.gather.event.transientes.pojo.po.*;
-import com.njcn.gather.event.transientes.pojo.po.MessageEventFeedback;
-import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo;
-import com.njcn.gather.event.transientes.pojo.po.PqsEventdetail;
 import com.njcn.gather.event.transientes.pojo.vo.*;
 import com.njcn.gather.event.devcie.service.*;
 import com.njcn.gather.event.transientes.service.*;
@@ -63,6 +60,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
     private final MsgEventInfoService msgEventInfoService;
     private final MessageEventFeedbackService messageEventFeedbackService;
     private final CommGeneralService commGeneralService;
+
+    private final PqsUsersetService pqsUsersetService;
     @Value("${SYS_TYPE_ZT}")
     private String sysTypeZt;
     @Override
@@ -150,6 +149,16 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         alarmAnalysisVO.setLookNoticeCount(lookNoticeCount);
 
 
+        alarmAnalysisVO.setEventdetails(eventdetails);
+        alarmAnalysisVO.setALarmEvent(aLarmEvent);
+        alarmAnalysisVO.setWarnEvent(warnEvent);
+        alarmAnalysisVO.setNoticeEvent(noticeEvent);
+        alarmAnalysisVO.setLookALarmEvent(lookALarmEvent);
+        alarmAnalysisVO.setLookWarnEvent(lookWarnEvent);
+        alarmAnalysisVO.setLookNoticeEvent(lookNoticeEvent);
+
+
+
         return alarmAnalysisVO;
     }
 
@@ -227,6 +236,9 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
             throw new BusinessException("部门下暂无监测点");
 
         }
+        List<LedgerBaseInfoDTO> pqLineList = pqLineMapper.getBaseLineInfo(deptslineIds);
+        Map<Integer,LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
+
         QueryWrapper<PqsEventdetail> queryWrapper = new QueryWrapper<>();
         if(Objects.equals(largeScreenCountParam.getEventtype(),1)){
              queryWrapper.lambda()
@@ -243,10 +255,33 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
                     .orderByAsc(PqsEventdetail::getLookFlag)
                     .orderByDesc(PqsEventdetail::getTimeid);
         }
+        //查询需要发送短息处理的部门反推监测点
+        List<PqsUserSet> pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).list();
+        List<String> noticeDept = pqsUserSetList.stream().map(temp -> {
+            return pqsDeptsService.findDeptAndChildren(temp.getDeptsIndex());
+        }).flatMap(Collection::stream).distinct().collect(Collectors.toList());
+        //获取对应监测点id
+        List<PqsDeptsline> noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list();
+        List<Integer> noticeLineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
+
         IPage<PqsEventdetail> list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper);
         List<EventDetailVO> collect = list.getRecords().stream().map(temp -> {
             EventDetailVO eventDetailVO = new EventDetailVO();
-            BeanUtils.copyProperties(temp, 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.setNeedDealFlag(noticeLineIds.contains(temp.getLineid())?1:0);
             return eventDetailVO;
         }).collect(Collectors.toList());
         Page<EventDetailVO> returnpage = new Page<> (largeScreenCountParam.getPageNum ( ), largeScreenCountParam.getPageSize ( ));

event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java

@@ -0,0 +1,21 @@
+package com.njcn.gather.event.transientes.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.gather.event.transientes.mapper.PqsUserSetMapper;
+import com.njcn.gather.event.transientes.pojo.po.PqsUserSet;
+import org.springframework.stereotype.Service;
+
+
+import com.njcn.gather.event.transientes.service.PqsUsersetService;
+/**
+ * 
+ * Description:
+ * Date: 2025/06/26  下午 2:27【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class PqsUsersetServiceImpl extends ServiceImpl<PqsUserSetMapper, PqsUserSet> implements PqsUsersetService{
+
+}