From 6c917742001c6adfa2890e3d41fe1e6ee8602a00 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Wed, 11 Feb 2026 13:31:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8A=A5=E5=91=8A=E6=A8=A1=E6=9D=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/service/impl/LineIntegrityDataServiceImpl.java | 5 -----
 .../java/com/njcn/harmonic/service/impl/GridServiceImpl.java | 2 +-
 .../harmonic/common}/mapper/mapping/RStatDataVDMapper.xml    | 2 +-
 .../com/njcn/system/service/impl/EventDictServiceImpl.java   | 3 ++-
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename pqs-harmonic/{harmonic-boot/src/main/java/com/njcn/harmonic => harmonic-common/src/main/java/com/njcn/harmonic/common}/mapper/mapping/RStatDataVDMapper.xml (97%)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
index 22ca48af5..aeecd15e9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java
@@ -101,12 +101,7 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             if (CollectionUtil.isEmpty(alarmStrategyVos)) {
                 throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY);
             }
-            List<AlarmStrategyVO> alarmAlgoDescribe = lineIntegrityDataMapper.getAlarmAlgoDescribe(alarmStrategyVos);
-            Map<Integer, Integer> mapAlarm = alarmAlgoDescribe.stream().collect(Collectors.toMap(AlarmStrategyVO::getAlgoDescribe, AlarmStrategyVO::getIntegrityValue));
-
             Map<String, Integer> mapA = alarmStrategyVos.stream().collect(Collectors.toMap(AlarmStrategyVO::getId, AlarmStrategyVO::getIntegrityValue));
-
-
             // 遍历集合
             for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
index 20d6c0ce1..7c2bb52ca 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
@@ -212,7 +212,7 @@ public class GridServiceImpl implements IGridService {
             if (param.getAreaType() == 0) {
                 AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
                 vo.setDeptId(param.getDeptIndex());
-                vo.setDeptName("冀北");
+                vo.setDeptName(deptFeignClient.getDeptById(param.getDeptIndex()).getData().getName());
                 List<AssessVo> children = new ArrayList<>();
                 map.forEach((k1, v1) -> {
                     AssessVo assessVo = new AssessVo();
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/mapper/mapping/RStatDataVDMapper.xml
similarity index 97%
rename from pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
rename to pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/mapper/mapping/RStatDataVDMapper.xml
index a04a92ba5..8f96fbfe8 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
+++ b/pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/mapper/mapping/RStatDataVDMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataVDMapper">
+<mapper namespace="com.njcn.harmonic.common.mapper.RStatDataVDMapper">
 
     <select id="getFreqDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
index c3d21ec98..0906e0946 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java
@@ -131,7 +131,8 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
         queryWrapper.eq("report_dict.state", DataStateEnum.ENABLE.getCode()).eq("report_dict.Type",dictQueryParam.getType());
         List<ReportDict> reportAllDicts = this.baseMapper.selectList(queryWrapper);
         List<ReportDict> reportDicts = new ArrayList<>();
-        reportAllDicts.stream().filter(reportDict -> reportDict.getId().equals(dictQueryParam.getId())).forEach(reportDict -> {
+        List<ReportDict> rootList = reportAllDicts.stream().filter(reportDict -> Objects.equals(reportDict.getPid(),"0")).collect(Collectors.toList());
+        rootList.forEach(reportDict -> {
             reportDicts.add(reportDict);
             getChild(reportDicts, reportDict, reportAllDicts);
         });