From 38332616fae8a492da16f4293ccb4881633e6871 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 27 Jun 2025 08:53:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LargeScreenCountController.java | 2 +- .../transientes/pojo/vo/AlarmAnalysisVO.java | 11 +++++ .../transientes/pojo/vo/EventDetailVO.java | 2 + .../service/PqsUsersetService.java | 18 ++++++++ .../impl/LargeScreenCountServiceImpl.java | 45 ++++++++++++++++--- .../service/impl/PqsUsersetServiceImpl.java | 21 +++++++++ 6 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java create mode 100644 event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java index 926594a9..e9f3abb2 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java +++ b/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> eventList(@RequestBody LargeScreenCountParam largeScreenCountParam) { - String methodDescribe = getMethodDescribe("eventTrend"); + String methodDescribe = getMethodDescribe("eventList"); Page result = largeScreenCountService.eventList(largeScreenCountParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java index b734f46a..0cec7d73 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/AlarmAnalysisVO.java +++ b/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 eventdetails; + List aLarmEvent; + List warnEvent; + List noticeEvent; + List lookALarmEvent; + List lookWarnEvent; + List lookNoticeEvent; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java index 70912d29..dcd8a35d 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java +++ b/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; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/PqsUsersetService.java new file mode 100644 index 00000000..127df983 --- /dev/null +++ b/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{ + + + +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index a46440c3..de5a6563 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/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.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.po.*; 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 pqLineList = pqLineMapper.getBaseLineInfo(deptslineIds); + Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); + QueryWrapper 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 pqsUserSetList = pqsUsersetService.lambdaQuery().eq(PqsUserSet::getIsNotice, 1).list(); + List noticeDept = pqsUserSetList.stream().map(temp -> { + return pqsDeptsService.findDeptAndChildren(temp.getDeptsIndex()); + }).flatMap(Collection::stream).distinct().collect(Collectors.toList()); + //获取对应监测点id + List noticeLine = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, noticeDept).eq(PqsDeptsline::getSystype, sysTypeZt).list(); + List noticeLineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList()); + IPage list = pqsEventdetailService.getBaseMapper().selectPage(pqsEventdetailPage,queryWrapper); List 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 returnpage = new Page<> (largeScreenCountParam.getPageNum ( ), largeScreenCountParam.getPageSize ( )); diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/PqsUsersetServiceImpl.java new file mode 100644 index 00000000..5a6fe3f9 --- /dev/null +++ b/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 implements PqsUsersetService{ + +}