From 85f0775c970ea9693c9e1eb2bd7504d71e5e669f Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Wed, 10 Jun 2026 10:51:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(harmonic):=20=E4=BC=98=E5=8C=96=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将多个模块的根日志级别从info调整为warn
- 在CldEventParam中为幅值和持续时间字段添加更明确的描述
- 为CommonStatisticalQueryParam添加持续时间、特征幅值、严重度等范围验证参数
- 在CsEngineeringServiceImpl中添加排序功能支持
- 为设备交付相关参数和实体类添加治理方法、敏感用户、治理类型等新字段
- 在事件服务中实现持续时间、幅值、严重度等多维度筛选查询功能
- 为CsEventPO添加严重度字段并实现相关计算逻辑
- 优化事件列表查询性能，添加波形文件存在性过滤条件
- 更新XML映射文件以支持新的查询参数和字段映射
- 重构台账树构建逻辑，提升数据加载效率
- 修复数据查询中的大小写匹配问题
---
 .../param/CsEquipmentDeliveryAddParm.java     |    9 +
 .../param/CsEquipmentDeliveryAuditParm.java   |    9 +
 .../pojo/po/CsEquipmentDeliveryPO.java        |   24 +
 .../csdevice/pojo/vo/DataGroupEventVO.java    |    9 +-
 .../csdevice/pojo/vo/RecordAllDevTreeVo.java  |    4 +
 .../ledger/CsCommTerminalController.java      |   22 +-
 .../mapper/mapping/WlRecordMapper.xml         |    4 +-
 .../impl/CsEngineeringServiceImpl.java        |    1 +
 .../service/impl/CsGroupServiceImpl.java      |   26 +-
 .../service/impl/CsLedgerServiceImpl.java     |  132 +-
 .../csdevice/service/impl/IcdServiceImpl.java |   11 +-
 .../src/main/resources/bootstrap.yml          |    2 +-
 .../njcn/csharmonic/param/CldEventParam.java  |    4 +-
 .../param/CommonStatisticalQueryParam.java    |   32 +
 .../param/CsEventUserQueryPage.java           |   30 +
 .../param/CsEventUserQueryParam.java          |    1 +
 .../com/njcn/csharmonic/param/ItemParam.java  |   50 +
 .../njcn/csharmonic/pojo/po/CsEventPO.java    |    6 +
 .../csharmonic/pojo/vo/EventDetailVO.java     |   18 +
 .../njcn/csharmonic/utils/DataChangeUtil.java |   33 +
 .../csharmonic/controller/DataController.java |   12 +-
 .../controller/PqSensitiveUserController.java |   15 +
 .../mapper/mapping/CsEventUserPOMapper.xml    |   32 +-
 .../csharmonic/service/CsEventPOService.java  |    8 +-
 .../njcn/csharmonic/service/IDataService.java |    5 +-
 .../service/IPqSensitiveUserService.java      |    4 +
 .../service/impl/CsEventPOServiceImpl.java    |  106 +-
 .../impl/CsEventUserPOServiceImpl.java        |   24 +-
 .../service/impl/DataServiceImpl.java         | 1410 ++++++++++++-----
 .../impl/PqSensitiveUserServiceImpl.java      |   30 +-
 .../service/impl/RealDataServiceImpl.java     |   33 +-
 .../service/impl/StableDataServiceImpl.java   |   13 -
 .../src/main/resources/bootstrap.yml          |    2 +-
 .../src/main/resources/bootstrap.yml          |    2 +-
 .../src/main/resources/bootstrap.yml          |    2 +-
 35 files changed, 1546 insertions(+), 579 deletions(-)
 create mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ItemParam.java

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
index 2c211e8..ae00027 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
@@ -111,4 +111,13 @@ public class CsEquipmentDeliveryAddParm implements Serializable {
 
     @ApiModelProperty(value="是否支持升级(0:否 1:是)")
     private Integer upgrade;
+
+    @ApiModelProperty(value="治理方法")
+    private String governMethod;
+
+    @ApiModelProperty(value="敏感用户id")
+    private String monitorUser;
+
+    @ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
+    private String governType;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
index 3216740..db07a14 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
@@ -116,4 +116,13 @@ public class CsEquipmentDeliveryAuditParm {
 
     @ApiModelProperty(value="是否支持升级(0:否 1:是)")
     private Integer upgrade;
+
+    @ApiModelProperty(value="治理方法")
+    private String governMethod;
+
+    @ApiModelProperty(value="敏感用户id")
+    private String monitorUser;
+
+    @ApiModelProperty(value="治理类型(稳态:harmonic 暂态:event)")
+    private String governType;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
index ac92fe9..77fa813 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
@@ -158,4 +158,28 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
      * 是否支持升级(0:否 1:是)
      */
     private Integer upgrade;
+
+    /**
+     * 治理方法
+     */
+    @TableField(value = "govern_method")
+    private String governMethod;
+
+    /**
+     * 敏感用户id
+     */
+    @TableField(value = "monitor_user")
+    private String monitorUser;
+
+    /**
+     * 治理类型(稳态:harmonic 暂态:event)
+     */
+    @TableField(value = "govern_type")
+    private String governType;
+
+    /**
+     * 治理报告文件路径
+     */
+    @TableField(value = "report_file_path")
+    private String reportFilePath;
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
index 5d78e3e..bb2c9cb 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -31,6 +30,9 @@ public class    DataGroupEventVO {
     @ApiModelProperty("装置ID")
     private String deviceId;
 
+    @ApiModelProperty("设备网络码")
+    private String nDid;
+
     @ApiModelProperty("装置名称")
     private String devName;
 
@@ -65,7 +67,7 @@ public class    DataGroupEventVO {
     private Double amplitude;
 
     @ApiModelProperty("严重度")
-    private String severity;
+    private Double severity;
 
     @ApiModelProperty("波形路径")
     private String wavePath;
@@ -82,4 +84,7 @@ public class    DataGroupEventVO {
     @ApiModelProperty("暂降源与监测位置关系 0-未知、1-上游、2-下游")
     private String sagSource;
 
+    @ApiModelProperty("监测点电压等级")
+    private Double lineVoltage;
+
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordAllDevTreeVo.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordAllDevTreeVo.java
index 766bb8d..2aeaae2 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordAllDevTreeVo.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordAllDevTreeVo.java
@@ -2,6 +2,7 @@ package com.njcn.csdevice.pojo.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.List;
 
 /**
@@ -20,6 +21,9 @@ public class RecordAllDevTreeVo {
     @ApiModelProperty("设备名称")
     private String name;
 
+    @ApiModelProperty("设备状态")
+    private Integer runStatus;
+
     @ApiModelProperty("线路")
     private List<RecordAllLineTreeVo> children;
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsCommTerminalController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsCommTerminalController.java
index fcf531c..f4b6704 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsCommTerminalController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsCommTerminalController.java
@@ -1,39 +1,25 @@
 package com.njcn.csdevice.controller.ledger;
 
 
-import cn.hutool.core.collection.CollUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.csdevice.mapper.PqsDeviceUnitMapper;
-import com.njcn.csdevice.pojo.po.CsDeviceUserPO;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.service.CsCommTerminalService;
-import com.njcn.csdevice.service.CsDeviceUserPOService;
-import com.njcn.csdevice.service.CsEquipmentDeliveryService;
-import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
-import com.njcn.user.api.UserFeignClient;
-import com.njcn.user.pojo.constant.UserType;
-import com.njcn.user.pojo.vo.UserVO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 
 /**
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
index 46319a4..be26eb2 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml
@@ -21,7 +21,7 @@
 
     <select id="getRecordAll" resultType="com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo">
         <if test="wlRecordPageParam.isTrueFlag == 0">
-            select a.dev_id as id,b.name as name from  wl_record a
+            select a.dev_id as id,b.name as name,b.run_status as runStatus from  wl_record a
             left join cs_equipment_delivery b on a.dev_id = b.id
             where a.type=1 and a.state =1 and a.end_time is not null
             and
@@ -31,7 +31,7 @@
             group by a.dev_id,b.name having a.dev_id is not null and b.name is not null
         </if>
         <if test="wlRecordPageParam.isTrueFlag == 1">
-            select a.dev_id as id,b.name as name from  wl_record a
+            select a.dev_id as id,b.name as name,b.run_status as runStatus from  wl_record a
             left join cs_equipment_delivery b on a.dev_id = b.id
             where a.type=1 and a.state =1 and a.end_time is not null
             and exists
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
index a25c212..9b7d732 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
@@ -138,6 +138,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
         if(StringUtils.isNotBlank(csEngineeringAuditParm.getName())){
             csLedger1.setName(csEngineeringAuditParm.getName());
         }
+        csLedger1.setSort(csEngineeringAuditParm.getSort());
         csLedgerMapper.updateById(csLedger1);
         List<CsEngineeringPO> list = this.lambdaQuery().eq(CsEngineeringPO::getName, csEngineeringAuditParm.getName()).eq(CsEngineeringPO::getStatus, "1").list();
         if(list.size()>1){
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index 2cd69fc..07a9904 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -25,12 +25,14 @@ import com.njcn.csdevice.mapper.CsDataSetMapper;
 import com.njcn.csdevice.mapper.CsGroArrMapper;
 import com.njcn.csdevice.mapper.CsGroupMapper;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.param.EnergyBaseParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsGroupVO;
 import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.DataGroupTemplateVO;
 import com.njcn.csdevice.pojo.vo.EnergyTemplateVO;
+import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsGroupService;
 import com.njcn.csdevice.service.ICsLedgerService;
@@ -109,6 +111,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
 
     private final String GRID_SIDE_DICT_CODE = "Grid_Side";
     private final String LOAD_SIDE_DICT_CODE = "Load_Side";
+    private final CsLinePOService csLinePOService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -517,9 +520,24 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
             csEventUserQueryPage.setLineId(commonStatisticalQueryParam.getLineId());
             csEventUserQueryPage.setStartTime(commonStatisticalQueryParam.getStartTime());
             csEventUserQueryPage.setEndTime(commonStatisticalQueryParam.getEndTime());
+            csEventUserQueryPage.setEvtParamTmMin(commonStatisticalQueryParam.getEvtParamTmMin());
+            csEventUserQueryPage.setEvtParamTmMax(commonStatisticalQueryParam.getEvtParamTmMax());
+            csEventUserQueryPage.setFeatureAmplitudeMin(commonStatisticalQueryParam.getFeatureAmplitudeMin());
+            csEventUserQueryPage.setFeatureAmplitudeMax(commonStatisticalQueryParam.getFeatureAmplitudeMax());
+            csEventUserQueryPage.setSeverityMin(commonStatisticalQueryParam.getSeverityMin());
+            csEventUserQueryPage.setSeverityMax(commonStatisticalQueryParam.getSeverityMax());
+            csEventUserQueryPage.setTarget(commonStatisticalQueryParam.getTarget());
+            csEventUserQueryPage.setFileFlag(commonStatisticalQueryParam.getFileFlag());
             Page<DataGroupEventVO> csEventVOPage = eventFeignClient.pageQueryByLineId(csEventUserQueryPage).getData();
-
+            //获取监测点电压等级
+            List<CsLineDTO> list = csLinePOService.getAllLineDetail();
+            Map<String, CsLineDTO> map = list.stream().collect(Collectors.toMap(CsLineDTO::getLineId, temp -> temp));
             csEventVOPage.getRecords().forEach(temp->{
+                //监测点电压等级
+                Double volGrade = map.get(temp.getLineId()).getVolGrade();
+                if (!Objects.isNull(volGrade)) {
+                    temp.setLineVoltage(volGrade);
+                }
                 //事件描述、相别、暂降幅值,需要特殊处理赋值
                 //事件描述
                 CsLedger dataById = iCsLedgerService.findDataById(temp.getLineId());
@@ -1137,7 +1155,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                     CommonQueryParam commonQueryParam = new CommonQueryParam();
                     commonQueryParam.setLineId(finalCsLinePO.getLineId());
                     commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
-                    commonQueryParam.setColumnName(epdPqd.getName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
+                    commonQueryParam.setColumnName(epdPqd.getOtherName() + (StringUtils.isEmpty(param.getFrequency()) ? "" : "_" + param.getFrequency()));
                     commonQueryParam.setPhasic(epdPqd.getPhase());
 
                     commonQueryParam.setStartTime(DateUtil.format(DateUtil.parse(fittingDataQueryParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN), DatePattern.NORM_DATETIME_PATTERN));
@@ -1146,7 +1164,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                     String dataType = param.getValueType();
                     if (StrUtil.isEmpty(dataType)) {
                         // 电能质量指标，取限值计算类型，判断是否越限
-                        dataType = epdPqd.getFormula();
+                        dataType = epdPqd.getFormula().toUpperCase();
+                    } else {
+                        dataType = dataType.toUpperCase();
                     }
                     commonQueryParam.setDataType(dataType);
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
index 6f2d4fb..ac4b4cb 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.csdevice.api.CsCommTerminalFeignClient;
-import com.njcn.csdevice.api.CsMarketDataFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.*;
@@ -1171,60 +1170,33 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
     public CsLedgerVO cldTree() {
         List<CsLedgerVO> allList = this.baseMapper.getAll();
         if (CollectionUtil.isEmpty(allList)) {
-            CsLedgerVO government = new CsLedgerVO();
-            government.setLevel(-1);
-            government.setName("台账树");
-            government.setPid("0");
-            government.setId(IdUtil.simpleUUID());
-            government.setChildren(new ArrayList<>());
-            return government;
+            return buildTreeRootNode(new ArrayList<>());
         }
 
-        List<CsLedgerVO> engineeringList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode()))
+        Map<Integer, List<CsLedgerVO>> levelMap = allList.stream()
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
+                .collect(Collectors.groupingBy(CsLedgerVO::getLevel));
 
-        List<CsLedgerVO> projectList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode()))
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
-
-        List<CsLedgerVO> deviceList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode()))
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
-
-        List<CsLedgerVO> lineList = allList.stream()
-                .filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
-                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
+        List<CsLedgerVO> engineeringList = levelMap.getOrDefault(LineBaseEnum.ENGINEERING_LEVEL.getCode(), new ArrayList<>());
+        List<CsLedgerVO> projectList = levelMap.getOrDefault(LineBaseEnum.PROJECT_LEVEL.getCode(), new ArrayList<>());
+        List<CsLedgerVO> deviceList = levelMap.getOrDefault(LineBaseEnum.DEVICE_LEVEL.getCode(), new ArrayList<>());
+        List<CsLedgerVO> lineList = levelMap.getOrDefault(LineBaseEnum.LINE_LEVEL.getCode(), new ArrayList<>());
 
         if (CollectionUtil.isEmpty(deviceList)) {
-            CsLedgerVO government = new CsLedgerVO();
-            government.setLevel(-1);
-            government.setName("台账树");
-            government.setPid("0");
-            government.setId(IdUtil.simpleUUID());
-            government.setChildren(engineeringList);
-            return government;
+            Map<String, List<CsLedgerVO>> projectByPidMap = projectList.stream()
+                    .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+            engineeringList.forEach(eng -> eng.setChildren(projectByPidMap.getOrDefault(eng.getId(), new ArrayList<>())));
+            return buildTreeRootNode(engineeringList);
         }
 
+        // 批量查询设备交付信息
         List<String> devIds = deviceList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
         List<CsEquipmentDeliveryPO> devs = csEquipmentDeliveryMapper.selectBatchIds(devIds);
-        Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
-        Map<String, String> lineDevMap = lineList.stream().collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
-
-        Set<String> cldDevIds = devs.stream()
-                .map(CsEquipmentDeliveryPO::getId)
-                .collect(Collectors.toSet());
-
-        Map<String, List<CsLedgerVO>> projectToDeviceMap = deviceList.stream()
-                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
-
-        Map<String, List<CsLedgerVO>> deviceToLineMap = lineList.stream()
-                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+        Map<String, CsEquipmentDeliveryPO> devsMap = devs.stream()
+                .collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
+        Set<String> cldDevIds = devs.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toSet());
 
+        // 填充设备状态信息
         deviceList.forEach(device -> {
             CsEquipmentDeliveryPO dev = devsMap.get(device.getId());
             if (dev != null) {
@@ -1233,6 +1205,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             }
         });
 
+        // 填充监测点状态信息
+        Map<String, String> lineDevMap = lineList.stream()
+                .collect(Collectors.toMap(CsLedgerVO::getId, CsLedgerVO::getPid));
         lineList.forEach(line -> {
             String devId = lineDevMap.get(line.getId());
             if (devId != null) {
@@ -1243,39 +1218,48 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             }
         });
 
-        engineeringList.forEach(engineering -> {
-            List<CsLedgerVO> sortedProjects = projectList.stream()
-                    .filter(project -> project.getPid().equals(engineering.getId()))
-                    .peek(project -> {
-                        List<CsLedgerVO> projectDevices = projectToDeviceMap.getOrDefault(project.getId(), new ArrayList<>());
-                        if (CollectionUtil.isNotEmpty(projectDevices)) {
-                            List<CsLedgerVO> sortedDevices = projectDevices.stream()
-                                    .filter(device -> cldDevIds.contains(device.getId()))
-                                    .peek(device -> {
-                                        List<CsLedgerVO> sortedLines = deviceToLineMap.getOrDefault(device.getId(), new ArrayList<>())
-                                                .stream()
-                                                .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                                                .collect(Collectors.toList());
-                                        device.setChildren(sortedLines);
-                                    })
-                                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                                    .collect(Collectors.toList());
-                            project.setChildren(sortedDevices);
-                        }
-                    })
-                    .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                    .collect(Collectors.toList());
-            engineering.setChildren(sortedProjects);
+        // 预构建pid映射
+        Map<String, List<CsLedgerVO>> projectByEngineeringMap = projectList.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+        Map<String, List<CsLedgerVO>> deviceByProjectMap = deviceList.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+        Map<String, List<CsLedgerVO>> lineByDeviceMap = lineList.stream()
+                .collect(Collectors.groupingBy(CsLedgerVO::getPid));
+
+        // 逐层构建树：设备 -> 监测点
+        deviceList.forEach(device -> {
+            if (cldDevIds.contains(device.getId())) {
+                device.setChildren(lineByDeviceMap.getOrDefault(device.getId(), new ArrayList<>()));
+            }
         });
 
-        CsLedgerVO government = new CsLedgerVO();
-        government.setLevel(-1);
-        government.setName("台账树");
-        government.setPid("0");
-        government.setId(IdUtil.simpleUUID());
-        government.setChildren(engineeringList);
+        // 项目 -> 设备（仅包含有交付记录的设备）
+        projectList.forEach(project -> {
+            List<CsLedgerVO> projectDevices = deviceByProjectMap.getOrDefault(project.getId(), new ArrayList<>());
+            if (CollectionUtil.isNotEmpty(projectDevices)) {
+                List<CsLedgerVO> validDevices = projectDevices.stream()
+                        .filter(device -> cldDevIds.contains(device.getId()))
+                        .collect(Collectors.toList());
+                project.setChildren(validDevices);
+            }
+        });
 
-        return government;
+        // 工程 -> 项目
+        engineeringList.forEach(eng ->
+                eng.setChildren(projectByEngineeringMap.getOrDefault(eng.getId(), new ArrayList<>()))
+        );
+
+        return buildTreeRootNode(engineeringList);
+    }
+
+    private CsLedgerVO buildTreeRootNode(List<CsLedgerVO> children) {
+        CsLedgerVO root = new CsLedgerVO();
+        root.setLevel(-1);
+        root.setName("台账树");
+        root.setPid("0");
+        root.setId(IdUtil.simpleUUID());
+        root.setChildren(children);
+        return root;
     }
 
     @Override
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java
index d52074f..51aad1d 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java
@@ -164,9 +164,8 @@ class IcdServiceImpl implements IcdService {
         }
         Integer level = csLedger.getLevel();
         String[] pids = csLedger.getPids().split(StrUtil.COMMA);
-        Integer sort = csLedger.getSort();
         // 设置工程信息（所有级别都需要）
-        setEngineeringInfo(vo, level, pids, id, sort);
+        setEngineeringInfo(vo, level, pids, id);
         // 根据级别设置不同的业务数据
         switch (level) {
             case 0:
@@ -328,7 +327,7 @@ class IcdServiceImpl implements IcdService {
                 .collect(Collectors.toList());
 
         event.setMonitorIdList(monitorIds);
-        if (bzType == 0) {
+        if (!Objects.isNull(bzType) && bzType == 0) {
             event.setDataType(0);
         } else {
             event.setDataType(1);
@@ -371,7 +370,7 @@ class IcdServiceImpl implements IcdService {
             reply.setDeviceId(device.getId());
             reply.setLineId(lineId);
             reply.setIsReceived(0);
-            if (bzType == 0) {
+            if (!Objects.isNull(bzType) && bzType == 0) {
                 reply.setCode("harmonic");
             } else {
                 reply.setCode("allEvent");
@@ -494,7 +493,7 @@ class IcdServiceImpl implements IcdService {
     /**
      * 设置工程信息
      */
-    private void setEngineeringInfo(CldLedgerVo vo, Integer level, String[] pids, String id,  Integer sort) {
+    private void setEngineeringInfo(CldLedgerVo vo, Integer level, String[] pids, String id) {
         String engineeringId;
 
         if (level == 0) {
@@ -513,7 +512,7 @@ class IcdServiceImpl implements IcdService {
             vo.setProvince(po.getProvince());
             vo.setCity(po.getCity());
             vo.setEngineeringDescription(po.getDescription());
-            vo.setSort(sort);
+            vo.setSort(po.getSort());
         }
     }
 
diff --git a/cs-device/cs-device-boot/src/main/resources/bootstrap.yml b/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
index d37c637..a72db7b 100644
--- a/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
+++ b/cs-device/cs-device-boot/src/main/resources/bootstrap.yml
@@ -43,7 +43,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: warn
 
 data:
   source:
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CldEventParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CldEventParam.java
index 7267f34..f25daab 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CldEventParam.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CldEventParam.java
@@ -23,10 +23,10 @@ public class CldEventParam implements Serializable {
     @ApiModelProperty("暂降触发时间")
     private String startTime;
 
-    @ApiModelProperty("幅值")
+    @ApiModelProperty("幅值 没带百分比")
     private Double amplitude;
 
-    @ApiModelProperty("持续时间")
+    @ApiModelProperty("持续时间 s")
     private Double duration;
 
     @ApiModelProperty("暂态类型 0-未知 1-暂降 2-暂升 3-中断 4-瞬态")
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CommonStatisticalQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CommonStatisticalQueryParam.java
index e942251..38319c1 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CommonStatisticalQueryParam.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CommonStatisticalQueryParam.java
@@ -2,6 +2,7 @@ package com.njcn.csharmonic.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
 
 import java.util.List;
 
@@ -52,4 +53,35 @@ public class CommonStatisticalQueryParam {
     @ApiModelProperty(value = "数据模型 0:全量查询 1:增量查询")
     private Integer dataModel;
 
+    @ApiModelProperty(value = "持续时间最小值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMin;
+
+    @ApiModelProperty(value = "持续时间最大值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMax;
+
+    @ApiModelProperty(value = "特征幅值最小值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMin;
+
+    @ApiModelProperty(value = "特征幅值最大值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMax;
+
+    @ApiModelProperty(value = "是否存在波形",name = "fileFlag")
+    private Integer fileFlag;
+
+    @ApiModelProperty(value = "严重度最小值",name = "severityMin")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMin;
+
+    @ApiModelProperty(value = "严重度最大值",name = "severityMax")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMax;
+
+    @ApiModelProperty(value = "事件类型",name = "target")
+    private List<String> target;
+
+
 }
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
index e9493c0..cc62306 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java
@@ -3,6 +3,7 @@ package com.njcn.csharmonic.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
@@ -28,6 +29,35 @@ public class CsEventUserQueryPage extends CsEventUserQueryParam{
     @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
     private Integer pageSize;
 
+    @ApiModelProperty(value = "搜索内容",name = "searchValue")
+    private String searchValue;
+
+    @ApiModelProperty(value = "持续时间最小值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMin;
+
+    @ApiModelProperty(value = "持续时间最大值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMax;
+
+    @ApiModelProperty(value = "特征幅值最小值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMin;
+
+    @ApiModelProperty(value = "特征幅值最大值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMax;
+
+    @ApiModelProperty(value = "是否存在波形",name = "fileFlag")
+    private Integer fileFlag;
+
+    @ApiModelProperty(value = "严重度最小值",name = "severityMin")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMin;
+
+    @ApiModelProperty(value = "严重度最大值",name = "severityMax")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMax;
 
     @ApiModelProperty(value = "设备类型名称(便携式，治理)")
     private String deviceTypeName;
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
index e364b01..98cdb3f 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java
@@ -45,6 +45,7 @@ public class CsEventUserQueryParam {
     private String status;
 
     private String level;
+
     @ApiModelProperty(value="起始时间")
     private String startTime;
 
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ItemParam.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ItemParam.java
new file mode 100644
index 0000000..66a9cd3
--- /dev/null
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ItemParam.java
@@ -0,0 +1,50 @@
+package com.njcn.csharmonic.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author 徐扬
+ */
+@Data
+public class ItemParam extends BaseParam implements Serializable{
+
+    @ApiModelProperty("测试项id")
+    private String id;
+
+    @ApiModelProperty(value = "持续时间最小值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMin;
+
+    @ApiModelProperty(value = "持续时间最大值",name = "evtParamTm")
+    @Range(min = 0, max = 60, message = "持续时间范围应在0~60s之间")
+    private Double evtParamTmMax;
+
+    @ApiModelProperty(value = "特征幅值最小值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMin;
+
+    @ApiModelProperty(value = "特征幅值最大值",name = "featureAmplitude")
+    @Range(min = 0, max = 180, message = "特征幅值范围应在0~180%之间")
+    private Double featureAmplitudeMax;
+
+    @ApiModelProperty(value = "是否存在波形",name = "fileFlag")
+    private Integer fileFlag;
+
+    @ApiModelProperty(value = "严重度最小值",name = "severityMin")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMin;
+
+    @ApiModelProperty(value = "严重度最大值",name = "severityMax")
+    @Range(min = 0, max = 10, message = "严重度范围应在0~10之间")
+    private Double severityMax;
+
+    @ApiModelProperty(value = "事件类型",name = "target")
+    private List<String> target;
+
+}
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
index d03356c..68019a8 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsEventPO.java
@@ -165,4 +165,10 @@ public class CsEventPO extends BaseEntity {
      */
     @TableField(value = "uchg")
     private Double uchg;
+
+    /**
+     * 暂降严重度
+     */
+    @TableField(value = "severity")
+    private Double severity;
 }
\ No newline at end of file
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
index 7c4d941..cbf38bf 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/EventDetailVO.java
@@ -46,6 +46,9 @@ public class EventDetailVO {
      */
     private String deviceId;
 
+    @ApiModelProperty(value = "设备网络id")
+    private String nDid;
+
     @ApiModelProperty(value = "设备类型")
     private String devType;
 
@@ -69,10 +72,19 @@ public class EventDetailVO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime startTime2;
 
+    /**
+     * 事件字典id
+     */
+    private String dictDataId;
+
     /**
      * 事件类型
      */
     private String tag;
+
+    /**
+     * 事件名称
+     */
     private String showName;
 
     /**
@@ -148,4 +160,10 @@ public class EventDetailVO {
     @ApiModelProperty("暂降源与监测位置关系 0-未知、1-上游、2-下游")
     private String sagSource;
 
+    @ApiModelProperty("监测点电压等级")
+    private Double lineVoltage;
+
+    @ApiModelProperty("事件严重度")
+    private Double severity;
+
 }
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/DataChangeUtil.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/DataChangeUtil.java
index 8e15c14..9e1e58a 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/DataChangeUtil.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/DataChangeUtil.java
@@ -1,5 +1,8 @@
 package com.njcn.csharmonic.utils;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class DataChangeUtil {
 
     /**
@@ -43,4 +46,34 @@ public class DataChangeUtil {
         return data;
     }
 
+    public static List<String> getTag(List<String> target) {
+        List<String> tag = new ArrayList<>();
+        target.forEach(temp -> {
+            switch (temp) {
+                case "暂降":
+                    tag.add("Evt_Sys_DipStr");
+                    break;
+                case "中断":
+                    tag.add("Evt_Sys_IntrStr");
+                    break;
+                case "暂升":
+                    tag.add("Evt_Sys_SwlStr");
+                    break;
+                case "瞬态":
+                    tag.add("Evt_Sys_QitrV");
+                    tag.add("Evt_Sys_QitrA");
+                    tag.add("Transient");
+                    break;
+                case "振荡":
+                    tag.add("Evt_Sys_PoscLowStr");
+                    tag.add("Evt_Sys_PoscSyncStr");
+                    tag.add("Evt_Sys_PoscWideStr");
+                    break;
+                default:
+                    break;
+            }
+        });
+        return tag;
+    }
+
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DataController.java
index d116872..b4aeee7 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DataController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DataController.java
@@ -9,8 +9,8 @@ import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.EachModuleVO;
 import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.param.ItemParam;
 import com.njcn.csharmonic.pojo.vo.AppLineDetailVo;
-import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
 import com.njcn.csharmonic.service.IDataService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -38,9 +38,9 @@ public class DataController extends BaseController {
     @PostMapping("/realTimeData")
     @ApiOperation("设备监控-》准实时数据")
     @ApiImplicitParam(name = "param", value = "参数", required = true)
-    public HttpResult<List<RealTimeDataVo>> realTimeData(@RequestBody DataParam param) {
+    public HttpResult<List<AppLineDetailVo>> realTimeData(@RequestBody DataParam param) {
         String methodDescribe = getMethodDescribe("realTimeData");
-        List<RealTimeDataVo> list = dataService.getRealTimeData(param);
+        List<AppLineDetailVo> list = dataService.getRealTimeData(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
@@ -57,10 +57,10 @@ public class DataController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getEventByItem")
     @ApiOperation("方案数据-》根据测试项获取暂态事件")
-    @ApiImplicitParam(name = "id", value = "id", required = true)
-    public HttpResult<List<DataGroupEventVO>> getEventByItem(@RequestParam("id") String id) {
+    @ApiImplicitParam(name = "param", value = "param", required = true)
+    public HttpResult<List<DataGroupEventVO>> getEventByItem(@RequestBody ItemParam param) {
         String methodDescribe = getMethodDescribe("getEventByItem");
-        List<DataGroupEventVO> list = dataService.getEventByItem(id);
+        List<DataGroupEventVO> list = dataService.getEventByItem(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/PqSensitiveUserController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/PqSensitiveUserController.java
index 951bc93..7840574 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/PqSensitiveUserController.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/PqSensitiveUserController.java
@@ -11,6 +11,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csharmonic.pojo.param.PqSensitiveUserParam;
 import com.njcn.csharmonic.pojo.vo.PqSensitiveUserVo;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -137,5 +139,18 @@ public class PqSensitiveUserController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
     }
 
+    /**
+     * 治理用户与设备关系树
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getUserDevTree")
+    @ApiOperation("治理用户与设备关系树")
+    @ApiImplicitParam(name = "type", value = "治理类型")
+    public HttpResult<Map<String,List<CsEquipmentDeliveryPO>>> getUserDevTree(@RequestParam(name = "type") String type) {
+        String methodDescribe = getMethodDescribe("getUserDevTree");
+        Map<String,List<CsEquipmentDeliveryPO>> map = pqSensitiveUserService.getUserDevTree(type);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe);
+    }
+
 }
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index c378b77..619afa0 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -243,10 +243,40 @@
     select DISTINCT b.id id,
     b.device_id deviceId,b.line_id lineId,b.code code,
     b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,b.cl_did clDid
-    ,d.name lineName,b.advance_reason advanceReason,b.advance_type advanceType,b.sag_source sagSource
+    ,d.name lineName,b.advance_reason advanceReason,b.advance_type advanceType,b.sag_source sagSource,e.dev_type devType,b.severity severity,e.ndid nDid
     from  cs_event b
     left join  cs_line d on d.line_id=b.line_id
+    left join  cs_equipment_delivery e on b.device_id = e.id
     where 1=1
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.evtParamTmMin  != null and csEventUserQueryPage.evtParamTmMin !=''">
+      AND b.persist_time &gt; #{csEventUserQueryPage.evtParamTmMin}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.evtParamTmMax  != null and csEventUserQueryPage.evtParamTmMax !=''">
+      AND b.persist_time &lt; #{csEventUserQueryPage.evtParamTmMax}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.featureAmplitudeMin  != null and csEventUserQueryPage.featureAmplitudeMin !=''">
+      AND b.amplitude &gt; #{csEventUserQueryPage.featureAmplitudeMin}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.featureAmplitudeMax  != null and csEventUserQueryPage.featureAmplitudeMax !=''">
+      AND b.amplitude &lt; #{csEventUserQueryPage.featureAmplitudeMax}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.severityMin  != null and csEventUserQueryPage.severityMin !=''">
+      AND b.severity &gt; #{csEventUserQueryPage.severityMin}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.severityMax  != null and csEventUserQueryPage.severityMax !=''">
+      AND b.severity &lt; #{csEventUserQueryPage.severityMax}
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.searchValue  != null and csEventUserQueryPage.searchValue !=''">
+      AND d.name like concat('%',#{csEventUserQueryPage.searchValue},'%')
+    </if>
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.fileFlag != null">
+      <if test="csEventUserQueryPage!=null and csEventUserQueryPage.fileFlag == 0 ">
+        AND b.wave_path is null
+      </if>
+      <if test="csEventUserQueryPage!=null and csEventUserQueryPage.fileFlag == 1 ">
+        AND b.wave_path is not null
+      </if>
+    </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime  != null and csEventUserQueryPage.endTime !=''">
       AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})
     </if>
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java
index 44bcddc..99d933d 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java
@@ -3,10 +3,7 @@ package com.njcn.csharmonic.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
-import com.njcn.csharmonic.param.CldEventParam;
-import com.njcn.csharmonic.param.CsEventUserQueryPage;
-import com.njcn.csharmonic.param.CsEventUserQueryParam;
-import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.param.*;
 import com.njcn.csharmonic.pojo.param.EventStatisticParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.csharmonic.pojo.vo.CsEventVO;
@@ -57,7 +54,7 @@ public interface CsEventPOService extends IService<CsEventPO>{
 
     void getFileZip(String eventId,HttpServletResponse response);
 
-    List<DataGroupEventVO> queryEventList(LocalDateTime startDate, LocalDateTime endDate, String lineId);
+    List<DataGroupEventVO> queryEventList(ItemParam param, LocalDateTime startDate, LocalDateTime endDate, String lineId);
 
     List<CsEventPO> queryByModelId(DataParam param);
 
@@ -73,5 +70,4 @@ public interface CsEventPOService extends IService<CsEventPO>{
     List<CsEventPO> getEvents(List<String> idList);
 
     List<CsEventPO> getDevAlarmList(CsEventUserQueryParam param);
-
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IDataService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IDataService.java
index 27f326d..6443b73 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IDataService.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IDataService.java
@@ -4,6 +4,7 @@ import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csdevice.pojo.vo.EachModuleVO;
 import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.param.ItemParam;
 import com.njcn.csharmonic.pojo.vo.AppLineDetailVo;
 import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
 
@@ -19,7 +20,7 @@ public interface IDataService {
      * @param param
      * @return
      */
-    List<RealTimeDataVo> getRealTimeData(DataParam param);
+    List<AppLineDetailVo> getRealTimeData(DataParam param);
 
     /**
      * 获取监测点测试项信息
@@ -29,7 +30,7 @@ public interface IDataService {
     /**
      * 根据测试项id获取时间范围内的暂态事件
      */
-    List<DataGroupEventVO> getEventByItem(String id);
+    List<DataGroupEventVO> getEventByItem(ItemParam param);
 
     /**
      * 获取治理监测点下所有模块的事件数据
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IPqSensitiveUserService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IPqSensitiveUserService.java
index 09778a5..fecf1af 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IPqSensitiveUserService.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IPqSensitiveUserService.java
@@ -2,12 +2,14 @@ package com.njcn.csharmonic.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csharmonic.pojo.param.PqSensitiveUserParam;
 import com.njcn.csharmonic.pojo.vo.PqSensitiveUserVo;
 import com.njcn.device.biz.pojo.po.PqSensitiveUser;
 import com.njcn.web.pojo.param.BaseParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,4 +29,6 @@ public interface IPqSensitiveUserService extends IService<PqSensitiveUser> {
 
     boolean update(PqSensitiveUserParam.UpdatePqSensitiveUserParam pqSensitiveUserParam);
 
+    Map<String,List<CsEquipmentDeliveryPO>> getUserDevTree(String type);
+
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
index c1bc88c..3c46cb1 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
@@ -25,10 +25,7 @@ import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
 import com.njcn.csharmonic.enums.CsEventEnum;
 import com.njcn.csharmonic.enums.CsTransientEnum;
 import com.njcn.csharmonic.mapper.CsEventPOMapper;
-import com.njcn.csharmonic.param.CldEventParam;
-import com.njcn.csharmonic.param.CsEventUserQueryPage;
-import com.njcn.csharmonic.param.CsEventUserQueryParam;
-import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.param.*;
 import com.njcn.csharmonic.pojo.param.EventStatisticParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.csharmonic.pojo.vo.CsEventVO;
@@ -36,6 +33,7 @@ import com.njcn.csharmonic.pojo.vo.CsWarnDescVO;
 import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.csharmonic.service.CsEventPOService;
 import com.njcn.csharmonic.service.CsEventUserPOService;
+import com.njcn.csharmonic.utils.DataChangeUtil;
 import com.njcn.cssystem.api.MsgSendFeignClient;
 import com.njcn.cssystem.pojo.param.MsgSendParam;
 import com.njcn.event.common.mapper.WlRmpEventDetailMapper;
@@ -180,8 +178,37 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         }
 
         LambdaQueryWrapper<CsEventPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (!Objects.isNull(csEventUserQueryPage.getEvtParamTmMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getPersistTime,csEventUserQueryPage.getEvtParamTmMin());
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getEvtParamTmMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getPersistTime,csEventUserQueryPage.getEvtParamTmMax());
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getFeatureAmplitudeMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getAmplitude,csEventUserQueryPage.getFeatureAmplitudeMin());
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getFeatureAmplitudeMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getAmplitude,csEventUserQueryPage.getFeatureAmplitudeMax());
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getSeverityMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getSeverity,csEventUserQueryPage.getSeverityMin());
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getSeverityMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getSeverity,csEventUserQueryPage.getSeverityMax());
+        }
+        if (CollUtil.isNotEmpty(csEventUserQueryPage.getTarget())) {
+            List<String> tag = DataChangeUtil.getTag(csEventUserQueryPage.getTarget());
+            lambdaQueryWrapper.in(CsEventPO::getTag,tag);
+        }
+        if (!Objects.isNull(csEventUserQueryPage.getFileFlag()) && csEventUserQueryPage.getFileFlag() == 0) {
+            lambdaQueryWrapper.isNull(CsEventPO::getWavePath);
+        } else if (!Objects.isNull(csEventUserQueryPage.getFileFlag()) && csEventUserQueryPage.getFileFlag() == 1) {
+            lambdaQueryWrapper.isNotNull(CsEventPO::getWavePath);
+        }
+
         lambdaQueryWrapper.eq(CsEventPO::getLineId,csEventUserQueryPage.getLineId())
-                .eq(CsEventPO::getType,0).between(CsEventPO::getStartTime,begin,end)
+                .eq(CsEventPO::getType,0)
+                .between(CsEventPO::getStartTime,begin,end)
                 .orderByDesc(CsEventPO::getStartTime);
         Page<CsEventPO> page = this.page(new Page<>(csEventUserQueryPage.getPageNum(),csEventUserQueryPage.getPageSize()),lambdaQueryWrapper);
         if(CollUtil.isNotEmpty(page.getRecords())){
@@ -247,9 +274,9 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
             dataGroupEventVOList.forEach(item->{
                 item.setLineName(linePOMap.getOrDefault(item.getLineId(),"/"));
                 if(CsTransientEnum.EVT_SYS_SWLSTR.getCode().equals(item.getTag())){
-                    item.setSeverity("/");
+                    item.setSeverity(null);
                 }else {
-                    item.setSeverity(getYzd(item.getPersistTime()*1000,item.getAmplitude()/100.0));
+                    item.setSeverity(Double.valueOf(getYzd(item.getPersistTime()*1000,item.getAmplitude()/100.0)));
                 }
                 item.setTag(CsTransientEnum.getNameByCode(item.getTag()));
                 item.setPersistTime(BigDecimal.valueOf(item.getPersistTime()).setScale(3, RoundingMode.HALF_UP).doubleValue());
@@ -332,9 +359,38 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
     }
 
     @Override
-    public List<DataGroupEventVO> queryEventList(LocalDateTime startDate, LocalDateTime endDate, String lineId) {
+    public List<DataGroupEventVO> queryEventList(ItemParam param, LocalDateTime startDate, LocalDateTime endDate, String lineId) {
         List<DataGroupEventVO> dataGroupEventVOList = new ArrayList<>();
         LambdaQueryWrapper<CsEventPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+        if (!Objects.isNull(param.getEvtParamTmMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getPersistTime,param.getEvtParamTmMin());
+        }
+        if (!Objects.isNull(param.getEvtParamTmMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getPersistTime,param.getEvtParamTmMax());
+        }
+        if (!Objects.isNull(param.getFeatureAmplitudeMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getAmplitude,param.getFeatureAmplitudeMin());
+        }
+        if (!Objects.isNull(param.getFeatureAmplitudeMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getAmplitude,param.getFeatureAmplitudeMax());
+        }
+        if (!Objects.isNull(param.getSeverityMin())) {
+            lambdaQueryWrapper.gt(CsEventPO::getSeverity,param.getSeverityMin());
+        }
+        if (!Objects.isNull(param.getSeverityMax())) {
+            lambdaQueryWrapper.lt(CsEventPO::getSeverity,param.getSeverityMax());
+        }
+        if (CollUtil.isNotEmpty(param.getTarget())) {
+            List<String> tag = DataChangeUtil.getTag(param.getTarget());
+            lambdaQueryWrapper.in(CsEventPO::getTag,tag);
+        }
+        if (!Objects.isNull(param.getFileFlag()) && param.getFileFlag() == 0) {
+            lambdaQueryWrapper.isNull(CsEventPO::getWavePath);
+        } else if (!Objects.isNull(param.getFileFlag()) && param.getFileFlag() == 1) {
+            lambdaQueryWrapper.isNotNull(CsEventPO::getWavePath);
+        }
+
         lambdaQueryWrapper.eq(CsEventPO::getLineId,lineId)
                 .eq(CsEventPO::getType,0).between(CsEventPO::getStartTime,startDate,endDate)
                 .orderByDesc(CsEventPO::getStartTime);
@@ -397,6 +453,12 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
             eventPo.setPhase(param.getPhase());
             String dropZone = eventAnalysisService.determineDropZone(String.valueOf(param.getAmplitude() * 100),String.valueOf(param.getDuration()));
             eventPo.setLandPoint(dropZone);
+            if (param.getEventType() == 1) {
+                if (!Objects.isNull(param.getDuration()) && !Objects.isNull(param.getAmplitude())) {
+                    eventPo.setSeverity(Double.valueOf(getYzd(param.getDuration()*1000,param.getAmplitude())));
+                }
+            }
+
             this.baseMapper.insert(eventPo);
             //influxDB数据录入
             List<String> records = new ArrayList<String>();
@@ -414,7 +476,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
                 influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, records);
             }
             //同步数据到 r_mp_event_detail
-            insertEvent(uuid, param, time);
+            insertEvent(uuid, param, time, eventPo.getSeverity());
 
             //获取台账信息
             DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(po.getDeviceId()).getData();
@@ -507,7 +569,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         return result;
     }
 
-    public void insertEvent(String uuid, CldEventParam param, LocalDateTime time) {
+    public void insertEvent(String uuid, CldEventParam param, LocalDateTime time, Double severity) {
         RmpEventDetailPO rmpEventDetailPO = new RmpEventDetailPO();
         rmpEventDetailPO.setEventId(uuid);
         rmpEventDetailPO.setMeasurementPointId(param.getMonitorId());
@@ -519,6 +581,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         rmpEventDetailPO.setPhase(param.getPhase());
         rmpEventDetailPO.setDealFlag(0);
         rmpEventDetailPO.setFileFlag(0);
+        rmpEventDetailPO.setSeverity(severity);
         wlRmpEventDetailMapper.insert(rmpEventDetailPO);
     }
 
@@ -588,6 +651,29 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
         return this.list(wrapper);
     }
 
+    /**
+     * 获取该事件的严重度
+     *
+     * @param persisttime 持续时间 ms单位
+     * @param eventvaule  暂降、暂升幅值
+     */
+    public static String getYzd(Float persisttime, Float eventvaule) {
+        float yzd;
+        DecimalFormat df = new DecimalFormat("0.000");// 格式化小数
+        if (persisttime <= 20) {
+            yzd = 1 - eventvaule;
+        } else if (persisttime > 20 && persisttime <= 200) {
+            yzd = 2 * (1 - eventvaule);
+        } else if (persisttime > 200 && persisttime <= 500) {
+            yzd = 3.3f * (1 - eventvaule);
+        } else if (persisttime > 500 && persisttime <= 10000) {
+            yzd = 5 * (1 - eventvaule);
+        } else {
+            yzd = 10 * (1 - eventvaule);
+        }
+        return df.format(yzd);
+    }
+
     public String getTag(Integer type) {
         String tag;
         switch (type) {
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 1315785..acdaa2d 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -10,11 +10,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.constant.LogInfo;
-import com.njcn.csdevice.api.CsCommTerminalFeignClient;
-import com.njcn.csdevice.api.CsDeviceUserFeignClient;
-import com.njcn.csdevice.api.CsLedgerFeignClient;
-import com.njcn.csdevice.api.NodeFeignClient;
+import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.constant.DataParam;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.Node;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
@@ -29,6 +27,7 @@ import com.njcn.csharmonic.pojo.po.CsEventUserPO;
 import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
 import com.njcn.csharmonic.service.CsEventUserPOService;
+import com.njcn.csharmonic.utils.DataChangeUtil;
 import com.njcn.influx.pojo.dto.EventDataSetDTO;
 import com.njcn.influx.service.EvtDataService;
 import com.njcn.system.api.DicDataFeignClient;
@@ -46,8 +45,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -74,6 +71,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
     private final NodeFeignClient nodeFeignClient;
     private final CsDeviceUserFeignClient csDeviceUserFeignClient;
     private final CsCommTerminalFeignClient csCommTerminalFeignClient;
+    private final CsLineFeignClient csLineFeignClient;
 
     @Override
     public Integer queryEventCount(CsEventUserQueryParam csEventUserQueryParam) {
@@ -439,6 +437,17 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         if (CollectionUtils.isEmpty(devIds)){
             return returnpage;
         }
+        //获取tag
+        if (Objects.equals(csEventUserQueryPage.getType(), "0")) {
+            if (CollUtil.isNotEmpty(csEventUserQueryPage.getTarget())) {
+                List<String> tag = DataChangeUtil.getTag(csEventUserQueryPage.getTarget());
+                csEventUserQueryPage.setTarget(tag);
+            }
+        }
+
+        //获取监测点电压等级
+        List<CsLineDTO> list = csLineFeignClient.getAllLineDetail().getData();
+        Map<String, CsLineDTO> map = list.stream().collect(Collectors.toMap(CsLineDTO::getLineId, temp -> temp));
         returnpage  = this.getBaseMapper().queryEventPageWeb(returnpage,csEventUserQueryPage,devIds);
         returnpage.getRecords().forEach(temp->{
             DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
@@ -447,6 +456,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
             temp.setProjectName(devDetail.getProjectName());
             temp.setEngineeringid(devDetail.getEngineeringid());
             temp.setEngineeringName(devDetail.getEngineeringName());
+            if (ObjectUtil.isNotNull(temp.getLineId())) {
+                temp.setLineVoltage(map.get(temp.getLineId()).getVolGrade());
+            }
             EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
             if (Objects.isNull(ele)) {
                 temp.setShowName(temp.getTag());
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
index 8a2805f..14cfedd 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
@@ -28,15 +28,12 @@ import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csdevice.utils.DataChangeUtil;
 import com.njcn.csdevice.utils.ReflectUtils;
 import com.njcn.csharmonic.constant.HarmonicConstant;
-import com.njcn.csharmonic.mapper.CsDataSetMapper;
 import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.param.ItemParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.csharmonic.pojo.vo.AppLineDetailVo;
-import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
 import com.njcn.csharmonic.service.CsEventPOService;
 import com.njcn.csharmonic.service.IDataService;
-import com.njcn.csharmonic.util.InfluxDbParamUtil;
-import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.imapper.*;
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.dto.EventDataSetDTO;
@@ -50,22 +47,22 @@ import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.*;
 import com.njcn.system.pojo.po.*;
-import com.njcn.system.pojo.vo.DictTreeVO;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 类的介绍：
@@ -81,9 +78,7 @@ public class DataServiceImpl implements IDataService {
     private final CommonService commonService;
     private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
     private final DictTreeFeignClient dictTreeFeignClient;
-    private final InfluxDbParamUtil influxDbParamUtil;
     private final CsLineFeignClient csLineFeignClient;
-    private final CsDataSetMapper csDataSetMapper;
     private final WlRecordFeignClient wlRecordFeignClient;
     private final CsEventPOService csEventPOService;
     private final DecimalFormat df = new DecimalFormat("#0.00");
@@ -128,39 +123,822 @@ public class DataServiceImpl implements IDataService {
     private final DataSetFeignClient dataSetFeignClient;
 
     @Override
-    public List<RealTimeDataVo> getRealTimeData(DataParam param) {
-        List<RealTimeDataVo> result = new ArrayList<>();
-        //获取监测点使用的数据集
-        List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Collections.singletonList(param.getLineId())).getData();
-        CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
-        Double ct = finalCsLinePOList.get(0).getCtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getCt2Ratio())?1.0:finalCsLinePOList.get(0).getCt2Ratio());
-        Double pt = finalCsLinePOList.get(0).getPtRatio() / (Objects.isNull(finalCsLinePOList.get(0).getPt2Ratio())?1.0:finalCsLinePOList.get(0).getPt2Ratio());
-        //根据类型id获取指标分组
-        List<DictTreeVO> dictTreeVOList = dictTreeFeignClient.query(param.getTargetType()).getData();
-        if (CollUtil.isNotEmpty(dictTreeVOList)) {
-            dictTreeVOList = dictTreeVOList.stream().sorted(Comparator.comparing(DictTreeVO::getSort)).collect(Collectors.toList());
-            //根据分组获取对应指标
-            List<RealTimeDataVo> finalResult = result;
-            dictTreeVOList.forEach(item->{
-                List<EleEpdPqd> epdPqdList = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(item.getId())).getData();
-                epdPqdList.forEach(item2->{
-                    if (Objects.isNull(item2.getHarmStart())) {
-                        RealTimeDataVo vo = getBaseData(item2,param.getLineId(),param.getDataLevel(),csDataSet.getDataLevel(),pt,ct);
-                        if (Objects.nonNull(vo)) {
-                            finalResult.add(vo);
+    public List<AppLineDetailVo> getRealTimeData(DataParam param) {
+        List<AppLineDetailVo> result = new ArrayList<>();
+        List<DataV> data1 = new ArrayList<>();
+        List<DataI> data2 = new ArrayList<>();
+        List<DataFlicker> data3 = new ArrayList<>();
+        List<DataFluc> data4 = new ArrayList<>();
+        List<DataHarmPhasicV> data5 = new ArrayList<>();
+        List<DataHarmPhasicI> data6 = new ArrayList<>();
+        List<DataHarmPowerP> data7 = new ArrayList<>();
+        List<DataHarmPowerQ> data8 = new ArrayList<>();
+        List<DataHarmPowerS> data9 = new ArrayList<>();
+        List<DataHarmRateV> data10 = new ArrayList<>();
+        List<DataHarmRateI> data11 = new ArrayList<>();
+        List<DataInHarmV> data12 = new ArrayList<>();
+        List<DataPlt> data13 = new ArrayList<>();
+        List<ApfData> data14 = new ArrayList<>();
+
+        List<CsLinePO> linePo = csLineFeignClient.queryLineById(Collections.singletonList(param.getLineId())).getData();
+        Double ct = linePo.get(0).getCtRatio() / (Objects.isNull(linePo.get(0).getCt2Ratio())?1.0:linePo.get(0).getCt2Ratio());
+        Double pt = linePo.get(0).getPtRatio() / (Objects.isNull(linePo.get(0).getPt2Ratio())?1.0:linePo.get(0).getPt2Ratio());
+        Map<String,CsLinePO> lineMap = linePo.stream().collect(Collectors.toMap(CsLinePO::getLineId, item->item));
+        //拆分治理监测点 、 监测监测点
+        List<CsLinePO> line1 = linePo.stream().filter(item->item.getClDid()==0).collect(Collectors.toList());
+        List<CsLinePO> line2 = linePo.stream().filter(item->item.getClDid()!=0).collect(Collectors.toList());
+        List<String> lineList2 = line2.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
+        List<List<String>> partitions = Lists.partition(lineList2, 95);
+
+        //表集合
+        List<DictData> dataList = dicDataFeignClient.getDicDataByTypeCode("Data").getData();
+        Map<String, DictData> map = dataList.stream().collect(Collectors.toMap(DictData::getId, v -> v));
+        //获取需要查询的指标
+        SysDicTreePO po = dictTreeFeignClient.queryById(param.getTargetType()).getData();
+        List<SysDicTreePO> list = dictTreeFeignClient.queryByCodeList(po.getCode()).getData();
+        List<SysDicTreePO> children = list.get(0).getChildren();
+        children.sort(Comparator.comparing(SysDicTreePO::getSort));
+        List<String> idList = children.stream().map(SysDicTreePO::getId).collect(Collectors.toList());
+        List<EleEpdPqd> epdPqdList = csStatisticalSetFeignClient.queryStatisticalSelect(idList).getData();
+        Map<String,List<EleEpdPqd>> epdPqdMap = epdPqdList.stream().collect(Collectors.groupingBy(EleEpdPqd::getClassId));
+        Map<String,EleEpdPqd> epdPqdMap2 = epdPqdList.stream().collect(Collectors.toMap(EleEpdPqd::getId, v -> v));
+        //获取监测点的数据集，转换一二次值
+        List<String> dataSetIdList = linePo.stream().map(CsLinePO::getDataSetId).distinct().collect(Collectors.toList());
+        List<CsDataSet> csDataSetList = dataSetFeignClient.getDataSetBySetIds(dataSetIdList).getData();
+        Map<String,CsDataSet> csDataSetMap = csDataSetList.stream().collect(Collectors.toMap(CsDataSet::getId, v -> v));
+        //获取指标名称和对应的指标集合
+        List<CsStatisticalSetPO> csStatisticalSetPOList = csStatisticalSetFeignClient.queryStatisticalById(idList).getData();
+        Map<String,List<CsStatisticalSetPO>> csStatisticalSetPOMap = csStatisticalSetPOList.stream().collect(Collectors.groupingBy(CsStatisticalSetPO::getStatisicalId));
+
+        epdPqdMap.forEach((k,v) ->{
+            if (Objects.equals(map.get(k).getName(), "data_v")) {
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
                         }
-                    } else if (Objects.equals(item2.getHarmStart(),2)) {
-                        List<RealTimeDataVo> harmList = getHarmData(item2,param.getLineId(),param.getDataLevel(),csDataSet.getDataLevel(),pt,ct);
-                        finalResult.addAll(harmList);
-                    } else if (Objects.equals(item2.getHarmStart(),1)) {
-                        List<RealTimeDataVo> inuharmList = getInuHarmData(item2,param.getLineId(),param.getDataLevel(),csDataSet.getDataLevel(),pt,ct);
-                        finalResult.addAll(inuharmList);
+                    });
+                    influxQueryWrapper.regular(DataV::getLineId, l)
+                            .eq(DataV::getValueType,"AVG")
+                            .groupBy(DataV::getPhaseType)
+                            .groupBy(DataV::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataV> dataV = dataVMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data1.addAll(dataV);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_i")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataI::getLineId, l)
+                            .eq(DataI::getValueType,"AVG")
+                            .groupBy(DataI::getPhaseType)
+                            .groupBy(DataI::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataI> dataI = dataIMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data2.addAll(dataI);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_flicker")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class);
+                    v.stream().map(EleEpdPqd::getOtherName).distinct().forEach(otherName -> influxQueryWrapper.select(otherName, otherName));
+                    influxQueryWrapper.regular(DataFlicker::getLineId, l)
+                            .eq(DataFlicker::getValueType,"AVG")
+                            .groupBy(DataFlicker::getPhaseType)
+                            .groupBy(DataFlicker::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataFlicker> dataFlicker = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data3.addAll(dataFlicker);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_fluc")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFluc.class);
+                    v.stream().map(EleEpdPqd::getOtherName).distinct().forEach(otherName -> influxQueryWrapper.select(otherName, otherName));
+                    influxQueryWrapper.regular(DataFluc::getLineId, l)
+                            .eq(DataFluc::getValueType,"AVG")
+                            .groupBy(DataFluc::getPhaseType)
+                            .groupBy(DataFluc::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataFluc> dataFluc = dataFlucMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data4.addAll(dataFluc);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmphasic_v")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPhasicV.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmPhasicV::getLineId, l)
+                            .eq(DataHarmPhasicV::getValueType,"AVG")
+                            .groupBy(DataHarmPhasicV::getPhaseType)
+                            .groupBy(DataHarmPhasicV::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmPhasicV> dataHarmPhasicV = dataHarmPhasicVMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data5.addAll(dataHarmPhasicV);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmphasic_i")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPhasicI.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmPhasicI::getLineId, l)
+                            .eq(DataHarmPhasicI::getValueType,"AVG")
+                            .groupBy(DataHarmPhasicI::getPhaseType)
+                            .groupBy(DataHarmPhasicI::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmPhasicI> dataHarmPhasicI = dataHarmPhasicIMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data6.addAll(dataHarmPhasicI);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmpower_p")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerP.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmPowerP::getLineId, l)
+                            .eq(DataHarmPowerP::getValueType,"AVG")
+                            .groupBy(DataHarmPowerP::getPhaseType)
+                            .groupBy(DataHarmPowerP::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmPowerP> dataHarmPowerP = dataHarmPowerPMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data7.addAll(dataHarmPowerP);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmpower_q")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerQ.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmPowerQ::getLineId, l)
+                            .eq(DataHarmPowerQ::getValueType,"AVG")
+                            .groupBy(DataHarmPowerQ::getPhaseType)
+                            .groupBy(DataHarmPowerQ::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmPowerQ> dataHarmPowerQ = dataHarmPowerQMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data8.addAll(dataHarmPowerQ);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmpower_s")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerS.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmPowerS::getLineId, l)
+                            .eq(DataHarmPowerS::getValueType,"AVG")
+                            .groupBy(DataHarmPowerS::getPhaseType)
+                            .groupBy(DataHarmPowerS::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmPowerS> dataHarmPowerS = dataHarmPowerSMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data9.addAll(dataHarmPowerS);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmrate_v")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmRateV::getLineId, l)
+                            .eq(DataHarmRateV::getValueType,"AVG")
+                            .groupBy(DataHarmRateV::getPhaseType)
+                            .groupBy(DataHarmRateV::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmRateV> dataHarmRateV = dataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data10.addAll(dataHarmRateV);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_harmrate_i")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateI.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataHarmRateI::getLineId, l)
+                            .eq(DataHarmRateI::getValueType,"AVG")
+                            .groupBy(DataHarmRateI::getPhaseType)
+                            .groupBy(DataHarmRateI::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataHarmRateI> DataHarmRateI = dataHarmRateIMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data11.addAll(DataHarmRateI);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_inharm_v")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInHarmV.class);
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
+                    influxQueryWrapper.regular(DataInHarmV::getLineId, l)
+                            .eq(DataInHarmV::getValueType,"AVG")
+                            .groupBy(DataInHarmV::getPhaseType)
+                            .groupBy(DataInHarmV::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataInHarmV> dataInHarmV = dataInHarmVMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data12.addAll(dataInHarmV);
+                });
+            } else if (Objects.equals(map.get(k).getName(), "data_plt")){
+                partitions.forEach(l -> {
+                    InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class);
+                    v.stream().map(EleEpdPqd::getOtherName).distinct().forEach(otherName -> influxQueryWrapper.select(otherName, otherName));
+                    influxQueryWrapper.regular(DataPlt::getLineId, l)
+                            .eq(DataPlt::getValueType,"AVG")
+                            .groupBy(DataPlt::getPhaseType)
+                            .groupBy(DataPlt::getLineId)
+                            .timeDesc().limit(1);
+                    List<DataPlt> dataPlt = dataPltMapper.selectByQueryWrapper(influxQueryWrapper);
+                    data13.addAll(dataPlt);
+                });
+            }
+        });
+        //监测点第一层
+        line2.forEach(item->{
+            AppLineDetailVo vo = new AppLineDetailVo();
+            vo.setLineType(1);
+            vo.setPointId(item.getLineId());
+            vo.setPointName(lineMap.get(item.getLineId()).getName());
+            List<AppLineDetailVo.targetDetail> children2 = new ArrayList<>();
+            //指标第二层
+            List<AppLineDetailVo.targetDetail> finalChildren = children2;
+            children.forEach(item3->{
+                List<CsStatisticalSetPO> l1 = csStatisticalSetPOMap.get(item3.getId());
+                if (CollUtil.isEmpty(l1)) {
+                    return;
+                }
+                l1.forEach(item1 -> {
+                    EleEpdPqd epdPqd = epdPqdMap2.get(item1.getTargetId());
+                    AppLineDetailVo.targetDetail targetDetail = new AppLineDetailVo.targetDetail();
+                    targetDetail.setTargetId(item3.getId());
+                    targetDetail.setName(item3.getName());
+                    targetDetail.setPhase(epdPqd.getPhase());
+                    targetDetail.setUnit(epdPqd.getUnit());
+                    targetDetail.setSort(item3.getSort());
+                    targetDetail.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                    if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_v")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataV matchedDataV = data1.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataV matchedDataV = data1.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_i")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataI matchedDataV = data2.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataI matchedDataV = data2.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_flicker")) {
+                        //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                        String otherName = epdPqd.getOtherName();
+                        DataFlicker matchedDataV = data3.stream()
+                                .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                        && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                .findFirst()
+                                .orElse(null);
+                        if (matchedDataV != null) {
+                            Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                            if (value instanceof Number) {
+                                targetDetail.setData(((Number) value).doubleValue());
+                            }
+                            vo.setDataTime(matchedDataV.getTime());
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_fluc")) {
+                        //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                        String otherName = epdPqd.getOtherName();
+                        DataFluc matchedDataV = data4.stream()
+                                .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                        && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                .findFirst()
+                                .orElse(null);
+                        if (matchedDataV != null) {
+                            Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                            if (value instanceof Number) {
+                                targetDetail.setData(((Number) value).doubleValue());
+                            }
+                            vo.setDataTime(matchedDataV.getTime());
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmphasic_v")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmPhasicV matchedDataV = data5.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmPhasicV matchedDataV = data5.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmphasic_i")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmPhasicI matchedDataV = data6.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmPhasicI matchedDataV = data6.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmpower_p")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmPowerP matchedDataV = data7.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmPowerP matchedDataV = data7.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmpower_q")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmPowerQ matchedDataV = data8.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmPowerQ matchedDataV = data8.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmpower_s")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmPowerS matchedDataV = data9.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmPowerS matchedDataV = data9.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmrate_v")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmRateV matchedDataV = data10.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmRateV matchedDataV = data10.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_harmrate_i")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataHarmRateI matchedDataV = data11.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataHarmRateI matchedDataV = data11.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_inharm_v")) {
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                DataInHarmV matchedDataV = data12.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName((i-0.5) + "次" + item3.getName());
+                                finalChildren.add(t1);
+                            }
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            DataInHarmV matchedDataV = data12.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
+                            }
+                        }
+                    } else if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "data_plt")) {
+                        //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                        String otherName = epdPqd.getOtherName();
+                        DataPlt matchedDataV = data13.stream()
+                                .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                        && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                .findFirst()
+                                .orElse(null);
+                        if (matchedDataV != null) {
+                            Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                            if (value instanceof Number) {
+                                targetDetail.setData(((Number) value).doubleValue());
+                            }
+                            vo.setDataTime(matchedDataV.getTime());
+                        }
+                    }
+                    if (Objects.isNull(epdPqd.getHarmStart()) && Objects.isNull(epdPqd.getHarmEnd())) {
+                        finalChildren.add(targetDetail);
                     }
                 });
             });
+            // 根据接线方式处理相别
+            chanelPhase(lineMap, item, finalChildren, children2);
+            // 处理一二次值
+            String dataLevel = csDataSetMap.get(lineMap.get(item.getLineId()).getDataSetId()).getDataLevel();
+            chanelData(children2,param.getDataLevel(),dataLevel,pt,ct);
+            if (CollUtil.isNotEmpty(children2)) {
+                children2.sort(Comparator.comparingInt(AppLineDetailVo.targetDetail::getSort));
+                children2.forEach(item2->{
+                    if (Objects.isNull(item2.getData())) {
+                        item2.setData(3.15159);
+                    }
+                    if (!Objects.equals(item2.getData(),3.14159)) {
+                        item2.setData(BigDecimal.valueOf(item2.getData()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                    }
+                });
+            }
+            vo.setChildren(children2);
+            result.add(vo);
+        });
+        if (CollectionUtil.isNotEmpty(line1)) {
+            List<AppLineDetailVo> zhiLiLineData = getZhiLiLineData(line1,data14, map, null, lineMap, csDataSetMap, null, param.getTargetType(), param.getDataLevel());
+            result.addAll(zhiLiLineData);
         }
         if (CollUtil.isNotEmpty(result)) {
-            result = channelData(result);
+            result.sort(Comparator.comparing(AppLineDetailVo::getProjectName)
+                    .thenComparing(AppLineDetailVo::getDeviceName)
+                    .thenComparing(AppLineDetailVo::getPointId));
         }
         return result;
     }
@@ -194,25 +972,38 @@ public class DataServiceImpl implements IDataService {
     }
 
     @Override
-    public List<DataGroupEventVO> getEventByItem(String id) {
+    public List<DataGroupEventVO> getEventByItem(ItemParam param) {
         List<DataGroupEventVO> result = new ArrayList<>();
-        List<WlRecord> list = wlRecordFeignClient.getWlAssByWlId(id).getData();
+        List<WlRecord> list = wlRecordFeignClient.getWlAssByWlId(param.getId()).getData();
         if (CollUtil.isNotEmpty(list)) {
-            list.forEach(item->{
-                List<DataGroupEventVO> eventList = csEventPOService.queryEventList(item.getStartTime(),item.getEndTime(),item.getLineId());
-                result.addAll(eventList);
+            Map<String, List<WlRecord>> map = list.stream().filter(record -> record.getLineId() != null).collect(Collectors.groupingBy(WlRecord::getLineId));
+            map.forEach((k,v)->{
+                LocalDateTime globalMin = v.stream()
+                        .flatMap(record -> Stream.of(record.getStartTime(), record.getEndTime()))
+                        .min(Comparator.naturalOrder())
+                        .orElse(null);
+                LocalDateTime globalMax = v.stream()
+                        .flatMap(record -> Stream.of(record.getStartTime(), record.getEndTime()))
+                        .max(Comparator.naturalOrder())
+                        .orElse(null);
+                if (!Objects.isNull(globalMin) && !Objects.isNull(globalMax)) {
+                    List<DataGroupEventVO> eventList = csEventPOService.queryEventList(param,globalMin,globalMax,k);
+                    result.addAll(eventList);
+                }
             });
         }
         if (CollUtil.isNotEmpty(result)) {
+            List<String> lineList = result.stream().map(DataGroupEventVO::getLineId).distinct().collect(Collectors.toList());
+            List<String> devList = result.stream().map(DataGroupEventVO::getDeviceId).distinct().collect(Collectors.toList());
+            List<CsLinePO> linePoList = csLineFeignClient.queryLineById(lineList).getData();
+            Map<String, CsLinePO> lineMap = linePoList.stream().collect(Collectors.toMap(CsLinePO::getLineId, item -> item));
+            List<CsEquipmentDeliveryDTO> devDtoList = equipmentFeignClient.queryDeviceById(devList).getData();
+            Map<String, CsEquipmentDeliveryDTO> devMap = devDtoList.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, item -> item));
             result.forEach(temp->{
-                String lineName = csLineFeignClient.getById(temp.getLineId()).getData().getName();
-                temp.setLineName(lineName);
-                List<CsEquipmentDeliveryDTO> dto = equipmentFeignClient.queryDeviceById(Collections.singletonList(temp.getDeviceId())).getData();
-                if (CollUtil.isNotEmpty(dto)) {
-                    String devName = dto.get(0).getName();
-                    temp.setDevName(devName);
-                }
-
+                temp.setLineName(lineMap.get(temp.getLineId()).getName());
+                temp.setLineVoltage(lineMap.get(temp.getLineId()).getVolGrade());
+                temp.setDevName(devMap.get(temp.getDeviceId()).getName());
+                temp.setNDid(devMap.get(temp.getDeviceId()).getNdid());
                 EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
                 if(ele!=null){
                     temp.setShowName(ele.getShowName());
@@ -945,7 +1736,7 @@ public class DataServiceImpl implements IDataService {
                 result.add(vo);
             });
             if (CollectionUtil.isNotEmpty(line1)) {
-                List<AppLineDetailVo> zhiLiLineData = getZhiLiLineData(line1,data14, map, data, lineMap, csDataSetMap);
+                List<AppLineDetailVo> zhiLiLineData = getZhiLiLineData(line1,data14, map, data, lineMap, csDataSetMap, "Key_Power_Quality_Pq_Com", null, "Primary");
                 result.addAll(zhiLiLineData);
             }
         }
@@ -961,8 +1752,11 @@ public class DataServiceImpl implements IDataService {
         // 根据接线方式处理相别
         Integer conType = lineMap.get(item.getLineId()).getConType();
         if (conType != null && conType == 0) {
-            // 星型接线: 保留A/B/C/T，去除AB/BC/CA
-            finalChildren.removeIf(d -> "AB".equals(d.getPhase()) || "BC".equals(d.getPhase()) || "CA".equals(d.getPhase()));
+            // 星型接线: 保留A/B/C/T，去除AB/BC/CA 除了 线电压总有效值 外
+            finalChildren.removeIf(d ->
+                    ("AB".equals(d.getPhase()) || "BC".equals(d.getPhase()) || "CA".equals(d.getPhase()))
+                            && !Objects.equals(d.getName(), "线电压总有效值")
+            );
         } else if (conType != null) {
             // 角型/V型接线: A/B/C数据用AB/BC/CA替换，然后去除AB/BC/CA
             Map<String, List<AppLineDetailVo.targetDetail>> groupByTargetId = finalChildren.stream()
@@ -1002,13 +1796,88 @@ public class DataServiceImpl implements IDataService {
         }
     }
 
+    public void chanelData(List<AppLineDetailVo.targetDetail> finalChildren, String dataLevel1, String dataLevel2, Double pt, Double ct) {
+        finalChildren.forEach(item->{
+            Double re;
+            String unit = item.getUnit();
+
+            if (Objects.equals("Primary",dataLevel1)) {
+                if (Objects.equals("Primary",dataLevel2)) {
+                    if (HarmonicConstant.POWER_LIST.contains(item.getName())) {
+                        re = Objects.isNull(item.getData()) ? 3.14159 : Double.parseDouble(df.format(item.getData() / 1000));
+                        item.setData(re);
+                        unit = "k" + item.getUnit();
+                    } else {
+                        item.setData(Objects.isNull(item.getData()) ? 3.14159 : Double.parseDouble(df.format(item.getData())));
+                        unit = item.getUnit();
+                    }
+                } else {
+                    if(Objects.nonNull(item.getPrimaryFormula())){
+                        switch (item.getPrimaryFormula()) {
+                            case "*PT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() * pt / 1000;
+                                unit = "k" + item.getUnit();
+                                break;
+                            case "*CT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() * ct;
+                                unit = item.getUnit();
+                                break;
+                            case "*PT*CT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() * pt * ct / 1000;
+                                unit = "k" + item.getUnit();
+                                break;
+                            default:
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData();
+                                unit = item.getUnit();
+                                break;
+                        }
+                        item.setData(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
+                    }else {
+                        item.setData(Objects.isNull(item.getData()) ? 3.14159 : Double.parseDouble(df.format(item.getData())));
+                    }
+                }
+            } else {
+                if (Objects.equals("Primary",dataLevel2)) {
+                    if(Objects.nonNull(item.getPrimaryFormula())) {
+                        switch (item.getPrimaryFormula()) {
+                            case "*PT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() / pt;
+                                break;
+                            case "*CT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() / ct;
+                                break;
+                            case "*PT*CT":
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData() / pt / ct * 1000;
+                                break;
+                            default:
+                                re = Objects.isNull(item.getData()) ? 3.14159 : item.getData();
+                                break;
+                        }
+                        item.setData(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
+                    }else {
+                        if (Objects.nonNull(item.getData())) {
+                            re = item.getData();
+                            item.setData(Double.valueOf(df.format(re)));
+                        }
+                    }
+                } else {
+                    item.setData(Objects.isNull(item.getData()) ? 3.14159 : Double.parseDouble(df.format(item.getData())));
+                }
+            }
+            item.setUnit(unit);
+        });
+    }
+
     //处理治理监测点
     public List<AppLineDetailVo> getZhiLiLineData(List<CsLinePO> poList
             ,List<ApfData> data14
             , Map<String, DictData> map
             ,  List<DevDetailDTO> data
             , Map<String,CsLinePO> lineMap
-            , Map<String,CsDataSet> csDataSetMap) {
+            , Map<String,CsDataSet> csDataSetMap
+            , String code
+            , String codeId
+            , String dataLevel1) {
         List<AppLineDetailVo> result = new ArrayList<>();
         if (CollUtil.isEmpty(poList)) {
             return result;
@@ -1016,7 +1885,13 @@ public class DataServiceImpl implements IDataService {
         List<String> lineList = poList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
         List<List<String>> partitions = Lists.partition(lineList, 95);
         //获取需要查询的指标
-        List<SysDicTreePO> list = dictTreeFeignClient.queryByCodeList("Key_Power_Quality_Pq_Com").getData();
+        List<SysDicTreePO> list;
+        if (Objects.isNull(codeId)) {
+            list = dictTreeFeignClient.queryByCodeList(code).getData();
+        } else {
+            SysDicTreePO po = dictTreeFeignClient.queryById(codeId).getData();
+            list = dictTreeFeignClient.queryByCodeList(po.getCode()).getData();
+        }
         List<SysDicTreePO> children = list.get(0).getChildren();
         children.sort(Comparator.comparing(SysDicTreePO::getSort));
         List<String> idList = children.stream().map(SysDicTreePO::getId).collect(Collectors.toList());
@@ -1031,9 +1906,18 @@ public class DataServiceImpl implements IDataService {
             if (Objects.equals(map.get(k).getName(), "apf_data")) {
                 partitions.forEach(l -> {
                     InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(ApfData.class);
-                    v.stream().map(EleEpdPqd::getOtherName).distinct().forEach(otherName -> influxQueryWrapper.select(otherName, otherName));
+                    v.forEach(item->{
+                        if (!Objects.isNull(item.getHarmStart()) && !Objects.isNull(item.getHarmEnd())) {
+                            for (int i = item.getHarmStart(); i <= item.getHarmEnd(); i++) {
+                                influxQueryWrapper.select(item.getOtherName() + "_" + i,item.getOtherName() + "_" + i);
+                            }
+                        } else{
+                            influxQueryWrapper.select(item.getOtherName(),item.getOtherName());
+                        }
+                    });
                     influxQueryWrapper.regular(ApfData::getLineId, l)
                             .eq(ApfData::getValueType,"AVG")
+                            .eq(ApfData::getClDid,"0")
                             .groupBy(ApfData::getPhaseType)
                             .groupBy(ApfData::getLineId)
                             .timeDesc().limit(1);
@@ -1046,16 +1930,20 @@ public class DataServiceImpl implements IDataService {
         //监测点第一层
         poList.forEach(item->{
             AppLineDetailVo vo = new AppLineDetailVo();
-            for (DevDetailDTO item2 : data) {
-                if (item2.getLineList() != null && item2.getLineList().contains(item.getLineId())) {
-                    vo.setProjectName(item2.getProjectName());
-                    vo.setDeviceName(item2.getEquipmentName());
-                    break;
+            if (!CollUtil.isEmpty(data)) {
+                for (DevDetailDTO item2 : data) {
+                    if (item2.getLineList() != null && item2.getLineList().contains(item.getLineId())) {
+                        vo.setProjectName(item2.getProjectName());
+                        vo.setDeviceName(item2.getEquipmentName());
+                        break;
+                    }
                 }
             }
             vo.setLineType(0);
             vo.setPointId(item.getLineId());
             vo.setPointName(lineMap.get(item.getLineId()).getName());
+            Double ct = lineMap.get(item.getLineId()).getCtRatio() / (Objects.isNull(lineMap.get(item.getLineId()).getCt2Ratio())?1.0:lineMap.get(item.getLineId()).getCtRatio());
+            Double pt = lineMap.get(item.getLineId()).getPtRatio() / (Objects.isNull(lineMap.get(item.getLineId()).getPt2Ratio())?1.0:lineMap.get(item.getLineId()).getPtRatio());
             List<AppLineDetailVo.targetDetail> children2 = new ArrayList<>();
             //指标第二层
             List<AppLineDetailVo.targetDetail> finalChildren = children2;
@@ -1071,52 +1959,69 @@ public class DataServiceImpl implements IDataService {
                     targetDetail.setSort(item3.getSort());
                     targetDetail.setPrimaryFormula(epdPqd.getPrimaryFormula());
                     if (Objects.equals(map.get(epdPqd.getClassId()).getName(), "apf_data")) {
-                        //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
-                        String otherName = epdPqd.getOtherName();
-                        ApfData matchedDataV = data14.stream()
-                                .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
-                                        && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
-                                .findFirst()
-                                .orElse(null);
-                        if (matchedDataV != null) {
-                            Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
-                            if (value instanceof Number) {
-                                targetDetail.setData(((Number) value).doubleValue());
+                        if (!Objects.isNull(epdPqd.getHarmStart()) && !Objects.isNull(epdPqd.getHarmEnd())) {
+                            for (int i = epdPqd.getHarmStart(); i <= epdPqd.getHarmEnd(); i++) {
+                                AppLineDetailVo.targetDetail t1 = new AppLineDetailVo.targetDetail();
+                                t1.setTargetId(item3.getId());
+                                t1.setName(item3.getName());
+                                t1.setPhase(epdPqd.getPhase());
+                                t1.setUnit(epdPqd.getUnit());
+                                t1.setSort(item3.getSort());
+                                t1.setPrimaryFormula(epdPqd.getPrimaryFormula());
+                                //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                                String otherName = epdPqd.getOtherName();
+                                ApfData matchedDataV = data14.stream()
+                                        .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                                && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                        .findFirst()
+                                        .orElse(null);
+                                if (matchedDataV != null) {
+                                    Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName + "_" + i));
+                                    if (value instanceof Number) {
+                                        t1.setData(((Number) value).doubleValue());
+                                    }
+                                    vo.setDataTime(matchedDataV.getTime());
+                                }
+                                t1.setName(i + "次" + item3.getName());
+                                finalChildren.add(t1);
                             }
-                            vo.setDataTime(matchedDataV.getTime());
-                        }
-                    }
-                    //一二次值处理
-                    if (!Objects.isNull(targetDetail.getData())) {
-                        String dataLevel = csDataSetMap.get(lineMap.get(item.getLineId()).getDataSetId()).getDataLevel();
-                        if (Objects.equals(dataLevel, "Primary")) {
-                            targetDetail.setUnit(targetDetail.getUnit());
-                            targetDetail.setData(Math.round(targetDetail.getData() * 100.0) / 100.0);
-                        } else if (Objects.equals(dataLevel, "Secondary")) {
-                            Double ct = item.getCtRatio() / (Objects.isNull(item.getCt2Ratio())?1.0:item.getCt2Ratio());
-                            Double pt = item.getPtRatio() / (Objects.isNull(item.getPt2Ratio())?1.0:item.getPt2Ratio());
-                            String formula = targetDetail.getPrimaryFormula();
-                            if (formula == null) {
-                                targetDetail.setData(Math.round(targetDetail.getData() * 100.0) / 100.0);
-                            }
-                            if ("*PT".equals(formula) || "*PT*CT".equals(formula)) {
-                                targetDetail.setUnit("k" + targetDetail.getUnit());
-                                double finalData = DataChangeUtil.secondaryToPrimary(formula, targetDetail.getData(), pt, ct);
-                                targetDetail.setData(Math.round((finalData/1000) * 100.0) / 100.0);
-                            }
-                            if ("*CT".equals(formula)) {
-                                double finalData = DataChangeUtil.secondaryToPrimary(formula, targetDetail.getData(), pt, ct);
-                                targetDetail.setData(Math.round(finalData * 100.0) / 100.0);
+                        } else {
+                            //根据otherName反射获取DataV中的字段值，按lineId和相别匹配
+                            String otherName = epdPqd.getOtherName();
+                            ApfData matchedDataV = data14.stream()
+                                    .filter(d -> Objects.equals(d.getLineId(), item.getLineId())
+                                            && Objects.equals(d.getPhaseType(), epdPqd.getPhase()))
+                                    .findFirst()
+                                    .orElse(null);
+                            if (matchedDataV != null) {
+                                Object value = ReflectUtils.getValue(matchedDataV, toCamelCase(otherName));
+                                if (value instanceof Number) {
+                                    targetDetail.setData(((Number) value).doubleValue());
+                                }
+                                vo.setDataTime(matchedDataV.getTime());
                             }
                         }
                     }
-                    finalChildren.add(targetDetail);
+                    if (Objects.isNull(epdPqd.getHarmStart()) && Objects.isNull(epdPqd.getHarmEnd())) {
+                        finalChildren.add(targetDetail);
+                    }
                 });
             });
             // 根据接线方式处理相别
             chanelPhase(lineMap, item, finalChildren, children2);
+            // 处理一二次值
+            String dataLevel = csDataSetMap.get(lineMap.get(item.getLineId()).getDataSetId()).getDataLevel();
+            chanelData(children2,dataLevel1,dataLevel,pt,ct);
             if (CollUtil.isNotEmpty(children2)) {
                 children2.sort(Comparator.comparingInt(AppLineDetailVo.targetDetail::getSort));
+                children2.forEach(item2->{
+                    if (Objects.isNull(item2.getData())) {
+                        item2.setData(3.15159);
+                    }
+                    if (!Objects.equals(item2.getData(),3.14159)) {
+                        item2.setData(BigDecimal.valueOf(item2.getData()).setScale(2, RoundingMode.HALF_UP).doubleValue());
+                    }
+                });
             }
             vo.setChildren(children2);
             result.add(vo);
@@ -1124,7 +2029,6 @@ public class DataServiceImpl implements IDataService {
         return result;
     }
 
-
     public String toCamelCase(String input) {
         if (input == null || input.isEmpty()) {
             return input;
@@ -1220,316 +2124,4 @@ public class DataServiceImpl implements IDataService {
         return str;
     }
 
-    //基础数据
-    public RealTimeDataVo getBaseData(EleEpdPqd item2, String lineId, String dataLevel, String csDataSetLevel,Double pt, Double ct) {
-        RealTimeDataVo vo = new RealTimeDataVo();
-        String unit;
-        double re;
-        vo.setId(item2.getId());
-        vo.setName(item2.getName());
-        StatisticalDataDTO statisticalDataDTO;
-        if (item2.getOtherName() == null || item2.getOtherName().isEmpty()) {
-            statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName(),item2.getPhase(), InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-        } else {
-            statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getOtherName(),item2.getPhase(), InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-        }
-        if (Objects.nonNull(statisticalDataDTO)) {
-            vo.setTime(statisticalDataDTO.getTime());
-            vo.setAvgValue(statisticalDataDTO.getValue());
-        }
-        vo.setPhase(item2.getPhase());
-        vo.setOtherName(item2.getShowName());
-        vo.setSort(item2.getSort());
-        if (Objects.equals("Primary",dataLevel)) {
-            if (Objects.equals("Primary",csDataSetLevel)) {
-                if (HarmonicConstant.POWER_LIST.contains(item2.getShowName())) {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue() / 1000));
-                    vo.setAvgValue(re);
-                    unit = "k" + item2.getUnit();
-                } else {
-                    vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
-                    unit = item2.getUnit();
-                }
-            } else {
-                if(Objects.nonNull(item2.getPrimaryFormula())){
-                    switch (item2.getPrimaryFormula()) {
-                        case "*PT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt / 1000;
-                            unit = "k" + item2.getUnit();
-                            break;
-                        case "*CT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * ct;
-                            unit = item2.getUnit();
-                            break;
-                        case "*PT*CT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt * ct / 1000;
-                            unit = "k" + item2.getUnit();
-                            break;
-                        default:
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                            unit = item2.getUnit();
-                            break;
-                    }
-                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
-                }else {
-                    if (Objects.nonNull(statisticalDataDTO)) {
-                        re = statisticalDataDTO.getValue();
-                        vo.setAvgValue(Double.valueOf(df.format(re)));
-                    }
-                    unit = item2.getUnit();
-                }
-            }
-        } else {
-            if (Objects.equals("Primary",csDataSetLevel)) {
-                if(Objects.nonNull(item2.getPrimaryFormula())) {
-                    switch (item2.getPrimaryFormula()) {
-                        case "*PT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt;
-                            break;
-                        case "*CT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / ct;
-                            break;
-                        case "*PT*CT":
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt / ct * 1000;
-                            break;
-                        default:
-                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                            break;
-                    }
-                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
-                }else {
-                    if (Objects.nonNull(statisticalDataDTO)) {
-                        re = statisticalDataDTO.getValue();
-                        vo.setAvgValue(Double.valueOf(df.format(re)));
-                    }
-                }
-            } else {
-                vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
-            }
-            unit = item2.getUnit();
-        }
-        vo.setUnit(unit);
-        if (Objects.nonNull(unit)) {
-            vo.setOtherName(item2.getShowName() + "(" + unit + ")");
-        }
-        return vo;
-    }
-
-    //谐波数据
-    public List<RealTimeDataVo> getHarmData(EleEpdPqd item2, String lineId, String dataLevel, String csDataSetLevel, Double pt, Double ct) {
-        List<RealTimeDataVo> list = new ArrayList<>();
-        for (int i = item2.getHarmStart(); i <= item2.getHarmEnd(); i++) {
-            RealTimeDataVo vo = new RealTimeDataVo();
-            vo.setId(item2.getId());
-            vo.setName(item2.getName().concat("_").concat(Integer.toString(i)));
-            StatisticalDataDTO statisticalDataDTO;
-            if (item2.getOtherName() == null || item2.getOtherName().isEmpty()) {
-                statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName().concat("_").concat(Integer.toString(i)),item2.getPhase(),InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-            } else {
-                statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getOtherName().concat("_").concat(Integer.toString(i)),item2.getPhase(),InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-            }
-            double re;
-            String unit;
-            if (Objects.equals("Primary",dataLevel)) {
-                if (Objects.equals("Primary",csDataSetLevel)) {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                    unit = item2.getUnit();
-                } else {
-                    if(Objects.nonNull(item2.getPrimaryFormula())){
-                        switch (item2.getPrimaryFormula()) {
-                            case "*PT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt / 1000;
-                                unit = "k" + item2.getUnit();
-                                break;
-                            case "*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * ct;
-                                unit = item2.getUnit();
-                                break;
-                            case "*PT*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt * ct / 1000;
-                                unit = "k" + item2.getUnit();
-                                break;
-                            default:
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                                unit = item2.getUnit();
-                                break;
-                        }
-                    }else {
-                        re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                        unit = item2.getUnit();
-                    }
-                }
-            } else {
-                if (Objects.equals("Primary",csDataSetLevel)) {
-                    if(Objects.nonNull(item2.getPrimaryFormula())) {
-                        switch (item2.getPrimaryFormula()) {
-                            case "*PT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt;
-                                break;
-                            case "*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / ct;
-                                break;
-                            case "*PT*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt / ct * 1000;
-                                break;
-                            default:
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                                break;
-                        }
-                    }else {
-                        re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                    }
-                } else {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                }
-                unit = item2.getUnit();
-            }
-            if (Objects.isNull(statisticalDataDTO)) {
-                vo.setAvgValue(3.14159);
-            } else {
-                vo.setTime(statisticalDataDTO.getTime());
-                vo.setAvgValue(Double.valueOf(df.format(re)));
-            }
-            vo.setPhase(item2.getPhase());
-            vo.setOtherName(i + "次" + "(" + unit + ")");
-            vo.setSort(item2.getSort());
-            vo.setUnit(unit);
-            list.add(vo);
-        }
-        return list;
-    }
-
-    //间谐波数据
-    public List<RealTimeDataVo> getInuHarmData(EleEpdPqd item2, String lineId, String dataLevel, String csDataSetLevel, Double pt, Double ct) {
-        List<RealTimeDataVo> list = new ArrayList<>();
-        for (int i = item2.getHarmStart(); i <= item2.getHarmEnd(); i++) {
-            RealTimeDataVo vo = new RealTimeDataVo();
-            vo.setId(item2.getId());
-            vo.setName(item2.getName().concat("_").concat(Integer.toString(i)));
-            StatisticalDataDTO statisticalDataDTO;
-            if (item2.getOtherName() == null || item2.getOtherName().isEmpty()) {
-                statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName().concat("_").concat(Integer.toString(i)),item2.getPhase(),InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-            } else {
-                statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getOtherName().concat("_").concat(Integer.toString(i)),item2.getPhase(),InfluxDbSqlConstant.AVG_WEB,influxDbParamUtil.getClDidByLineId(lineId));
-            }
-            double re;
-            String unit;
-            if (Objects.equals("Primary",dataLevel)) {
-                if (Objects.equals("Primary",csDataSetLevel)) {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                    unit = item2.getUnit();
-                } else {
-                    if(Objects.nonNull(item2.getPrimaryFormula())){
-                        switch (item2.getPrimaryFormula()) {
-                            case "*PT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt / 1000;
-                                unit = "k" + item2.getUnit();
-                                break;
-                            case "*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * ct;
-                                unit = item2.getUnit();
-                                break;
-                            case "*PT*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt * ct / 1000;
-                                unit = "k" + item2.getUnit();
-                                break;
-                            default:
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                                unit = item2.getUnit();
-                                break;
-                        }
-                    }else {
-                        re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                        unit = item2.getUnit();
-                    }
-                }
-            } else {
-                if (Objects.equals("Primary",csDataSetLevel)) {
-                    if(Objects.nonNull(item2.getPrimaryFormula())) {
-                        switch (item2.getPrimaryFormula()) {
-                            case "*PT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt;
-                                break;
-                            case "*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / ct;
-                                break;
-                            case "*PT*CT":
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt / ct * 1000;
-                                break;
-                            default:
-                                re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                                break;
-                        }
-                    }else {
-                        re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                    }
-                } else {
-                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
-                }
-                unit = item2.getUnit();
-            }
-            if (Objects.isNull(statisticalDataDTO)) {
-                vo.setAvgValue(3.14159);
-            } else {
-                vo.setTime(statisticalDataDTO.getTime());
-                vo.setAvgValue(Double.valueOf(df.format(re)));
-            }
-            vo.setPhase(item2.getPhase());
-            vo.setOtherName((i-0.5) + "次" + "(" + unit + ")");
-            vo.setSort(item2.getSort());
-            vo.setUnit(unit);
-            list.add(vo);
-        }
-        return list;
-    }
-
-    //数据格式处理
-    public  List<RealTimeDataVo> channelData(List<RealTimeDataVo> list) {
-        AtomicReference<Instant> time = new AtomicReference<>();
-        list.forEach(item->{
-            if (Objects.equals(item.getName(),"Pq_Freq")) {
-                time.set(item.getTime());
-            }
-        });
-//        if (Objects.nonNull(time.get())) {
-//            list.forEach(item->{
-//                if (ObjectUtil.isNotNull(item.getTime()) && item.getTime().isBefore(time.get())) {
-//                    item.setAvgValue(3.14159);
-//                    item.setValueA(3.14159);
-//                    item.setValueB(3.14159);
-//                    item.setValueC(3.14159);
-//                }
-//            });
-//        }
-
-        List<RealTimeDataVo> result = new ArrayList<>();
-        //将list 排序，并按照排序后的结果进行有序分组
-        LinkedHashMap<String, List<RealTimeDataVo>> map = list.stream().sorted(Comparator.comparing(RealTimeDataVo::getSort)).collect(Collectors.groupingBy(RealTimeDataVo::getName, LinkedHashMap::new, Collectors.toList()));
-        map.forEach((k,v)->{
-            RealTimeDataVo vo = new RealTimeDataVo();
-            RealTimeDataVo vo1 = v.get(0);
-            BeanUtils.copyProperties(vo1,vo);
-            RealTimeDataVo phaseA = v.stream().filter(s->Objects.equals(s.getPhase(),"A") || Objects.equals(s.getPhase(),"AB")).findFirst().orElse(null);
-            if (Objects.nonNull(phaseA)) {
-                vo.setValueA(Objects.isNull(phaseA.getAvgValue()) ? 3.14159 : phaseA.getAvgValue());
-            }
-            RealTimeDataVo phaseB = v.stream().filter(s->Objects.equals(s.getPhase(),"B") || Objects.equals(s.getPhase(),"BC")).findFirst().orElse(null);
-            if (Objects.nonNull(phaseB)) {
-                vo.setValueB(Objects.isNull(phaseB.getAvgValue()) ? 3.14159 : phaseB.getAvgValue());
-            }
-            RealTimeDataVo phaseC = v.stream().filter(s->Objects.equals(s.getPhase(),"C") || Objects.equals(s.getPhase(),"CA")).findFirst().orElse(null);
-            if (Objects.nonNull(phaseC)) {
-                vo.setValueC(Objects.isNull(phaseC.getAvgValue()) ? 3.14159 : phaseC.getAvgValue());
-            }
-            RealTimeDataVo phaseM = v.stream().filter(s->Objects.equals(s.getPhase(),"T")).findFirst().orElse(null);
-            if (Objects.nonNull(phaseM)) {
-                vo.setValueM(Objects.isNull(phaseM.getAvgValue()) ? 3.14159 : phaseM.getAvgValue());
-            }
-            vo.setPhase("/");
-            vo.setAvgValue(null);
-            result.add(vo);
-        });
-        return result;
-    }
-
 }
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
index 24faf2d..b6102f5 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/PqSensitiveUserServiceImpl.java
@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csharmonic.pojo.param.PqSensitiveUserParam;
 import com.njcn.csharmonic.pojo.vo.PqSensitiveUserVo;
@@ -42,8 +44,8 @@ import java.util.stream.Collectors;
 public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMapper, PqSensitiveUser> implements IPqSensitiveUserService {
 
     private final CsLineFeignClient csLineFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
+    private final EquipmentFeignClient equipmentFeignClient;
 
     @Override
     public Page<PqSensitiveUserVo> getList(BaseParam param) {
@@ -146,6 +148,32 @@ public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMappe
         return this.updateById(pqSensitiveUser);
     }
 
+    @Override
+    public Map<String, List<CsEquipmentDeliveryPO>> getUserDevTree(String type) {
+        Map<String, List<CsEquipmentDeliveryPO>> map = new HashMap<>();
+        List<PqSensitiveUser> list = this.list();
+        if (CollUtil.isNotEmpty(list)) {
+            List<CsEquipmentDeliveryPO> devList = equipmentFeignClient.getAll().getData();
+            Map<String,List<CsEquipmentDeliveryPO>> devMap = new HashMap<>();
+            if (CollUtil.isNotEmpty(devList)) {
+                String governType = Objects.equals(type, "apf") ? "harmonic" : "event";
+                devMap = devList.stream()
+                        .filter(po -> po.getMonitorUser() != null && Objects.equals(po.getGovernType(), governType))
+                        .sorted(Comparator.comparing(CsEquipmentDeliveryPO::getSort))
+                        .collect(Collectors.groupingBy(
+                                CsEquipmentDeliveryPO::getMonitorUser,
+                                LinkedHashMap::new,
+                                Collectors.toList()
+                        ));
+            }
+            Map<String, List<CsEquipmentDeliveryPO>> finalDevMap = devMap;
+            list.forEach(item->{
+                map.put(item.getName(), finalDevMap.get(item.getId()));
+            });
+        }
+        return map;
+    }
+
 
     private void checkParam(PqSensitiveUserParam param,boolean update){
         DictData data = dicDataFeignClient.getDicDataById(param.getLoadType()).getData();
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
index bf34022..dcfdcab 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java
@@ -40,7 +40,7 @@ public class RealDataServiceImpl implements RealDataService {
     private final MqttUtil mqttUtil;
     private final DictTreeFeignClient dictTreeFeignClient;
 
-    @Override
+//    @Override
     public boolean getBaseRealData(String lineId) {
         boolean result = true;
         try {
@@ -74,21 +74,26 @@ public class RealDataServiceImpl implements RealDataService {
                 redisUtil.saveByKeyWithExpire("rtDataUserId:"+lineId, RequestUtil.getUserIndex(),600L);
             }
             //等待装置响应,获取询问结果
-            Thread.sleep(5000);
-            Object object;
-            if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
-                object = redisUtil.getObjectByKey("devResponse:" + lineId);
-            } else {
-                object = redisUtil.getObjectByKey("devResponse");
-            }
-            if (Objects.isNull(object)) {
-                result = false;
-                //throw new BusinessException("数据获取失败,设备无响应");
-            } else {
-                int code = (Integer) object;
-                if (code != 200) {
+            for (int i = 0; i < 5; i++) {
+                Thread.sleep(1000);
+                Object object;
+                if (Objects.equals(DicDataEnum.DEV_CLD.getCode(),devModelCode) && Objects.equals(dev.getDevAccessMethod(),"CLD")) {
+                    object = redisUtil.getObjectByKey("devResponse:" + lineId);
+                } else {
+                    object = redisUtil.getObjectByKey("devResponse");
+                }
+                if (Objects.isNull(object)) {
                     result = false;
                     //throw new BusinessException("数据获取失败,设备无响应");
+                } else {
+                    int code = (Integer) object;
+                    if (code != 200) {
+                        result = false;
+                        //throw new BusinessException("数据获取失败,设备无响应");
+                    } else {
+                        result = true;
+                        break;
+                    }
                 }
             }
         } catch (Exception e) {
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
index 913d7c4..12a7736 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java
@@ -244,27 +244,17 @@ public class StableDataServiceImpl implements StableDataService {
 
     @Override
     public List<ThdDataVO> queryCommonStatisticalByTime(CommonStatisticalQueryParam commonStatisticalQueryParam) {
-
         List<ThdDataVO> result = new ArrayList();
-
         Optional.ofNullable(commonStatisticalQueryParam.getDevId()).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.DEVICE_LOSE));
         List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(commonStatisticalQueryParam.getDevId()).collect(Collectors.toList())).getData();
-
-
-
         List<CsLinePO> csLinePOList = csLineFeignClient.queryLineByDevId(commonStatisticalQueryParam.getDevId()).getData();
         if(CollectionUtil.isEmpty(csLinePOList)){
             throw  new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR);
         }
-        List<String> collect = csLinePOList.stream().map(CsLinePO::getLineId).collect(Collectors.toList());
         String areaId =  dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData().getId();
         Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR));
         List<CsLinePO> csLinePOList1 = csLinePOList.stream().filter(temp -> Objects.equals(areaId, temp.getPosition())).collect(Collectors.toList());
-
         List<EleEpdPqd> data = csStatisticalSetFeignClient.queryStatisticalSelect(Collections.singletonList(commonStatisticalQueryParam.getStatisticalId())).getData();
-
-//        EleEpdPqd data = epdFeignClient.selectById(commonStatisticalQueryParam.getStatisticalId()).getData();
-//        Optional.ofNullable(data).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.ELEEPDPQD_DATA_ERROR));
         if(CollectionUtil.isNotEmpty(data)){
             List<CsLinePO> finalCsLinePOList = csLinePOList;
             data.forEach(epdPqd->{
@@ -295,7 +285,6 @@ public class StableDataServiceImpl implements StableDataService {
             }).collect(Collectors.toList());
             List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
 
-
             List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
                 ThdDataVO vo = new ThdDataVO();
                 vo.setLineId(temp.getLineId());
@@ -314,8 +303,6 @@ public class StableDataServiceImpl implements StableDataService {
             result.addAll(collect1);
             });
         }
-
-
         return result;
     }
 
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/resources/bootstrap.yml b/cs-harmonic/cs-harmonic-boot/src/main/resources/bootstrap.yml
index df8eb2c..59faaff 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/resources/bootstrap.yml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/resources/bootstrap.yml
@@ -43,7 +43,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: warn
 
 
 #mybatis配置信息
diff --git a/cs-report/cs-report-boot/src/main/resources/bootstrap.yml b/cs-report/cs-report-boot/src/main/resources/bootstrap.yml
index 773d82f..26a1927 100644
--- a/cs-report/cs-report-boot/src/main/resources/bootstrap.yml
+++ b/cs-report/cs-report-boot/src/main/resources/bootstrap.yml
@@ -39,7 +39,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: warn
 
 
 #mybatis配置信息
diff --git a/cs-system/cs-system-boot/src/main/resources/bootstrap.yml b/cs-system/cs-system-boot/src/main/resources/bootstrap.yml
index 61f96e0..96e72bb 100644
--- a/cs-system/cs-system-boot/src/main/resources/bootstrap.yml
+++ b/cs-system/cs-system-boot/src/main/resources/bootstrap.yml
@@ -39,7 +39,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: warn
 
 
 #mybatis配置信息