From d3294ccdbd62e98cd96ebc632edaacb4d520c4c4 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 29 Jul 2025 15:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../majornetwork/Impl/EventDetailServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
index 8197ef0d0..0156f891c 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
@@ -14,7 +14,9 @@ import com.njcn.common.utils.PubUtils;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.DeptGetBase;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
+import com.njcn.device.pq.api.DeptLineFeignClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.event.pojo.vo.SendEventVO;
 import com.njcn.event.utils.EventUtil;
@@ -55,6 +57,7 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
     private final MqttPublisher publisher;
     private final CommTerminalGeneralClient commTerminalGeneralClient;
     private final LineFeignClient lineFeignClient;
+    private final DeptLineFeignClient deptLineFeignClient;
 
 
     @Override
@@ -181,12 +184,13 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
     }
 
     private void pushEvent(RmpEventDetailPO po) {
-        //获取部门
-        String deptIndex = RequestUtil.getDeptIndex();
+        //根据监测点获取部门
+        DeptLine deptLine = deptLineFeignClient.getLineByLineIds(po.getMeasurementPointId()).getData();
+        String id = deptLine.getId();
         Set<String> dept = new HashSet<>();
-        dept.add(deptIndex);
+        dept.add(id);
         DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
-        deptGetLineParam.setDeptId(deptIndex);
+        deptGetLineParam.setDeptId(id);
         List<DeptGetBase> deptList = commTerminalGeneralClient.getDeptChildrenByParent(deptGetLineParam).getData();
         if (CollectionUtil.isNotEmpty(deptList)) {
             deptList.forEach(item->{