微调

2、重复导入子计划时，增量被检设备并删除未检设备。

CLAUDE.md

@@ -1,215 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## 项目概述
-
-CN_Gather是灿能公司的融合工具项目体，专门用于电能质量设备检测的企业级应用系统。采用Spring Boot多模块Maven架构，以detection模块为核心的检测业务系统。
-
-## 项目架构
-
-### 核心模块结构
-- **entrance**: 应用入口模块，端口18092，整合所有其他模块
-- **detection**: 核心检测业务模块，电能质量设备检测的完整业务流程
-- **storage**: 数据存储模块，处理检测数据存储和谐波数据处理
-- **system**: 基础系统模块，提供字典管理、日志管理、配置管理等基础功能
-- **user**: 用户管理模块，处理认证授权和权限控制
-
-### 模块依赖关系
-```
-entrance (启动入口)
-├── system (基础服务层)
-├── user (认证授权层)
-├── detection (核心业务层) → 依赖 system, storage
-└── storage (数据存储层) → 依赖 system
-```
-
-## 常用开发命令
-
-### 构建和打包
-```bash
-# 编译整个项目
-mvn clean compile
-
-# 打包所有模块
-mvn clean package
-
-# 跳过测试打包
-mvn clean package -DskipTests
-
-# 安装到本地仓库
-mvn clean install
-```
-
-### 运行应用
-```bash
-# 运行主入口应用 (端口18092)
-cd entrance
-mvn spring-boot:run
-
-# 运行事件智能模块 (独立应用)
-cd event_smart  
-mvn spring-boot:run
-```
-
-### 测试
-```bash
-# 运行所有测试
-mvn test
-
-# 运行特定模块测试
-cd detection
-mvn test
-```
-
-## 技术栈
-
-### 核心框架
-- **Spring Boot**: 2.3.12.RELEASE
-- **MyBatis Plus**: 数据持久层框架
-- **Maven**: 项目构建管理
-- **Java**: 1.8
-
-### 数据库
-- **MySQL**: 主数据库 (192.168.1.24:13306/pqs9100)
-- **Oracle**: event_smart模块使用
-- **Druid**: 数据库连接池
-
-### 通信技术
-- **Netty**: Socket通信 (端口61000设备, 62000源)
-- **WebSocket**: 实时数据推送 (端口7777)
-- **RestTemplate**: HTTP客户端通信
-
-### 其他关键技术
-- **Apache POI + docx4j**: Word文档报告生成
-- **FastJSON**: JSON数据处理
-- **Spring Security + JWT**: 安全认证 (event_smart模块)
-- **Redis**: 缓存服务 (event_smart模块)
-
-## 关键配置
-
-### 数据库配置
-- 数据库URL: `jdbc:mysql://192.168.1.24:13306/pqs9100`
-- MyBatis映射文件位置: `classpath*:com/njcn/**/mapping/*.xml`
-- 主键生成策略: `assign_uuid`
-
-### Socket通信配置
-- 源设备Socket: 127.0.0.1:62000
-- 被检设备Socket: 127.0.0.1:61000
-- WebSocket端口: 7777
-
-### 文件路径配置
-- 日志目录: `D:\logs`
-- 报告模板目录: `D:\template`
-- 报告输出目录: `D:\report`
-- Word模板位置: `entrance/src/main/resources/model/`
-
-## detection模块核心架构
-
-### 子模块功能划分
-- **device**: 设备管理 - PqDev(被检设备)、PqStandardDev(标准设备)、PqDevSub(设备子表)
-- **plan**: 检测计划管理 - AdPlan(检测计划)、AdPlanSource(计划源)、AdPlanStandardDev(计划标准设备)
-- **script**: 检测脚本管理 - PqScript(检测脚本)、PqScriptDtls(脚本详情)、PqScriptCheckData(检测数据)
-- **source**: 程控源管理 - PqSource(程控源设备)
-- **err**: 误差体系管理 - PqErrSys(误差体系)、PqErrSysDtls(误差详情)
-- **report**: 报告生成管理 - PqReport(报告模板)，支持Word模板处理
-- **monitor**: 监测管理 - PqMonitor(监测点管理)
-- **icd**: ICD路径管理 - PqIcdPath(通信配置)
-- **result**: 结果管理 - 检测结果查询和数据展示
-- **type**: 设备类型管理 - DevType(设备类型字典)
-
-### 核心检测流程 (PreDetectionController)
-```java
-// 主要检测接口
-@PostMapping("/startPreTest")         // 检测通用入口
-@PostMapping("/ytxCheckSimulate")     // 源通讯校验
-@PostMapping("/startSimulateTest")    // 启动程控源检测
-@PostMapping("/coefficientCheck")     // 系数校验
-@PostMapping("/startContrastTest")    // 比对检测
-@PostMapping("/devPhaseSequence")     // 设备相序检测
-```
-
-### Socket通信架构
-- **SocketManager**: Socket会话管理，存储userId与Channel映射
-- **WebServiceManager**: WebSocket服务管理，实时数据推送
-- **通信处理器**:
-  - SocketSourceResponseService: 程控源响应处理
-  - SocketDevResponseService: 设备响应处理
-  - SocketContrastResponseService: 比对检测响应处理
-- **通信工具**:
-  - CnSocketUtil: Socket连接工具
-  - FormalTestManager: 正式检测管理
-  - XiNumberManager: 系数管理
-
-### 暂态检测参数
-- 暂态前时间: 2秒
-- 写入时间: 0.001秒
-- 写出时间: 0.001秒  
-- 暂态后时间: 3秒
-
-### 闪变参数
-- 波形类型: CPM/SQU
-- 占空比: 50%
-
-## 开发注意事项
-
-### detection模块包结构
-```
-detection/
-├── controller/          # 控制层 - PreDetectionController
-├── handler/            # Socket响应处理器
-├── service/            # 业务逻辑层
-│   └── impl/          # 服务实现
-├── util/              # 工具类层
-│   ├── business/      # 业务工具 - DetectionCommunicateUtil
-│   └── socket/        # Socket通信工具
-├── pojo/              # 数据模型层
-│   ├── constant/      # 常量 - DetectionCommunicateConstant
-│   ├── dto/          # 数据传输对象
-│   ├── enums/        # 枚举 - DetectionCodeEnum等
-│   ├── param/        # 请求参数
-│   ├── po/           # 持久化对象
-│   └── vo/           # 视图对象 - DetectionData等
-└── [子模块]/          # device、plan、script等子模块
-    ├── controller/    # 子模块控制器
-    ├── service/       # 子模块服务
-    ├── mapper/        # 数据访问层
-    │   └── mapping/   # MyBatis映射文件
-    └── pojo/         # 子模块数据对象
-```
-
-### 检测数据处理机制
-- **任意值**: 取第一个满足条件的数据
-- **部分值**: 去除最大最小值后取值  
-- **所有值**: 要求所有数据都合格
-- **CP95值**: 取95%分位数
-- **平均值**: 取算术平均值
-
-### 检测项目类型
-- **频率**: FREQ
-- **电压**: V_RELATIVE(相对值)/V_ABSOLUTELY(绝对值)
-- **电流**: I_RELATIVE/I_ABSOLUTELY
-- **谐波**: HV/HI (2-50次谐波)
-- **间谐波**: HSV/HSI
-- **不平衡度**: IMBV/IMBA (三相不平衡)
-- **闪变**: F (PST)
-- **暂态**: VOLTAGE_MAG/VOLTAGE_DUR
-
-### 检测模式
-- **数字式检测**: 数字接口通信
-- **模拟式检测**: 模拟信号输出
-- **比对式检测**: 多台设备比对
-
-### 报告生成机制
-- **模板处理**: 使用POI和docx4j处理Word文档
-- **模板位置**: `entrance/src/main/resources/model/`
-- **支持模板**: NPQS-580、PQV-700、njcn_882系列等
-- **功能**: 书签替换、表格填充、文档合并
-- **云端上传**: 支持FTP批量上传报告
-
-### 依赖组件
-项目使用灿能公司自研组件:
-- `njcn-common`: 通用工具包
-- `mybatis-plus`: MyBatis增强包  
-- `spingboot2.3.12`: Spring Boot定制包
-- `RestTemplate-plugin`: HTTP客户端插件

Gitea本地协作开发服务器配置指南.md

@@ -1,238 +0,0 @@
-# Gitea本地协作开发服务器配置指南
-
-## 概述
-
-本文档说明如何将本地安装的Gitea配置为团队协作开发服务器，替代原有的物理服务器环境。
-
-## 1. 网络配置
-
-### 1.1 确认本机IP地址
-```bash
-# Windows系统
-ipconfig
-# 查找本机局域网IP地址，通常形如 192.168.x.x 或 10.x.x.x
-```
-
-### 1.2 配置Gitea服务地址
-编辑Gitea配置文件 `app.ini`：
-
-```ini
-[server]
-# 将localhost改为本机IP地址，确保同事可以访问
-HTTP_ADDR = 0.0.0.0
-HTTP_PORT = 3000
-# 外部访问URL，替换为你的实际IP
-ROOT_URL = http://192.168.x.x:3000/
-```
-
-### 1.3 防火墙配置
-确保Windows防火墙允许Gitea端口通信：
-
-```bash
-# 打开Windows防火墙入站规则
-# 添加端口3000的TCP入站规则
-```
-
-或在Windows防火墙中：
-- 控制面板 → 系统和安全 → Windows Defender防火墙 → 高级设置
-- 入站规则 → 新建规则 → 端口 → TCP → 特定本地端口: 3000
-
-## 2. Gitea服务配置
-
-### 2.1 启动Gitea服务
-```bash
-# 进入Gitea安装目录
-cd C:\gitea  # 或你的安装路径
-gitea.exe web
-```
-
-### 2.2 配置为Windows服务（推荐）
-创建Windows服务确保开机自启：
-
-1. 下载NSSM (Non-Sucking Service Manager)
-2. 以管理员身份运行命令提示符：
-```bash
-nssm install Gitea
-# 在弹出界面中配置：
-# Path: C:\gitea\gitea.exe
-# Arguments: web
-# Working directory: C:\gitea
-```
-
-3. 启动服务：
-```bash
-net start Gitea
-```
-
-### 2.3 数据库配置优化
-如果使用SQLite（默认），确保数据文件路径正确：
-```ini
-[database]
-DB_TYPE = sqlite3
-PATH = data/gitea.db
-```
-
-如果需要更好性能，考虑配置MySQL：
-```ini
-[database]
-DB_TYPE = mysql
-HOST = 127.0.0.1:3306
-NAME = gitea
-USER = gitea
-PASSWD = your_password
-```
-
-## 3. 同事访问配置
-
-### 3.1 提供访问地址
-向同事提供访问地址：
-```
-http://你的IP地址:3000
-例如: http://192.168.1.100:3000
-```
-
-### 3.2 用户账号管理
-1. 访问管理界面创建用户账号
-2. 或开启用户自注册：
-```ini
-[service]
-DISABLE_REGISTRATION = false
-REQUIRE_SIGNIN_VIEW = false
-```
-
-### 3.3 权限配置
-为协作项目设置适当权限：
-- 项目所有者：完全控制权限
-- 协作者：推送/拉取权限
-- 读者：仅读取权限
-
-## 4. 代码仓库迁移
-
-### 4.1 从原服务器迁移仓库
-如果原服务器数据可恢复：
-```bash
-# 在原服务器或备份中找到Git裸仓库
-# 复制到新Gitea的repositories目录
-# 通常位于 gitea-repositories/用户名/仓库名.git
-```
-
-### 4.2 重新创建仓库
-如果需要重新创建：
-1. 在Gitea界面创建新仓库
-2. 本地添加新的远程地址：
-```bash
-git remote remove origin
-git remote add origin http://你的IP:3000/用户名/仓库名.git
-git push -u origin master
-```
-
-## 5. 开发工作流配置
-
-### 5.1 分支保护规则
-为主要分支设置保护规则：
-- 设置 → 分支 → 分支保护规则
-- 保护master分支，要求代码审查
-
-### 5.2 Webhook配置
-如果需要CI/CD集成：
-```
-设置 → Webhooks → 添加Webhook
-配置自动构建触发器
-```
-
-## 6. 备份策略
-
-### 6.1 定期备份
-```bash
-# 备份Gitea数据目录
-# 包括：repositories/, data/, log/, custom/
-robocopy "C:\gitea" "D:\backup\gitea" /MIR /Z /R:3 /W:10
-```
-
-### 6.2 自动备份脚本
-创建批处理文件实现定期备份：
-```batch
-@echo off
-set BACKUP_DIR=D:\backup\gitea_%date:~0,4%%date:~5,2%%date:~8,2%
-robocopy "C:\gitea" "%BACKUP_DIR%" /MIR /Z /R:3 /W:10
-echo Backup completed to %BACKUP_DIR%
-```
-
-## 7. 常见问题排查
-
-### 7.1 访问问题
-- 检查防火墙设置
-- 确认IP地址和端口正确
-- 验证Gitea服务是否正常运行
-
-### 7.2 权限问题
-- 检查用户账号状态
-- 确认仓库权限设置
-- 验证SSH密钥配置（如使用SSH）
-
-### 7.3 性能优化
-```ini
-[server]
-# 调整并发连接数
-HTTP_ADDR = 0.0.0.0
-HTTP_PORT = 3000
-
-[database]
-# 数据库连接池配置
-MAX_IDLE_CONNS = 30
-MAX_OPEN_CONNS = 300
-```
-
-## 8. 安全建议
-
-1. **网络安全**：
-   - 仅在受信任的局域网环境中开放
-   - 考虑使用VPN访问
-   - 定期更新Gitea版本
-
-2. **访问控制**：
-   - 禁用不必要的公开注册
-   - 使用强密码策略
-   - 启用双因子认证
-
-3. **数据安全**：
-   - 定期备份重要数据
-   - 监控异常访问
-   - 记录操作日志
-
-## 9. 同事操作指南
-
-### 9.1 首次设置
-```bash
-# 克隆仓库
-git clone http://你的IP:3000/用户名/CN_Gather.git
-
-# 配置用户信息
-git config user.name "姓名"
-git config user.email "邮箱"
-```
-
-### 9.2 日常协作
-```bash
-# 拉取最新代码
-git pull origin master
-
-# 创建功能分支
-git checkout -b feature/新功能
-
-# 提交更改
-git add .
-git commit -m "描述信息"
-git push origin feature/新功能
-
-# 在Gitea界面创建Pull Request
-```
-
----
-
-**联系信息**：
-- Gitea服务地址：http://你的IP:3000
-- 管理员：[你的联系方式]
-- 紧急联系：[备用联系方式]
-
-**注意**：请确保定期备份重要代码，避免数据丢失。

detection/pom.xml

@@ -139,6 +139,12 @@
             <artifactId>report-generator</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <!--激活工具-->
+        <dependency>
+            <groupId>com.njcn.gather</groupId>
+            <artifactId>activate-tool</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
 

detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java

@@ -439,6 +439,7 @@ public class SocketDevResponseService {
 
             //告诉前端当前项开始了
             WebSocketVO<Object> webSocketVO = new WebSocketVO<>();
+            FormalTestManager.currentIssue = sourceIssues.get(0);
             String type = sourceIssues.get(0).getType();
             if (ResultUnitEnum.P.getCode().equals(type)) {
                 sourceIssues.get(0).setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
@@ -612,7 +613,7 @@ public class SocketDevResponseService {
 
     private void assemblyEntity(List<DevData> deList, DevXiNumData.F F, DevXiNumData.GF startF, CoefficientVO coefficientVO, CoefficientVO.DevParameter devParameter) {
         //表示接收完成,必须保证3个数
-        if (deList.size() >= 3) {
+        if (deList.size() >= 7) {
             List<Double> aList = deList.stream().map(it -> it.getSqlData().get(0).getList().getA()).collect(Collectors.toList());
             List<Double> bList = deList.stream().map(it -> it.getSqlData().get(0).getList().getB()).collect(Collectors.toList());
             List<Double> cList = deList.stream().map(it -> it.getSqlData().get(0).getList().getC()).collect(Collectors.toList());
@@ -687,7 +688,7 @@ public class SocketDevResponseService {
      */
     private Double reduceList(List<Double> valList) {
         // valList.subList(0, 5).clear();
-        // valList.subList(valList.size() - 3, valList.size() - 1).clear();
+        valList.subList(valList.size() - 2, valList.size()).clear();
         return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
     }
 
@@ -849,7 +850,7 @@ public class SocketDevResponseService {
                     boolean isContinue = true;
                     List<String> descList = icdCheckData.getResultData().stream().map(
                             obj -> {
-                                if (DetectionCodeEnum.MAG.getCode().equals(obj.getDesc()) || DetectionCodeEnum.DUR.getCode().equals(obj.getDesc())) {
+                                if (DetectionCodeEnum.MAG.getCode().equals(obj.getDesc()) || DetectionCodeEnum.DUR.getCode().equals(obj.getDesc()) || DetectionCodeEnum.PST.getCode().equals(obj.getDesc())) {
                                     return DetectionCodeEnum.AVG_PREFIX.getCode() + obj.getDesc();
                                 } else {
                                     return DetectionCodeEnum.REAL_PREFIX.getCode() + obj.getDesc();
@@ -953,6 +954,7 @@ public class SocketDevResponseService {
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
+                                FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
                                 socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
@@ -1210,6 +1212,7 @@ public class SocketDevResponseService {
                                 } else {
                                     webSocketVO.setRequestId(sourceIssues.get(0).getType() + CnSocketUtil.START_TAG);
                                 }
+                                FormalTestManager.currentIssue = sourceIssues.get(0);
                                 socketMsg.setData(JSON.toJSONString(sourceIssues.get(0)));
                                 socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
                                 socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
@@ -1782,6 +1785,7 @@ public class SocketDevResponseService {
         } else {
             dataRule = DictDataEnum.SECTION_VALUE;
         }
+        FormalTestManager.currentTestPlan = plan;
 
         String code = dictDataService.getDictDataById(plan.getPattern()).getCode();
         FormalTestManager.patternEnum = PatternEnum.getEnum(code);

detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java

@@ -2,6 +2,7 @@ package com.njcn.gather.detection.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
 import com.njcn.gather.detection.pojo.param.DevPhaseSequenceParam;
@@ -14,7 +15,12 @@ import com.njcn.gather.detection.util.socket.*;
 import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.plan.pojo.po.AdPlanSource;
+import com.njcn.gather.plan.service.IAdPlanSourceService;
+import com.njcn.gather.result.pojo.enums.ResultUnitEnum;
 import com.njcn.gather.script.pojo.po.SourceIssue;
+import com.njcn.gather.source.pojo.po.SourceInitialize;
+import com.njcn.gather.source.service.IPqSourceService;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -56,6 +62,8 @@ public class SocketSourceResponseService {
      * 设备信息服务，提供设备基础信息查询功能
      */
     private final IPqDevService iPqDevService;
+    private final IAdPlanSourceService adPlanSourceService;
+    private final IPqSourceService pqSourceService;
 
     /**
      * Socket连接管理器，负责管理设备和源的Socket连接
@@ -334,9 +342,9 @@ public class SocketSourceResponseService {
                     // 系数校验固定检测项：实时电压有效值和实时电流有效值
                     phaseSequenceParam.setDataType(Arrays.asList("real$VRMS", "real$IRMS"));
                     // 读取3次数据用于系数计算
-                    phaseSequenceParam.setReadCount(3);
+                    phaseSequenceParam.setReadCount(7); //3
                     // 忽略前4次数据，等待测量稳定
-                    phaseSequenceParam.setIgnoreCount(4);
+                    phaseSequenceParam.setIgnoreCount(3); //4
                     socketMsg.setData(JSON.toJSONString(phaseSequenceParam));
                     SocketManager.sendMsg(s, JSON.toJSONString(socketMsg));
 
@@ -363,6 +371,19 @@ public class SocketSourceResponseService {
             SocketMsg<String> socketMsg = new SocketMsg<>();
             switch (dictDataEnumByCode) {
                 case SUCCESS:
+                    if (FormalTestManager.unknownError) {
+                        FormalTestManager.unknownError = false;
+
+                        //重新下发脚本
+                        String type = FormalTestManager.currentIssue.getType();
+                        if (ResultUnitEnum.P.getCode().equals(type)) {
+                            FormalTestManager.currentIssue.setType(ResultUnitEnum.V_ABSOLUTELY.getCode());
+                        }
+                        socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue());
+                        socketMsg.setData(JSON.toJSONString(FormalTestManager.currentIssue));
+                        socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue() + CnSocketUtil.STEP_TAG + type);
+                        SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.SOURCE_TAG, JSON.toJSONString(socketMsg));
+                    } else {
                         //todo 前端推送收到的消息暂未处理好
                         sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
                         //开始设备通讯检测(发送设备初始化)
@@ -375,6 +396,7 @@ public class SocketSourceResponseService {
                         String json = JSON.toJSONString(socketMsg);
                         // 使用智能发送工具类，自动管理设备连接
                         socketManager.smartSendToDevice(param, json);
+                    }
                     break;
                 case UNPROCESSED_BUSINESS:
                     sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
@@ -570,6 +592,10 @@ public class SocketSourceResponseService {
                 case UNPROCESSED_BUSINESS:
                     sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
                     break;
+                case UNKNOWN_ERROR: //-1源未知异常
+                    CnSocketUtil.quitSendSource(param);
+                    FormalTestManager.unknownError = true;
+                    break;
                 default:
                     sendErrorAndQuit(param, socketDataMsg, dictDataEnumByCode);
                     break;
@@ -601,9 +627,23 @@ public class SocketSourceResponseService {
         SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
         switch (Objects.requireNonNull(dictDataEnumByCode)) {
             case SUCCESS:
+                if (FormalTestManager.unknownError) {
+                    //获取源初始化参数
+                    AdPlanSource planSource = adPlanSourceService.getOne(new LambdaQueryWrapper<AdPlanSource>().eq(AdPlanSource::getPlanId, param.getPlanId()));
+                    SourceInitialize sourceParam = pqSourceService.getSourceInitializeParam(planSource.getSourceId());
+                    if (ObjectUtil.isNotNull(sourceParam)) {
+                        SocketMsg<String> socketMsg1 = new SocketMsg<>();
+                        socketMsg1.setRequestId(SourceOperateCodeEnum.YJC_YTXJY.getValue());
+                        socketMsg1.setOperateCode(SourceOperateCodeEnum.INIT_GATHER.getValue());
+                        socketMsg1.setData(JSON.toJSONString(sourceParam));
+                        //使用智能发送工具类，自动管理与源控程序的socket连接
+                        socketManager.smartSendToSource(param, JSON.toJSONString(socketMsg1));
+                    }
+                } else {
                     //通讯校验成功
                     SocketManager.removeUser(param.getUserPageId() + CnSocketUtil.SOURCE_TAG);
                     sendWebSocketMessage(param.getUserPageId(), socketDataMsg);
+                }
                 break;
             case UNPROCESSED_BUSINESS:
                 break;
@@ -653,6 +693,8 @@ public class SocketSourceResponseService {
 
         // 同步更新系数管理器中的设备列表
         XiNumberManager.xiDevList = devList;
+        FormalTestManager.unknownError = false;
+        FormalTestManager.currentIssue = null;
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/pojo/enums/DetectionCodeEnum.java

@@ -50,7 +50,10 @@ public enum DetectionCodeEnum {
     DELTA("Delta", "角型接线"),
 
     REAL_PREFIX("real$", "实时数据前缀"),
-    AVG_PREFIX("avg$", "统计数据前缀");
+    CP_95_PREFIX("cp95$", "分钟统计-CP95值数据前缀"),
+    MAX_PREFIX("max$", "分钟统计-最大值数据前缀"),
+    MIN_PREFIX("min$", "分钟统计-最小值数据前缀"),
+    AVG_PREFIX("avg$", "分钟统计-平均值数据前缀");
 
     private final String code;
     private final String message;

detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceOperateCodeEnum.java

@@ -52,7 +52,7 @@ public enum SourceOperateCodeEnum {
     YJC_MXYZXJY("yjc_mxyzxjy", "模型一致性校验"),
     FORMAL_REAL("formal_real","正式检测"),
     RECORD_WAVE_STEP1("record_wave_step1","启动录波_step1"),
-    RECORD_WAVE_STEP2("record_wave_step2","启动录波_step2"),
+//    RECORD_WAVE_STEP2("record_wave_step2","启动录波_step2"),
 //    SIMULATE_REAL("simulate_real","模拟检测"),
     Coefficient_Check("Coefficient_Check","系数校验"),
     QUITE("quit","关闭设备通讯初始化"),
@@ -67,6 +67,8 @@ public enum SourceOperateCodeEnum {
     SERVER_ERROR("server_error","服务端主动关闭连接,请稍后再试"),
     DEVICE_ERROR("device_error","设备主动关闭连接,请稍后再试"),
 
+    FLICKER_DATA_CHECK("flicker_data_check","闪变数据校验"),
+
 
 
 

detection/src/main/java/com/njcn/gather/detection/pojo/enums/SourceResponseCodeEnum.java

@@ -42,7 +42,9 @@ public enum SourceResponseCodeEnum {
     FAIL(25002,"失败"),
     ALL_FAIL(25003,"校验失败"),
     RECEIVE_DATA_TIME_OUT(25004,"接收数据超时"),
-    REAL_DATA_CHECK_FAIL(25005,"实时数据校验失败")
+    REAL_DATA_CHECK_FAIL(25005,"实时数据不符合"),
+    STATISTICS_DATA_CHECK_FAIL(25006,"统计数据不符合"),
+    FLICKER_DATA_START(25007,"开始接收闪变数据")
 
 
 

detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java

@@ -43,4 +43,9 @@ public class ContrastDetectionParam {
     private List<Boolean> testItemList;
 
     private String userId;
+
+    /**
+     * 是否进行相许校验
+     */
+    private Integer phaseCheck;
 }

detection/src/main/java/com/njcn/gather/detection/pojo/vo/DetectionData.java

@@ -53,4 +53,9 @@ public class DetectionData {
      * 误差体系详情ID(比对式使用)
      */
     private String errorDtlId;
+
+    /**
+     * 有效组数
+     */
+    private Integer validGroupNum;
 }

detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java

@@ -1508,9 +1508,10 @@ public class DetectionServiceImpl {
      * @param numMap              第几次检测 key为设备id_通道号，value为第几次检测
      * @param code                结果表code
      * @param waveNum             第几次录波
+     * @param dataSourceEnum      数据源类型
      * @return key为被检设备ip_通道号、value为是否合格（1合格 2不合格 4无法处理）
      */
-    public List<DevLineTestResult> processing(List<DevData> devDataList, List<DevData> standardDevDataList, Map<String, String> parsIp, Map<String, String> devIdMapComm, List<String> testItemCodeList, String errorSysId, DictDataEnum dataRule, Map<String, Integer> numMap, String code, Integer waveNum) {
+    public List<DevLineTestResult> processing(List<DevData> devDataList, List<DevData> standardDevDataList, Map<String, String> parsIp, Map<String, String> devIdMapComm, List<String> testItemCodeList, String errorSysId, DictDataEnum dataRule, Map<String, Integer> numMap, String code, Integer waveNum, DataSourceEnum dataSourceEnum) {
         Map<String, List<DevData>> devDataMap = devDataList.stream().collect(Collectors.groupingBy(obj -> obj.getId().split("_")[0]));
         Map<String, List<DevData>> standardDevDataMap = standardDevDataList.stream().collect(Collectors.groupingBy(DevData::getId));
 
@@ -1525,7 +1526,7 @@ public class DetectionServiceImpl {
             Map<String, List<Integer>> chnResultMap = new HashMap<>();
             devMonitorMap.forEach((devMoniterId, devData) -> {
                 String[] split = devMoniterId.split(CnSocketUtil.SPLIT_TAG);
-                Map<String, Integer> map = singleMonitorProcessing(devData, standardDevDataMap.get(parsIp.get(devMoniterId)), devIdMapComm, testItemCodeList, errorSysId, dataRule, numMap.get(devId + CnSocketUtil.SPLIT_TAG + split[1]), code, waveNum);
+                Map<String, Integer> map = singleMonitorProcessing(devData, standardDevDataMap.get(parsIp.get(devMoniterId)), devIdMapComm, testItemCodeList, errorSysId, dataRule, numMap.get(devId + CnSocketUtil.SPLIT_TAG + split[1]), code, waveNum, dataSourceEnum);
                 map.forEach((key, value) -> {
                     DevLineTestResult devLineTestResult = new DevLineTestResult();
                     devLineTestResult.setDeviceId(devId);
@@ -1560,11 +1561,15 @@ public class DetectionServiceImpl {
      * @param num                 第几次检测
      * @param code                结果表code
      * @param waveNum             第几次录波
+     * @param dataSourceEnum      数据源类型
      * @return
      */
-    private Map<String, Integer> singleMonitorProcessing(List<DevData> devDataList, List<DevData> standardDevDataList, Map<String, String> devIdMapComm, List<String> testItemCodeList, String errorSysId, DictDataEnum dataRule, Integer num, String code, Integer waveNum) {
+    private Map<String, Integer> singleMonitorProcessing(List<DevData> devDataList, List<DevData> standardDevDataList, Map<String, String> devIdMapComm, List<String> testItemCodeList, String errorSysId, DictDataEnum dataRule, Integer num, String code, Integer waveNum, DataSourceEnum dataSourceEnum) {
         Map<String, Integer> resultMap = new HashMap<>();
         if (CollUtil.isNotEmpty(devDataList) && CollUtil.isNotEmpty(standardDevDataList) && CollUtil.isNotEmpty(testItemCodeList)) {
+            devDataList = devDataList.stream().sorted(Comparator.comparing(DevData::getTime)).collect(Collectors.toList());
+            standardDevDataList = standardDevDataList.stream().sorted(Comparator.comparing(DevData::getTime)).collect(Collectors.toList());
+            // 处理谐波数据
             SysTestConfig oneConfig = sysTestConfigService.getOneConfig();
             String[] split1 = devDataList.get(0).getId().split("_");
             String devMonitorId = devIdMapComm.get(split1[0]) + "_" + split1[1];
@@ -1610,12 +1615,12 @@ public class DetectionServiceImpl {
 //                                sqlData.setList(listDTO);
 //                            }));
 //                        }
-                        resultMap.put(PowerIndexEnum.FREQ.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fHz, DetectionCodeEnum.FREQ.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.FREQ.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fHz, DetectionCodeEnum.FREQ.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case VRMS:
                     case PVRMS:
                         // 如果是角型接法且存在角型接法的一些指标，则不进行使用角型接线的指标。反之，则使用相别的指标。
-                        resultMap.put(PowerIndexEnum.V.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fUn, (isDelta && isExitDelta ? DetectionCodeEnum.PVRMS.getCode() : DetectionCodeEnum.VRMS.getCode()), dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.V.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fUn, (isDelta && isExitDelta ? DetectionCodeEnum.PVRMS.getCode() : DetectionCodeEnum.VRMS.getCode()), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case IRMS:
 //                        if (ObjectUtil.isNotNull(waveNum) && (waveNum.equals(2) || waveNum.equals(5))) {
@@ -1626,30 +1631,33 @@ public class DetectionServiceImpl {
 //                                sqlData.setList(listDTO);
 //                            }));
 //                        }
-                        resultMap.put(PowerIndexEnum.I.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fIn, DetectionCodeEnum.IRMS.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.I.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fIn, DetectionCodeEnum.IRMS.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case V_UNBAN:
-                        resultMap.put(PowerIndexEnum.IMBV.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fUn, DetectionCodeEnum.V_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.IMBV.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fUn, DetectionCodeEnum.V_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case I_UNBAN:
-                        resultMap.put(PowerIndexEnum.IMBA.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fIn, DetectionCodeEnum.I_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.IMBA.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fIn, DetectionCodeEnum.I_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case V2_50:
                     case PV2_50:
-                        resultMap.put(PowerIndexEnum.HV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.HV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case I2_50:
-                        resultMap.put(PowerIndexEnum.HI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.HI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case P2_50:
-                        resultMap.put(PowerIndexEnum.HP.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, HP, fUn * fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.HP.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, HP, fUn * fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case SV_1_49:
                     case PSV_1_49:
-                        resultMap.put(PowerIndexEnum.HSV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.HSV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
                         break;
                     case SI_1_49:
-                        resultMap.put(PowerIndexEnum.HSI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum));
+                        resultMap.put(PowerIndexEnum.HSI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum));
+                        break;
+                    case PST:
+                        resultMap.put(PowerIndexEnum.F.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fUn, DetectionCodeEnum.PST.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, DataSourceEnum.MINUTE_STATISTICS_AVG));
                         break;
                     case UNKNOWN_ERROR:
                         break;
@@ -1708,6 +1716,7 @@ public class DetectionServiceImpl {
      * @param code                结果表code
      * @param scale               小数点位数
      * @param waveNum             第几次录波
+     * @param dataSourceEnum      数据源类型
      * @return
      */
     private Integer isQualified(List<DevData> devDataList,
@@ -1721,11 +1730,15 @@ public class DetectionServiceImpl {
                                 Integer num,
                                 String code,
                                 Integer scale,
-                                Integer waveNum) {
+                                Integer waveNum,
+                                DataSourceEnum dataSourceEnum) {
         List<ContrastNonHarmonicResult> info = new ArrayList<>();
         if (CollUtil.isNotEmpty(devDataList) && CollUtil.isNotEmpty(standardDevDataList) && CollUtil.isNotEmpty(errSysDtls)) {
 
             Map<String, List<List<Double>>> map = devListMap(devDataList, standardDevDataList, desc, dataRule);
+            if (ObjectUtil.isNull(map)) {
+                return 4;
+            }
             ContrastNonHarmonicResult result = new ContrastNonHarmonicResult();
             result.setWaveNum(waveNum);
 
@@ -1735,13 +1748,21 @@ public class DetectionServiceImpl {
             result.setDevMonitorId(devIdMapComm.get(split1[0]) + "_" + split1[1]);
             result.setStdDevMonitorId(devIdMapComm.get(split2[0]) + "_" + split2[1]);
             result.setAdType(errSysDtls.get(0).getScriptType());
-            result.setDataType(DataSourceEnum.REAL_DATA.getValue());
+            result.setDataType(dataSourceEnum.getValue());
             if (ObjectUtil.isNotNull(waveNum)) {
                 result.setDataType(DataSourceEnum.WAVE_DATA.getValue());
             }
 
+            Map<String, List<Double>> validData = this.getValidData(standardDevDataList, desc);
+
+            Integer validGroupNum = 0;
             if (map.containsKey(TYPE_T)) {
+                if (ObjectUtil.isNotNull(validData)) {
+                    List<Double> tValidDataList = validData.get(TYPE_T);
+                    validGroupNum = this.getValidGroupNum(tValidDataList, null, errSysDtls, fData, scale, dataRule);
+                }
                 List<DetectionData> tList = rangeComparisonList(map.get(TYPE_T).get(0), map.get(TYPE_T).get(1), errSysDtls, fData, scale, dataRule);
+                this.setValidGroupNum(tList, validGroupNum);
                 result.setTValue(JSON.toJSONString(tList));
                 result.setResultFlag(setResultFlag(tList));
             } else {
@@ -1758,7 +1779,13 @@ public class DetectionServiceImpl {
                 phases.add(TYPE_B);
 
                 for (String phase : phases) {
+                    if (ObjectUtil.isNotNull(validData)) {
+                        List<Double> validDataList = validData.get(phase);
+                        validGroupNum = this.getValidGroupNum(validDataList, null, errSysDtls, fData, scale, dataRule);
+                    }
+
                     List<DetectionData> phaseList = rangeComparisonList(map.get(phase).get(0), map.get(phase).get(1), errSysDtls, fData, scale, dataRule);
+                    this.setValidGroupNum(phaseList, validGroupNum);
                     resultFlag.addAll(phaseList);
                     BiConsumer<ContrastNonHarmonicResult, List<DetectionData>> setter = setters.get(phase);
                     setter.accept(result, phaseList);
@@ -1773,6 +1800,169 @@ public class DetectionServiceImpl {
         return StorageUtil.getInteger(resultFlag);
     }
 
+    private Map<String, List<Double>> getValidData(List<DevData> dev, String desc) {
+        List<Double> aDev = new ArrayList<>();
+        List<Double> bDev = new ArrayList<>();
+        List<Double> cDev = new ArrayList<>();
+        List<Double> tDev = new ArrayList<>();
+
+        for (int i = 0; i < dev.size(); i++) {
+            List<DevData.SqlDataDTO> devSqlData = dev.get(i).getSqlData();
+
+            String finalDesc = desc;
+            List<DevData.SqlDataDTO.ListDTO> devList = devSqlData.stream().filter(j -> finalDesc.equals(j.getDesc()))
+                    .map(DevData.SqlDataDTO::getList).collect(Collectors.toList());
+
+            if (CollUtil.isEmpty(devList)) {
+                return null;
+            }
+            aDev.addAll(devList.stream().filter(x -> ObjectUtil.isNotNull(x.getA()))
+                    .map(x -> x.getA().doubleValue())
+                    .collect(Collectors.toList()));
+            bDev.addAll(devList.stream().filter(x -> ObjectUtil.isNotNull(x.getB()))
+                    .map(x -> x.getB().doubleValue())
+                    .collect(Collectors.toList()));
+            cDev.addAll(devList.stream().filter(x -> ObjectUtil.isNotNull(x.getC()))
+                    .map(x -> x.getC().doubleValue())
+                    .collect(Collectors.toList()));
+            tDev.addAll(devList.stream().filter(x -> ObjectUtil.isNotNull(x.getT()))
+                    .map(x -> x.getT().doubleValue())
+                    .collect(Collectors.toList()));
+        }
+
+        return new HashMap() {
+            {
+                put(TYPE_A, aDev);
+                put(TYPE_B, bDev);
+                put(TYPE_C, cDev);
+                put(TYPE_T, tDev);
+            }
+        };
+    }
+
+    private Map<String, Map<Double, List<Double>>> getHarmValidData(List<DevData> dev, String fundCode, String harmCode, Integer harmonicFlag) {
+        // key为相别、value{key为谐波次数，value为按数据处理原则处理后的数据}
+        Map<String, Map<Double, List<Double>>> devMap = new HashMap<>(3);
+
+        List<Double> harmNum = new ArrayList<>();
+        if (1 == harmonicFlag) {
+            harmNum.addAll(Stream.iterate(0.5, x -> x + 1.0).limit(50).collect(Collectors.toList()));
+        } else {
+            harmNum.addAll(Stream.iterate(1.0, x -> x + 1.0).limit(50).collect(Collectors.toList()));
+        }
+
+        for (int i = 0; i < dev.size(); i++) {
+            List<DevData.SqlDataDTO> devSqlData = dev.get(i).getSqlData();
+
+            Optional<DevData.SqlDataDTO> first1 = Optional.empty();
+
+            if (CollUtil.isNotEmpty(devSqlData)) {
+                first1 = devSqlData.stream().filter(j -> fundCode.equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
+            }
+
+            DevData.SqlDataDTO fund1 = null;
+            if (first1.isPresent()) {
+                fund1 = first1.get();
+            }
+
+            List<DevData.SqlDataHarmDTO> devHarmList = dev.get(i).getSqlDataHarm().stream().filter(x -> harmCode.equals(x.getDesc())).collect(Collectors.toList());
+
+            if (CollUtil.isEmpty(devHarmList)) {
+                return null;
+            }
+
+            if (CollUtil.isNotEmpty(devHarmList)) {
+                DevData.SqlDataHarmDTO devHarm = devHarmList.get(0);
+                if (ObjectUtil.isNotNull(fund1)) {
+                    harmPut(TYPE_A, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getA()), harmonicFlag);
+                    harmPut(TYPE_B, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getB()), harmonicFlag);
+                    harmPut(TYPE_C, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getC()), harmonicFlag);
+                } else {
+                    harmPut(TYPE_A, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                    harmPut(TYPE_B, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                    harmPut(TYPE_C, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                }
+            }
+        }
+        return devMap;
+    }
+
+    private Integer getValidGroupNum(List<Double> devDataList, List<Double> U1List, List<PqErrSysDtls> errSysDtls, Double fData, Integer scale, DictDataEnum dataRule) {
+        int result = 0;
+        if (dataRule.getCode().equals(DictDataEnum.Own_value.getCode()) || dataRule.getCode().equals(DictDataEnum.SECTION_VALUE.getCode())) {
+            return 1;
+        } else {
+            for (int i = 0; i < devDataList.size(); i++) {
+                Double U1 = CollUtil.isNotEmpty(U1List) ? U1List.get(i) : null;
+                Double stdDevData = BigDecimal.valueOf(devDataList.get(i)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+                Double devData = BigDecimal.valueOf(devDataList.get(i)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+                DetectionData detectionData = new DetectionData();
+                detectionData.setIsData(ResultEnum.NO_ERROR_SYS.getValue());
+
+                //获得误差体系
+                List<PqErrSysDtls> errSysDtls1 = errSysDtls.stream().filter(x -> rangeComparison(startRadiusEnd(x.getStartValue(), fData, stdDevData, x.getConditionType(), scale),
+                        x.getStartFlag(),
+                        startRadiusEnd(x.getEndValue(), fData, stdDevData, x.getConditionType(), scale),
+                        x.getEndFlag(),
+                        ObjectUtil.isNotNull(U1) ? stdDevData * U1 * 0.01 : stdDevData)).collect(Collectors.toList());
+                detectionData.setData(devData);
+                detectionData.setResultData(stdDevData);
+                if (CollUtil.isNotEmpty(errSysDtls1)) {
+                    result++;
+
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private Map<Double, Integer> getHarmValidGroupNum(Map<Double, List<Double>> devDataMap, List<Double> U1List, List<PqErrSysDtls> errSysDtls, Double fData, Integer scale, DictDataEnum dataRule) {
+        Map<Double, Integer> resultMap = new HashMap<>();
+        devDataMap.forEach((harmNum, dataList) -> {
+            if (dataRule.getCode().equals(DictDataEnum.Own_value.getCode()) || dataRule.getCode().equals(DictDataEnum.SECTION_VALUE.getCode())) {
+                resultMap.put(harmNum, 1);
+            } else {
+                Integer validGroupNum = 0;
+                for (int i = 0; i < dataList.size(); i++) {
+                    Double U1 = CollUtil.isNotEmpty(U1List) ? U1List.get(i) : null;
+                    Double stdDevData = BigDecimal.valueOf(dataList.get(i)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    Double devData = BigDecimal.valueOf(dataList.get(i)).setScale(scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+                    DetectionData detectionData = new DetectionData();
+                    detectionData.setIsData(ResultEnum.NO_ERROR_SYS.getValue());
+
+                    //获得误差体系
+                    List<PqErrSysDtls> errSysDtls1 = errSysDtls.stream().filter(x -> rangeComparison(startRadiusEnd(x.getStartValue(), fData, stdDevData, x.getConditionType(), scale),
+                            x.getStartFlag(),
+                            startRadiusEnd(x.getEndValue(), fData, stdDevData, x.getConditionType(), scale),
+                            x.getEndFlag(),
+                            ObjectUtil.isNotNull(U1) ? stdDevData * U1 * 0.01 : stdDevData)).collect(Collectors.toList());
+                    detectionData.setData(devData);
+                    detectionData.setResultData(stdDevData);
+                    if (CollUtil.isNotEmpty(errSysDtls1)) {
+                        validGroupNum++;
+                    }
+                }
+                resultMap.put(harmNum, validGroupNum);
+            }
+        });
+        return resultMap;
+    }
+
+    private void setValidGroupNum(List<DetectionData> tList, Integer validGroupNum) {
+        tList.forEach(detectionData -> {
+            detectionData.setValidGroupNum(validGroupNum);
+        });
+    }
+
+    private void setHarmValidGroupNum(List<DetectionData> integerBooleanA, Map<Double, Integer> harmValidGroupNumA) {
+        integerBooleanA.forEach(detectionData -> {
+            Double harmNum = detectionData.getNum();
+            Integer validGroupNum = harmValidGroupNumA.get(harmNum);
+            detectionData.setValidGroupNum(validGroupNum);
+        });
+    }
+
 
     /**
      * 处理谐波数据
@@ -1790,6 +1980,7 @@ public class DetectionServiceImpl {
      * @param code                结果表code
      * @param scale               小数点位数
      * @param waveNum             第几次录波
+     * @param dataSourceEnum      数据源类型
      * @return
      */
     public Integer isHarmQualified(List<DevData> devDataList,
@@ -1804,7 +1995,8 @@ public class DetectionServiceImpl {
                                    Integer num,
                                    String code,
                                    Integer scale,
-                                   Integer waveNum) {
+                                   Integer waveNum,
+                                   DataSourceEnum dataSourceEnum) {
         List<ContrastHarmonicResult> info = new ArrayList<>();
         if (CollUtil.isNotEmpty(devDataList) && CollUtil.isNotEmpty(standardDevDataList) && CollUtil.isNotEmpty(errSysDtls)) {
             String fundCode = "";
@@ -1840,6 +2032,9 @@ public class DetectionServiceImpl {
             }
 
             Map<String, List<Map<Double, List<Double>>>> devMap = devHarmListMap(devDataList, standardDevDataList, fundCode, harmCode, harmonicFlag, dataRule);
+            if (ObjectUtil.isNull(devMap)) {
+                return 4;
+            }
             ContrastHarmonicResult result = new ContrastHarmonicResult();
             result.setWaveNum(waveNum);
 
@@ -1849,14 +2044,27 @@ public class DetectionServiceImpl {
             result.setDevMonitorId(devIdMapComm.get(split1[0]) + "_" + split1[1]);
             result.setStdDevMonitorId(devIdMapComm.get(split2[0]) + "_" + split2[1]);
             result.setAdType(errSysDtls.get(0).getScriptType());
-            result.setDataType(DataSourceEnum.REAL_DATA.getValue());
+            result.setDataType(dataSourceEnum.getValue());
             if (ObjectUtil.isNotNull(waveNum)) {
                 result.setDataType(DataSourceEnum.WAVE_DATA.getValue());
             }
 
+            Map<String, Map<Double, List<Double>>> harmValidData = this.getHarmValidData(standardDevDataList, fundCode, harmCode, harmonicFlag);
+
             List<DetectionData> integerBooleanA = harmRangeComparison(devMap.get(TYPE_A).get(0), devMap.get(TYPE_A).get(1), errSysDtls, type, fData, scale, dataRule);
-            List<DetectionData> integerBooleanB = harmRangeComparison(devMap.get(TYPE_B).get(0), devMap.get(TYPE_A).get(1), errSysDtls, type, fData, scale, dataRule);
+            List<DetectionData> integerBooleanB = harmRangeComparison(devMap.get(TYPE_B).get(0), devMap.get(TYPE_B).get(1), errSysDtls, type, fData, scale, dataRule);
-            List<DetectionData> integerBooleanC = harmRangeComparison(devMap.get(TYPE_C).get(0), devMap.get(TYPE_A).get(1), errSysDtls, type, fData, scale, dataRule);
+            List<DetectionData> integerBooleanC = harmRangeComparison(devMap.get(TYPE_C).get(0), devMap.get(TYPE_C).get(1), errSysDtls, type, fData, scale, dataRule);
+
+            Map<String, Map<Double, List<Double>>> U1ListMap = this.getU1ListMap(standardDevDataList, fundCode, harmCode, harmonicFlag);
+            Map<Double, Integer> harmValidGroupNumA = this.getHarmValidGroupNum(harmValidData.get(TYPE_A), U1ListMap.get(TYPE_A).get(0.0), errSysDtls, fData, scale, dataRule);
+            this.setHarmValidGroupNum(integerBooleanA, harmValidGroupNumA);
+
+            Map<Double, Integer> harmValidGroupNumB = this.getHarmValidGroupNum(harmValidData.get(TYPE_B), U1ListMap.get(TYPE_B).get(0.0), errSysDtls, fData, scale, dataRule);
+            this.setHarmValidGroupNum(integerBooleanB, harmValidGroupNumB);
+
+            Map<Double, Integer> harmValidGroupNumC = this.getHarmValidGroupNum(harmValidData.get(TYPE_C), U1ListMap.get(TYPE_C).get(0.0), errSysDtls, fData, scale, dataRule);
+            this.setHarmValidGroupNum(integerBooleanC, harmValidGroupNumC);
+
             reflectHarmonic(true, "a", integerBooleanA, result, harmonicFlag);
             reflectHarmonic(true, "b", integerBooleanB, result, harmonicFlag);
             reflectHarmonic(true, "c", integerBooleanC, result, harmonicFlag);
@@ -1873,6 +2081,59 @@ public class DetectionServiceImpl {
         return StorageUtil.getInteger(resultFlag);
     }
 
+    private Map<String, Map<Double, List<Double>>> getU1ListMap(List<DevData> devDataList, String fundCode, String harmCode, Integer harmonicFlag) {
+        Map<String, Map<Double, List<Double>>> resultMap = new HashMap<>(3);
+
+        // key为相别、value{key为谐波次数，value为按数据处理原则处理后的数据}
+        Map<String, Map<Double, List<Double>>> devMap = new HashMap<>(3);
+
+        List<Double> harmNum = new ArrayList<>();
+        if (1 == harmonicFlag) {
+            harmNum.addAll(Stream.iterate(0.5, x -> x + 1.0).limit(50).collect(Collectors.toList()));
+        } else {
+            harmNum.addAll(Stream.iterate(1.0, x -> x + 1.0).limit(50).collect(Collectors.toList()));
+        }
+
+        for (int i = 0; i < devDataList.size(); i++) {
+            List<DevData.SqlDataDTO> standardDevSqlData = devDataList.get(i).getSqlData();
+
+            Optional<DevData.SqlDataDTO> first1 = Optional.empty();
+
+            if (CollUtil.isNotEmpty(standardDevSqlData)) {
+                first1 = standardDevSqlData.stream().filter(j -> fundCode.equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
+            }
+
+            DevData.SqlDataDTO fund1 = null;
+            if (first1.isPresent()) {
+                fund1 = first1.get();
+            }
+
+            List<DevData.SqlDataHarmDTO> devHarmList = devDataList.get(i).getSqlDataHarm().stream().filter(x -> harmCode.equals(x.getDesc())).collect(Collectors.toList());
+
+            if (CollUtil.isEmpty(devHarmList)) {
+                return null;
+            }
+
+            if (CollUtil.isNotEmpty(devHarmList)) {
+                DevData.SqlDataHarmDTO devHarm = devHarmList.get(0);
+                if (ObjectUtil.isNotNull(fund1)) {
+                    harmPut(TYPE_A, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getA()), harmonicFlag);
+                    harmPut(TYPE_B, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getB()), harmonicFlag);
+                    harmPut(TYPE_C, devMap, harmNum, devHarm, String.valueOf(fund1.getList().getC()), harmonicFlag);
+                } else {
+                    harmPut(TYPE_A, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                    harmPut(TYPE_B, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                    harmPut(TYPE_C, devMap, harmNum, devHarm, "1.0", harmonicFlag);
+                }
+            }
+        }
+        resultMap.put(TYPE_A, devMap.get(TYPE_A));
+        resultMap.put(TYPE_B, devMap.get(TYPE_C));
+        resultMap.put(TYPE_C, devMap.get(TYPE_C));
+
+        return resultMap;
+    }
+
 
     /**
      * 处理非谐波类取值
@@ -1893,6 +2154,7 @@ public class DetectionServiceImpl {
         List<Double> cStandardDev = new ArrayList<>();
         List<Double> tDev = new ArrayList<>();
         List<Double> tStandardDev = new ArrayList<>();
+
         for (int i = 0; i < dev.size(); i++) {
             List<DevData.SqlDataDTO> devSqlData = dev.get(i).getSqlData();
             List<DevData.SqlDataDTO> standardDevSqlData = standardDev.get(i).getSqlData();
@@ -1903,6 +2165,10 @@ public class DetectionServiceImpl {
             List<DevData.SqlDataDTO.ListDTO> standardDevList = standardDevSqlData.stream().filter(j -> finalDesc.equals(j.getDesc()))
                     .map(DevData.SqlDataDTO::getList).collect(Collectors.toList());
 
+            if (CollUtil.isEmpty(devList) || CollUtil.isEmpty(standardDevList)) {
+                return null;
+            }
+
             aDev.addAll(devList.stream().filter(x -> ObjectUtil.isNotNull(x.getA()))
                     .map(x -> x.getA().doubleValue())
                     .collect(Collectors.toList()));
@@ -1933,66 +2199,66 @@ public class DetectionServiceImpl {
                     .map(x -> x.getT().doubleValue())
                     .collect(Collectors.toList()));
         }
-        List<Integer> aIdxs = DetectionUtil.sort(aDev, false);
+        List<Integer> aIdxs = DetectionUtil.sort(aStandardDev, false);
-        List<Integer> bIdxs = DetectionUtil.sort(bDev, false);
+        List<Integer> bIdxs = DetectionUtil.sort(bStandardDev, false);
-        List<Integer> cIdxs = DetectionUtil.sort(cDev, false);
+        List<Integer> cIdxs = DetectionUtil.sort(cStandardDev, false);
-        List<Integer> tIdxs = DetectionUtil.sort(tDev, false);
+        List<Integer> tIdxs = DetectionUtil.sort(tStandardDev, false);
         switch (dataRule) {
             case SECTION_VALUE:
-                if (aDev.size() > 2) {
+                if (aStandardDev.size() > 2) {
-                    aDev.remove(aIdxs.get(0));
+                    aStandardDev.remove(aIdxs.get(0));
-                    aDev.remove(aIdxs.get(aIdxs.size() - 1));
+                    aStandardDev.remove(aIdxs.get(aIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(aStandardDev, aIdxs.subList(1, aIdxs.size() - 1));
+                    List<Double> newArray = DetectionUtil.getNewArray(aDev, aIdxs.subList(1, aIdxs.size() - 1));
-                    aStandardDev.clear();
+                    aDev.clear();
-                    aStandardDev.addAll(newArray);
+                    aDev.addAll(newArray);
                 }
 
-                if (bDev.size() > 2) {
+                if (bStandardDev.size() > 2) {
-                    bDev.remove(bIdxs.get(0));
+                    bStandardDev.remove(bIdxs.get(0));
-                    bDev.remove(bIdxs.get(bIdxs.size() - 1));
+                    bStandardDev.remove(bIdxs.get(bIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(bStandardDev, bIdxs.subList(1, bIdxs.size() - 1));
+                    List<Double> newArray = DetectionUtil.getNewArray(bDev, bIdxs.subList(1, bIdxs.size() - 1));
-                    bStandardDev.clear();
+                    bDev.clear();
-                    bStandardDev.addAll(newArray);
+                    bDev.addAll(newArray);
                 }
 
-                if (cDev.size() > 2) {
+                if (cStandardDev.size() > 2) {
-                    cDev.remove(cIdxs.get(0));
+                    cStandardDev.remove(cIdxs.get(0));
-                    cDev.remove(cIdxs.get(cIdxs.size() - 1));
+                    cStandardDev.remove(cIdxs.get(cIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(cStandardDev, cIdxs.subList(1, cIdxs.size() - 1));
+                    List<Double> newArray = DetectionUtil.getNewArray(cDev, cIdxs.subList(1, cIdxs.size() - 1));
-                    cStandardDev.clear();
+                    cDev.clear();
-                    cStandardDev.addAll(newArray);
+                    cDev.addAll(newArray);
                 }
 
-                if (tDev.size() > 2) {
+                if (tStandardDev.size() > 2) {
-                    tDev.remove(tIdxs.get(0));
+                    tStandardDev.remove(tIdxs.get(0));
-                    tDev.remove(tIdxs.get(tIdxs.size() - 1));
+                    tStandardDev.remove(tIdxs.get(tIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(tStandardDev, tIdxs.subList(1, tIdxs.size() - 1));
+                    List<Double> newArray = DetectionUtil.getNewArray(tDev, tIdxs.subList(1, tIdxs.size() - 1));
-                    tStandardDev.clear();
+                    tDev.clear();
-                    tStandardDev.addAll(newArray);
+                    tDev.addAll(newArray);
                 }
                 break;
             case CP95_VALUE:
-                if (CollUtil.isNotEmpty(aDev)) {
+                if (CollUtil.isNotEmpty(aStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(aDev);
+                    int cp95Idx = DetectionUtil.getCP95Idx(aStandardDev);
-                    aDev = Collections.singletonList(aDev.get(cp95Idx));
                     aStandardDev = Collections.singletonList(aStandardDev.get(cp95Idx));
+                    aDev = Collections.singletonList(aDev.get(aIdxs.get(cp95Idx)));
                 }
-                if (CollUtil.isNotEmpty(bDev)) {
+                if (CollUtil.isNotEmpty(bStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(bDev);
+                    int cp95Idx = DetectionUtil.getCP95Idx(bStandardDev);
-                    bDev = Collections.singletonList(bDev.get(cp95Idx));
                     bStandardDev = Collections.singletonList(bStandardDev.get(cp95Idx));
+                    bDev = Collections.singletonList(bDev.get(bIdxs.get(cp95Idx)));
                 }
 
-                if (CollUtil.isNotEmpty(cDev)) {
+                if (CollUtil.isNotEmpty(cStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(cDev);
+                    int cp95Idx = DetectionUtil.getCP95Idx(cStandardDev);
-                    cDev = Collections.singletonList(cDev.get(cp95Idx));
                     cStandardDev = Collections.singletonList(cStandardDev.get(cp95Idx));
+                    cDev = Collections.singletonList(cDev.get(cIdxs.get(cp95Idx)));
                 }
 
-                if (CollUtil.isNotEmpty(tDev)) {
+                if (CollUtil.isNotEmpty(tStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(tDev);
+                    int cp95Idx = DetectionUtil.getCP95Idx(tStandardDev);
-                    tDev = Collections.singletonList(tDev.get(cp95Idx));
                     tStandardDev = Collections.singletonList(tStandardDev.get(cp95Idx));
+                    tDev = Collections.singletonList(tDev.get(tIdxs.get(cp95Idx)));
                 }
 
                 break;
@@ -2090,9 +2356,12 @@ public class DetectionServiceImpl {
                 fund2 = first2.get();
             }
 
-            List<DevData.SqlDataHarmDTO> devHarmList = dev.get(i).getSqlDataHarm().stream().filter(x -> x.getDesc().equals(harmCode)).collect(Collectors.toList());
+            List<DevData.SqlDataHarmDTO> devHarmList = dev.get(i).getSqlDataHarm().stream().filter(x -> harmCode.equals(x.getDesc())).collect(Collectors.toList());
-            List<DevData.SqlDataHarmDTO> stdDevHarmList = standardDev.get(i).getSqlDataHarm().stream().filter(x -> x.getDesc().equals(harmCode)).collect(Collectors.toList());
+            List<DevData.SqlDataHarmDTO> stdDevHarmList = standardDev.get(i).getSqlDataHarm().stream().filter(x -> harmCode.equals(x.getDesc())).collect(Collectors.toList());
 
+            if (CollUtil.isEmpty(devHarmList) || CollUtil.isEmpty(stdDevHarmList)) {
+                return null;
+            }
 //            // 如果角型接法中，不存在线电压谐波电压含有率，则取相电压谐波电压含有率进行计算
 //            if (CollUtil.isEmpty(devHarmList)) {
 //                if (DetectionCodeEnum.PV2_50.getCode().equals(harmCode)) {
@@ -2131,7 +2400,7 @@ public class DetectionServiceImpl {
                 }
             }
         }
-        devMap.forEach((typeKey, typeValue) -> {
+        standardDevMap.forEach((typeKey, typeValue) -> {
             typeValue.forEach((key, value) -> {
                 if (CollUtil.isNotEmpty(value)) {
                     List<Integer> idx = DetectionUtil.sort(value, false);
@@ -2140,9 +2409,9 @@ public class DetectionServiceImpl {
                             if (value.size() > 2) {
                                 value.remove(idx.get(0));
                                 value.remove(idx.get(idx.size() - 1));
-                                List<Double> newArray = DetectionUtil.getNewArray(standardDevMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1));
+                                List<Double> newArray = DetectionUtil.getNewArray(devMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1));
-                                standardDevMap.get(typeKey).get(key).clear();
+                                devMap.get(typeKey).get(key).clear();
-                                standardDevMap.get(typeKey).get(key).addAll(newArray);
+                                devMap.get(typeKey).get(key).addAll(newArray);
                             }
                             break;
                         case CP95_VALUE:
@@ -2151,18 +2420,18 @@ public class DetectionServiceImpl {
                                 List<Double> newValue = Collections.singletonList(value.get(cp95Idx));
                                 value.clear();
                                 value.addAll(newValue);
-                                Double standardCP95Data = standardDevMap.get(typeKey).get(key).get(cp95Idx);
+                                Double devCP95Data = devMap.get(typeKey).get(key).get(idx.get(cp95Idx));
-                                standardDevMap.get(typeKey).get(key).clear();
+                                devMap.get(typeKey).get(key).clear();
-                                standardDevMap.get(typeKey).get(key).add(standardCP95Data);
+                                devMap.get(typeKey).get(key).add(devCP95Data);
                             }
                             break;
                         case AVG_VALUE:
                             List<Double> avgDoubles = DetectionUtil.getAvgDoubles(value);
                             value.clear();
                             value.addAll(avgDoubles);
-                            List<Double> standardAvgData = DetectionUtil.getAvgDoubles(standardDevMap.get(typeKey).get(key));
+                            List<Double> devAvgData = DetectionUtil.getAvgDoubles(devMap.get(typeKey).get(key));
-                            standardDevMap.get(typeKey).get(key).clear();
+                            devMap.get(typeKey).get(key).clear();
-                            standardDevMap.get(typeKey).get(key).addAll(standardAvgData);
+                            devMap.get(typeKey).get(key).addAll(devAvgData);
                             break;
                     }
                 }

detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java

@@ -25,6 +25,7 @@ import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.po.PqDev;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanSource;
 import com.njcn.gather.plan.service.IAdPlanService;
@@ -75,7 +76,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final SocketManager socketManager;
 
-    @Value("${log.homeDir}")
+    @Value("${report.reportDir}")
     private String alignDataFilePath;
 
 
@@ -336,7 +337,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
 
     @Override
     public void exportAlignData() {
-        String fileName = "实时数据.xlsx";
+        String fileName = "对齐数据.xlsx";
         HttpServletResponse response = HttpServletUtil.getResponse();
         response.reset();
         response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
@@ -385,7 +386,15 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         String jsonString = JSON.toJSONString(map);
         SocketMsg<String> socketMsg = new SocketMsg<>();
         socketMsg.setRequestId(SourceOperateCodeEnum.YJC_SBTXJY.getValue());
+        AdPlan currentTestPlan = FormalTestManager.currentTestPlan;
+        String[] datasource = currentTestPlan.getDatasourceId().split(",");
+        if (Arrays.stream(datasource).anyMatch(x -> x.equals(DataSourceEnum.REAL_DATA.getValue()))) {
             socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue());
+        } else if (Arrays.stream(datasource).anyMatch(x -> x.equals(DataSourceEnum.MINUTE_STATISTICS_AVG.getValue()) || x.equals(DataSourceEnum.MINUTE_STATISTICS_MAX.getValue()) || x.equals(DataSourceEnum.MINUTE_STATISTICS_MIN.getValue()) || x.equals(DataSourceEnum.MINUTE_STATISTICS_CP95.getValue()))) {
+            socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_01.getValue());
+        } else if (Arrays.stream(datasource).anyMatch(x -> x.equals(DataSourceEnum.WAVE_DATA.getValue()))) {
+            socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_INIT_GATHER_02.getValue());
+        }
         socketMsg.setData(jsonString);
         PreDetectionParam preDetectionParam = new PreDetectionParam();
         preDetectionParam.setUserPageId(param.getLoginName());

detection/src/main/java/com/njcn/gather/detection/util/DetectionUtil.java

@@ -51,6 +51,11 @@ public class DetectionUtil {
      */
     private static final long MILLIS_TO_SECONDS = 1000L;
 
+    /**
+     * 毫秒转分钟的转换因子
+     */
+    private static final long MILLIS_TO_MINUTES = 1000 * 60L;
+
     /**
      * 时间对齐判断的容差毫秒数
      * 当两个时间戳差值小于此值时，认为时间是对齐的
@@ -123,12 +128,12 @@ public class DetectionUtil {
      * @param standardDevData 标准设备数据，包含时间戳信息
      * @return true表示数据时间对齐，false表示不对齐
      */
-    public static boolean isAlignData(DevData devData, DevData standardDevData) {
+    public static boolean isAlignData(DevData devData, DevData standardDevData, int type) {
         if (ObjectUtil.isNotNull(devData) && ObjectUtil.isNotNull(standardDevData)) {
             // 获取两个设备数据的时间戳（毫秒）
             long devMillis = getMillis(devData.getTime());
             long standardMillis = getMillis(standardDevData.getTime());
-
+            if (type == 1) { // 实时数据
                 // 方式1：将时间戳转换为秒级精度进行比较（处理跨秒边界情况）
                 BigDecimal devSeconds = BigDecimal.valueOf(devMillis).divide(BigDecimal.valueOf(MILLIS_TO_SECONDS), 0, RoundingMode.HALF_UP);
                 BigDecimal standardSeconds = BigDecimal.valueOf(standardMillis).divide(BigDecimal.valueOf(MILLIS_TO_SECONDS), 0, RoundingMode.HALF_UP);
@@ -141,6 +146,15 @@ public class DetectionUtil {
                     return true;
                 }
             }
+            if (type == 2) { //统计数据
+                BigDecimal devSeconds = BigDecimal.valueOf(devMillis).divide(BigDecimal.valueOf(MILLIS_TO_MINUTES), 0, RoundingMode.HALF_UP);
+                BigDecimal standardSeconds = BigDecimal.valueOf(standardMillis).divide(BigDecimal.valueOf(MILLIS_TO_MINUTES), 0, RoundingMode.HALF_UP);
+                if (devSeconds.compareTo(standardSeconds) == 0) {
+                    return true;
+                }
+            }
+        }
+
         return false;
     }
 

detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java

@@ -58,7 +58,7 @@ public class CnSocketUtil {
      * 比对式-退出检测
      */
     public static void contrastSendquit(String loginName, SourceOperateCodeEnum operateCode, boolean isRemoveSocket) {
-        System.out.println("比对式-发送关闭备通讯模块指令。。。。。。。。");
+        System.out.println("比对式-发送" + operateCode.getMsg() + "指令。。。。。。。。");
         SocketMsg<String> socketMsg = new SocketMsg<>();
         socketMsg.setRequestId(SourceOperateCodeEnum.QUITE.getValue());
         socketMsg.setOperateCode(operateCode.getValue());

detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java

@@ -7,8 +7,10 @@ import com.njcn.gather.detection.pojo.po.DevData;
 import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.device.pojo.vo.PreDetection;
+import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.plan.pojo.po.AdPlanTestConfig;
+import com.njcn.gather.script.pojo.po.SourceIssue;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 
 import java.util.ArrayList;
@@ -16,6 +18,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 
 /**
  * @Author: cdf
@@ -87,6 +91,17 @@ public class FormalTestManager {
      */
     public static AdPlan currentTestPlan;
 
+    /**
+     * 非录波数据源枚举
+     */
+    public static DataSourceEnum nonWaveDataSourceEnum;
+
+
+    /**
+     * 统计数据最大超时时间
+     */
+    public static Long maxTime;
+
     public static AdPlanTestConfig curretntTestPlanConfig;
 
     /**
@@ -154,4 +169,43 @@ public class FormalTestManager {
      */
     public static List<DevLineTestResult> preNumTestResultList = new ArrayList<>();
 
+    /**
+     * 定时器
+     */
+    public static ScheduledExecutorService scheduler;
+
+    /**
+     * 定时器任务
+     */
+    public static ScheduledFuture<?> scheduledFuture;
+
+
+    public static boolean isWaveCheck;
+
+    public static List<String> pstDataType;
+
+    public static boolean isPstData;
+
+    /**
+     * 是否在检测中
+     */
+    public static boolean isTesting;
+
+    public static boolean realProtocol;
+
+    public static boolean statisticsProtocol;
+
+    public static boolean voltageProtocol;
+
+    public static boolean unknownError;
+
+    /**
+     * 当前下发的脚本
+     */
+    public static SourceIssue currentIssue;
+
+    /**
+     * 是否进行相序校验
+     */
+    public static boolean isXu;
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/MsgUtil.java

@@ -84,6 +84,15 @@ public class MsgUtil {
         }
     }
 
+    public static String getMonitorInfo(String monitorId, Map<String, String> devMap) {
+        if (StrUtil.isBlank(monitorId)) {
+            return "";
+        } else {
+            String[] split1 = monitorId.split("_");
+            return devMap.get(split1[0]) + CnSocketUtil.SPLIT_TAG + split1[1] + "路\"";
+        }
+    }
+
     /**
      * 获取消息
      *

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/HeartbeatHandler.java

@@ -193,7 +193,7 @@ public class HeartbeatHandler extends SimpleChannelInboundHandler<String> {
                 } else if (CnSocketUtil.SOURCE_TAG.equals(handlerType)) {
                     CnSocketUtil.quitSendSource(param);
                 } else {
-                    if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1 || FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP2) {
+                    if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1) {
                         CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
                     } else {
                         CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);

detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyContrastClientHandler.java

@@ -1,6 +1,6 @@
 package com.njcn.gather.detection.util.socket.cilent;
 
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.util.ObjectUtil;
 import com.njcn.gather.detection.handler.SocketContrastResponseService;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
@@ -60,11 +60,14 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
             socketContrastResponseService.deal(param, msg);
         } catch (Exception e) {
             log.error("处理服务端消息异常", e);
-            if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1 || FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP2) {
+//            if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1) {
+//                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
+//            } else {
+//                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+//            }
+            CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+            CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
             CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
-            } else {
-                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
-            }
         }
     }
 
@@ -85,18 +88,35 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
         if (evt instanceof IdleStateEvent) { //IdleState.在一段时间内没有收到任何消息时，会触发该事件
             if (((IdleStateEvent) evt).state() == IdleState.READER_IDLE) {
+                if (FormalTestManager.isTesting) {
                     System.out.println(LocalDateTime.now() + "contrastClientHandler触发读超时函数**************************************");
-                SocketManager.contrastClockMap.put(DataSourceEnum.REAL_DATA, SocketManager.contrastClockMap.get(DataSourceEnum.REAL_DATA) + 60L);
 
-                if (FormalTestManager.isRemoveSocket) {
+                    if (!FormalTestManager.isRemoveSocket && ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
-                    //实时数据
+                        long time = SocketManager.contrastClockMap.get(FormalTestManager.nonWaveDataSourceEnum) + 60L;
-                    if (SocketManager.contrastClockMap.get(DataSourceEnum.REAL_DATA) >= 60) {
+                        SocketManager.contrastClockMap.put(FormalTestManager.nonWaveDataSourceEnum, time);
-                        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+
-                        System.out.println("超时处理-----》" + "实时数据已超时----------------关闭");
+                        if (FormalTestManager.isPstData) {
-                        timeoutSend();
+                            if (time > 60 * 10) {
+                                if (DataSourceEnum.REAL_DATA == FormalTestManager.nonWaveDataSourceEnum) {
+                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+                                }
+                                if (FormalTestManager.isWaveCheck) {
+                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
+                                }
+                                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, true);
+                                timeoutSend(SourceOperateCodeEnum.QUIT_INIT_01);
+                            }
+                        } else if (DataSourceEnum.REAL_DATA == FormalTestManager.nonWaveDataSourceEnum) {
+                            if (time >= 60) {
+                                CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+                                timeoutSend(SourceOperateCodeEnum.QUIT_INIT_02);
+                            }
+                        } else if (time >= FormalTestManager.maxTime) {
+                            CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, true);
+                            timeoutSend(SourceOperateCodeEnum.QUIT_INIT_01);
+                        }
                     }
                 }
-
             }
         }
     }
@@ -126,8 +146,9 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
             System.out.println("Unknown exception caught: " + cause.getMessage());
             WebServiceManager.sendDetectionErrorMessage(param.getUserPageId(), SourceOperateCodeEnum.DEVICE_ERROR);
         }
-        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
-//        socketContrastResponseService.backCheckState(param);
+        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+        CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
         ctx.close();
     }
 
@@ -135,13 +156,14 @@ public class NettyContrastClientHandler extends SimpleChannelInboundHandler<Stri
     /**
      * 接收数据超时处理
      */
-    private void timeoutSend() {
+    private void timeoutSend(SourceOperateCodeEnum sourceOperateCodeEnum) {
+        System.out.println("超时处理-----》" + "统计数据已超时----------------关闭");
         // 向前端推送超时消息
         SocketDataMsg webSend = new SocketDataMsg();
+        webSend.setRequestId(sourceOperateCodeEnum.getValue());
+        webSend.setData(sourceOperateCodeEnum.getMsg() + SourceResponseCodeEnum.RECEIVE_DATA_TIME_OUT.getMessage());
         webSend.setCode(SourceResponseCodeEnum.RECEIVE_DATA_TIME_OUT.getCode());
         WebServiceManager.sendMsg(param.getUserPageId(), MsgUtil.msgToWebData(webSend, FormalTestManager.devNameMapComm, 0));
-
-        WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
     }
 
 }

detection/src/main/java/com/njcn/gather/detection/util/socket/websocket/WebServiceManager.java

@@ -120,6 +120,7 @@ public class WebServiceManager {
             channel.writeAndFlush(frame);
         } else {
             log.error("WebSocket推送消息失败，用户连接已断开，时间: {}, userId: {}", LocalDateTime.now(), userId);
+            WebSocketHandler.cleanupSocketResources(userId);
         }
     }
 
@@ -137,6 +138,7 @@ public class WebServiceManager {
             channel.writeAndFlush(frame);
         } else {
             log.error("WebSocket推送结构化消息失败，用户连接已断开，时间: {}, userId: {}", LocalDateTime.now(), userId);
+            WebSocketHandler.cleanupSocketResources(userId);
         }
     }
 

detection/src/main/java/com/njcn/gather/detection/util/socket/websocket/WebSocketHandler.java

@@ -5,7 +5,6 @@ import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.detection.util.socket.FormalTestManager;
-import com.njcn.gather.detection.util.socket.SocketManager;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -360,7 +359,7 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
      *
      * @param userId 用户ID
      */
-    private void cleanupSocketResources(String userId) {
+    public static void cleanupSocketResources(String userId) {
         if (userId == null || userId.trim().isEmpty()) {
             log.warn("userId为空，无法进行Socket连接清理");
             return;
@@ -372,20 +371,43 @@ public class WebSocketHandler extends SimpleChannelInboundHandler<TextWebSocketF
                 // 使用该用户的检测参数关闭Socket连接
                 log.info("使用用户检测参数关闭Socket连接，userId: {}", userId);
                 if (FormalTestManager.patternEnum.equals(PatternEnum.CONTRAST)) {
-                    if (!FormalTestManager.isRemoveSocket) {
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
-                        if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1 || FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP2) {
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
-                            CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, true);
+                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
-                        } else if (FormalTestManager.currentStep != SourceOperateCodeEnum.QUITE) {
+//                    if (FormalTestManager.isRemoveSocket) {
-                            CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, true);
+//                        boolean channelActive = SocketManager.isChannelActive(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
-                        } else {
+//                        if (channelActive) {
-                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
-                        }
+//                        }
-                    } else {
+//                    } else {
-                        boolean channelActive = SocketManager.isChannelActive(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        if (FormalTestManager.currentStep == SourceOperateCodeEnum.RECORD_WAVE_STEP1) {
-                        if (channelActive) {
+//                            CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
-                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        } else if (FormalTestManager.currentStep != SourceOperateCodeEnum.QUITE) {
-                        }
+//                            if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
-                    }
+//                                if (FormalTestManager.nonWaveDataSourceEnum == DataSourceEnum.REAL_DATA) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+//                                    if (FormalTestManager.statisticsProtocol) {
+//                                        CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                    }
+//                                } else {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                }
+//                                if (FormalTestManager.isWaveCheck) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                                }
+//                            } else {
+//                                if (FormalTestManager.statisticsProtocol) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
+//                                }
+//                                if (FormalTestManager.isWaveCheck) {
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_02, false);
+//                                    CnSocketUtil.contrastSendquit(preDetectionParam.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
+//                                }
+//                            }
+//                        } else {
+//                            SocketManager.removeUser(preDetectionParam.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG);
+//                        }
+//                    }
                 } else {
                     CnSocketUtil.quitSendSource(preDetectionParam);
                     CnSocketUtil.quitSend(preDetectionParam);

detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java

@@ -12,7 +12,6 @@ import com.njcn.common.utils.LogUtil;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.service.IPqDevService;
-import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.type.service.IDevTypeService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.FileUtil;
@@ -101,7 +100,7 @@ public class PqDevController extends BaseController {
     @OperateInfo(operateType = OperateType.DELETE)
     @PostMapping("/delete")
     @ApiOperation("删除被检设备")
-    @ApiImplicitParam(name = "ids", value = "被检设备id", required = true)
+    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
     public HttpResult<Boolean> delete(@RequestBody @Validated PqDevParam.DeleteParam param) {
         String methodDescribe = getMethodDescribe("delete");
         LogUtil.njcnDebug(log, "{}，删除ID数据为：{}", methodDescribe, String.join(StrUtil.COMMA, param.getIds()));
@@ -137,7 +136,7 @@ public class PqDevController extends BaseController {
             @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
             @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
     })
-    public HttpResult<Boolean> importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, HttpServletResponse response) {
+    public HttpResult importDev(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importDev");
         LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
         boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
@@ -147,12 +146,7 @@ public class PqDevController extends BaseController {
         if ("null".equals(planId)) {
             planId = null;
         }
-        Boolean result = pqDevService.importDev(file, patternId, planId, response);
+        return pqDevService.importDev(file, patternId, planId, response, cover);
-        if (result) {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
-        } else {
-            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
-        }
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -168,10 +162,31 @@ public class PqDevController extends BaseController {
 
     @OperateInfo
     @GetMapping("/getSelectOptions")
-    @ApiOperation("根据历史记录信息来获取下拉框内容")
+    @ApiOperation("从历史数据中查询下拉框选项")
+    @ApiImplicitParam(name = "pattern", value = "模式id", required = true)
     public HttpResult<Map<String, List<String>>> getSelectOptions(@RequestParam("pattern") String pattern) {
         String methodDescribe = getMethodDescribe("getSelectOptions");
         Map<String, List<String>> result = pqDevService.listSelectOptions(pattern);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @PostMapping(value = "/ttt")
+    @ApiOperation("批量导入被检设备")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "被检设备数据文件", required = true),
+            @ApiImplicitParam(name = "patternId", value = "模式id", required = true)
+    })
+    public HttpResult ttt(@RequestParam("file") MultipartFile file, @RequestParam("patternId") String patternId, @RequestParam("planId") String planId, @RequestParam(value = "cover", defaultValue = "0") Integer cover, HttpServletResponse response) {
+        String methodDescribe = getMethodDescribe("ttt");
+        LogUtil.njcnDebug(log, "{}，上传文件为：{}", methodDescribe, file.getOriginalFilename());
+        boolean fileType = FileUtil.judgeFileIsExcel(file.getOriginalFilename());
+        if (!fileType) {
+            throw new BusinessException(CommonResponseEnum.FILE_XLSX_ERROR);
+        }
+        if ("null".equals(planId)) {
+            planId = null;
+        }
+        return pqDevService.importDev(file, patternId, planId, response, cover);
+    }
 }

detection/src/main/java/com/njcn/gather/device/controller/PqStandardDevController.java

@@ -149,17 +149,17 @@ public class PqStandardDevController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/listByPlanId")
+//    @PostMapping("/listByPlanId")
-    @ApiOperation("查询出指定计划已关联的标准设备")
+//    @ApiOperation("查询出指定计划已关联的标准设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+//    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
-    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
+//    public HttpResult<List<PqStandardDev>> listByPlanId(@RequestParam("planId") String planId) {
-        String methodDescribe = getMethodDescribe("listByPlanId");
+//        String methodDescribe = getMethodDescribe("listByPlanId");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
+//        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, planId);
-        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
+//        List<PqStandardDev> pqDevVOList = pqStandardDevService.listByPlanId(planId);
-
+//
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
+//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqDevVOList, methodDescribe);
-    }
+//    }
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)

detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml

@@ -134,6 +134,7 @@
                 #{item}
             </foreach>
         </if>
+        order by dev.Create_Time DESC, dev.Name ASC
     </select>
 </mapper>
 

detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java

@@ -6,14 +6,12 @@ import com.njcn.gather.pojo.constant.DetectionValidMessage;
 import com.njcn.web.pojo.annotation.DateTimeStrValid;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.Valid;
 import javax.validation.constraints.*;
-import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -137,6 +135,7 @@ public class PqDevParam {
 
     @ApiModelProperty("是否为导入设备")
     private Integer importFlag;
+
     /**
      * 更新操作实体
      */
@@ -197,6 +196,12 @@ public class PqDevParam {
 
         @ApiModelProperty("是否分配")
         private Integer assign;
+        @ApiModelProperty("关键词")
+        private String keywords;
+        @ApiModelProperty("主计划ID")
+        private String planId;
+        @ApiModelProperty("是否分配子计划")
+        private Integer assignSub;
     }
 
     @Data

detection/src/main/java/com/njcn/gather/device/pojo/po/PqStandardDev.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.device.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;
 import lombok.Data;
@@ -72,5 +73,8 @@ public class PqStandardDev extends BaseEntity implements Serializable {
     private String devKey;
 
     private Integer state;
+
+    @TableField(exist = false)
+    private boolean disabled;
 }
 

detection/src/main/java/com/njcn/gather/device/pojo/vo/ContrastDevExcel.java

@@ -38,8 +38,8 @@ public class ContrastDevExcel implements Serializable {
     @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DetectionValidMessage.NAME_FORMAT_ERROR)
     private String name;
 
-    @Excel(name = "设备序列号*", width = 20, needMerge = true, orderNum = "5")
+    @Excel(name = "设备序列号", width = 20, needMerge = true, orderNum = "5")
-    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
+//    @NotBlank(message = DetectionValidMessage.FACTORYNO_NOT_BLANK)
     private String createId;
 
     @Excel(name = "设备类型*", width = 20, needMerge = true, orderNum = "6")
@@ -91,8 +91,8 @@ public class ContrastDevExcel implements Serializable {
     @NotNull(message = DetectionValidMessage.INSPECT_DATE_NOT_NULL)
     private LocalDate inspectDate;
 
-    @Excel(name = "谐波系统设备id*", width = 30, needMerge = true, orderNum = "18")
+    @Excel(name = "谐波系统设备id", width = 30, needMerge = true, orderNum = "18")
-    @NotBlank(message = DetectionValidMessage.HARM_SYS_ID_NOT_BLANK)
+//    @NotBlank(message = DetectionValidMessage.HARM_SYS_ID_NOT_BLANK)
     private String harmSysId;
 
     @ExcelCollection(name = "监测点信息", orderNum = "19")

detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java

@@ -111,4 +111,9 @@ public class PqDevVO extends PqDev {
      * 是否已经分配。0-未分配、1-已分配、2-所有
      */
     private Integer assign;
+
+    /**
+     * 检测点结果
+     */
+    private List<Integer> monitorResults;
 }

detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java

@@ -3,6 +3,7 @@ package com.njcn.gather.device.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.poi.PullDown;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum;
 import com.njcn.gather.device.pojo.param.PqDevParam;
 import com.njcn.gather.device.pojo.po.PqDev;
@@ -160,7 +161,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param planId    计划Id
      * @param response  响应
      */
-    boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+    HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
 
     /**
      * 导入灿能二楼设备数据
@@ -254,7 +255,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param planId    计划Id
      * @param response  响应
      */
-    boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response);
+    HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover);
 
     /**
      * 导入比对式设备数据
@@ -262,7 +263,7 @@ public interface IPqDevService extends IService<PqDev> {
      * @param contrastDevExcelList
      * @param patternId
      */
-    boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId);
+    HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover);
 
     /**
      * 获取比对式设备导出、导出文件模板的下拉列表

detection/src/main/java/com/njcn/gather/device/service/IPqStandardDevService.java

@@ -82,7 +82,7 @@ public interface IPqStandardDevService extends IService<PqStandardDev> {
      * @param planId
      * @return
      */
-    List<PqStandardDev> listByPlanId(String planId);
+//    List<PqStandardDev> listByPlanId(String planId);
 
     /**
      * 查询出标准设备所需的检测信息

detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java

@@ -11,15 +11,19 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.poi.PullDown;
+import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.EncryptionUtil;
 import com.njcn.db.mybatisplus.constant.DbConstant;
 import com.njcn.gather.device.mapper.PqDevMapper;
@@ -33,6 +37,7 @@ import com.njcn.gather.device.service.IPqDevSubService;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel;
 import com.njcn.gather.monitor.service.IPqMonitorService;
+import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.storage.service.DetectionDataDealService;
 import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
@@ -48,6 +53,7 @@ import com.njcn.gather.user.user.pojo.po.SysUser;
 import com.njcn.gather.user.user.service.ISysUserService;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.ExcelUtil;
+import com.njcn.web.utils.HttpResultUtil;
 import com.njcn.web.utils.PoiUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -62,6 +68,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author caozehui
@@ -211,7 +218,8 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         if (PatternEnum.CONTRAST.getValue().equals(dictDataService.getDictDataById(param.getPattern()).getCode())) {
             for (String id : param.getIds()) {
                 if (ObjectUtils.isNotEmpty(pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(id)))) {
-                    throw new BusinessException(DetectionResponseEnum.PQ_DEV_HAS_MONITOR);
+//                    throw new BusinessException(DetectionResponseEnum.PQ_DEV_HAS_MONITOR);
+                    pqMonitorService.removeByDevId(id);
                 }
             }
         }
@@ -285,6 +293,33 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             return Collections.emptyList();
         }
         List<PqDevVO> pqDevList = this.baseMapper.selectByQueryParam(param);
+        pqDevList.forEach(pqDev -> {
+            List<PqMonitor> monitorList = pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(pqDev.getId()));
+            List<PqMonitor> enabledMonitorList = monitorList.stream().filter(x -> x.getCheckFlag() == 1).collect(Collectors.toList());
+            pqDev.setMonitorResults(enabledMonitorList.stream().map(x -> {
+                if (ObjectUtil.isNull(x.getResultType())) {
+                    return CheckResultEnum.UNCHECKED.getValue();
+                } else {
+                    DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(x.getResultType());
+
+                    switch (dataSourceEnum) {
+                        case REAL_DATA:
+                            return x.getRealtimeResult();
+                        case MINUTE_STATISTICS_AVG:
+                        case MINUTE_STATISTICS_CP95:
+                        case MINUTE_STATISTICS_MIN:
+                        case MINUTE_STATISTICS_MAX:
+                            return x.getStatisticsResult();
+                        case WAVE_DATA:
+                            return x.getRecordedResult();
+                        default:
+                            break;
+                    }
+                }
+                return CheckResultEnum.UNCHECKED.getValue();
+            }).collect(Collectors.toList()));
+        });
+
         return pqDevList;
     }
 
@@ -395,12 +430,21 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     .in(CollectionUtil.isNotEmpty(queryParam.getPlanIdList()), "pq_dev.Plan_Id", queryParam.getPlanIdList())
                     .isNotNull(DataStateEnum.ENABLE.getCode().equals(queryParam.getAssign()), "pq_dev.Plan_Id")
                     .isNull(DataStateEnum.DELETED.getCode().equals(queryParam.getAssign()), "pq_dev.Plan_Id")
+                    .eq(DataStateEnum.DELETED.getCode().equals(queryParam.getAssignSub()), "pq_dev.Plan_Id", queryParam.getPlanId())
+                    .ne(DataStateEnum.ENABLE.getCode().equals(queryParam.getAssignSub()), "pq_dev.Plan_Id", queryParam.getPlanId())
                     .between(ObjectUtil.isAllNotEmpty(queryParam.getSearchBeginTime(), queryParam.getSearchEndTime()), "pq_dev.Create_Date", queryParam.getSearchBeginTime(), queryParam.getSearchEndTime());
             if (StrUtil.isNotBlank(queryParam.getRegion())) {
                 queryWrapper.and(w -> w.like(StrUtil.isNotBlank(queryParam.getRegion()), "pq_dev.City_Name", queryParam.getRegion())
                         .or().like(StrUtil.isNotBlank(queryParam.getRegion()), "pq_dev.Gd_Name", queryParam.getRegion())
                         .or().like(StrUtil.isNotBlank(queryParam.getRegion()), "pq_dev.Sub_Name", queryParam.getRegion()));
             }
+            if (StrUtil.isNotBlank(queryParam.getKeywords())) {
+                queryWrapper.and(w -> w.like(StrUtil.isNotBlank(queryParam.getKeywords()), "pq_dev.City_Name", queryParam.getKeywords())
+                        .or().like(StrUtil.isNotBlank(queryParam.getKeywords()), "pq_dev.Gd_Name", queryParam.getKeywords())
+                        .or().like(StrUtil.isNotBlank(queryParam.getKeywords()), "pq_dev.Sub_Name", queryParam.getKeywords())
+                        .or().like(StrUtil.isNotBlank(queryParam.getKeywords()), "pq_dev.name", queryParam.getKeywords())
+                );
+            }
             //排序
             if (ObjectUtil.isAllNotEmpty(queryParam.getSortBy(), queryParam.getOrderBy())) {
                 queryWrapper.orderBy(true, queryParam.getOrderBy().equals(DbConstant.ASC), StrUtil.toUnderlineCase(queryParam.getSortBy()));
@@ -519,12 +563,30 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         PqDev dev = this.getById(devId);
         Integer checkState = pqMonitorService.getDevCheckState(devId);
         Integer checkResult = pqMonitorService.getDevCheckResult(devId);
+        if (checkResult == 1) {
+            checkResult = CheckResultEnum.ACCORD.getValue();
+        }
+        if (checkResult == 2) {
+            checkResult = CheckResultEnum.NOT_ACCORD.getValue();
+        }
 
-        pqDevSubService.lambdaUpdate()
+
+        SysUser user = userService.getById(userId);
+
+        LambdaUpdateChainWrapper<PqDevSub> w = pqDevSubService.lambdaUpdate()
                 .set(PqDevSub::getCheckState, checkState)
                 .set(PqDevSub::getCheckResult, checkResult)
-                .set(StrUtil.isNotBlank(userId), PqDevSub::getCheckBy, userId)
+                .set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue())
-                .eq(PqDevSub::getDevId, devId).update();
+                .set(PqDevSub::getCheckTime, LocalDateTime.now())
+                .eq(PqDevSub::getDevId, devId);
+
+        if (ObjectUtil.isNotNull(user)) {
+            w.set(PqDevSub::getCheckBy, user.getName());
+        }
+        if (checkState.equals(CheckStateEnum.CHECKED.getValue())) {
+            w.set(PqDevSub::getReportState, DevReportStateEnum.NOT_GENERATED.getValue());
+        }
+        w.update();
 
         PqDevParam.QueryParam param = new PqDevParam.QueryParam();
         String planId = dev.getPlanId();
@@ -532,7 +594,13 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         List<PqDevVO> pqDevVOList = this.baseMapper.selectByQueryParam(param);
 
         if (CollUtil.isNotEmpty(pqDevVOList)) {
-            Set<Integer> set = pqDevVOList.stream().map(PqDevVO::getCheckResult).collect(Collectors.toSet());
+            Set<Integer> set = pqDevVOList.stream().filter(obj -> CheckStateEnum.CHECKED.getValue().equals(obj.getCheckState()) || CheckStateEnum.DOCUMENTED.getValue().equals(obj.getCheckState())).map(PqDevVO::getCheckResult).collect(Collectors.toSet());
+            if (checkState == CheckStateEnum.CHECKED.getValue()) {
+                set.add(checkResult);
+            }
+            if (CollUtil.isEmpty(set)) {
+                this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.UNCHECKED.getValue());
+            } else {
                 if (set.contains(CheckResultEnum.NOT_ACCORD.getValue())) {
                     this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.NOT_ACCORD.getValue());
                 } else if (set.contains(CheckResultEnum.UNCHECKED.getValue())) {
@@ -540,10 +608,16 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                 } else {
                     this.baseMapper.updatePlanCheckResult(planId, CheckResultEnum.ACCORD.getValue());
                 }
+            }
+
 
             set = pqDevVOList.stream().map(PqDevVO::getCheckState).collect(Collectors.toSet());
             if (set.contains(CheckStateEnum.UNCHECKED.getValue())) {
                 this.baseMapper.updatePlanTestState(planId, CheckStateEnum.CHECKING.getValue());
+            } else if (set.contains(CheckStateEnum.CHECKING.getValue())) {
+                this.baseMapper.updatePlanTestState(planId, CheckStateEnum.CHECKING.getValue());
+            } else {
+                this.baseMapper.updatePlanTestState(planId, CheckStateEnum.CHECKED.getValue());
             }
         }
     }
@@ -619,25 +693,31 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     }
 
     @Override
-    public boolean importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) {
+    public HttpResult importDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
         DictData dictData = dictDataService.getDictDataById(patternId);
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-            return this.importContrastDev(file, patternId, planId, response);
+            return this.importContrastDev(file, patternId, planId, response, cover);
         } else {
             String currrentScene = sysTestConfigService.getCurrrentScene();
             SceneEnum sceneEnum = SceneEnum.getSceneEnum(currrentScene);
             switch (sceneEnum) {
                 case PROVINCE_PLATFORM:
-                    return this.importProvinceDev(file, patternId, planId, response);
+                    boolean result = this.importProvinceDev(file, patternId, planId, response);
+                    if (result) {
+                        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
+                    }
                 case LEAVE_FACTORY_TEST:
-                    return this.importCNDev(file, patternId, planId, response);
+                    result = this.importCNDev(file, patternId, planId, response);
+                    if (result) {
+                        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, "导入成功");
+                    }
                 case SELF_TEST:
                     break;
                 default:
                     break;
             }
         }
-        return false;
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
     }
 
     @Override
@@ -764,21 +844,15 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
      * @param isExcludeSelf 是否排除自己
      */
     private void checkRepeat(PqDevParam param, boolean isExcludeSelf) {
-        QueryWrapper<PqDev> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<PqDev> queryWrapper = new LambdaQueryWrapper<PqDev>()
-        queryWrapper
+                .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
-                .eq("state", DataStateEnum.ENABLE.getCode())
+                .eq(StrUtil.isNotBlank(param.getIp()), PqDev::getIp, param.getIp())
-                .eq(StrUtil.isNotBlank(param.getDevType()), "Dev_Type", param.getDevType())
+                .eq(ObjectUtil.isNotNull(param.getPort()), PqDev::getPort, param.getPort())
-                .eq(StrUtil.isNotBlank(param.getPattern()), "pattern", param.getPattern())
+                .eq(StrUtil.isNotBlank(param.getPattern()), PqDev::getPattern, param.getPattern())
-                .eq(StrUtil.isNotBlank(param.getCityName()), "City_Name", param.getCityName())
+                .eq(StrUtil.isNotBlank(param.getCreateId()), PqDev::getCreateId, param.getCreateId());
-                .eq(StrUtil.isNotBlank(param.getGdName()), "Gd_Name", param.getGdName())
-                .eq(StrUtil.isNotBlank(param.getSubName()), "Sub_Name", param.getSubName())
-                .and(q -> q.eq(StrUtil.isNotBlank(param.getName()), "name", param.getName()).or()
-                        .eq(StrUtil.isNotBlank(param.getCreateId()), "Create_Id", param.getCreateId())); //设备序列号重复
-//                        .eq("manufacturer", param.getManufacturer())
-//                        .eq("Dev_Type", param.getDevType()).or()
         if (isExcludeSelf) {
             if (param instanceof PqDevParam.UpdateParam) {
-                queryWrapper.ne("id", ((PqDevParam.UpdateParam) param).getId());
+                queryWrapper.ne(PqDev::getId, ((PqDevParam.UpdateParam) param).getId());
             }
         }
         int count = this.count(queryWrapper);
@@ -1157,7 +1231,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
     }
 
     @Override
-    public boolean importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response) {
+    public HttpResult importContrastDev(MultipartFile file, String patternId, String planId, HttpServletResponse response, Integer cover) {
         ImportParams params = new ImportParams();
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
@@ -1177,52 +1251,56 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         } catch (Exception e) {
             throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL);
         }
-        return this.importContrastDev(contrastDevExcelList, patternId, planId);
+        return this.importContrastDev(contrastDevExcelList, patternId, planId, cover);
     }
 
     @Override
     @Transactional
-    public boolean importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId) {
+    public HttpResult importContrastDev(List<ContrastDevExcel> contrastDevExcelList, String patternId, String planId, Integer cover) {
         if (CollUtil.isNotEmpty(contrastDevExcelList)) {
             // 根据设备名称分组
             Map<String, List<ContrastDevExcel>> listMap = contrastDevExcelList.stream()
                     .collect(Collectors.groupingBy(ContrastDevExcel::getName, LinkedHashMap::new, Collectors.toList()));
-            List<PqDev> oldDevList = new ArrayList<>(listMap.size());
+            List<PqDev> newDevList = new ArrayList<>(listMap.size());
-            List<PqMonitor> finalMonitorList = new ArrayList<>();
+            List<PqDev> updateDevList = new ArrayList<>();
+            List<PqDev> finalUpdateDevList = new ArrayList<>();
             for (Map.Entry<String, List<ContrastDevExcel>> entry : listMap.entrySet()) {
                 String name = entry.getKey();
+
                 List<ContrastDevExcel> devExcelList = entry.getValue();
                 // 监测点数据
                 List<PqMonitorExcel> pqMonitorExcelList = devExcelList.stream()
                         .map(ContrastDevExcel::getPqMonitorExcelList)
                         .filter(Objects::nonNull)
                         .flatMap(List::stream)
+                        // 过滤掉没有线路号的数据
+                        .filter(item -> ObjectUtil.isNotNull(item.getNum()))
                         .collect(Collectors.toList());
                 // 取第一条为设备基本信息
                 ContrastDevExcel devExcel = devExcelList.get(0);
-                PqDev pqDev = BeanUtil.copyProperties(devExcel, PqDev.class);
+                PqDev importPqDev = BeanUtil.copyProperties(devExcel, PqDev.class);
-                if (pqDev.getEncryptionFlag() == 1) {
+                if (importPqDev.getEncryptionFlag() == 1) {
-                    if (StrUtil.isNotBlank(pqDev.getSeries()) && StrUtil.isNotBlank(pqDev.getDevKey())) {
+                    if (StrUtil.isNotBlank(importPqDev.getSeries()) && StrUtil.isNotBlank(importPqDev.getDevKey())) {
-                        pqDev.setSeries(EncryptionUtil.encodeString(1, pqDev.getSeries()));
+                        importPqDev.setSeries(EncryptionUtil.encodeString(1, importPqDev.getSeries()));
-                        pqDev.setDevKey(EncryptionUtil.encodeString(1, pqDev.getDevKey()));
+                        importPqDev.setDevKey(EncryptionUtil.encodeString(1, importPqDev.getDevKey()));
                     } else {
                         throw new BusinessException(DetectionResponseEnum.SERIES_AND_DEVKEY_NOT_BLANK);
                     }
                 }
-                DevType devType = devTypeService.getByName(pqDev.getDevType());
+                DevType devType = devTypeService.getByName(importPqDev.getDevType());
                 if (ObjectUtil.isNull(devType)) {
                     throw new BusinessException(DetectionResponseEnum.DEV_TYPE_NOT_EXIST);
                 }
                 // 校验监测点数量
                 int devChns = devType.getDevChns();
-                if (pqMonitorExcelList.size() != devChns) {
+//                if (pqMonitorExcelList.size() != devChns) {
-                    throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL, "【" + name + "】的设备类型必须具备" + devChns + "个监测点信息！");
+//                    throw new BusinessException(DetectionResponseEnum.IMPORT_DATA_FAIL, "【" + name + "】的设备类型必须具备" + devChns + "个监测点信息！");
-                }
+//                }
                 List<Integer> numList = pqMonitorExcelList.stream().map(PqMonitorExcel::getNum).collect(Collectors.toList());
                 // 判断是否有重复的num
                 Set<Integer> uniqueNumSet = new HashSet<>(numList);
                 if (uniqueNumSet.size() != numList.size()) {
-                    throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT);
+                    throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_REPEAT, "【" + name + "】该被检设备下存在相同线路号的监测点！");
                 }
                 Integer max = CollectionUtil.max(numList);
                 Integer min = CollectionUtil.min(numList);
@@ -1230,67 +1308,111 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     throw new BusinessException(DetectionResponseEnum.MONITOR_NUM_OUT_OF_RANGE);
                 }
 
-                pqDev.setDevType(devType.getId());
+                importPqDev.setDevType(devType.getId());
-                pqDev.setImportFlag(1);
+                importPqDev.setImportFlag(1);
-                pqDev.setId(UUID.randomUUID().toString().replaceAll("-", ""));
+                importPqDev.setId(UUID.randomUUID().toString().replaceAll("-", ""));
-                pqDev.setCreateId(pqDev.getName()); //导入时设备序列号默认与设备名称相同
+
-                List<PqMonitor> monitorList = new ArrayList<>();
+                if (StrUtil.isEmpty(importPqDev.getCreateId())) {
+                    // 与设备名称相同
+                    importPqDev.setCreateId(importPqDev.getName());
+                }
                 // 根据num排序
                 pqMonitorExcelList.sort(Comparator.comparingInt(PqMonitorExcel::getNum));
+                StringBuilder inspectChannelBuilder = new StringBuilder();
+                for (int i = 0; i < numList.size(); i++) {
+                    inspectChannelBuilder.append(numList.get(i));
+                    if (i < numList.size() - 1) {
+                        inspectChannelBuilder.append(StrUtil.COMMA);
+                    }
+                }
+                importPqDev.setInspectChannel(inspectChannelBuilder.toString());
+                List<PqMonitor> monitorList = new ArrayList<>();
+                // 1、先判断是否有谐波系统ID
+                boolean hasHarmSys = false;
+                if (StrUtil.isNotBlank(importPqDev.getHarmSysId())) {
+                    // 1.1、如果有则判断是否已存在
+                    List<PqDev> hasList = this.lambdaQuery()
+                            .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                            .eq(PqDev::getPattern, patternId)
+                            .eq(PqDev::getHarmSysId, importPqDev.getHarmSysId())
+                            .isNull(PqDev::getPlanId)
+                            .orderByDesc(PqDev::getCreateTime).list();
+                    // 1.2、 存在则放入强制更新list
+                    if (CollUtil.isNotEmpty(hasList)) {
+                        importPqDev.setId(hasList.get(0).getId());
                         for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
                             PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
-                    monitor.setDevId(pqDev.getId());
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
                             monitorList.add(monitor);
                         }
-                StringBuilder inspectChannelBuilder = new StringBuilder();
+                        importPqDev.setMonitorList(monitorList);
-                for (int i = 1; i <= devChns; i++) {
+                        finalUpdateDevList.add(importPqDev);
-                    inspectChannelBuilder.append(i);
+                        hasHarmSys = true;
-                    if (i < devChns) {
-                        inspectChannelBuilder.append(",");
                     }
-                }
-                pqDev.setInspectChannel(inspectChannelBuilder.toString());
-                oldDevList.add(pqDev);
-                finalMonitorList.addAll(monitorList);
-            }
-            //逆向可视化
-            this.reverseVisualizeProvinceDev(oldDevList, patternId);
 
-            List<PqDev> newDevList = new ArrayList<>();
-            oldDevList.forEach(pqDev -> {
-                PqDevParam param = BeanUtil.copyProperties(pqDev, PqDevParam.class);
-                this.checkRepeat(param, false);
-                long count = newDevList.stream().filter(dev ->
-                                dev.getDevType().equals(pqDev.getDevType())
-                                        && dev.getCityName().equals(pqDev.getCityName())
-                                        && dev.getGdName().equals(pqDev.getGdName())
-                                        && dev.getSubName().equals(pqDev.getSubName())
-                                        && (dev.getName().equals(pqDev.getName()) || dev.getCreateId().equals(pqDev.getCreateId())))
-                        .count();
-                if (count == 0) {
-                    pqDev.setPlanId(planId);
-                    newDevList.add(pqDev);
                 }
+                if (!hasHarmSys) {
+                    // 2、查询 ip + 端口 + 序列号 + patternId + Plan_Id为空 是否存在
+                    List<PqDev> hasList = this.lambdaQuery()
+                            .eq(PqDev::getState, DataStateEnum.ENABLE.getCode())
+                            .eq(PqDev::getIp, devExcel.getIp())
+                            .eq(PqDev::getPort, devExcel.getPort())
+                            .eq(PqDev::getPattern, patternId)
+                            .eq(PqDev::getCreateId, devExcel.getCreateId())
+                            .isNull(PqDev::getPlanId)
+                            .orderByDesc(PqDev::getCreateTime).list();
+                    // 2.1、存在则放入更新list
+                    if (CollUtil.isNotEmpty(hasList)) {
+                        importPqDev.setId(hasList.get(0).getId());
+                        for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
+                            PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
+                            monitorList.add(monitor);
+                        }
+                        importPqDev.setMonitorList(monitorList);
+                        updateDevList.add(importPqDev);
+                    } else {
+                        //2.2、不存在则放入新增list
+                        for (PqMonitorExcel pqMonitorExcel : pqMonitorExcelList) {
+                            PqMonitor monitor = BeanUtil.copyProperties(pqMonitorExcel, PqMonitor.class);
+                            monitor.setDevId(importPqDev.getId());
+                            monitor.setPt(pqMonitorExcel.getPt1() + StrUtil.C_COLON + pqMonitorExcel.getPt2());
+                            monitor.setCt(pqMonitorExcel.getCt1() + StrUtil.C_COLON + pqMonitorExcel.getCt2());
+                            monitorList.add(monitor);
+                        }
+                        importPqDev.setMonitorList(monitorList);
+                        newDevList.add(importPqDev);
+                    }
+                }
+            }
+            // 3、是否有重复的设备
+            if (CollUtil.isNotEmpty(updateDevList)) {
+                // 3.1、有则让用户确认是否覆盖
+                if (cover == 0) {
+                    List<String> existDevList = new ArrayList<>();
+                    updateDevList.forEach(pqDev -> {
+                        existDevList.add(pqDev.getName() + "(" + pqDev.getIp() + ":" + pqDev.getPort() + ")");
                     });
-            QueryWrapper<PqDev> wrapper1 = new QueryWrapper<PqDev>()
+                    return HttpResultUtil.assembleResult(DetectionResponseEnum.DEV_IP_PORT_EXIST.getCode(), existDevList, "请确认是否覆盖");
-                    .eq("pq_dev.State", DataStateEnum.ENABLE.getCode())
+
-                    .in("pq_dev.Harm_Sys_Id", newDevList.stream().map(PqDev::getHarmSysId).collect(Collectors.toList()));
+                } else {
-            List<PqDev> oldDevList1 = this.list(wrapper1);
+                    // 3.2、确认覆盖则放入强制更新list
-            if (CollUtil.isNotEmpty(oldDevList1)) {
+                    finalUpdateDevList.addAll(updateDevList);
-                oldDevList1.stream().forEach(oldDev -> {
-                    PqDev newDev = newDevList.stream().filter(dev -> dev.getHarmSysId().equals(oldDev.getHarmSysId())).findFirst().orElse(null);
-                    if (ObjectUtil.isNotNull(newDev)) {
-                        newDevList.remove(newDev);
-                        finalMonitorList.stream()
-                                .filter(monitor -> monitor.getDevId().equals(newDev.getId()))
-                                .forEach(monitor -> monitor.setDevId(oldDev.getId()));
-                        BeanUtil.copyProperties(newDev, oldDev, "id");
                 }
-                });
-                this.updateBatchById(oldDevList1);
             }
+
+
+            // 4、新增list
+            if (CollUtil.isNotEmpty(newDevList)) {
+                //逆向可视化
+                this.reverseVisualizeProvinceDev(newDevList, patternId);
                 this.saveBatch(newDevList);
                 List<PqDevSub> pqDevSubList = new ArrayList<>();
+                List<PqMonitor> newMonitorList = new ArrayList<>();
                 for (PqDev dev : newDevList) {
                     PqDevSub pqDevSub = new PqDevSub();
                     pqDevSub.setDevId(dev.getId());
@@ -1300,20 +1422,30 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
                     pqDevSub.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue());
                     pqDevSub.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());
                     pqDevSubList.add(pqDevSub);
+                    newMonitorList.addAll(dev.getMonitorList());
                 }
+                pqMonitorService.reverseVisualizeMonitor(newMonitorList);
+                pqMonitorService.saveBatch(newMonitorList);
                 pqDevSubService.saveBatch(pqDevSubList);
+            }
+            // 5、更新list
+            if (CollUtil.isNotEmpty(finalUpdateDevList)) {
+                //逆向可视化
+                this.reverseVisualizeProvinceDev(finalUpdateDevList, patternId);
+                this.updateBatchById(finalUpdateDevList);
+                List<PqMonitor> updateMonitorList = new ArrayList<>();
+                for (PqDev dev : finalUpdateDevList) {
+                    updateMonitorList.addAll(dev.getMonitorList());
+                }
+                pqMonitorService.reverseVisualizeMonitor(updateMonitorList);
+                for (PqMonitor monitor : updateMonitorList) {
+                    pqMonitorService.update(monitor, new LambdaUpdateWrapper<PqMonitor>().eq(PqMonitor::getDevId, monitor.getDevId()));
+                }
+            }
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "导入成功");
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, "导入失败");
 
-            List<String> devIdList = oldDevList1.stream().map(PqDev::getId).collect(Collectors.toList());
-            if (CollUtil.isNotEmpty(devIdList)) {
-                QueryWrapper<PqMonitor> wrapper = new QueryWrapper<PqMonitor>()
-                        .in("pq_monitor.Dev_Id", devIdList);
-                pqMonitorService.remove(wrapper);
-            }
-            pqMonitorService.reverseVisualizeMonitor(finalMonitorList);
-            pqMonitorService.saveBatch(finalMonitorList);
-            return true;
-        }
-        return false;
     }
 
     @Override
@@ -1371,13 +1503,19 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
         if (ObjectUtil.isNotNull(dictType)) {
             dictDataList = dictDataService.getDictDataByTypeId(dictType.getId());
             pullDown = new PullDown();
-            pullDown.setFirstCol(startCol + 24);
+            pullDown.setFirstCol(startCol + 26);
-            pullDown.setLastCol(startCol + 24);
+            pullDown.setLastCol(startCol + 26);
 
             pullDown.setStrings(dictDataList.stream().map(DictData::getName).collect(Collectors.toList()));
             pullDowns.add(pullDown);
         }
 
+        pullDown = new PullDown();
+        pullDown.setFirstCol(startCol + 27);
+        pullDown.setLastCol(startCol + 27);
+        pullDown.setStrings(Stream.iterate(1, x -> x + 1).limit(10).map(String::valueOf).collect(Collectors.toList()));
+        pullDowns.add(pullDown);
+
         return pullDowns;
     }
 
@@ -1439,7 +1577,22 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
             contrastDevExcels.forEach(contrastDevExcel -> {
                 List<PqMonitor> monitorList = pqMonitorService.listPqMonitorByDevIds(Collections.singletonList(contrastDevExcel.getId()));
                 pqMonitorService.visualizeMonitor(monitorList);
-                List<PqMonitorExcel> pqMonitorExcelList = BeanUtil.copyToList(monitorList, PqMonitorExcel.class);
+                List<PqMonitorExcel> pqMonitorExcelList = new ArrayList<>();
+                for (int i = 0; i < monitorList.size(); i++) {
+                    PqMonitor pqMonitor = monitorList.get(i);
+                    PqMonitorExcel pqMonitorExcel = BeanUtil.copyProperties(pqMonitor, PqMonitorExcel.class);
+                    String pt = pqMonitor.getPt();
+                    String[] split1 = pt.split(String.valueOf(StrUtil.C_COLON));
+                    pqMonitorExcel.setPt1(split1[0]);
+                    pqMonitorExcel.setPt2(split1[1]);
+
+                    String ct = pqMonitor.getCt();
+                    String[] split2 = ct.split(String.valueOf(StrUtil.C_COLON));
+                    pqMonitorExcel.setCt1(split2[0]);
+                    pqMonitorExcel.setCt2(split2[1]);
+
+                    pqMonitorExcelList.add(pqMonitorExcel);
+                }
                 contrastDevExcel.setPqMonitorExcelList(pqMonitorExcelList);
             });
         }

detection/src/main/java/com/njcn/gather/device/service/impl/PqStandardDevServiceImpl.java

@@ -8,7 +8,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,9 +23,6 @@ import com.njcn.gather.device.pojo.vo.PqStandardDevExcel;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqStandardDevService;
 import com.njcn.gather.plan.mapper.AdPlanStandardDevMapper;
-import com.njcn.gather.plan.pojo.po.AdPlan;
-import com.njcn.gather.plan.pojo.po.AdPlanStandardDev;
-import com.njcn.gather.plan.service.IAdPlanService;
 import com.njcn.gather.plan.service.IAdPlanStandardDevService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
@@ -71,7 +67,8 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         wrapper.like(StrUtil.isNotBlank(queryParam.getName()), "name", queryParam.getName())
                 .eq(StrUtil.isNotBlank(queryParam.getManufacturer()), "manufacturer", queryParam.getManufacturer())
                 .eq(StrUtil.isNotBlank(queryParam.getDevType()), "dev_type", queryParam.getDevType())
-                .eq("state", DataStateEnum.ENABLE.getCode());
+                .eq("state", DataStateEnum.ENABLE.getCode())
+                .orderByDesc("create_time");
         return this.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), wrapper);
     }
 
@@ -157,10 +154,10 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
         this.importData(contrastDevExcelList);
     }
 
-    @Override
+//    @Override
-    public List<PqStandardDev> listByPlanId(String planId) {
+//    public List<PqStandardDev> listByPlanId(String planId) {
-        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
+//        return adPlanStandardDevMapper.listByPlanId(Collections.singletonList(planId));
-    }
+//    }
 
     @Override
     public List<PreDetection> listStandardDevPreDetection(List<String> ids) {
@@ -309,34 +306,37 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
 
     @Override
     public List<PqStandardDev> canBindingList() {
-        List<String> excludeStandardDevIds = new ArrayList<>();
+        /*List<String> excludeStandardDevIds = new ArrayList<>();
         // 获取所有已绑定的标准设备
         List<AdPlanStandardDev> boundList = adPlanStandardDevService.list();
         if (CollectionUtil.isNotEmpty(boundList)) {
             // 获取对应检测计划
             List<String> planIds = boundList.stream().map(AdPlanStandardDev::getPlanId).collect(Collectors.toList());
             IAdPlanService adPlanService = SpringUtil.getBean(IAdPlanService.class);
-            List<AdPlan> planList = adPlanService.listByIds(planIds);
+            List<AdPlan> planList = adPlanService.lambdaQuery().in(AdPlan::getId, planIds).eq(AdPlan::getState, DataStateEnum.ENABLE.getCode()).list();
             // 区分主计划和子计划
-            List<AdPlan> mainPlanList = planList.stream().filter(plan -> plan.getFatherPlanId() == null).collect(Collectors.toList());
+            List<AdPlan> mainPlanList = planList.stream().filter(plan -> plan.getFatherPlanId().equals(CommonEnum.FATHER_ID.getValue())).collect(Collectors.toList());
-            List<AdPlan> subPlanList = planList.stream().filter(plan -> plan.getFatherPlanId() != null).collect(Collectors.toList());
+            List<AdPlan> subPlanList = planList.stream().filter(plan -> !plan.getFatherPlanId().equals(CommonEnum.FATHER_ID.getValue())).collect(Collectors.toList());
             List<String> excludePlanIds = new ArrayList<>();
 
-            // 主计划直接排除
+            // 主计划未完成直接排除
             if (CollectionUtil.isNotEmpty(mainPlanList)) {
-                List<String> excludeMainPlanIds = mainPlanList.stream().filter(plan -> plan.getTestState() != 2).map(plan -> plan.getId()).collect(Collectors.toList());
+                List<String> excludeMainPlanIds = mainPlanList.stream().filter(plan -> !plan.getTestState().equals(CheckStateEnum.CHECKED.getValue())).map(AdPlan::getId).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(excludeMainPlanIds)) {
                     excludePlanIds.addAll(excludeMainPlanIds);
                 }
+
+            }
             // 子计划需要判断其主计划, 如果主计划未完成则排除
             if (CollectionUtil.isNotEmpty(subPlanList)) {
-                List<String> fatherPlanIds = subPlanList.stream().map(plan -> plan.getFatherPlanId()).collect(Collectors.toList());
+                List<String> fatherPlanIds = subPlanList.stream().map(AdPlan::getFatherPlanId).distinct().collect(Collectors.toList());
                 List<AdPlan> fatherPlanList = adPlanService.listByIds(fatherPlanIds);
                 List<String> excludeFatherPlanIds = fatherPlanList.stream()
-                        .filter(plan -> plan.getTestState() != 2)
+                        .filter(plan -> !plan.getTestState().equals(CheckStateEnum.CHECKED.getValue()))
-                        .map(plan -> plan.getId()).collect(Collectors.toList());
+                        .map(AdPlan::getId).collect(Collectors.toList());
                 List<String> excludeSubPlanIds = subPlanList.stream()
                         .filter(plan -> excludeFatherPlanIds.contains(plan.getFatherPlanId()))
-                        .map(plan -> plan.getId()).collect(Collectors.toList());
+                        .map(AdPlan::getId).collect(Collectors.toList());
                 excludePlanIds.addAll(excludeSubPlanIds);
             }
             if (CollectionUtil.isNotEmpty(excludePlanIds)) {
@@ -345,11 +345,13 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
                         .collect(Collectors.toList());
                 excludeStandardDevIds = excludeBoundList.stream().map(AdPlanStandardDev::getStandardDevId).collect(Collectors.toList());
             }
-        }
+        }*/
-
+        List<PqStandardDev> list = this.lambdaQuery()
-        return this.lambdaQuery()
                 .eq(PqStandardDev::getState, DataStateEnum.ENABLE.getCode())
-                .notIn(CollectionUtil.isNotEmpty(excludeStandardDevIds), PqStandardDev::getId, excludeStandardDevIds)
                 .list();
+        /*for (PqStandardDev pqStandardDev : list) {
+            pqStandardDev.setDisabled(excludeStandardDevIds.contains(pqStandardDev.getId()));
+        }*/
+        return list;
     }
 }

detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.err.mapper.PqErrSysMapper;
 import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam;
 import com.njcn.gather.err.pojo.param.PqErrSysParam;
@@ -18,6 +19,7 @@ import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO;
 import com.njcn.gather.err.service.IPqErrSysDtlsService;
 import com.njcn.gather.err.service.IPqErrSysService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
+import com.njcn.gather.report.pojo.enums.PowerIndexEnum;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.pojo.po.DictTree;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
@@ -219,7 +221,9 @@ public class PqErrSysServiceImpl extends ServiceImpl<PqErrSysMapper, PqErrSys> i
             List<DictTree> parentDictTreeList = dictTreeService.listByIds(pids);
             Map<String, String> map = new HashMap<>();
             parentDictTreeList.forEach(dictTree -> {
+                if(!dictTree.getCode().equals(PowerIndexEnum.VOLTAGE.getKey())&&!dictTree.getCode().equals(PowerIndexEnum.P.getKey())){
                     map.put(dictTree.getId(), dictTree.getName());
+                }
             });
             return map;
         }

detection/src/main/java/com/njcn/gather/icd/controller/PqIcdPathController.java

@@ -60,7 +60,7 @@ public class PqIcdPathController extends BaseController {
     @PostMapping("/add")
     @ApiOperation("新增icd")
     @ApiImplicitParam(name = "param", value = "icd新增参数", required = true)
-    public HttpResult<Boolean> add(@RequestBody @Validated PqIcdPathParam param) {
+    public HttpResult<Boolean> add(PqIcdPathParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
 
@@ -76,7 +76,7 @@ public class PqIcdPathController extends BaseController {
     @PostMapping("/update")
     @ApiOperation("修改icd")
     @ApiImplicitParam(name = "param", value = "icd修改参数", required = true)
-    public HttpResult<Boolean> update(@RequestBody @Validated PqIcdPathParam.UpdateParam param) {
+    public HttpResult<Boolean> update(PqIcdPathParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
 

detection/src/main/java/com/njcn/gather/icd/pojo/enums/IcdResponseEnum.java

@@ -0,0 +1,19 @@
+package com.njcn.gather.icd.pojo.enums;
+
+/**
+ * @author caozehui
+ * @data 2025-11-11
+ */
+public enum IcdResponseEnum {
+    FILE_NOT_NULL("A018001", "映射文件不能为空"),
+    FILE_TYPE_ERROR("A018002", "映射文件类型错误"),
+    FILE_SIZE_ERROR("A018003", "映射文件大小超出限制");
+
+    private String code;
+    private String message;
+
+    IcdResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+}

detection/src/main/java/com/njcn/gather/icd/pojo/param/PqIcdPathParam.java

@@ -6,6 +6,7 @@ import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
@@ -32,6 +33,9 @@ public class PqIcdPathParam {
     @ApiModelProperty(value = "角型接线时是否使用相别的指标来进行检测，0表示否，1表示是", required = true)
     private Integer usePhaseIndex;
 
+    @ApiModelProperty(value = "映射文件", required = true)
+    private MultipartFile mappingFile;
+
     /**
      * 分页查询实体
      */

detection/src/main/java/com/njcn/gather/icd/pojo/po/PqIcdPath.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.icd.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.mybatisplus.bo.BaseEntity;
 import lombok.Data;
@@ -46,5 +47,18 @@ public class PqIcdPath extends BaseEntity implements Serializable {
      * 角型接线时是否使用相别的指标来进行检测，0表示否，1表示是
      */
     private Integer usePhaseIndex;
+
+    /**
+     * 映射文件路径
+     */
+    @TableField(exist = false)
+    private FileVO mappingFile;
+
+    @Data
+    public static class FileVO{
+        private String name;
+
+        private String url;
+    }
 }
 

detection/src/main/java/com/njcn/gather/icd/service/impl/PqIcdPathServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.gather.icd.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,17 +8,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.icd.mapper.PqIcdPathMapper;
+import com.njcn.gather.icd.pojo.enums.IcdResponseEnum;
 import com.njcn.gather.icd.pojo.param.PqIcdPathParam;
 import com.njcn.gather.icd.pojo.po.PqIcdPath;
 import com.njcn.gather.icd.service.IPqIcdPathService;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
+import com.njcn.gather.report.pojo.enums.ReportResponseEnum;
 import com.njcn.web.factory.PageFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 /**
@@ -41,6 +51,13 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
                 .like(StrUtil.isNotBlank(param.getName()), PqIcdPath::getName, param.getName())
                 .orderByDesc(PqIcdPath::getCreateTime);
         Page<PqIcdPath> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), wrapper);
+        String commInstallPath = this.getCommInstallPath();
+        page.getRecords().forEach(pqIcdPath -> {
+            PqIcdPath.FileVO fileVO = new PqIcdPath.FileVO();
+            fileVO.setUrl(commInstallPath + "\\DeviceControl\\Config\\" + pqIcdPath.getName() + ".txt");
+            fileVO.setName(pqIcdPath.getName() + ".txt");
+            pqIcdPath.setMappingFile(fileVO);
+        });
         return page;
     }
 
@@ -52,9 +69,77 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
         pqIcdPath.setState(DataStateEnum.ENABLE.getCode());
+
+        String commInstallPath = this.getCommInstallPath();
+        System.out.println("commInstallPath = " + commInstallPath);
+        long FILE_SIZE_LIMIT = 1 * 1024 * 1024;
+        MultipartFile mappingFile = param.getMappingFile();
+
+        System.out.println("mappingFile = " + ObjectUtil.isNotNull(mappingFile) + " " + !mappingFile.isEmpty());
+        if (ObjectUtil.isNotNull(mappingFile) && !mappingFile.isEmpty()) {
+            String mappingFilename = mappingFile.getOriginalFilename();
+
+            if (!mappingFilename.endsWith(".txt")) {
+                throw new BusinessException(IcdResponseEnum.FILE_TYPE_ERROR);
+            }
+            if (mappingFile.getSize() > FILE_SIZE_LIMIT) {
+                throw new BusinessException(IcdResponseEnum.FILE_SIZE_ERROR);
+            }
+
+            try {
+                // 如果文件存在，则先删除
+                String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + mappingFilename;
+                System.out.println("mappingFilePath = " + mappingFilePath);
+                Path path = Paths.get(mappingFilePath);
+                File file = path.toFile();
+                if (file.exists()) {
+                    file.delete();
+                }
+
+                // 保存文件
+                byte[] bytes = mappingFile.getBytes();
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(mappingFilePath));
+                bufferedOutputStream.write(bytes);
+                bufferedOutputStream.flush();
+
+                bufferedOutputStream.close();
+                System.out.println("File saved successfully");
+            } catch (IOException e) {
+                throw new BusinessException(ReportResponseEnum.FILE_UPLOAD_FAILED);
+            }
+        } else {
+            System.out.println("mappingFile is null or empty");
+            throw new BusinessException(IcdResponseEnum.FILE_NOT_NULL);
+        }
+
+        this.executeRestartCmd(commInstallPath);
+
         return this.save(pqIcdPath);
     }
 
+    /**
+     * 执行重启通讯服务脚本
+     *
+     * @param commInstallPath
+     */
+    private void executeRestartCmd(String commInstallPath) {
+        // 以管理员身份运行bat脚本
+        String batFilePath = commInstallPath + "\\重启所有服务.bat";
+        try {
+            Runtime.getRuntime().exec(batFilePath);
+        } catch (IOException e) {
+            log.error("重启通讯服务失败", e);
+        }
+    }
+
+    private String getCommInstallPath() {
+        String workDir = System.getProperty("user.dir");
+//        String workDir = "D:\\program\\CN_Gather";
+        // 获取映射文件存放文件夹
+        String dirPath = workDir + "\\9100";
+        return dirPath;
+    }
+
     @Override
     @Transactional
     public boolean updateIcd(PqIcdPathParam.UpdateParam param) {
@@ -62,6 +147,43 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
         this.checkRepeat(param, true);
         PqIcdPath pqIcdPath = new PqIcdPath();
         BeanUtils.copyProperties(param, pqIcdPath);
+
+        String commInstallPath = this.getCommInstallPath();
+        long FILE_SIZE_LIMIT = 1 * 1024 * 1024;
+        MultipartFile mappingFile = param.getMappingFile();
+        if (ObjectUtil.isNotNull(mappingFile) && !mappingFile.isEmpty()) {
+            String mappingFilename = mappingFile.getOriginalFilename();
+
+            if (!mappingFilename.endsWith(".txt")) {
+                throw new BusinessException(IcdResponseEnum.FILE_TYPE_ERROR);
+            }
+            if (mappingFile.getSize() > FILE_SIZE_LIMIT) {
+                throw new BusinessException(IcdResponseEnum.FILE_SIZE_ERROR);
+            }
+
+            try {
+                // 如果文件存在，则先删除
+                String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + mappingFilename;
+                Path path = Paths.get(mappingFilePath);
+                File file = path.toFile();
+                if (file.exists()) {
+                    file.delete();
+                }
+
+                // 保存文件
+                byte[] bytes = mappingFile.getBytes();
+                BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(mappingFilePath));
+                bufferedOutputStream.write(bytes);
+                bufferedOutputStream.flush();
+
+                bufferedOutputStream.close();
+            } catch (IOException e) {
+                throw new BusinessException(ReportResponseEnum.FILE_UPLOAD_FAILED);
+            }
+        }
+
+        this.executeRestartCmd(commInstallPath);
+
         return this.updateById(pqIcdPath);
     }
 

detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java

@@ -1,8 +1,10 @@
 package com.njcn.gather.monitor.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqDevSub;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.plan.pojo.po.AdPlan;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -33,5 +35,21 @@ public interface PqMonitorMapper extends MPJBaseMapper<PqMonitor> {
     PqMonitor getByDevIdAndNum(@Param("devId") String devId, @Param("num") Integer num);
 
     List<PqMonitor> listByDevIds(@Param("devIds") List<String> devIds);
+
+    void updateDeviceCheckState(@Param("devId")String devId, @Param("value") Integer value);
+
+    void updateDeviceCheckResult(@Param("devId")String devId, @Param("value") Integer value);
+
+    void updateDeviceReportRState(@Param("devId")String devId, @Param("value") Integer value);
+
+    AdPlan getPlanByDevId(@Param("devId") String devId);
+
+    List<PqDevSub> listDevSubByPlanId(@Param("planId") String planId);
+
+    void updatePlanCheckState(@Param("planId") String planId, @Param("value") Integer value);
+
+    void updatePlanCheckResult(@Param("planId") String planId, @Param("value") Integer value);
+
+    void updatePlanReportRState(@Param("planId") String planId, @Param("value") Integer value);
 }
 

detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.njcn.gather.monitor.mapper.PqMonitorMapper">
 
+
     <select id="selectMonitorInfo"
             resultType="com.njcn.gather.device.pojo.vo.PreDetection$MonitorListDTO">
         SELECT CONCAT(pq_dev.IP, '_', Num) as lineId,
@@ -41,5 +42,55 @@
         </foreach>
         order by Num
     </select>
+
+    <update id="updateDeviceCheckState">
+        update pq_dev_sub
+        set Check_State = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <update id="updateDeviceCheckResult">
+        update pq_dev_sub
+        set Check_Result = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <update id="updateDeviceReportRState">
+        update pq_dev_sub
+        set Report_State = #{value}
+        where dev_Id = #{devId}
+    </update>
+
+    <select id="getPlanByDevId" resultType="com.njcn.gather.plan.pojo.po.AdPlan">
+        select *
+        from ad_plan
+                 inner join pq_dev on ad_plan.id = pq_dev.Plan_Id
+        where pq_dev.Id = #{devId}
+    </select>
+
+    <select id="listDevSubByPlanId" resultType="com.njcn.gather.device.pojo.po.PqDevSub">
+        select *
+        from pq_dev_sub
+                 inner join pq_dev on pq_dev_sub.dev_Id = pq_dev.Id
+        where pq_dev.Plan_Id = #{planId}
+    </select>
+
+    <update id="updatePlanCheckState">
+        update ad_plan
+        set Test_State = #{value}
+        where id = #{planId}
+    </update>
+
+    <update id="updatePlanCheckResult">
+        update ad_plan
+        set Result = #{value}
+        where id = #{planId}
+    </update>
+
+    <update id="updatePlanReportRState">
+        update ad_plan
+        set Report_State = #{value}
+        where id = #{planId}
+    </update>
 </mapper>
 

detection/src/main/java/com/njcn/gather/monitor/pojo/param/PqMonitorParam.java

@@ -52,7 +52,7 @@ public class PqMonitorParam {
     private Integer statInterval;
 
     @ApiModelProperty(value = "谐波系统监测点id")
-    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
+//    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
     private String harmSysId;
 
     @ApiModelProperty(value = "是否做检测")

detection/src/main/java/com/njcn/gather/monitor/pojo/vo/PqMonitorExcel.java

@@ -14,11 +14,11 @@ import javax.validation.constraints.NotNull;
 @Data
 public class PqMonitorExcel {
 
-    @Excel(name = "谐波系统监测点ID*", width = 20, orderNum = "1")
+    @Excel(name = "谐波系统监测点ID", width = 20, orderNum = "1")
-    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
+//    @NotBlank(message = DetectionValidMessage.MONITOR_ID_NOT_BLANK)
     private String harmSysId;
 
-    @Excel(name = "所属母线*", width = 20, orderNum = "2")
+    @Excel(name = "母线名称*", width = 20, orderNum = "2")
     @NotBlank(message = DetectionValidMessage.BELONG_LINE_NOT_BLANK)
     private String busbar;
 
@@ -30,19 +30,27 @@ public class PqMonitorExcel {
     @NotNull(message = DetectionValidMessage.MONITOR_NUM_NOT_NULL)
     private Integer num;
 
-    @Excel(name = "PT变比(pt1:pt2)*", width = 20, orderNum = "5")
+    @Excel(name = "PT一次变比*", width = 20, orderNum = "5")
     @NotBlank(message = DetectionValidMessage.PT_NOT_BLANK)
-    private String pt;
+    private String pt1;
 
-    @Excel(name = "CT变比(ct1:ct2)*", width = 20, orderNum = "6")
+    @Excel(name = "PT二次变比*", width = 20, orderNum = "6")
+    @NotBlank(message = DetectionValidMessage.PT_NOT_BLANK)
+    private String pt2;
+
+    @Excel(name = "CT一次变比*", width = 20, orderNum = "7")
     @NotBlank(message = DetectionValidMessage.CT_NOT_BLANK)
-    private String ct;
+    private String ct1;
 
-    @Excel(name = "接线方式*", width = 20, orderNum = "7")
+    @Excel(name = "CT二次变比*", width = 20, orderNum = "8")
+    @NotBlank(message = DetectionValidMessage.CT_NOT_BLANK)
+    private String ct2;
+
+    @Excel(name = "接线方式*", width = 20, orderNum = "9")
     @NotBlank(message = DetectionValidMessage.CONNECTION_NOT_BLANK)
     private String connection;
 
-    @Excel(name = "统计间隔*", width = 10, orderNum = "8")
+    @Excel(name = "统计间隔*", width = 20, orderNum = "10")
     @NotNull(message = DetectionValidMessage.STAT_INTERVAL_NOT_NULL)
     private Integer statInterval;
 }

detection/src/main/java/com/njcn/gather/monitor/service/IPqMonitorService.java

@@ -6,7 +6,6 @@ import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author caozehui
@@ -112,4 +111,18 @@ public interface IPqMonitorService extends IService<PqMonitor> {
      */
     Integer getDevCheckResult(String devId);
 
+    /**
+     * 根据被检设备id删除监测点信息
+     *
+     * @param devId
+     * @return
+     */
+    boolean removeByDevId(String devId);
+
+    /**
+     * 根据被检设备id和监测点编号获取监测点信息
+     * @param id 被检设备id
+     * @param monitorNum 监测点编号
+     */
+    PqMonitor getByDevAndNum(String id, int monitorNum);
 }

detection/src/main/java/com/njcn/gather/monitor/service/impl/PqMonitorServiceImpl.java

@@ -10,11 +10,15 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
 import com.njcn.gather.device.pojo.enums.CheckResultEnum;
 import com.njcn.gather.device.pojo.enums.CheckStateEnum;
+import com.njcn.gather.device.pojo.enums.DevReportStateEnum;
+import com.njcn.gather.device.pojo.po.PqDevSub;
 import com.njcn.gather.monitor.mapper.PqMonitorMapper;
 import com.njcn.gather.monitor.pojo.param.PqMonitorParam;
 import com.njcn.gather.monitor.pojo.po.PqMonitor;
 import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
+import com.njcn.gather.plan.pojo.enums.PlanReportStateEnum;
+import com.njcn.gather.plan.pojo.po.AdPlan;
 import com.njcn.gather.pojo.enums.DetectionResponseEnum;
 import com.njcn.gather.storage.service.DetectionDataDealService;
 import com.njcn.gather.storage.service.impl.DetectionDataServiceImpl;
@@ -26,6 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -62,11 +67,108 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     @Transactional
     public boolean updatePqMonitorByDevId(String devId, List<PqMonitorParam> paramList) {
         // 先删除原有数据
-        this.deletePqMonitorByDevId(devId);
+//        this.deletePqMonitorByDevId(devId);
-        // 再添加新数据
+
+        // 添加新数据
         List<PqMonitor> pqMonitorList = BeanUtil.copyToList(paramList, PqMonitor.class);
         pqMonitorList.forEach(pqMonitor -> pqMonitor.setDevId(devId));
-        return this.saveBatch(pqMonitorList);
+
+        List<PqMonitor> existedMonitorList = this.listPqMonitorByDevIds(Collections.singletonList(devId));
+
+        Map<Integer, List<PqMonitor>> map = pqMonitorList.stream().collect(Collectors.groupingBy(PqMonitor::getNum));
+
+        List<PqMonitor> newMonitorList = new ArrayList<>();
+        map.forEach((num, monitorList) -> {
+            PqMonitor pqMonitor = existedMonitorList.stream().filter(monitor -> monitor.getNum() == num).findFirst().orElse(null);
+
+            if (ObjectUtil.isNotNull(pqMonitor)) {
+                BeanUtil.copyProperties(monitorList.get(0), pqMonitor, "id", "realtimeResult", "statisticsResult", "recordedResult", "realtimeNum", "statisticsNum", "recordedNum", "resultType", "qualifiedNum");
+                newMonitorList.add(pqMonitor);
+            } else {
+                newMonitorList.addAll(monitorList);
+            }
+        });
+
+        // 同步更新设备的状态
+        List<PqMonitor> enableCheckMonitorList = newMonitorList.stream().filter(pqMonitor -> pqMonitor.getCheckFlag() == 1).collect(Collectors.toList());
+        List<PqMonitor> checkedMonitorList = enableCheckMonitorList.stream().filter(pqMonitor -> ObjectUtil.isNotNull(pqMonitor.getResultType())).collect(Collectors.toList());
+
+        if (enableCheckMonitorList.size() == checkedMonitorList.size() && checkedMonitorList.size() > 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.CHECKED.getValue());
+            this.baseMapper.updateDeviceReportRState(devId, DevReportStateEnum.NOT_GENERATED.getValue());
+        }
+        if (enableCheckMonitorList.size() > checkedMonitorList.size() && checkedMonitorList.size() > 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.CHECKING.getValue());
+            this.baseMapper.updateDeviceReportRState(devId, DevReportStateEnum.NOT_GENERATED.getValue());
+        }
+        if (enableCheckMonitorList.size() > 0 && checkedMonitorList.size() == 0) {
+            this.baseMapper.updateDeviceCheckState(devId, CheckStateEnum.UNCHECKED.getValue());
+        }
+
+        List<Integer> monitorResultList = checkedMonitorList.stream().map(pqMonitor -> {
+            String resultType = pqMonitor.getResultType();
+            DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(resultType);
+            switch (dataSourceEnum) {
+                case REAL_DATA:
+                    return pqMonitor.getRealtimeResult();
+                case WAVE_DATA:
+                    return pqMonitor.getRecordedResult();
+                case MINUTE_STATISTICS_MAX:
+                case MINUTE_STATISTICS_MIN:
+                case MINUTE_STATISTICS_AVG:
+                case MINUTE_STATISTICS_CP95:
+                    return pqMonitor.getStatisticsResult();
+                default:
+                    break;
+            }
+            return null;
+        }).collect(Collectors.toList());
+
+        long qualifiedCount = monitorResultList.stream().filter(result -> result != null && result == 1).count();
+        if (qualifiedCount == monitorResultList.size() && monitorResultList.size() > 0) {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.ACCORD.getValue());
+        } else if (monitorResultList.size() > 0) {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.NOT_ACCORD.getValue());
+        } else {
+            this.baseMapper.updateDeviceCheckResult(devId, CheckResultEnum.UNCHECKED.getValue());
+        }
+
+        // 同步更新计划的状态
+        AdPlan plan = this.baseMapper.getPlanByDevId(devId);
+        if (ObjectUtil.isNotNull(plan)) {
+
+
+            List<PqDevSub> devSubList = this.baseMapper.listDevSubByPlanId(plan.getId());
+
+            List<PqDevSub> checkedDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKED.getValue()).collect(Collectors.toList());
+            List<PqDevSub> checkingDevSubList = devSubList.stream().filter(pqDevSub -> pqDevSub.getCheckState() == CheckStateEnum.CHECKING.getValue()).collect(Collectors.toList());
+            if (checkedDevSubList.size() == devSubList.size() && devSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKED.getValue());
+            } else if (checkedDevSubList.size() > 0 || checkingDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.CHECKING.getValue());
+            } else {
+                this.baseMapper.updatePlanCheckState(plan.getId(), CheckStateEnum.UNCHECKED.getValue());
+            }
+
+            List<PqDevSub> accordDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getCheckResult() == CheckResultEnum.ACCORD.getValue()).collect(Collectors.toList());
+            if (accordDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.ACCORD.getValue());
+            } else if (accordDevSubList.size() > 0) {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.NOT_ACCORD.getValue());
+            } else {
+                this.baseMapper.updatePlanCheckResult(plan.getId(), CheckResultEnum.UNCHECKED.getValue());
+            }
+
+            List<PqDevSub> generatedDevSubList = checkedDevSubList.stream().filter(pqDevSub -> pqDevSub.getReportState() == DevReportStateEnum.GENERATED.getValue()).collect(Collectors.toList());
+            if (generatedDevSubList.size() == checkedDevSubList.size() && checkedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_ALL_GENERATED.getValue());
+            } else if (generatedDevSubList.size() > 0) {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_PARTIALLY_GENERATED.getValue());
+            } else {
+                this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue());
+            }
+        }
+        return this.saveOrUpdateBatch(newMonitorList);
     }
 
     @Override
@@ -148,9 +250,6 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
         Integer newMonitorResult = CheckResultEnum.UNCHECKED.getValue();
         AtomicReference<Integer> newWaveNum = new AtomicReference<>(-1);
         switch (dataSourceEnum) {
-            case REAL_DATA:
-                newMonitorResult = detectionDataDealService.getMonitorResult(monitorId, adTypes, dataSourceEnum.getValue(), num, null, code);
-                break;
             case WAVE_DATA:
                 Map<Integer, Integer> waveNumResultMap = detectionDataDealService.getWaveNumResultMap(monitorId, adTypes, num, code);
                 if (CollUtil.isEmpty(waveNumResultMap)) {
@@ -166,9 +265,19 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                 } else {
                     newWaveNum.set(waveNum);
                     newMonitorResult = waveNumResultMap.get(waveNum);
+                    if (newMonitorResult == 2) {
+                        newMonitorResult = CheckResultEnum.NOT_ACCORD.getValue();
+                    }
                 }
                 break;
             default:
+                newMonitorResult = detectionDataDealService.getMonitorResult(monitorId, adTypes, dataSourceEnum.getValue(), num, null, code);
+                if (newMonitorResult == 2) {
+                    newMonitorResult = CheckResultEnum.NOT_ACCORD.getValue();
+                }
+                if (newMonitorResult == 1) {
+                    newMonitorResult = CheckResultEnum.ACCORD.getValue();
+                }
                 break;
         }
 
@@ -190,7 +299,18 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
 
             if (CheckResultEnum.ACCORD.getValue().equals(oldMonitorResult)) {
                 if (CheckResultEnum.ACCORD.getValue().equals(newMonitorResult)) {
+                    String oldNum = "";
+                    if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRealtimeNum();
+                    } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
+                        oldNum = monitor.getRecordedNum();
+                    } else {
+                        oldNum = monitor.getStatisticsNum();
+                    }
+                    String[] split1 = oldNum.split(CnSocketUtil.SPLIT_TAG);
+                    if (!split1[0].equals(num.toString())) {
                         qualifiedNum += 1;
+                    }
                     updateFlag = true;
                 }
             } else {
@@ -206,22 +326,28 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
 
             switch (dataSourceEnum) {
                 case REAL_DATA:
-                    monitor.setRealtimeResult(newMonitorResult);
                     monitor.setRealtimeNum(String.valueOf(num));
-                    monitor.setRecordedResult(null);
+                    monitor.setRealtimeResult(newMonitorResult);
                     monitor.setRecordedNum(null);
-                    monitor.setStatisticsResult(null);
+                    monitor.setRecordedResult(null);
                     monitor.setStatisticsNum(null);
+                    monitor.setStatisticsResult(null);
                     break;
                 case WAVE_DATA:
-                    monitor.setRealtimeResult(null);
                     monitor.setRealtimeNum(null);
-                    monitor.setRecordedResult(newMonitorResult);
+                    monitor.setRealtimeResult(null);
                     monitor.setRecordedNum(num + CnSocketUtil.SPLIT_TAG + newWaveNum.get());
-                    monitor.setStatisticsResult(null);
+                    monitor.setRecordedResult(newMonitorResult);
                     monitor.setStatisticsNum(null);
+                    monitor.setStatisticsResult(null);
                     break;
                 default:
+                    monitor.setRealtimeResult(null);
+                    monitor.setRealtimeNum(null);
+                    monitor.setRecordedResult(null);
+                    monitor.setRecordedNum(null);
+                    monitor.setStatisticsNum(String.valueOf(num));
+                    monitor.setStatisticsResult(newMonitorResult);
                     break;
             }
             monitor.setQualifiedNum(qualifiedNum);
@@ -265,15 +391,61 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
             String resultType = monitor.getResultType();
             if (StrUtil.isNotBlank(resultType)) {
                 if (DataSourceEnum.REAL_DATA.getValue().equals(resultType)) {
-                    allResultFlags.add(monitor.getRealtimeResult());
+                    //allResultFlags.add(monitor.getRealtimeResult());
+                    if (monitor.getRealtimeResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getRealtimeResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getRealtimeResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 } else if (DataSourceEnum.WAVE_DATA.getValue().equals(resultType)) {
-                    allResultFlags.add(monitor.getRecordedResult());
+                    //allResultFlags.add(monitor.getRecordedResult());
+                    if (monitor.getRecordedResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getRecordedResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getRecordedResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 } else {
-                    allResultFlags.add(monitor.getStatisticsResult());
+                    //allResultFlags.add(monitor.getStatisticsResult());
+                    if (monitor.getStatisticsResult() == 0) {
+                        allResultFlags.add(2);
+                    }
+                    if (monitor.getStatisticsResult() == 1) {
+                        allResultFlags.add(1);
+                    }
+                    if (monitor.getStatisticsResult() == 4) {
+                        allResultFlags.add(4);
+                    }
                 }
             }
         }
 
         return DetectionDataServiceImpl.isResultFlag(allResultFlags);
     }
+
+    @Override
+    public boolean removeByDevId(String devId) {
+        QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
+        wrapper.eq("pq_monitor.Dev_Id", devId);
+        return this.remove(wrapper);
+    }
+
+    @Override
+    public PqMonitor getByDevAndNum(String devId, int monitorNum) {
+        QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
+        wrapper.eq("pq_monitor.Dev_Id", devId)
+                .eq("pq_monitor.Num", monitorNum);
+        List<PqMonitor> pqMonitors = this.list(wrapper);
+        if (CollUtil.isNotEmpty(pqMonitors)) {
+            return pqMonitors.get(0);
+        }
+        return null;
+    }
 }

detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java

@@ -42,6 +42,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -178,7 +180,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBigTestItem")
     @ApiOperation("获取检测大项数据")
-    @ApiImplicitParam(name = "id", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "checkParam", value = "检测计划id", required = true)
     public HttpResult<List<Map<String, String>>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) {
         String methodDescribe = getMethodDescribe("getBigTestItem");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam);
@@ -189,7 +191,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DOWNLOAD)
     @PostMapping("/analyse")
     @ApiOperation("检测数据分析")
-    @ApiImplicitParam(name = "planId", value = "检测计划id", required = true)
+    @ApiImplicitParam(name = "ids", value = "检测计划id", required = true)
     public void analyse(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("analyse");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
@@ -199,7 +201,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listByPlanId")
     @ApiOperation("查询出所有已绑定的设备")
-    @ApiImplicitParam(name = "planId", value = "计划id", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<PqDevVO>> listByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -239,7 +241,7 @@ public class AdPlanController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/listDevByPlanId")
     @ApiOperation("根据计划id分页查询被检设备")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Page<PqDevVO>> listDevByPlanId(@RequestBody @Validated PqDevParam.QueryParam param) {
         String methodDescribe = getMethodDescribe("listDevByPlanId");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -250,6 +252,7 @@ public class AdPlanController extends BaseController {
             List<String> planIdList = planList.stream().map(AdPlan::getId).collect(Collectors.toList());
             param.getPlanIdList().addAll(planIdList);
         }
+        param.setPlanId(plan.getId());
         Page<PqDevVO> pqDevVOPage = pqDevService.listPqDevs(param);
 
         List<AdPlan> planList = adPlanService.listByIds(param.getPlanIdList());
@@ -451,7 +454,17 @@ public class AdPlanController extends BaseController {
             fileTypeError.setMessage("请上传zip文件");
             throw new BusinessException(fileTypeError);
         }
-        asyncPlanHandler.importAndMergePlanCheckData(file, getUserId(), planId);
+        // 创建临时文件
+        File tempFile = cn.hutool.core.io.FileUtil.createTempFile();
+        // 将MultipartFile内容写入临时文件
+        try {
+            file.transferTo(tempFile);
+        } catch (IOException e) {
+            throw new BusinessException(CommonResponseEnum.FAIL, "文件保存失败");
+        }
+        // 获取文件路径
+        String filePath = tempFile.getAbsolutePath();
+        asyncPlanHandler.importAndMergePlanCheckData(filePath, getUserId(), planId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
 
     }

detection/src/main/java/com/njcn/gather/plan/service/AsyncPlanHandler.java

@@ -9,6 +9,7 @@ import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.gather.detection.pojo.po.AdPair;
 import com.njcn.gather.detection.service.IAdPariService;
@@ -36,7 +37,6 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.time.Duration;
@@ -63,6 +63,8 @@ public class AsyncPlanHandler {
     private final IAdPariService adPairService;
 
     private final JdbcTemplate jdbcTemplate;
+
+
     @Value("${report.reportDir}")
     private String reportPath;
     @Value("${data.homeDir}")
@@ -89,6 +91,12 @@ public class AsyncPlanHandler {
         List<String> devIdList = devList.stream().map(PqDev::getId).collect(Collectors.toList());
         // 被检设备状态统计
         List<PqDevSub> devSubList = pqDevSubService.list(new LambdaQueryWrapper<PqDevSub>().in(PqDevSub::getDevId, devIdList));
+        for (PqDevSub devSub : devSubList) {
+            // 不导出报告，设置报告状态为未生成
+            if (ObjectUtil.isNull(report) || report.equals(DataStateEnum.DELETED.getCode())) {
+                devSub.setReportState(DataStateEnum.DELETED.getCode());
+            }
+        }
         planCheckDataVO.setDevSubList(devSubList);
         // 被检设备监测点信息
         List<PqMonitor> monitorList = pqMonitorService.list(new LambdaQueryWrapper<PqMonitor>().in(PqMonitor::getDevId, devIdList));
@@ -227,28 +235,28 @@ public class AsyncPlanHandler {
     }
 
 
-    @Transactional
     @Async
-    public void importAndMergePlanCheckData(MultipartFile file, String uid, String planId) {
+    public void importAndMergePlanCheckData(String zipFilePath, String uid, String planId) {
+        importAndMergePlanCheckDataLogic(zipFilePath, uid, planId);
+
+    }
+
+    @Transactional
+    public void importAndMergePlanCheckDataLogic(String zipFilePath, String uid, String planId) {
         NonWebAutoFillValueHandler.setCurrentUserId(uid);
         LocalDateTime startTime = LocalDateTime.now();
         AtomicInteger progress = new AtomicInteger(0);
         AtomicInteger currentProgress = new AtomicInteger(0);
         AtomicInteger dataCount = new AtomicInteger(0);
         try {
-            sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "开始保存文件，请耐心等待..."));
             // 创建临时目录用于解压文件
             File tempDir = FileUtil.mkdir(FileUtil.getTmpDirPath() + "import_plan_check_data_" + System.currentTimeMillis() + "/");
-
-            // 将上传的zip文件保存到临时目录
-            File zipFile = FileUtil.file(tempDir, file.getOriginalFilename());
-            file.transferTo(zipFile);
             progress.addAndGet(1);
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "开始解压文件，请耐心等待..."));
 
             // 解压zip文件
             File unzipDir = FileUtil.mkdir(FileUtil.file(tempDir, "unzip"));
-            ZipUtil.unzip(zipFile.getAbsolutePath(), unzipDir.getAbsolutePath());
+            ZipUtil.unzip(zipFilePath, unzipDir.getAbsolutePath());
 
             // 查找解压目录中的json文件
             File[] files = unzipDir.listFiles();
@@ -310,11 +318,13 @@ public class AsyncPlanHandler {
             adPlanService.updateById(subPlan);
             progress.addAndGet(1);
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "开始同步计划设备信息，请耐心等待..."));
-
+            // 更新监测点数据
-            // 批量更新被检设备信息
+            List<PqMonitor> monitorList = planCheckDataVO.getMonitorList();
+            pqMonitorService.updateBatchById(monitorList);
+            // 批量更新被检设备信息，不需要更新
             // 不更新导入标志
-            devList.forEach(dev -> dev.setImportFlag(null));
+            /*devList.forEach(dev -> dev.setImportFlag(null));
-            pqDevService.updateBatchById(devList);
+            pqDevService.updateBatchById(devList);*/
 
             List<PqDevSub> devSubList = planCheckDataVO.getDevSubList();
             for (PqDevSub devSub : devSubList) {
@@ -325,7 +335,7 @@ public class AsyncPlanHandler {
 
             // 同步检测数据
             List<AdPair> pairList = planCheckDataVO.getPairList();
-            adPairService.updateBatchById(pairList);
+            adPairService.saveOrUpdateBatch(pairList);
             // 主计划
             AdPlan plan = adPlanService.getById(planId);
             if (CollUtil.isNotEmpty(docxFiles)) {
@@ -447,14 +457,14 @@ public class AsyncPlanHandler {
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), progress, "数据合并完成"));
 
         } catch (Exception e) {
+
             log.error("导入数据失败", e);
             sseClient.sendMessage(uid, planId, HttpResultUtil.assembleResult(CommonResponseEnum.FAIL.getCode(), progress.get() + currentProgress.get(), "导入失败"));
         } finally {
             NonWebAutoFillValueHandler.clearCurrentUserId();
         }
-
+        FileUtil.del(zipFilePath);
         sseClient.closeSse(uid);
-
     }
 
     // 构建分页查询SQL

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java

@@ -193,11 +193,21 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         adPlanVO.setSourceName(pqSourceList.stream().map(PqSource::getName).collect(Collectors.toList()));
 
         PqDevParam.QueryParam queryParam1 = new PqDevParam.QueryParam();
+        if (adPlan.getFatherPlanId().equals(CommonEnum.FATHER_ID.getValue())) {
+            List<String> planIds = this.lambdaQuery()
+                    .eq(AdPlan::getFatherPlanId, adPlan.getId())
+                    .eq(AdPlan::getState, DataStateEnum.ENABLE.getCode())
+                    .select(AdPlan::getId)
+                    .list()
+                    .stream().map(AdPlan::getId).collect(Collectors.toList());
+            planIds.add(adPlan.getId());
+            queryParam1.setPlanIdList(planIds);
+        } else {
             queryParam1.setPlanIdList(Collections.singletonList(adPlan.getId()));
-
+        }
         List<PqDevVO> pqDevVOList = pqDevMapper.selectByQueryParam(queryParam1);
         if (CollUtil.isNotEmpty(pqDevVOList)) {
-            long count = pqDevVOList.stream().filter(pqDev -> CheckStateEnum.CHECKED.getValue().equals(pqDev.getCheckState())).count();
+            long count = pqDevVOList.stream().filter(pqDev -> CheckStateEnum.CHECKED.getValue().equals(pqDev.getCheckState()) || CheckStateEnum.DOCUMENTED.getValue().equals(pqDev.getCheckState())).count();
             adPlanVO.setProgress((float) count / pqDevVOList.size());
         } else {
             adPlanVO.setProgress(0.0f);
@@ -355,7 +365,6 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
             this.updateBindStandardDev(param.getId(), param.getStandardDevIds());
             List<AdPlan> list = new ArrayList<>();
-            AdPlan fatherPlan = this.getById(fatherPlanId);
             // 原始绑定被检设备
             List<PqDev> oldDevList = pqDevService.list(new QueryWrapper<PqDev>().eq("Plan_Id", param.getId()).eq("State", DataStateEnum.ENABLE.getCode()));
             List<String> oldDevIds = oldDevList.stream().map(PqDev::getId).collect(Collectors.toList());
@@ -371,8 +380,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
                 // 把排除绑定到主计划
                 fatherNowDevIds.addAll(unionDevIds);
-                fatherPlan.setTestState(pqDevService.bind(fatherPlanId, fatherNowDevIds));
+                pqDevService.bind(fatherPlanId, fatherNowDevIds);
-                list.add(fatherPlan);
 
             } else {
                 if (CollUtil.isNotEmpty(oldDevIds)) {
@@ -380,10 +388,23 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     List<String> fatherNowDevIds = fatherNowDevList.stream().map(PqDev::getId).collect(Collectors.toList());
                     fatherNowDevIds.addAll(oldDevIds);
                     // 把原始都绑定到主计划
-                    fatherPlan.setTestState(pqDevService.bind(fatherPlanId, fatherNowDevIds));
+                    pqDevService.bind(fatherPlanId, fatherNowDevIds);
-                    list.add(fatherPlan);
                 }
             }
+            // 非未检测状态
+            if (!plan1.getTestState().equals(CheckStateEnum.UNCHECKED.getValue())) {
+                PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam();
+                queryParam.setPlanIdList(Collections.singletonList(plan1.getId()));
+                List<PqDevVO> pqDevVOS = pqDevService.listByPlanId(queryParam);
+                long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count();
+                if (checkedCount == pqDevVOS.size()) {
+                    plan1.setTestState(CheckStateEnum.CHECKED.getValue());
+                } else if (checkedCount > 0) {
+                    plan1.setTestState(CheckStateEnum.CHECKING.getValue());
+                }
+            }
+
+
             list.add(plan1);
             return this.updateBatchById(list);
         }
@@ -510,7 +531,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
     @Override
     public List<Map<String, Object>> listByPattern(String pattern) {
-        List<AdPlan> adPlanList = this.lambdaQuery().eq(AdPlan::getPattern, pattern).eq(AdPlan::getState, DataStateEnum.ENABLE.getCode()).list();
+        List<AdPlan> adPlanList = this.lambdaQuery().eq(AdPlan::getPattern, pattern).eq(AdPlan::getState, DataStateEnum.ENABLE.getCode()).orderByDesc(AdPlan::getCreateTime).list();
         Map<Integer, List<AdPlan>> map1 = adPlanList.stream().collect(Collectors.groupingBy(AdPlan::getTestState));
 
         List<Map<String, Object>> result = new ArrayList<>();
@@ -533,6 +554,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     child.put("pid", adPlan.getFatherPlanId());
                     child.put("name", adPlan.getName());
                     child.put("timeCheck", adPlan.getTimeCheck());
+                    child.put("dataRule", adPlan.getDataRule());
 
                     List<PqStandardDev> pqStandardDevs = adPlanStandardDevMapper.listByPlanId(Collections.singletonList(adPlan.getId()));
                     List<String> devTypeIdList = pqStandardDevs.stream().map(PqStandardDev::getDevType).collect(Collectors.toList());
@@ -602,8 +624,14 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         }
         DictData dictData = dictDataService.getById(patternId);
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
+            String datasourceId = adPlan.getDatasourceId();
+            if (datasourceId.contains(DataSourceEnum.REAL_DATA.getValue())
+                    || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_CP95.getValue())
+                    || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_AVG.getValue())
+                    || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_MAX.getValue())
+                    || datasourceId.contains(DataSourceEnum.MINUTE_STATISTICS_MIN.getValue())) {
                 String[] split = adPlan.getTestItem().split(StrUtil.COMMA);
-            List<DictTree> dictTreeList = dictTreeService.list(new QueryWrapper<DictTree>().in("id", split).eq("state", DataStateEnum.DELETED.getCode()));
+                List<DictTree> dictTreeList = dictTreeService.list(new QueryWrapper<DictTree>().in("id", split).eq("state", DataStateEnum.DELETED.getCode()).orderByAsc("sort"));
 
                 for (DictTree dictTree : dictTreeList) {
                     Map<String, String> map = new HashMap<>();
@@ -612,6 +640,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     map.put("scriptName", dictTree.getName());
                     result.add(map);
                 }
+            }
+
             if (StrUtil.isBlank(scriptType)) {
                 if (adPlan.getDatasourceId().contains(DataSourceEnum.WAVE_DATA.getValue())) {
                     Map<String, String> map = new HashMap<>();
@@ -911,8 +941,25 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         // 0-解绑、1-绑定
         if (param.getBindFlag().equals(1)) {
             pqDevService.lambdaUpdate().set(PqDev::getPlanId, plan.getId()).in(PqDev::getId, param.getDevIds()).update();
+            // 绑定被检设备，若检测计划已检测完成，则修改为检测中
+            if (plan.getTestState().equals(CheckStateEnum.CHECKED.getValue())) {
+                plan.setTestState(CheckStateEnum.CHECKING.getValue());
+                this.updateById(plan);
+            }
         } else {
             pqDevService.lambdaUpdate().set(PqDev::getPlanId, plan.getFatherPlanId()).in(PqDev::getId, param.getDevIds()).update();
+            // 解绑被检设备，若检测计划检测中，且所有设备已检测完成，则修改为检测完成
+            if (plan.getTestState().equals(CheckStateEnum.CHECKING.getValue())) {
+                PqDevParam.QueryParam queryParam = new PqDevParam.QueryParam();
+                queryParam.setPlanIdList(Collections.singletonList(plan.getId()));
+                List<PqDevVO> pqDevVOS = pqDevService.listByPlanId(queryParam);
+                long checkedCount = pqDevVOS.stream().filter(pqDevVO -> pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())).count();
+                if (checkedCount == pqDevVOS.size()) {
+                    plan.setTestState(CheckStateEnum.CHECKED.getValue());
+                    this.updateById(plan);
+                }
+
+            }
         }
         return true;
     }
@@ -1508,8 +1555,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
 
             // 检测脚本
-            List<Map<String, Object>> maps1 = pqScriptService.listAllPqScript(null);
+            List<PqScript> pqScriptList = pqScriptService.listAllPqScript(null);
-            List<String> scriptNameList = maps1.stream().map(m -> (String) m.get("name")).collect(Collectors.toList());
+            List<String> scriptNameList = pqScriptList.stream().map(m -> m.getName()).collect(Collectors.toList());
             pullDown = new PullDown();
             pullDown.setFirstCol(3);
             pullDown.setLastCol(3);
@@ -1769,7 +1816,12 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             // 更新检测计划信息
             plan.setImportFlag(1);
             plan.setFatherPlanId(CommonEnum.FATHER_ID.getValue());
-            saveOrUpdate(plan);
+            AdPlan oldPlan = this.getById(plan.getId());
+            // 不存在，则入库
+            if (oldPlan == null) {
+                this.save(plan);
+            }
+
 
             List<PqDev> devList = subPlanMetaDataVO.getDevList();
             List<PqStandardDev> standardDevList = subPlanMetaDataVO.getStandardDevList();
@@ -1781,9 +1833,33 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             // 批量更新被检设备信息
             // 设置导入标志为 1
             devList.forEach(dev -> dev.setImportFlag(1));
-            pqDevService.saveOrUpdateBatch(devList);
+            // 排除已存在的，再入库
-            devList.forEach(dev -> {
+            List<String> devIds = devList.stream().map(PqDev::getId).collect(Collectors.toList());
+            List<PqDevSub> pqDevSubs = pqDevSubService.lambdaQuery().in(PqDevSub::getDevId, devIds).list();
+            Map<String, Integer> hadDevMaps = pqDevSubs.stream().collect(Collectors.toMap(PqDevSub::getDevId, PqDevSub::getCheckState));
+            List<PqDev> updateDevList = new ArrayList<>();
+            // 更新被检设备
+            for (Map.Entry<String, Integer> entry : hadDevMaps.entrySet()) {
+                String devId = entry.getKey();
+                Integer checkState = entry.getValue();
+                if (checkState.equals(CheckStateEnum.UNCHECKED.getValue())) {
+                    devList.stream().filter(dev -> dev.getId().equals(devId))
+                            .findFirst().ifPresent(dev -> updateDevList.add(dev));
+                }
+            }
+            if (CollUtil.isNotEmpty(updateDevList)) {
+                pqDevService.updateBatchById(updateDevList);
+                // 更新监测点数据
+                for (PqDev dev : updateDevList) {
                     pqMonitorService.saveOrUpdateBatch(dev.getMonitorList());
+                }
+            }
+            // 新增被检设备
+            List<PqDev> saveDevList = devList.stream().filter(dev -> !hadDevMaps.keySet().contains(dev.getId())).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(saveDevList)) {
+                pqDevService.saveBatch(saveDevList);
+                saveDevList.forEach(dev -> {
+                    pqMonitorService.saveBatch(dev.getMonitorList());
                     // 新增时默认设置
                     PqDevSub pqDevSub = new PqDevSub();
                     pqDevSub.setDevId(dev.getId());
@@ -1792,17 +1868,24 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                     pqDevSub.setCheckState(CheckStateEnum.UNCHECKED.getValue());
                     pqDevSub.setReportState(DevReportStateEnum.UNCHECKED.getValue());
                     pqDevSub.setCheckResult(CheckResultEnum.UNCHECKED.getValue());
-                Integer count = pqDevSubService.lambdaQuery().eq(PqDevSub::getDevId, dev.getId()).count();
-                if (count.intValue() == 0) {
                     pqDevSubService.save(pqDevSub);
-                } else {
-                    pqDevSubService.update(pqDevSub, new LambdaUpdateWrapper<PqDevSub>().eq(PqDevSub::getDevId, dev.getId()));
-                }
                 });
-            List<String> devIds = devList.stream().map(PqDev::getId).collect(Collectors.toList());
+            }
-            // 守时检测
-            pqDevService.updatePqDevTimeCheckResult(devIds, TimeCheckResultEnum.UNKNOWN);
 
+            // 移除未检测的被检设备
+            List<String> uncheckedDevIds = pqDevSubs.stream()
+                    .filter(pqDevSub -> pqDevSub.getCheckState().equals(CheckStateEnum.UNCHECKED.getValue()))
+                    .map(PqDevSub::getDevId)
+                    .collect(Collectors.toList());
+            List<String> removeDevIds = uncheckedDevIds.stream()
+                    .filter(devId -> !devIds.contains(devId))
+                    .collect(Collectors.toList());
+
+            if (CollUtil.isNotEmpty(removeDevIds)) {
+                pqDevService.removeByIds(removeDevIds);
+                pqDevSubService.remove(new LambdaQueryWrapper<PqDevSub>().in(PqDevSub::getDevId, removeDevIds));
+                pqMonitorService.remove(new LambdaQueryWrapper<PqMonitor>().in(PqMonitor::getDevId, removeDevIds));
+            }
             // 批量更新标准设备信息
             pqStandardDevService.saveOrUpdateBatch(standardDevList);
             List<String> standardDevIds = standardDevList.stream().map(PqStandardDev::getId).collect(Collectors.toList());
@@ -2045,6 +2128,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
 
     /**
      * 比对模式下计划的检测项获取
+     *
      * @param planId 计划ID
      * @return 检测项
      */

detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java

@@ -74,7 +74,8 @@ public enum DetectionResponseEnum {
     PLAN_HAS_CHILDREN("A02095", "该计划下存在子计划，请先删除子计划"),
     PLAN_REPEATED_IN_SAME_LEVEL("A02096", "该父计划下存在同名的子计划"),
     PLEASE_UNASSIGN_STANDARD_DEV("A02097", "存在已分配给子计划的标准设备，请先解除分配"),
-    PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配");
+    PLEASE_UNASSIGN_DEVICE("A02098", "存在已分配给计划的被检设备，请先解除分配"),
+    DEV_IP_PORT_EXIST("A02099", "存在重复被检设备");
 
     private final String code;
 

detection/src/main/java/com/njcn/gather/report/controller/ReportController.java

@@ -31,7 +31,7 @@ import java.util.List;
  * @data 2025/1/9 14:02
  */
 @Slf4j
-@Api(tags = "报表管理")
+@Api(tags = "报告管理")
 @RestController
 @RequestMapping("/report")
 @RequiredArgsConstructor
@@ -46,7 +46,7 @@ public class ReportController extends BaseController {
      */
     @OperateInfo
     @PostMapping("/generateReport")
-    @ApiOperation("生成测试报告")
+    @ApiOperation("生成报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<Object> generateReport(@RequestBody DevReportParam devReportParam) {
         String methodDescribe = getMethodDescribe("generateReport");
@@ -60,7 +60,7 @@ public class ReportController extends BaseController {
      */
     @OperateInfo
     @PostMapping("/downloadReport")
-    @ApiOperation("下载测试报告")
+    @ApiOperation("下载报告")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public void downloadReport(@RequestBody DevReportParam devReportParam, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("downloadReport");
@@ -91,7 +91,7 @@ public class ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> add(ReportParam reportParam) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增参数为：{}", methodDescribe, reportParam);
@@ -106,7 +106,7 @@ public class ReportController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("更新报告模板")
-    @ApiImplicitParam(name = "param", value = "报告模板参数", required = true)
+    @ApiImplicitParam(name = "reportParam", value = "报告模板参数", required = true)
     public HttpResult<Boolean> update(ReportParam.UpdateParam reportParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改参数为：{}", methodDescribe, reportParam);
@@ -136,7 +136,6 @@ public class ReportController extends BaseController {
     @OperateInfo
     @GetMapping("/listAllName")
     @ApiOperation("查询所有报告模板名称")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<String>> listAllName() {
         String methodDescribe = getMethodDescribe("listAllName");
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pqReportService.listAllName(), methodDescribe);
@@ -145,7 +144,7 @@ public class ReportController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/documented")
     @ApiOperation("设备归档")
-    @ApiImplicitParam(name = "id", value = "设备id", required = true)
+    @ApiImplicitParam(name = "ids", value = "设备id", required = true)
     public HttpResult<Boolean> documented(@RequestBody List<String> ids) {
         String methodDescribe = getMethodDescribe("documented");
         LogUtil.njcnDebug(log, "{}，设备id为：{}", methodDescribe, ids);

detection/src/main/java/com/njcn/gather/report/pojo/enums/BaseReportKeyEnum.java

@@ -31,6 +31,7 @@ public enum BaseReportKeyEnum {
     DAY("day","日"),
     YEAR_MONTH_DAY("year-month-day","年-月-日"),
     REPORT_DATE("reportDate","年-月-日"),
+    GD_NAME("gdName","供电部门"),
     SUB_NAME("subName","变电站"),
     CHECK_BY("checkBy","检测人"),
     AUDIT_BY("auditBy","负责人、审核人"),

detection/src/main/java/com/njcn/gather/report/pojo/enums/PowerIndexEnum.java

@@ -26,7 +26,8 @@ public enum PowerIndexEnum {
     HI("HI", "谐波电流"),
     HSV("HSV", "间谐波电压"),
     HSI("HSI", "间谐波电流"),
-    VOLTAGE("VOLTAGE", "电压暂降、暂升及短时中断");
+    VOLTAGE("VOLTAGE", "电压暂降、暂升及短时中断"),
+    PST("PST", "短时间闪变");
 
     private String key;
 

detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java

@@ -39,6 +39,8 @@ import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.device.service.IPqDevSubService;
 import com.njcn.gather.err.pojo.po.PqErrSys;
 import com.njcn.gather.err.service.IPqErrSysService;
+import com.njcn.gather.monitor.pojo.po.PqMonitor;
+import com.njcn.gather.monitor.service.IPqMonitorService;
 import com.njcn.gather.plan.pojo.enums.DataSourceEnum;
 import com.njcn.gather.plan.pojo.enums.PlanReportStateEnum;
 import com.njcn.gather.plan.pojo.po.AdPlan;
@@ -67,6 +69,7 @@ import com.njcn.gather.system.cfg.pojo.enums.SceneEnum;
 import com.njcn.gather.system.cfg.service.ISysTestConfigService;
 import com.njcn.gather.system.dictionary.pojo.po.DictData;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
+import com.njcn.gather.system.pojo.enums.SystemResponseEnum;
 import com.njcn.gather.tools.report.model.constant.ReportConstant;
 import com.njcn.gather.tools.report.service.IWordReportService;
 import com.njcn.gather.tools.report.util.BookmarkUtil;
@@ -89,7 +92,6 @@ import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
 import org.docx4j.wml.*;
-import org.docx4j.wml.Color;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.ClassPathResource;
@@ -109,6 +111,7 @@ import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
@@ -178,6 +181,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private final ISysUserService sysUserService;
     private final IPqErrSysService pqErrSysService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
+    private final IPqMonitorService pqMonitorService;
 
     @Resource
     private RestTemplateUtil restTemplateUtil;
@@ -306,7 +310,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private void uploadFile(ReportParam reportParam, PqReport pqReport, boolean isAdd) {
         MultipartFile baseFile = reportParam.getBaseFile();
         MultipartFile detailFile = reportParam.getDetailFile();
-        String newDir = templatePath + File.separator + reportParam.getName() + File.separator + reportParam.getVersion() + File.separator;
+        String relativePath = reportParam.getName() + File.separator + reportParam.getVersion() + File.separator;
+        String newDir = templatePath + File.separator + relativePath;
 
         long FILE_SIZE_LIMIT = 5 * 1024 * 1024;
         if (isAdd) {
@@ -325,13 +330,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     throw new BusinessException(ReportResponseEnum.FILE_SIZE_ERROR);
                 }
 
-                pqReport.setBasePath(newDir + baseOriginalFilename);
+                pqReport.setBasePath(relativePath + baseOriginalFilename);
-                pqReport.setDetailPath(newDir + detailOriginalFilename);
+                pqReport.setDetailPath(relativePath + detailOriginalFilename);
 
                 this.createDirectory(newDir);
                 this.clearDirectory(newDir);
-                this.uploadFile(baseFile, pqReport.getBasePath());
+                this.uploadFile(baseFile, newDir + baseOriginalFilename);
-                this.uploadFile(detailFile, pqReport.getDetailPath());
+                this.uploadFile(detailFile, newDir + detailOriginalFilename);
             } else {
                 throw new BusinessException(ReportResponseEnum.FILE_NOT_NULL);
             }
@@ -379,34 +384,34 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
             //若修改了文件名称、版本号，则需要重命名文件
             this.createDirectory(newDir);
-            if (!oldDir.equals(newDir)) {
+            if (!oldDir.equals(relativePath)) {
                 // 文件夹重命名
                 String oldBasePathStr = oldPqReport.getBasePath();
                 String baseName = oldBasePathStr.substring(oldBasePathStr.lastIndexOf(File.separator) + 1);
-                Path oldBasePath = Paths.get(oldBasePathStr);
+                Path oldBasePath = Paths.get(templatePath + File.separator + oldBasePathStr);
                 Path newBasePath = Paths.get(newDir + baseName);
-                pqReport.setBasePath(newDir + baseName);
+                pqReport.setBasePath(relativePath + baseName);
 
                 String oldDetailPathStr = oldPqReport.getDetailPath();
                 String detailName = oldDetailPathStr.substring(oldDetailPathStr.lastIndexOf(File.separator) + 1);
-                Path oldDetailPath = Paths.get(oldDetailPathStr);
+                Path oldDetailPath = Paths.get(templatePath + File.separator + oldDetailPathStr);
                 Path newDetailPath = Paths.get(newDir + detailName);
-                pqReport.setDetailPath(newDir + detailName);
+                pqReport.setDetailPath(relativePath + detailName);
 
                 try {
                     // windows下文件夹名称不区分大小写
-                    if (!oldDir.equalsIgnoreCase(newDir)) {
+                    if (!oldDir.equalsIgnoreCase(relativePath)) {
                         this.clearDirectory(newDir);
                         Files.move(oldBasePath, newBasePath);
                         Files.move(oldDetailPath, newDetailPath);
                         if (!oldPqReport.getName().equals(reportParam.getName()) && !this.existSameName(pqReport.getId(), oldPqReport.getName())) {
                             this.recursionDeleteDirectory(templatePath + File.separator + oldPqReport.getName());
                         } else {
-                            Paths.get(oldDir).toFile().delete();
+                            Paths.get(templatePath + oldDir).toFile().delete();
                         }
                     } else {
                         // 文件夹重命名
-                        Paths.get(oldDir).toFile().renameTo(Paths.get(newDir).toFile());
+                        Paths.get(templatePath + oldDir).toFile().renameTo(Paths.get(newDir).toFile());
                     }
                 } catch (IOException e) {
                     throw new BusinessException(ReportResponseEnum.FILE_RENAME_FAILED);
@@ -414,16 +419,16 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             }
 
             if (!baseFileOriginalFilename.isEmpty()) {
-                pqReport.setBasePath(newDir + baseFileOriginalFilename);
+                pqReport.setBasePath(relativePath + baseFileOriginalFilename);
-                Paths.get(oldPqReport.getBasePath()).toFile().delete();
+                Paths.get(templatePath + File.separator + oldPqReport.getBasePath()).toFile().delete();
                 Paths.get(newDir + oldPqReport.getBasePath().substring(oldPqReport.getBasePath().lastIndexOf(File.separator) + 1)).toFile().delete();
-                this.uploadFile(baseFile, pqReport.getBasePath());
+                this.uploadFile(baseFile, newDir + baseFileOriginalFilename);
             }
             if (!detailFileOriginalFilename.isEmpty()) {
-                pqReport.setDetailPath(newDir + detailFileOriginalFilename);
+                pqReport.setDetailPath(relativePath + detailFileOriginalFilename);
-                Paths.get(oldPqReport.getDetailPath()).toFile().delete();
+                Paths.get(templatePath + File.separator + oldPqReport.getDetailPath()).toFile().delete();
                 Paths.get(newDir + oldPqReport.getDetailPath().substring(oldPqReport.getDetailPath().lastIndexOf(File.separator) + 1)).toFile().delete();
-                this.uploadFile(detailFile, pqReport.getDetailPath());
+                this.uploadFile(detailFile, newDir + detailFileOriginalFilename);
             }
         }
     }
@@ -571,7 +576,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
 
     /**
-     *
      * 根据设备类型生成报告
      * 注：该方法目前仅支持楼下出厂检测场景，属于模板占位符替换方式，后期可能会有调整
      *
@@ -641,6 +645,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                         }
                     }
                 });
+            } catch (NoSuchFileException e) {
+                String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+            } catch (IOException e) {
+                log.error("报告文件读写异常", e);
+                throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
             } catch (Exception e) {
                 log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
                 throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
@@ -779,6 +790,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             if (Objects.isNull(pqDevVO)) {
                 throw new BusinessException(ReportResponseEnum.DEVICE_NOT_EXIST);
             }
+            if (CheckStateEnum.CHECKED.getValue().compareTo(pqDevVO.getCheckState()) <= 0) {
                 devReportParam.setDevId(devId);
                 // 获取设备型号
                 DevType devType = devTypeService.getById(pqDevVO.getDevType());
@@ -789,8 +801,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 if (Objects.isNull(report)) {
                     throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
                 }
-            Path basePath = Paths.get(report.getBasePath());
+                Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
-            Path detailPath = Paths.get(report.getDetailPath());
+                Path detailPath = Paths.get(templatePath + File.separator + report.getDetailPath());
                 try (InputStream baseInputStream = Files.newInputStream(basePath);
                      InputStream detailInputStream = Files.newInputStream(detailPath)) {
                     WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
@@ -813,13 +825,29 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                             pqDevVO.getGdName() != null ? pqDevVO.getGdName() : "未知供电公司",
                             pqDevVO.getSubName() != null ? pqDevVO.getSubName() : "未知电站",
                             pqDevVO.getName() != null ? pqDevVO.getName() : "未知设备");
+                    // 判断是否需要在报告上输出水印
+                    String leader = baseModelDataMap.get(BaseReportKeyEnum.AUDIT_BY.getKey());
+                    String loginName = RequestUtil.getLoginNameByToken();
+                    SysUser user = sysUserService.getUserByLoginName(loginName);
+                    if (!leader.equals(user.getName())) {
+                        log.info("当前用户不是审核人，添加非正式水印");
+                        Docx4jUtil.addWatermarkToDocument(baseModelDocument, "非正式");
+                    }
                     Docx4jUtil.cleanBlankPagesAndRedundantPageBreaks(baseModelDocument);
                     baseModelDocument.save(new File(dirPath.concat(File.separator).concat(fileName)));
                     this.updateDevAndPlanState(devId, devReportParam.getPlanId());
+                } catch (NoSuchFileException e) {
+                    String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                    log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                    throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+                } catch (IOException e) {
+                    log.error("报告文件读写异常", e);
+                    throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
                 } catch (Exception e) {
                     log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
                     throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
                 }
+            }
         });
 
     }
@@ -850,8 +878,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             if (Objects.isNull(report)) {
                 throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST);
             }
-            Path basePath = Paths.get(report.getBasePath());
+            Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
-            Path detailPath = Paths.get(report.getDetailPath());
+            Path detailPath = Paths.get(templatePath + File.separator + report.getDetailPath());
             try (InputStream baseInputStream = Files.newInputStream(basePath);
                  InputStream detailInputStream = Files.newInputStream(detailPath)) {
                 WordprocessingMLPackage detailModelDocument = WordprocessingMLPackage.load(detailInputStream);
@@ -871,6 +899,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 ensureDirectoryExists(dirPath);
                 baseModelDocument.save(new File(dirPath.concat(File.separator).concat(pqDevVO.getCreateId()).concat(ReportConstant.DOCX)));
                 this.updateDevAndPlanState(devId, devReportParam.getPlanId());
+            } catch (NoSuchFileException e) {
+                String filePath = e.getFile() != null ? e.getFile().replaceAll("\\\\", "/") : "未知文件";
+                log.error("报告模板文件不存在 - 文件路径: {}", filePath, e);
+                throw new BusinessException(SystemResponseEnum.FILE_NOT_FOUND);
+            } catch (IOException e) {
+                log.error("报告文件读写异常", e);
+                throw new BusinessException(SystemResponseEnum.FILE_IO_ERROR);
             } catch (Exception e) {
                 log.error(ReportResponseEnum.GENERATE_REPORT_ERROR.getMessage(), e);
                 throw new BusinessException(ReportResponseEnum.GENERATE_REPORT_ERROR);
@@ -1065,7 +1100,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      * 实时数据：3秒数据（150周波数据）
      * 录波：录波数据
      * 分钟统计数据：分钟统计数据-最大值、分钟统计数据-最小值、分钟统计数据-平均值、分钟统计数据-CP95值
-     *
      */
     private String getDataTypeFromParam(AdPlan adPlan) {
         String dataSource = adPlan.getDatasourceId();
@@ -1134,10 +1168,11 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             Integer monitorNum = next.getKey();
             // 线路下的指标数据
             List<ContrastTestResult> contrastTestResults = next.getValue();
+            PqMonitor pqMonitor = pqMonitorService.getByDevAndNum(pqDevVO.getId(), monitorNum);
             // 插入回路号前，先换个页
             todoInsertList.add(Docx4jUtil.createPageBreakParagraph());
             // 回路标题
-            todoInsertList.add(getContrastLineTitle(contentMap, monitorNum, stepIndex, factory));
+            todoInsertList.add(getContrastLineTitle(contentMap, monitorNum, stepIndex, factory, pqDevVO));
             int scriptIndex = 1;
             for (ContrastTestResult contrastTestResult : contrastTestResults) {
                 // 比如电压 V
@@ -1148,7 +1183,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                 // 根据code获取对应需要填充的内容
                 List<Docx4jUtil.HeadingContent> tempContent = contentMap.get(scriptCode);
                 // 需要区分下谐波类和非谐波类
-                List<Object> tempList = fillContentInTemplateContrast(tempContent, factory, contrastTestResult);
+                List<Object> tempList = fillContentInTemplateContrast(tempContent, factory, contrastTestResult, pqMonitor);
                 todoInsertList.addAll(tempList);
                 scriptIndex++;
             }
@@ -1566,18 +1601,37 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
                                         // 获取现有行的样式
                                         Tr existingRow = (Tr) tbl.getContent().get(rows.size() - 1);
+
                                         // 获取现有样式
                                         TrPr trPr = existingRow.getTrPr();
-                                        JAXBElement<Tc> element = (JAXBElement<Tc>) existingRow.getContent().get(0);
+                                        // 获取每个单元格的TcPr（保留各单元格独立的边框设置）
-                                        TcPr tcPr = element.getValue().getTcPr();
+                                        List<TcPr> tcPrList = new ArrayList<>();
+                                        RPr templateRPr = null;
+                                        for (Object cellObj : existingRow.getContent()) {
+                                            if (cellObj instanceof JAXBElement) {
+                                                JAXBElement<Tc> cellElement = (JAXBElement<Tc>) cellObj;
+                                                Tc templateCell = cellElement.getValue();
+                                                TcPr tcPr = templateCell.getTcPr();
+                                                // 设置单元格宽度
+                                                if (tcPr == null) {
+                                                    tcPr = factory.createTcPr();
+                                                }
                                                 TblWidth cellWidth = factory.createTblWidth();
                                                 cellWidth.setType("dxa");
                                                 cellWidth.setW(BigInteger.valueOf(5000 / tableKeys.size()));
                                                 tcPr.setTcW(cellWidth);
+                                                tcPrList.add(tcPr);
+                                                // 从第一个单元格获取字体样式
+                                                if (templateRPr == null && !templateCell.getContent().isEmpty() && templateCell.getContent().get(0) instanceof P) {
+                                                    P templateP = (P) templateCell.getContent().get(0);
+                                                    templateRPr = Docx4jUtil.getTcPrFromParagraph(templateP);
+                                                }
+                                            }
+                                        }
                                         tbl.getContent().remove(existingRow);
                                         // 迭代增加行,需要填充的表格keys在tableKeys集合中
                                         for (Map<String, String> stringStringMap : dataList) {
-                                            Tr newRow = Docx4jUtil.createCustomRow(factory, stringStringMap, tableKeys, trPr, tcPr, true);
+                                            Tr newRow = Docx4jUtil.createCustomRow(factory, stringStringMap, tableKeys, trPr, tcPrList, templateRPr, true);
                                             tbl.getContent().add(newRow);
                                         }
                                     } else {
@@ -1604,7 +1658,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      *
      * @return
      */
-    private List<Object> fillContentInTemplateContrast(List<Docx4jUtil.HeadingContent> tempContent, ObjectFactory factory, ContrastTestResult contrastTestResult) {
+    private List<Object> fillContentInTemplateContrast(List<Docx4jUtil.HeadingContent> tempContent, ObjectFactory factory, ContrastTestResult contrastTestResult, PqMonitor pqMonitor) {
         List<Object> todoInsertList = new ArrayList<>();
         Docx4jUtil.HeadingContent headingContent = tempContent.get(0);
         List<String> tableKeys = Docx4jUtil.getTableFillKeys(tempContent);
@@ -1718,9 +1772,47 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     // 纵向表格暂不考虑
                 }
 
-                // 如果存在特殊说明，在表格后添加一个段落
+                StringBuilder description = new StringBuilder();
+                if (contrastTestResult.getScriptCode().equalsIgnoreCase("I")) {
+                    // 获取该通道的额定电流
+                    String ct = pqMonitor.getCt();
+                    // 理论上ct是 xxx:xxx的格式。比如10:1，100:5
+                    if (ct.indexOf(":") > 0) {
+                        String[] ctArray = ct.split(":");
+                        description.append("注：当前回路额定电流为：").append(ctArray[1]).append("A。");
+                    }
+                } else if (contrastTestResult.getScriptCode().equalsIgnoreCase("V")) {
+                    // 获取该通道的额定电压
+                    String pt = pqMonitor.getPt();
+                    // 理论上pt是 xxx:xxx的格式。比如380:380，10000:100
+                    if (pt.indexOf(":") > 0) {
+                        String[] ptArray = pt.split(":");
+                        // 电压需要特殊处理下，处理为相电压值
+                        String voltage = ptArray[1];
+                        if (voltage.equalsIgnoreCase("100")) {
+                            voltage = "57.74";
+                        } else if (voltage.equalsIgnoreCase("380")) {
+                            voltage = "220";
+                        } else {
+                            // 其他场景下就除以根号3
+                            double result = Double.parseDouble(voltage) / Math.sqrt(3);
+                            voltage = doubleRound(2, result);
+                        }
+                        description.append("注：当前回路额定电流为：").append(voltage).append("V。");
+                    }
+                }
+
+                // 如果存在特殊说明，在表格后添加一个段落 如果有电压和电流需要把额定电压和电流标注进来 pqMonitor
+                if (StrUtil.isNotBlank(contrastTestResult.getSpecialCase()) || StrUtil.isNotBlank(description.toString())) {
+                    P specialCaseP;
+                    if (StrUtil.isNotBlank(description.toString())) {
                         if (StrUtil.isNotBlank(contrastTestResult.getSpecialCase())) {
-                    P specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, contrastTestResult.getSpecialCase());
+                            description.append(contrastTestResult.getSpecialCase().replace("注：", ""));
+                        }
+                        specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, description.toString());
+                    } else {
+                        specialCaseP = Docx4jUtil.createSpecialCaseParagraph(factory, contrastTestResult.getSpecialCase());
+                    }
                     todoInsertList.add(specialCaseP);
                 }
             }
@@ -1879,12 +1971,12 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
 
             for (int i = 0; i < pqDevVOList.size(); i++) {
                 pqDevVO = pqDevVOList.get(i);
+                tempPqDevVO = pqDevVO;
                 if (!pqDevVO.getCheckState().equals(CheckStateEnum.CHECKED.getValue())) {
                     throw new BusinessException(DetectionResponseEnum.DEV_UN_CHECKED);
                 }
                 if (!pqDevVO.getReportState().equals(DevReportStateEnum.GENERATED.getValue())) {
                     devIds.add(pqDevVO.getId());
-                    tempPqDevVO = pqDevVO;
                 }
             }
 
@@ -1986,7 +2078,6 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     }
 
     /**
-     *
      * 比对模式下需要获取的数据
      * 处理基础模版中的信息，非数据页报告
      * 因为Docx4j工具包替换时会默认增加${}
@@ -1997,7 +2088,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         // 委托方
         String delegate = pqDevVO.getDelegate();
         if (StrUtil.isNotBlank(delegate)) {
-            DictData delegateDictData = dictDataService.getDictDataById(pqDevVO.getManufacturer());
+            DictData delegateDictData = dictDataService.getDictDataById(pqDevVO.getDelegate());
             if (ObjectUtil.isNotNull(delegateDictData)) {
                 baseModelMap.put(BaseReportKeyEnum.DELEGATE.getKey(), delegateDictData.getName());
             } else {
@@ -2010,6 +2101,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         baseModelMap.put(BaseReportKeyEnum.SAMPLE_ID.getKey(), StrUtil.isEmpty(pqDevVO.getName()) ? StrPool.TAB : pqDevVO.getName());
         // 报告日期
         baseModelMap.put(BaseReportKeyEnum.REPORT_DATE.getKey(), DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN));
+        // 供电部门
+        baseModelMap.put(BaseReportKeyEnum.GD_NAME.getKey(), pqDevVO.getGdName());
         // 变电站名称
         baseModelMap.put(BaseReportKeyEnum.SUB_NAME.getKey(), pqDevVO.getSubName());
         // 检测人
@@ -2371,16 +2464,21 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     /**
      * 创建回路标题到报告中
      */
-    private P getContrastLineTitle(Map<String, List<Docx4jUtil.HeadingContent>> contentMap, int monitorNum, int index, ObjectFactory factory) {
+    private P getContrastLineTitle(Map<String, List<Docx4jUtil.HeadingContent>> contentMap, int monitorNum, int index, ObjectFactory factory, PqDevVO pqDevVO) {
+        PqMonitor pqMonitor = pqMonitorService.getByDevAndNum(pqDevVO.getId(), monitorNum);
+        String monitorInfoName = "";
+        if (StrUtil.isNotBlank(pqDevVO.getSubName()) && Objects.nonNull(pqMonitor)) {
+            monitorInfoName = "(" + pqDevVO.getSubName() + "-" + pqMonitor.getName() + ")";
+        }
         List<Docx4jUtil.HeadingContent> headingContents = contentMap.get(PowerIndexEnum.LINE_TITLE.getKey());
         // 如果contentMap中有指定内容，创建大纲级别为2的标题
         if (CollUtil.isNotEmpty(headingContents)) {
-            return Docx4jUtil.createTitle(factory, 2, index + ".测量回路" + monitorNum,
+            return Docx4jUtil.createTitle(factory, 2, index + ".测量回路" + monitorNum + monitorInfoName,
                     "SimSun", 30, true);
         }
         // 没有模板配置时，创建默认样式段落
         P titleParagraph = factory.createP();
-        Docx4jUtil.createTitle(factory, titleParagraph, "测量回路" + monitorNum,
+        Docx4jUtil.createTitle(factory, titleParagraph, "测量回路" + monitorNum + monitorInfoName,
                 28, true);
         return titleParagraph;
     }

detection/src/main/java/com/njcn/gather/result/controller/ResultController.java

@@ -90,7 +90,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/reCalculate")
     @ApiOperation("重新计算检测结果")
-    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "param", value = "重新计算参数", required = true)
     public HttpResult<Object> reCalculate(@RequestBody @Validated ResultParam.ChangeErrorSystemParam param) {
         String methodDescribe = getMethodDescribe("reCalculate");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
@@ -115,7 +115,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.DELETE)
     @GetMapping("/deleteTempTable")
     @ApiOperation("删除临时表")
-    @ApiImplicitParam(name = "param", value = "删除参数", required = true)
+    @ApiImplicitParam(name = "code", value = "计划对应的表后缀code", required = true)
     public HttpResult<Object> deleteTempTable(@RequestParam("code") String code) {
         String methodDescribe = getMethodDescribe("deleteTempTable");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, code);
@@ -127,7 +127,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastFormContent")
     @ApiOperation("获取比对式检测结果-表单内容")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<FormContentVO> getContrastFormContent(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastFormContent");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -139,7 +139,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getContrastResult")
     @ApiOperation("获取比对式检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true)
     public HttpResult<ContrastResultVO> getContrastResult(@RequestBody @Validated ResultParam.QueryParam queryParam) {
         String methodDescribe = getMethodDescribe("getContrastResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam);
@@ -154,7 +154,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getMonitorResult")
     @ApiOperation("获取监测点的检测结果")
-    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    @ApiImplicitParam(name = "devId", value = "设备id", required = true)
     public HttpResult<List<MonitorResultVO>> getMonitorResult(@RequestParam("devId") String devId) {
         String methodDescribe = getMethodDescribe("getMonitorResult");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, devId);
@@ -180,7 +180,7 @@ public class ResultController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/updateMonitorResult")
     @ApiOperation("更新监测点的检测结果")
-    @ApiImplicitParam(name = "result", value = "更新内容", required = true)
+    @ApiImplicitParam(name = "resultParams", value = "更新内容", required = true)
     public HttpResult<Boolean> updateMonitorResult(@RequestBody @Validated MonitorResultVO resultParams) {
         String methodDescribe = getMethodDescribe("updateMonitorResult");
         LogUtil.njcnDebug(log, "{}，更新数据为：{}", methodDescribe, resultParams);
@@ -198,7 +198,7 @@ public class ResultController extends BaseController {
         String methodDescribe = getMethodDescribe("getCheckItem");
 
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam);
-        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getDevId(),monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
+        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }

detection/src/main/java/com/njcn/gather/result/pojo/param/MonitorQueryParam.java

@@ -15,4 +15,6 @@ public class MonitorQueryParam {
     private Integer num;
 
     private Integer waveNum;
+
+    private String planId;
 }

detection/src/main/java/com/njcn/gather/result/pojo/param/ResultParam.java

@@ -2,6 +2,7 @@ package com.njcn.gather.result.pojo.param;
 
 import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.gather.pojo.constant.DetectionValidMessage;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -74,6 +75,8 @@ public class ResultParam {
 
         // 模式id
         private String patternId;
+
+        private String code;
     }
 
     @Data
@@ -83,7 +86,7 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.PLAN_ID_FORMAT_ERROR)
         private String planId;
 
-        @ApiModelProperty(value = "脚本Id", required = false)
+        @ApiModelProperty(value = "脚本Id")
         private String scriptId;
 
         @ApiModelProperty(value = "误差体系Id", required = true)
@@ -95,9 +98,16 @@ public class ResultParam {
         @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DetectionValidMessage.DEV_ID_FORMAT_ERROR)
         private String deviceId;
 
+        @ApiModelProperty(value = "计划对应表后缀", required = true)
         private String code;
 
         @ApiModelProperty(value = "模式Id", required = true)
         private String patternId;
+
+        @ApiModelProperty(value = "通道号", required = true)
+        private String chnNum;
+
+        @ApiModelProperty(value = "数据处理原则", required = true)
+        private String dataRuleId;
     }
 }

detection/src/main/java/com/njcn/gather/result/pojo/vo/MonitorResultVO.java

@@ -14,58 +14,38 @@ import javax.validation.constraints.NotNull;
 @Data
 public class MonitorResultVO implements Comparable<MonitorResultVO> {
 
-    /**
-     * 监测点id
-     */
     @ApiModelProperty(value = "监测点id", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_ID_NOT_BLANK)
     private String monitorId;
 
-    /**
+    @ApiModelProperty(value = "监测点序号")
-     * 监测点序号
-     */
     private Integer monitorNum;
 
-    /**
+    @ApiModelProperty(value = "总检测次数")
-     * 总检测次数
-     */
     private Integer totalNum;
 
-    /**
+    @ApiModelProperty(value = "合格检测次数")
-     * 合格检测次数
-     */
     private Integer qualifiedNum;
 
-    /**
+    @ApiModelProperty(value = "不合格检测次数")
-     * 不合格检测次数
-     */
     private Integer unQualifiedNum;
 
-    /**
+    @ApiModelProperty(value = "误差体系名称")
-     * 误差体系名称
-     */
     private String errorSysName;
 
-    /**
-     * 检测结果
-     */
     @ApiModelProperty(value = "检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NOT_NULL)
     private Integer checkResult;
 
-    /**
+
-     * 结论来源
+    @ApiModelProperty(value = "结论来源")
-     */
     private String resultOrigin;
-    /**
+
-     * 哪次
-     */
     @ApiModelProperty(value = "使用哪次检测结果", required = true)
     @NotNull(message = DetectionValidMessage.DEV_MONITOR_RESULT_NUM_NOT_BLANK)
     private String whichTime;
-    /**
+
-     * 数据源类型
+
-     */
     @ApiModelProperty(value = "数据源类型", required = true)
     @NotBlank(message = DetectionValidMessage.DEV_MONITOR_RESULT_TYPE_NOT_BLANK)
     private String resultType;

detection/src/main/java/com/njcn/gather/result/service/IResultService.java

@@ -119,15 +119,17 @@ public interface IResultService {
     /**
      * 获取检测项
      *
+     * @param planId
      * @param devId
      * @param chnNum
      * @param num
      * @return
      */
-    List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num);
+    List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num);
 
     /**
      * 获取设备比对式结果，用于出比对检测的报告
+     *
      * @param devReportParam 设备报告参数
      * @param pqDevVO        设备信息 省去一次sql查询
      * @return 该设备的比对式结果

detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java

@@ -22,6 +22,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.gather.detection.handler.SocketContrastResponseService;
 import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
+import com.njcn.gather.detection.pojo.enums.ResultEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.po.AdPair;
 import com.njcn.gather.detection.pojo.po.DevData;
@@ -30,7 +31,6 @@ import com.njcn.gather.detection.pojo.vo.DetectionData;
 import com.njcn.gather.detection.service.IAdPariService;
 import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
-import com.njcn.gather.detection.util.socket.FormalTestManager;
 import com.njcn.gather.device.pojo.enums.CommonEnum;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
 import com.njcn.gather.device.pojo.po.PqDev;
@@ -100,6 +100,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.njcn.gather.plan.pojo.enums.DataSourceEnum.*;
+
 /**
  * @author caozehui
  * @data 2024-12-30
@@ -112,6 +114,7 @@ public class ResultServiceImpl implements IResultService {
     private final IAdPlanService adPlanService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
     private final IPqDevService pqDevService;
+    private final IPqStandardDevService pqStandardDevService;
     private final SimAndDigNonHarmonicService simAndDigNonHarmonicService;
     private final SimAndDigHarmonicService simAndDigHarmonicService;
     private final ContrastHarmonicService contrastHarmonicService;
@@ -395,8 +398,8 @@ public class ResultServiceImpl implements IResultService {
                 double cosValue = Math.cos((aDtl1.get(0).getAngle() - aDtl2.get(0).getAngle()) / 180 * Math.PI);
                 BigDecimal bigDecimal = BigDecimal.valueOf(cosValue).setScale(6, BigDecimal.ROUND_HALF_UP);
 
-                dtlType.setScriptTypeName(ResultUnitEnum.V_RELATIVE.getName() + "=" + v.get(0).getValue().intValue() + unitV
+                dtlType.setScriptTypeName(ResultUnitEnum.V_RELATIVE.getName() + "=" + v.get(0).getValue() + unitV
-                        + " " + ResultUnitEnum.I_RELATIVE.getName() + "=" + i.get(0).getValue().intValue() + unitI
+                        + " " + ResultUnitEnum.I_RELATIVE.getName() + "=" + i.get(0).getValue() + unitI
                         + " cos(φ)=" + bigDecimal.doubleValue());
             }
             break;
@@ -412,7 +415,7 @@ public class ResultServiceImpl implements IResultService {
                     unit = ResultUnitEnum.V_ABSOLUTELY.getUnit();
                 }
                 List<PqScriptDtls> v = scriptDtlIndexList.stream().filter(x -> "VOL".equals(x.getValueType())).collect(Collectors.toList());
-                dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue().intValue() + unit);
+                dtlType.setScriptTypeName(dictTree.getName() + "=" + v.get(0).getValue() + unit);
                 break;
             /**
              * 电流
@@ -426,7 +429,7 @@ public class ResultServiceImpl implements IResultService {
                     unitI = ResultUnitEnum.I_ABSOLUTELY.getUnit();
                 }
                 List<PqScriptDtls> I = scriptDtlIndexList.stream().filter(x -> "CUR".equals(x.getValueType())).collect(Collectors.toList());
-                dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue().intValue() + unitI);
+                dtlType.setScriptTypeName(dictTree.getName() + "=" + I.get(0).getValue() + unitI);
                 break;
             /**
              * 谐波电压
@@ -446,12 +449,12 @@ public class ResultServiceImpl implements IResultService {
                         .collect(Collectors.groupingBy(PqScriptDtls::getHarmNum, LinkedHashMap::new, Collectors.toList()));
                 if (harmNumMap.size() > 1) {
                     //叠加2~50次谐波电压（含有率为GB/T）
-                    dtlType.setScriptTypeName("叠加" + harmNumMap.entrySet().iterator().next().getValue().get(0).getHarmNum().intValue() + "~" +
+                    dtlType.setScriptTypeName("叠加" + harmNumMap.entrySet().iterator().next().getValue().get(0).getHarmNum() + "~" +
-                            new ArrayList<>(harmNumMap.entrySet()).get(harmNumMap.size() - 1).getValue().get(0).getHarmNum().intValue()
+                            new ArrayList<>(harmNumMap.entrySet()).get(harmNumMap.size() - 1).getValue().get(0).getHarmNum()
                             + "次" + dictTree.getName()); // + "（含有率为GB/T）"
                 } else {
                     //叠加5%的2次谐波电压
-                    dtlType.setScriptTypeName("叠加" + hv.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum().intValue() + "次" + dictTree.getName());
+                    dtlType.setScriptTypeName("叠加" + hv.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + hv.get(0).getHarmNum() + "次" + dictTree.getName());
                 }
                 break;
             /**
@@ -485,7 +488,7 @@ public class ResultServiceImpl implements IResultService {
                     dtlType.setScriptTypeName(a.toString());
                 } else {
                     //叠加5%的2次谐波电压
-                    dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue().intValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName());
+                    dtlType.setScriptTypeName("叠加" + harmInNumList.get(0).getValue() + ResultUnitEnum.HV.getUnit() + "的" + harmInNumList.get(0).getHarmNum() + "次" + dictTree.getName());
                 }
 
                 break;
@@ -980,10 +983,10 @@ public class ResultServiceImpl implements IResultService {
         DictData dictData = dictDataService.getDictDataById(param.getPatternId());
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
             this.createTempResultTable(param.getCode() + "_temp", true);
-            this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId());
         } else {
             this.createTempResultTable(param.getCode() + "_temp", false);
-            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId());
+            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId());
         }
     }
 
@@ -997,9 +1000,9 @@ public class ResultServiceImpl implements IResultService {
     public void reCalculate(ResultParam.ChangeErrorSystemParam param) {
         DictData dictData = dictDataService.getDictDataById(param.getPatternId());
         if (PatternEnum.CONTRAST.getValue().equals(dictData.getCode())) {
-            this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getChnNum(), param.getDataRuleId());
         } else {
-            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId());
+            this.simAndDigCalculateResult(param.getPlanId(), param.getScriptId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), param.getDataRuleId());
         }
     }
 
@@ -1530,8 +1533,7 @@ public class ResultServiceImpl implements IResultService {
 
         AdPlan plan = adPlanService.getById(queryParam.getPlanId());
         PqDev dev = pqDevService.getById(queryParam.getDeviceId());
-        DictData dictData = dictDataService.getById(plan.getDataRule());
+        formContentVO.setDataRule(plan.getDataRule());
-        formContentVO.setDataRule(dictData.getName());
         formContentVO.setDeviceName(dev.getName());
         formContentVO.setErrorSysId(plan.getErrorSysId());
 
@@ -1551,10 +1553,10 @@ public class ResultServiceImpl implements IResultService {
         }
         List<ContrastBaseResult> allResultList = new ArrayList<>();
 
-        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
+        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList);
-        contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
+        contrastNonHarmonicResults.addAll(contrastNonHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList));
-        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, queryParam.getDeviceId(), adTypeList);
+        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, false, null, queryParam.getDeviceId(), adTypeList);
-        contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, queryParam.getDeviceId(), adTypeList));
+        contrastHarmonicResults.addAll(contrastHarmonicService.listAllResultData(String.valueOf(plan.getCode()), null, null, true, null, queryParam.getDeviceId(), adTypeList));
         allResultList.addAll(contrastHarmonicResults);
         allResultList.addAll(contrastNonHarmonicResults);
 
@@ -1578,8 +1580,6 @@ public class ResultServiceImpl implements IResultService {
     public ContrastResultVO getContrastResult(ResultParam.QueryParam queryParam) {
         ContrastResultVO contrastResultVO = new ContrastResultVO();
 
-        AdPlan plan = adPlanService.getById(queryParam.getPlanId());
-
         List<DictTree> dictTreeList = dictTreeService.getDictTreeById(Collections.singletonList(queryParam.getScriptType()));
 
         List<String> fatherIdList = dictTreeList.stream().map(DictTree::getId).collect(Collectors.toList());
@@ -1601,8 +1601,8 @@ public class ResultServiceImpl implements IResultService {
             }
         }
 
-        contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode())));
+        contrastResultVO.setResultMap(this.getResultMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode()));
-        contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode())));
+        contrastResultVO.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), queryParam.getCode(), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList())));
         return contrastResultVO;
     }
 
@@ -1615,7 +1615,12 @@ public class ResultServiceImpl implements IResultService {
 
         List<PqMonitor> pqMonitorList = pqMonitorService.lambdaQuery().eq(PqMonitor::getDevId, devId).isNotNull(PqMonitor::getResultType).list();
         List<MonitorResultVO> list = new ArrayList<>();
+        if (CollUtil.isEmpty(pqMonitorList)) {
+            return list;
+        }
         MonitorResultVO result;
+        // 根据通道号排序
+        pqMonitorList.sort(Comparator.comparing(PqMonitor::getNum));
         for (PqMonitor pqMonitor : pqMonitorList) {
             result = new MonitorResultVO();
             result.setMonitorId(pqMonitor.getDevId() + CnSocketUtil.SPLIT_TAG + pqMonitor.getNum());
@@ -1650,6 +1655,26 @@ public class ResultServiceImpl implements IResultService {
                     result.setResultType(resultType + CnSocketUtil.SPLIT_TAG + waveData.get(1));
                     result.setResultOrigin(dataSourceEnum.getMsg() + waveData.get(1));
                     break;
+                case MINUTE_STATISTICS_AVG:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_MAX:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_MIN:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
+                case MINUTE_STATISTICS_CP95:
+                    result.setCheckResult(pqMonitor.getStatisticsResult());
+                    result.setWhichTime(pqMonitor.getStatisticsNum());
+                    result.setResultOrigin(dataSourceEnum.getMsg());
+                    break;
                 default:
                     break;
             }
@@ -1675,40 +1700,142 @@ public class ResultServiceImpl implements IResultService {
         }
         AdPlan finalPlan = plan;
         // 实时数据结果
-        List<ContrastNonHarmonicResult> nonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, monitorId, null);
+        List<ContrastNonHarmonicResult> realNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null);
-        Map<Integer, List<ContrastNonHarmonicResult>> numMap = nonHarmonicResults.stream()
+        Map<Integer, List<ContrastNonHarmonicResult>> realNumNonHarmonicMap = realNonHarmonicResults.stream()
                 .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
                 .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
 
+        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, DataSourceEnum.REAL_DATA.getValue(), monitorId, null);
+        Map<Integer, List<ContrastHarmonicResult>> realNumHarmonicMap = realHarmonicResults.stream()
+                .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
+                .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
 
-        numMap.forEach((num, resultList) -> {
+        Map<Integer, List<Integer>> realNumResutMap = new TreeMap<>();
+        realNumNonHarmonicMap.forEach((num, resultList) -> {
+            realNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+        });
+        realNumHarmonicMap.forEach((num, resultList) -> {
+            List<Integer> list = realNumResutMap.getOrDefault(num, new ArrayList<>());
+            list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+            realNumResutMap.put(num, list);
+        });
+
+        realNumResutMap.forEach((num, resultList) -> {
             List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>();
-
             DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO();
             realDataSourceResultVO.setDataSourceCode(DataSourceEnum.REAL_DATA.getValue());
             realDataSourceResultVO.setDataSourceName(DataSourceEnum.REAL_DATA.getMsg());
-            List<Integer> resultFlagList = resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList());
+            realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList));
-            realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultFlagList));
             dataSourceResultVOList.add(realDataSourceResultVO);
 
-            // 录波数据结果
-            List<ContrastNonHarmonicResult> waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), num, null, true, monitorId, null);
-            Map<Integer, List<ContrastNonHarmonicResult>> waveNumMap = waveNonHarmonicResults.stream()
-                    .sorted(Comparator.comparing(ContrastNonHarmonicResult::getWaveNum))
-                    .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getWaveNum, LinkedHashMap::new, Collectors.toList()));
-
-            waveNumMap.forEach((waveNum, resultList1) -> {
-                DataSourceResultVO waveDataSourceResultVO = new DataSourceResultVO();
-                waveDataSourceResultVO.setDataSourceCode(DataSourceEnum.WAVE_DATA.getValue() + CnSocketUtil.SPLIT_TAG + waveNum);
-                waveDataSourceResultVO.setDataSourceName(DataSourceEnum.WAVE_DATA.getMsg() + StrUtil.SPACE + waveNum);
-                List<Integer> tempResultFlagList = resultList1.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList());
-                waveDataSourceResultVO.setCheckResult(StorageUtil.getInteger(tempResultFlagList));
-                dataSourceResultVOList.add(waveDataSourceResultVO);
-            });
-
             result.put(num, dataSourceResultVOList);
         });
 
+
+        // 录波数据结果
+        Map<Integer, Map<Integer, List<Integer>>> waveNumMap = new TreeMap<>();
+        List<ContrastNonHarmonicResult> waveNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null);
+        Map<Integer, List<ContrastNonHarmonicResult>> waveNumNonHarmonicMap = waveNonHarmonicResults.stream()
+                .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
+                .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, true, null, monitorId, null);
+        Map<Integer, List<ContrastHarmonicResult>> waveNumHarmonicMap = waveHarmonicResults.stream()
+                .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
+                .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+
+        waveNumNonHarmonicMap.forEach((num, resultList) -> {
+            LinkedHashMap<Integer, List<ContrastNonHarmonicResult>> collect = resultList.stream()
+                    .sorted(Comparator.comparing(ContrastNonHarmonicResult::getWaveNum))
+                    .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getWaveNum, LinkedHashMap::new, Collectors.toList()));
+
+            Map<Integer, List<Integer>> map = new TreeMap<>();
+            collect.forEach((waveNum, resultList1) -> {
+                map.put(waveNum, resultList1.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+            });
+            waveNumMap.put(num, map);
+        });
+
+        waveNumHarmonicMap.forEach((num, resultList) -> {
+            Map<Integer, List<Integer>> map = waveNumMap.getOrDefault(num, new TreeMap<>());
+
+            LinkedHashMap<Integer, List<ContrastHarmonicResult>> collect = resultList.stream().sorted(Comparator.comparing(ContrastHarmonicResult::getWaveNum))
+                    .collect(Collectors.groupingBy(ContrastHarmonicResult::getWaveNum, LinkedHashMap::new, Collectors.toList()));
+            collect.forEach((waveNum, resultList1) -> {
+                List<Integer> list = map.getOrDefault(waveNum, new ArrayList<>());
+                list.addAll(resultList1.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+                map.put(waveNum, list);
+            });
+            waveNumMap.put(num, map);
+        });
+
+        waveNumMap.forEach((num, map) -> {
+            List<DataSourceResultVO> orDefault = result.getOrDefault(num, new ArrayList<>());
+            map.forEach((waveNum, resultList) -> {
+                DataSourceResultVO waveDataSourceResultVO = new DataSourceResultVO();
+                waveDataSourceResultVO.setDataSourceCode(DataSourceEnum.WAVE_DATA.getValue() + CnSocketUtil.SPLIT_TAG + waveNum);
+                waveDataSourceResultVO.setDataSourceName(DataSourceEnum.WAVE_DATA.getMsg() + StrUtil.SPACE + waveNum);
+                waveDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList));
+                orDefault.add(waveDataSourceResultVO);
+            });
+            result.put(num, orDefault);
+        });
+
+        String dataRule = finalPlan.getDatasourceId();
+        String[] split1 = dataRule.split(CnSocketUtil.SPLIT_TAG);
+        DataSourceEnum dataType = null;
+        for (String s : split1) {
+            if (MINUTE_STATISTICS_AVG.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_AVG;
+                break;
+            }
+            if (MINUTE_STATISTICS_CP95.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_CP95;
+                break;
+            }
+            if (MINUTE_STATISTICS_MAX.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_MAX;
+                break;
+            }
+            if (MINUTE_STATISTICS_MIN.getValue().equals(s)) {
+                dataType = MINUTE_STATISTICS_MIN;
+                break;
+            }
+        }
+
+        // 统计数据
+        if (ObjectUtil.isNotNull(dataType)) {
+            List<ContrastNonHarmonicResult> statisticsNonHarmonicResults = contrastNonHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
+            Map<Integer, List<ContrastNonHarmonicResult>> statisticsNumNonHarmonicMap = statisticsNonHarmonicResults.stream()
+                    .sorted(Comparator.comparing(ContrastNonHarmonicResult::getNum))
+                    .collect(Collectors.groupingBy(ContrastNonHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+
+            List<ContrastHarmonicResult> statisticsHarmonicResults = contrastHarmonicService.listAllResultData(String.valueOf(finalPlan.getCode()), null, null, false, dataType.getValue(), monitorId, null);
+            Map<Integer, List<ContrastHarmonicResult>> statisticsNumHarmonicMap = statisticsHarmonicResults.stream()
+                    .sorted(Comparator.comparing(ContrastHarmonicResult::getNum))
+                    .collect(Collectors.groupingBy(ContrastHarmonicResult::getNum, LinkedHashMap::new, Collectors.toList()));
+
+            Map<Integer, List<Integer>> statisticsNumResutMap = new TreeMap<>();
+            statisticsNumNonHarmonicMap.forEach((num, resultList) -> {
+                statisticsNumResutMap.put(num, resultList.stream().map(ContrastNonHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+            });
+            statisticsNumHarmonicMap.forEach((num, resultList) -> {
+                List<Integer> list = statisticsNumResutMap.getOrDefault(num, new ArrayList<>());
+                list.addAll(resultList.stream().map(ContrastHarmonicResult::getResultFlag).distinct().collect(Collectors.toList()));
+                statisticsNumResutMap.put(num, list);
+            });
+
+            DataSourceEnum finalDataType = dataType;
+            statisticsNumResutMap.forEach((num, resultList) -> {
+                List<DataSourceResultVO> dataSourceResultVOList = new ArrayList<>();
+                DataSourceResultVO realDataSourceResultVO = new DataSourceResultVO();
+                realDataSourceResultVO.setDataSourceCode(finalDataType.getValue());
+                realDataSourceResultVO.setDataSourceName(finalDataType.getMsg());
+                realDataSourceResultVO.setCheckResult(StorageUtil.getInteger(resultList));
+                dataSourceResultVOList.add(realDataSourceResultVO);
+
+                result.put(num, dataSourceResultVOList);
+            });
+        }
         return result;
     }
 
@@ -1748,20 +1875,23 @@ public class ResultServiceImpl implements IResultService {
             monitor.setRecordedResult(null);
             monitor.setRecordedNum(null);
         }
+        boolean flag = pqMonitorService.updateById(monitor);
 
-        return pqMonitorService.updateById(monitor);
+        pqDevService.updateResult(split[0], null);
+
+        return flag;
     }
 
     @Override
-    public List<ContrastTestItemVO> getCheckItem(String devId, String chnNum, Integer num) {
+    public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num) {
-        PqDev dev = pqDevService.getById(devId);
+//        PqDev dev = pqDevService.getById(devId);
-        AdPlan plan = adPlanService.getById(dev.getPlanId());
+        AdPlan plan = adPlanService.getById(planId);
         String code = String.valueOf(plan.getCode());
 
         String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum;
 
-        List<ContrastNonHarmonicResult> realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, monitorId, null);
+        List<ContrastNonHarmonicResult> realNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null);
-        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, monitorId, null);
+        List<ContrastHarmonicResult> realHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, false, null, monitorId, null);
 
         Map<String, List<Integer>> checkItemResultMap = realNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList())));
         checkItemResultMap.putAll(realHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList()))));
@@ -1780,8 +1910,8 @@ public class ResultServiceImpl implements IResultService {
 
         checkItemResultMap.clear();
 
-        List<ContrastNonHarmonicResult> waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, monitorId, null);
+        List<ContrastNonHarmonicResult> waveNoHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null);
-        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, monitorId, null);
+        List<ContrastHarmonicResult> waveHarmonicResults = contrastHarmonicService.listAllResultData(code, num, null, true, null, monitorId, null);
         if (CollUtil.isNotEmpty(waveNoHarmonicResults) && CollUtil.isNotEmpty(waveHarmonicResults)) {
             checkItemResultMap.putAll(waveNoHarmonicResults.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getAdType, Collectors.mapping(ContrastNonHarmonicResult::getResultFlag, Collectors.toList()))));
             checkItemResultMap.putAll(waveHarmonicResults.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getAdType, Collectors.mapping(ContrastHarmonicResult::getResultFlag, Collectors.toList()))));
@@ -1901,8 +2031,10 @@ public class ResultServiceImpl implements IResultService {
             int totalDataPoints = 0; // 统计总的数据点数
             int zeroFilteredPoints = 0; // 统计双零过滤的数据点数
 
-            // 遍历 2~50 次谐波
+            // 间谐波从1开始，普通谐波从2开始
-            for (int harmNum = 2; harmNum <= 50; harmNum++) {
+            int startHarmNum = isInterHarmonic ? 1 : 2;
+            // 遍历谐波次数
+            for (int harmNum = startHarmNum; harmNum <= 50; harmNum++) {
                 String harmKey = String.valueOf(harmNum);
                 Map<String, Map<String, Map<String, String>>> checkResultHarmonic = new LinkedHashMap<>();
                 List<String> zeroFilteredPhases = new ArrayList<>(); // 当前次数被过滤的相别
@@ -1932,7 +2064,7 @@ public class ResultServiceImpl implements IResultService {
                                 // 双零情况，记录但不加入结果判定
                                 zeroFilteredPhases.add(phase.toUpperCase() + "相");
                                 // 将结果改为特殊标记，不参与整体结论判定
-                                singlePhaseData.put(ItemReportKeyEnum.RESULT.getKey(), "双零过滤");
+                                singlePhaseData.put(ItemReportKeyEnum.RESULT.getKey(), "符合");
                             } else {
                                 // 有非双零数据
                                 hasNonZeroData = true;
@@ -1940,7 +2072,6 @@ public class ResultServiceImpl implements IResultService {
                                 String resultTemp = singlePhaseData.get(ItemReportKeyEnum.RESULT.getKey());
                                 if (StrUtil.isNotBlank(resultTemp)) {
                                     allResult.add(resultTemp);
-
                                     // 收集特殊情况
                                     if ("无法比较".equals(resultTemp)) {
                                         String numOfDataStr = singlePhaseData.get(ItemReportKeyEnum.NUM_OF_DATA.getKey());
@@ -2006,6 +2137,7 @@ public class ResultServiceImpl implements IResultService {
 
     /**
      * 判断值是否为零
+     *
      * @param value 字符串值
      * @return 是否为零
      */
@@ -2023,6 +2155,7 @@ public class ResultServiceImpl implements IResultService {
 
     /**
      * 生成谐波类特殊情况描述
+     *
      * @param zeroFilteredMap    双零过滤的次数和相别
      * @param unComparableMap    无法比较的次数和相别
      * @param unqualifiedMap     不符合的次数和相别
@@ -2081,7 +2214,11 @@ public class ResultServiceImpl implements IResultService {
                     String phases = phaseEntry.getKey();
                     List<Integer> harmNums = phaseEntry.getValue();
                     specialCaseDesc.append("第").append(formatHarmNumbers(harmNums, isInterHarmonic)).append("次谐波");
-                    specialCaseDesc.append(phases).append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
+                    // 如果是T相，则不拼接相别
+                    if (!"T相".equals(phases)) {
+                        specialCaseDesc.append(phases);
+                    }
+                    specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
                 }
             }
         }
@@ -2143,6 +2280,7 @@ public class ResultServiceImpl implements IResultService {
 
     /**
      * 获取显示用的谐波次数
+     *
      * @param harmNum         原始次数（2-50）
      * @param isInterHarmonic 是否为间谐波
      * @return 显示用的次数字符串
@@ -2162,6 +2300,7 @@ public class ResultServiceImpl implements IResultService {
 
     /**
      * 格式化谐波次数列表
+     *
      * @param harmNumbers     谐波次数列表
      * @param isInterHarmonic 是否为间谐波
      * @return 格式化的字符串，如"2、3、5"或"2-5、7、9-11"（间谐波为"1.5、2.5、3.5"）
@@ -2240,10 +2379,8 @@ public class ResultServiceImpl implements IResultService {
             contrastTestResult.setHarmonic(false);
             List<String> allResult = new ArrayList<>();
             Map<String, Map<String, String>> checkResultNonHarmonic = new LinkedHashMap<>();
-
             // 根据指标代码确定小数位数
             Integer decimalPlaces = getDecimalPlacesByScriptCode(dictTree.getCode());
-
             try {
                 // 非谐波的需要注意是否为T相还是ABC三相的
                 if (PowerConstant.T_PHASE.contains(dictTree.getCode())) {
@@ -2303,11 +2440,17 @@ public class ResultServiceImpl implements IResultService {
                 // 生成无法比较的描述
                 if (!unComparablePhases.isEmpty()) {
                     specialCaseDesc.append("注：");
+                    // 如果只有T相，则不拼接相别
+                    if (unComparablePhases.size() == 1 && "T相".equals(unComparablePhases.get(0))) {
+                        // T相不拼接相别
+                    } else {
+                        // 其他情况拼接相别
                         if (unComparablePhases.size() == 1) {
                             specialCaseDesc.append(unComparablePhases.get(0));
                         } else {
                             specialCaseDesc.append(String.join("、", unComparablePhases));
                         }
+                    }
                     specialCaseDesc.append("无样本数据满足误差比较的前置条件，无法执行有效性判定。");
                 }
 
@@ -2363,40 +2506,38 @@ public class ResultServiceImpl implements IResultService {
             Map<String, String> dataMap = new LinkedHashMap<>();
             if (CollUtil.isNotEmpty(dataList)) {
                 DetectionData detectionData = dataList.get(0);
-
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
                 // 有效组数 todo... 目前是对齐组数
                 dataMap.put(ItemReportKeyEnum.NUM_OF_DATA.getKey(), String.valueOf(numOfData));
-
                 // 标准值 - 根据参数决定是否格式化
                 String standardValue = String.valueOf(detectionData.getResultData());
                 if (decimalPlaces != null && detectionData.getResultData() != null) {
                     standardValue = formatSignificantDigits(detectionData.getResultData(), decimalPlaces);
                 }
                 dataMap.put(ItemReportKeyEnum.STANDARD.getKey(), standardValue);
-
                 // 被检值 - 根据参数决定是否格式化
                 String testValue = String.valueOf(detectionData.getData());
                 if (decimalPlaces != null && detectionData.getData() != null) {
                     testValue = formatSignificantDigits(detectionData.getData(), decimalPlaces);
                 }
                 dataMap.put(ItemReportKeyEnum.TEST.getKey(), testValue);
-
                 // 误差 - 根据参数决定是否格式化
                 String errorValue = String.valueOf(detectionData.getErrorData());
                 if (decimalPlaces != null && detectionData.getErrorData() != null) {
                     errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces);
+                } else {
+                    errorValue = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue);
-
                 // 误差范围 - 根据参数决定是否格式化
                 String errorScope = String.valueOf(detectionData.getRadius());
                 if (decimalPlaces != null && detectionData.getRadius() != null) {
                     errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces);
+                } else {
+                    errorScope = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope);
-
                 // 结论
                 dataMap.put(ItemReportKeyEnum.RESULT.getKey(), getTestResult(detectionData.getIsData()));
             } else {
@@ -2491,8 +2632,20 @@ public class ResultServiceImpl implements IResultService {
             Map<String, String> dataMap = new LinkedHashMap<>();
             if (CollUtil.isNotEmpty(dataList)) {
                 DetectionData detectionData = dataList.get(0);
-                // 次数
+                // 次数 - 从数据对象中获取实际次数（间谐波为1.5、2.5等）
-                dataMap.put(ItemReportKeyEnum.TIME.getKey(), String.valueOf(harmNum));
+                String timeValue;
+                if (detectionData.getNum() != null) {
+                    double numValue = detectionData.getNum();
+                    // 如果是整数，则只显示整数部分（如2.0显示为2）
+                    if (numValue == Math.floor(numValue)) {
+                        timeValue = String.valueOf((int) numValue);
+                    } else {
+                        timeValue = String.valueOf(numValue);
+                    }
+                } else {
+                    timeValue = String.valueOf(harmNum);
+                }
+                dataMap.put(ItemReportKeyEnum.TIME.getKey(), timeValue);
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
                 // 有效组数 todo... 目前是对齐组数
@@ -2516,6 +2669,8 @@ public class ResultServiceImpl implements IResultService {
                 String errorValue = String.valueOf(detectionData.getErrorData());
                 if (decimalPlaces != null && detectionData.getErrorData() != null) {
                     errorValue = formatSignificantDigits(detectionData.getErrorData().doubleValue(), decimalPlaces);
+                } else {
+                    errorValue = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.ERROR.getKey(), errorValue);
 
@@ -2523,13 +2678,15 @@ public class ResultServiceImpl implements IResultService {
                 String errorScope = String.valueOf(detectionData.getRadius());
                 if (decimalPlaces != null && detectionData.getRadius() != null) {
                     errorScope = formatErrorRange(detectionData.getRadius(), decimalPlaces);
+                } else {
+                    errorScope = "/";
                 }
                 dataMap.put(ItemReportKeyEnum.A_ERROR_SCOPE.getKey(), errorScope);
 
                 // 结论
                 dataMap.put(ItemReportKeyEnum.RESULT.getKey(), getTestResult(detectionData.getIsData()));
             } else {
-                // 次数
+                // 次数 - 数据为空时用循环变量作为兜底
                 dataMap.put(ItemReportKeyEnum.TIME.getKey(), String.valueOf(harmNum));
                 // 相别
                 dataMap.put(ItemReportKeyEnum.PHASE.getKey(), phase);
@@ -2604,8 +2761,8 @@ public class ResultServiceImpl implements IResultService {
     private Map<String, List<RawResultDataVO>> getResultMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code) {
         Map<String, List<RawResultDataVO>> resultMap = new LinkedHashMap<>();
 
-        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> contrastNonHarmonicResults = contrastNonHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList);
-        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, monitorId, adTypeList);
+        List<ContrastHarmonicResult> contrastHarmonicResults = contrastHarmonicService.listAllResultData(code, num, waveNum, isWave, null, monitorId, adTypeList);
 
         if (CollUtil.isNotEmpty(contrastNonHarmonicResults)) {
             ContrastNonHarmonicResult contrastNonHarmonicResult = contrastNonHarmonicResults.get(0);
@@ -2651,7 +2808,7 @@ public class ResultServiceImpl implements IResultService {
         if (CollUtil.isNotEmpty(contrastHarmonicResults)) {
             ContrastHarmonicResult contrastHarmonicResult = contrastHarmonicResults.get(0);
             List<Double> harmonicNum = null;
-            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode())) {
+            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode()) || DicDataEnum.HP.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(2.0, n -> n + 1).limit(49).collect(Collectors.toList());
             }
             if (DicDataEnum.HSV.getCode().equals(dictTree.getCode()) || DicDataEnum.HSI.getCode().equals(dictTree.getCode())) {
@@ -2674,6 +2831,7 @@ public class ResultServiceImpl implements IResultService {
                     List<RawResultDataVO.DetectionData> cList = JSON.parseArray(fieldC.get(contrastHarmonicResult) + "", RawResultDataVO.DetectionData.class);
 
                     List<RawResultDataVO> rawResultDataVOList = new ArrayList<>();
+                    List<Integer> isDataList = new ArrayList<>();
                     for (int j = 0; j < aList.size(); j++) {
                         RawResultDataVO dataVO = new RawResultDataVO();
                         dataVO.setHarmNum(n);
@@ -2683,9 +2841,11 @@ public class ResultServiceImpl implements IResultService {
                         dataVO.setDataC(cList.get(j));
                         dataVO.setRadius(aList.get(j).getRadius());
                         dataVO.setIsData(StorageUtil.setResultFlag(Arrays.asList(aList.get(j), bList.get(j), cList.get(j))));
+                        isDataList.add(dataVO.getIsData());
                         rawResultDataVOList.add(dataVO);
                     }
-                    resultMap.put(String.valueOf(n), rawResultDataVOList);
+                    Integer isData = StorageUtil.getInteger(isDataList);
+                    resultMap.put(n + (isData == ResultEnum.NOT_QUALIFIED.getValue() ? "(不符合)" : (isData == ResultEnum.NO_ERROR_SYS.getValue() ? "(/)" : "")), rawResultDataVOList);
                 } catch (NoSuchFieldException e) {
                     throw new RuntimeException(e);
                 } catch (IllegalAccessException e) {
@@ -2696,36 +2856,36 @@ public class ResultServiceImpl implements IResultService {
         return resultMap;
     }
 
-    private Map<String, List<AlignDataVO.RawData>> getRawDataMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code) {
+    private Map<String, List<AlignDataVO.RawData>> getRawDataMap(DictTree dictTree, List<String> adTypeList, String monitorId, String unit, Integer num, Integer waveNum, Boolean isWave, String code, List<String> keys) {
         Map<String, List<AlignDataVO.RawData>> rawMap = new LinkedHashMap<>();
 
-        List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList);
-        List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList);
+        List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList);
-        List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 0, monitorId, adTypeList);
+        List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 0, monitorId, adTypeList);
-        List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, 1, monitorId, adTypeList);
+        List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(code, num, waveNum, isWave, null, 1, monitorId, adTypeList);
 
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
         List<AlignDataVO.RawData> rawDataVOList = new ArrayList<>();
         for (int i = 0; i < devNonHarmonicRawDataList.size(); i++) {
             AlignDataVO.RawData rawDataVO = new AlignDataVO.RawData();
             rawDataVO.setUnit(unit);
-            ContrastNonHarmonicResult contrastNonHarmonicResult = devNonHarmonicRawDataList.get(i);
+            ContrastNonHarmonicResult contrastNonHarmonicResultDev = devNonHarmonicRawDataList.get(i);
-            rawDataVO.setTimeDev(contrastNonHarmonicResult.getTimeId().format(dtf));
+            rawDataVO.setTimeDev(contrastNonHarmonicResultDev.getTimeId().format(dtf));
 
-            rawDataVO.setUbDev(getValue(contrastNonHarmonicResult.getBValue()));
+            rawDataVO.setUbDev(getValue(contrastNonHarmonicResultDev.getBValue()));
-            rawDataVO.setUtDev(getValue(contrastNonHarmonicResult.getTValue()));
+            rawDataVO.setUtDev(getValue(contrastNonHarmonicResultDev.getTValue()));
 
-            contrastNonHarmonicResult = stdDevNonHarmonicRawDataList.get(i);
+            ContrastNonHarmonicResult contrastNonHarmonicResultStdDev = stdDevNonHarmonicRawDataList.get(i);
-            rawDataVO.setTimeStdDev(contrastNonHarmonicResult.getTimeId().format(dtf));
+            rawDataVO.setTimeStdDev(contrastNonHarmonicResultStdDev.getTimeId().format(dtf));
             if (!DicDataEnum.IMBV.getCode().equals(dictTree.getCode()) && !DicDataEnum.IMBA.getCode().equals(dictTree.getCode())) {
-                rawDataVO.setUaDev(getValue(contrastNonHarmonicResult.getAValue()));
+                rawDataVO.setUaDev(getValue(contrastNonHarmonicResultDev.getAValue()));
-                rawDataVO.setUcDev(getValue(contrastNonHarmonicResult.getCValue()));
+                rawDataVO.setUcDev(getValue(contrastNonHarmonicResultDev.getCValue()));
-                rawDataVO.setUaStdDev(getValue(contrastNonHarmonicResult.getAValue()));
+                rawDataVO.setUaStdDev(getValue(contrastNonHarmonicResultStdDev.getAValue()));
-                rawDataVO.setUcStdDev(getValue(contrastNonHarmonicResult.getCValue()));
+                rawDataVO.setUcStdDev(getValue(contrastNonHarmonicResultStdDev.getCValue()));
             }
 
-            rawDataVO.setUbStdDev(getValue(contrastNonHarmonicResult.getBValue()));
+            rawDataVO.setUbStdDev(getValue(contrastNonHarmonicResultStdDev.getBValue()));
-            rawDataVO.setUtStdDev(getValue(contrastNonHarmonicResult.getTValue()));
+            rawDataVO.setUtStdDev(getValue(contrastNonHarmonicResultStdDev.getTValue()));
 
             rawDataVOList.add(rawDataVO);
         }
@@ -2735,11 +2895,14 @@ public class ResultServiceImpl implements IResultService {
 
         if (CollUtil.isNotEmpty(devHarmonicRawDataList) && CollUtil.isNotEmpty(stdDevHarmonicRawDataList)) {
             List<Double> harmonicNum = null;
-            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode())) {
+            boolean isHarm = true;
+            if (DicDataEnum.HV.getCode().equals(dictTree.getCode()) || DicDataEnum.HI.getCode().equals(dictTree.getCode()) || DicDataEnum.HP.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(2.0, n -> n + 1).limit(49).collect(Collectors.toList());
+                isHarm = true;
             }
             if (DicDataEnum.HSV.getCode().equals(dictTree.getCode()) || DicDataEnum.HSI.getCode().equals(dictTree.getCode())) {
                 harmonicNum = Stream.iterate(0.5, n -> n + 1).limit(50).collect(Collectors.toList());
+                isHarm = false;
             }
             for (Double n : harmonicNum) {
                 List<AlignDataVO.RawData> rawDataVOList1 = new ArrayList<>();
@@ -2790,7 +2953,10 @@ public class ResultServiceImpl implements IResultService {
                     }
                     rawDataVOList1.add(rawDataVO);
                 }
-                rawMap.put(String.valueOf(n), rawDataVOList1);
+                int num1 = n.intValue();
+                num1 = isHarm ? num1 - 2 : num1;
+                String key = keys.get(num1);
+                rawMap.put(key, rawDataVOList1);
             }
         }
 
@@ -2867,6 +3033,7 @@ public class ResultServiceImpl implements IResultService {
                                 "A_Value_0 json  NULL COMMENT 'A相基波有效值',\n" +
                                 "B_Value_0 json  NULL COMMENT 'B相基波有效值',\n" +
                                 "C_Value_0 json  NULL COMMENT 'B相基波有效值',\n" +
+                                "Wave_Num tinyint(1) unsigned DEFAULT null COMMENT '录波数据第几组',\n" +
                                 "PRIMARY KEY (Id)\n"
                         :
                         "    Script_Id CHAR(32) NOT NULL COMMENT '检测脚本表Id',\n" +
@@ -2897,7 +3064,7 @@ public class ResultServiceImpl implements IResultService {
      * @param errorSysId
      * @param devId
      */
-    private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId) {
+    private void simAndDigCalculateResult(String planId, String scriptId, String code, String errorSysId, String devId, String dataRuleId) {
         String oldCode = code.replace("_temp", "");
         PreDetectionParam param = new PreDetectionParam();
         param.setCode(code);
@@ -2915,8 +3082,8 @@ public class ResultServiceImpl implements IResultService {
 //        } else {
 //            dataRule = DictDataEnum.SECTION_VALUE;
 //        }
-        AdPlan plan = adPlanService.getById(planId);
+//        AdPlan plan = adPlanService.getById(planId);
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
@@ -2974,8 +3141,9 @@ public class ResultServiceImpl implements IResultService {
      * @param code
      * @param errorSysId
      * @param deviceId
+     * @param chnNum
      */
-    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId) {
+    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, String chnNum, String dataRuleId) {
         String oldCode = code.replace("_temp", "");
 
         Map<String, String> devIdMapComm = new HashMap<>();
@@ -2984,18 +3152,41 @@ public class ResultServiceImpl implements IResultService {
 
         AdPlan plan = adPlanService.getById(planId);
 
+        String dataSourceId = plan.getDatasourceId();
+        String[] dataSourceIds = dataSourceId.split(StrUtil.COMMA);
+
+        DataSourceEnum nonWaveDataSourceEnum = DataSourceEnum.REAL_DATA;
+        for (String ds : dataSourceIds) {
+            DataSourceEnum dataSourceEnum = DataSourceEnum.ofByValue(ds);
+            switch (dataSourceEnum) {
+                case MINUTE_STATISTICS_MIN:
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_MIN;
+                    break;
+                case MINUTE_STATISTICS_MAX:
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_MAX;
+                    break;
+                case MINUTE_STATISTICS_AVG:
+                    nonWaveDataSourceEnum = DataSourceEnum.MINUTE_STATISTICS_AVG;
+                    break;
+                case MINUTE_STATISTICS_CP95:
+                    nonWaveDataSourceEnum = MINUTE_STATISTICS_CP95;
+                    break;
+            }
+        }
+        DataSourceEnum finalNonWaveDataSourceEnum = nonWaveDataSourceEnum;
+
         BiMap<String, String> testItemMap = HashBiMap.create();
         List<String> testItemIds = Arrays.asList(plan.getTestItem().split(","));
         List<DictTree> dictTreeList = dictTreeService.getDictTreeById(testItemIds);
         List<String> fatherIdList = dictTreeList.stream().map(DictTree::getId).collect(Collectors.toList());
         List<DictTree> childDictTreeList = dictTreeService.listByFatherIds(fatherIdList);
         if (CollUtil.isNotEmpty(childDictTreeList)) {
-            List<String> collect1 = SocketContrastResponseService.testItemCodeMap.values().stream().flatMap(Collection::stream).map(x -> x.split("\\$")[1]).collect(Collectors.toList());
+            List<String> collect1 = SocketContrastResponseService.testItemCodeMap.values().stream().flatMap(Collection::stream).collect(Collectors.toList());
             testItemMap.putAll(childDictTreeList.stream().filter(x -> collect1.contains(x.getCode())).collect(Collectors.toMap(obj -> DetectionCodeEnum.REAL_PREFIX.getCode() + obj.getCode(), obj -> obj.getId())));
         }
 
         DictDataEnum dataRule;
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
@@ -3011,10 +3202,13 @@ public class ResultServiceImpl implements IResultService {
                 .set(PqMonitor::getResultType, null)
                 .set(PqMonitor::getQualifiedNum, 0)
                 .eq(PqMonitor::getDevId, deviceId)
+                .eq(PqMonitor::getNum, Integer.parseInt(chnNum))
                 .eq(PqMonitor::getCheckFlag, 1)
                 .update();
-        List<AdPair> adPairList = adPairService.listByDevIds(Arrays.asList(deviceId));
+        String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum;
+        List<AdPair> adPairList = adPairService.listByDevIds(Arrays.asList(monitorId));
         Map<Integer, List<AdPair>> numAdPairsMap = adPairList.stream().collect(Collectors.groupingBy(AdPair::getNum, Collectors.toList()));
+
         numAdPairsMap.forEach((num, pairList) -> {
             BiMap<String, String> parsIp = HashBiMap.create();
             BiMap<String, String> parsId = HashBiMap.create();
@@ -3030,39 +3224,42 @@ public class ResultServiceImpl implements IResultService {
                 parsId.put(dev.getId() + CnSocketUtil.SPLIT_TAG + split1[1], standardDev.getId() + CnSocketUtil.SPLIT_TAG + split2[1]);
                 numMap.put(devMonitorId, num);
                 numMap.put(adPair.getStdDevMonitorId(), num);
+                devIdMapComm.put(standardDev.getIp(), standardDev.getId());
             });
 
-            List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null);
+            List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null);
-            List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null);
+            List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null);
-            List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 0, deviceId, null);
+            List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null);
-            List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, 1, deviceId, null);
+            List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null);
 
-            List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap);
+            List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
-            List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap);
+            List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
 
-            detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null);
+            if (CollUtil.isNotEmpty(devData) && CollUtil.isNotEmpty(standardDevData)) {
+                detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, code, null, finalNonWaveDataSourceEnum);
 
                 parsId.forEach((devMonitorId, stdDevMonitorId) -> {
                     String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                pqMonitorService.updateMonitorResult(devMonitorId, null, DataSourceEnum.REAL_DATA, num, null, oldCode);
+                    pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode);
                     pqDevService.updateResult(split[0], null);
                 });
+            }
 
             AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId);
             for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) {
-                devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null);
+                devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null);
-                stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null);
+                stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null);
-                devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 0, deviceId, null);
+                devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null);
-                stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, 1, deviceId, null);
+                stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null);
 
-                devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap);
+                devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
-                standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap);
+                standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
-                detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i);
+                detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA);
             }
 
             parsId.forEach((devMonitorId, stdDevMonitorId) -> {
                 String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                pqMonitorService.updateMonitorResult(devMonitorId, null, DataSourceEnum.WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode);
+                pqMonitorService.updateMonitorResult(devMonitorId, null, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode);
                 pqDevService.updateResult(split[0], null);
             });
         });
@@ -3153,19 +3350,29 @@ public class ResultServiceImpl implements IResultService {
         return info;
     }
 
-    private List<DevData> contrastToList(List<ContrastNonHarmonicResult> nonHarm, List<ContrastHarmonicResult> harm, BiMap<String, String> testItemMap) {
+    private List<DevData> contrastToList(List<ContrastNonHarmonicResult> nonHarm, List<ContrastHarmonicResult> harm, BiMap<String, String> testItemMap, Integer flag) {
         List<DevData> info = new ArrayList<>();
-        if (CollUtil.isNotEmpty(nonHarm)) {
+
-            Map<String, List<ContrastNonHarmonicResult>> devMonitorIdMap = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getDevMonitorId, Collectors.toList()));
+        Map<String, List<ContrastNonHarmonicResult>> devMonitorIdMap1 = null;
-            devMonitorIdMap.forEach((devMonitorId, value) -> {
+        if (flag == 0) {
-                DevData devData = new DevData();
+            devMonitorIdMap1 = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getDevMonitorId, Collectors.toList()));
-                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
+        } else {
-                PqDev dev = pqDevService.getById(split[0]);
+            devMonitorIdMap1 = nonHarm.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getStdDevMonitorId, Collectors.toList()));
-                devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+        }
+        devMonitorIdMap1.forEach((devMonitorId, value) -> {
             Map<LocalDateTime, List<ContrastNonHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastNonHarmonicResult::getTimeId, Collectors.toList()));
             timeListMap.forEach((time, value1) -> {
-                    List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
+                DevData devData = new DevData();
+                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
+                if (flag == 0) {
+                    PqDev dev = pqDevService.getById(split[0]);
+                    devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                } else {
+                    PqStandardDev standardDev = pqStandardDevService.getById(split[0]);
+                    devData.setId(standardDev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                }
                 devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
+                List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
 
                 value1.forEach(x -> {
                     DevData.SqlDataDTO sqlDataDTO = new DevData.SqlDataDTO();
@@ -3180,31 +3387,51 @@ public class ResultServiceImpl implements IResultService {
                     sqlData.add(sqlDataDTO);
                 });
                 devData.setSqlData(sqlData);
-                });
                 info.add(devData);
             });
+        });
+
+        Map<String, List<ContrastHarmonicResult>> devMonitorIdMap2 = null;
+        if (flag == 0) {
+            devMonitorIdMap2 = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getDevMonitorId, Collectors.toList()));
+        } else {
+            devMonitorIdMap2 = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getStdDevMonitorId, Collectors.toList()));
         }
-        if (CollUtil.isNotEmpty(harm)) {
+
-            Map<String, List<ContrastHarmonicResult>> devMonitorIdMap = harm.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getDevMonitorId, Collectors.toList()));
+        devMonitorIdMap2.forEach((devMonitorId, value) -> {
-            devMonitorIdMap.forEach((devMonitorId, value) -> {
-                DevData devData = new DevData();
-                String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
-                PqDev dev = pqDevService.getById(split[0]);
-                devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
             Map<LocalDateTime, List<ContrastHarmonicResult>> timeListMap = value.stream().collect(Collectors.groupingBy(ContrastHarmonicResult::getTimeId, Collectors.toList()));
 
+            String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
             timeListMap.forEach((time, value1) -> {
-                    devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
+//                DevData devData = info.stream().filter(x -> x.getTime().equals(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)))).findFirst().orElse(null);
-                    List<DevData.SqlDataDTO> sqlData = new ArrayList<>();
+                DevData devData = null;
-                    List<DevData.SqlDataHarmDTO> sqlDataHarm = new ArrayList<>();
+                for (int i = 0; i < info.size(); i++) {
+                    DevData devData1 = info.get(i);
+                    if (time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)).equals(devData1.getTime()) && devData1.getId().split(CnSocketUtil.SPLIT_TAG)[1].equals(split1[1])) {
+                        devData = devData1;
+                        break;
+                    }
+                }
+                if (ObjectUtil.isNotNull(devData)) {
+                    String[] split = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
+                    if (flag == 0) {
+                        PqDev dev = pqDevService.getById(split[0]);
+                        devData.setId(dev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                    } else {
+                        PqStandardDev standardDev = pqStandardDevService.getById(split[0]);
+                        devData.setId(standardDev.getIp() + CnSocketUtil.SPLIT_TAG + split[1]);
+                    }
 
+                    devData.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.ISO8601_PATTERN)));
+                    List<DevData.SqlDataDTO> sqlData = devData.getSqlData();
+                    List<DevData.SqlDataHarmDTO> sqlDataHarm = new ArrayList<>();
                     value1.forEach(x -> {
                         DevData.SqlDataHarmDTO dataHarmDTO = new DevData.SqlDataHarmDTO();
                         dataHarmDTO.setType(x.getDataType());
                         String desc = testItemMap.inverse().get(x.getAdType()).replace(DetectionCodeEnum.REAL_PREFIX.getCode(), "");
                         dataHarmDTO.setDesc(desc);
                         boolean notContainBaseHarm = false;
-                        if (DetectionCodeEnum.V2_50.getCode().equals(desc) || DetectionCodeEnum.PV2_50.getCode().equals(desc) || DetectionCodeEnum.I2_50.getCode().equals(desc)) {
+                        if (DetectionCodeEnum.V2_50.getCode().equals(desc) || DetectionCodeEnum.PV2_50.getCode().equals(desc) || DetectionCodeEnum.I2_50.getCode().equals(desc) || DetectionCodeEnum.P2_50.getCode().equals(desc)) {
                             dataHarmDTO.setNum(49);
                             notContainBaseHarm = true;
                         }
@@ -3239,12 +3466,13 @@ public class ResultServiceImpl implements IResultService {
                             }
                         }
                     });
+
                     devData.setSqlDataHarm(sqlDataHarm);
                     devData.setSqlData(sqlData);
-                });
-                info.add(devData);
-            });
                 }
+            });
+        });
+
         return info;
     }
 
@@ -3373,10 +3601,10 @@ public class ResultServiceImpl implements IResultService {
         switch (scriptCode) {
             // 保留2位小数
             case "FREQ":  // 频率
-                return 2;
+                return 4;
             // 保留3位小数
             case "I":  // 电流
-                return 3;
+                return 5;
             // 保留4位小数
             case "IMBV": // 电压不平衡度
             case "IMBA": // 电流不平衡度

detection/src/main/java/com/njcn/gather/script/controller/PqScriptController.java

@@ -58,7 +58,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新增检测脚本")
-    @ApiImplicitParam(name = "pqDevParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<String> add(@RequestBody @Validated PqScriptParam param) {
         String methodDescribe = getMethodDescribe("add");
         LogUtil.njcnDebug(log, "{}，新增数据为：{}", methodDescribe, param);
@@ -69,7 +69,7 @@ public class PqScriptController extends BaseController {
     @OperateInfo(operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改检测脚本")
-    @ApiImplicitParam(name = "updateParam", value = "检测脚本", required = true)
+    @ApiImplicitParam(name = "param", value = "检测脚本", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated PqScriptParam.UpdateParam param) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, param);
@@ -126,10 +126,10 @@ public class PqScriptController extends BaseController {
     @GetMapping("/getAll")
     @ApiOperation("获取指定模式下的所有检测脚本")
     @ApiImplicitParam(name = "patternId", value = "模式Id", required = true)
-    public HttpResult<List<Map<String, Object>>> getAllPqScript(@RequestParam("patternId") String patternId) {
+    public HttpResult<List<PqScript>> getAllPqScript(@RequestParam("patternId") String patternId) {
         String methodDescribe = getMethodDescribe("getAllPqScript");
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, patternId);
-        List<Map<String, Object>> result = pqScriptService.listAllPqScript(patternId);
+        List<PqScript> result = pqScriptService.listAllPqScript(patternId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java

@@ -72,6 +72,9 @@ public class PqScriptParam {
     @Max(value = 20, message = DetectionValidMessage.SCRIPT_CURR_FORMAT_ERROR)
     private Double ratedCurr;
 
+    @ApiModelProperty("是否为Fluke专用脚本")
+    private Integer fluke;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java

@@ -73,6 +73,11 @@ public class PqScript extends BaseEntity implements Serializable {
      */
     private Double ratedCurr;
 
+    /**
+     * 是否为福禄克专用脚本。0-否 1-是
+     */
+    private Integer fluke;
+
     /**
      * 状态：0-删除 1-正常
      */

detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java

@@ -68,7 +68,7 @@ public interface IPqScriptService extends IService<PqScript> {
      * @param patternId 模式id
      * @return 检测脚本列表
      */
-    List<Map<String, Object>> listAllPqScript(String patternId);
+    List<PqScript> listAllPqScript(String patternId);
 
     /**
      * 根据脚本名称查询脚本

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java

@@ -13,6 +13,7 @@ import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.device.pojo.enums.CommonEnum;
 import com.njcn.gather.device.pojo.po.PqDev;
+import com.njcn.gather.device.pojo.vo.PqDevVO;
 import com.njcn.gather.device.service.IPqDevService;
 import com.njcn.gather.plan.mapper.AdPlanMapper;
 import com.njcn.gather.plan.pojo.po.AdPlan;
@@ -959,6 +960,22 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             queryWrapper.eq(PqScriptDtls::getScriptIndex, -1)
                     .eq(PqScriptDtls::getEnable, 1);
             pqScriptDtls = this.list(queryWrapper);
+            // 相序校验中电流需加量需要依据企标10650.2中章节5.5.3的描述过载能力：2 倍额定电流连续，10 倍额定电流持续 1 s。
+            // 考虑到有可能存在1A的额定电流，本处做特殊处理，加量分别为额定电流的0.2/0.4/0.6的标幺乘积加量
+            // 电压暂不做处理，原因：1、电压的企标描述过载能力为4倍，空间较大；2、额定电压比如57.74V为浮点数，存在不确定小数位，避免引起算术误差；
+            // 1. 获取额定电流,前端已做限制，相同额定电流才能一起检测
+            String deviceId = param.getDevIds().get(0);
+            PqDevVO pqDev = pqDevService.getPqDevById(deviceId);
+            String devTypeId = pqDev.getDevType();
+            DevType devType = devTypeService.getById(devTypeId);
+            Double devCurr = devType.getDevCurr();
+            for (int i = 0; i < pqScriptDtls.size(); i++) {
+                PqScriptDtls scriptDtls = pqScriptDtls.get(i);
+                // 注意此处scriptDtls.getValue() < 1.0,考虑到有些已经投入运行的地方，可能没有改库，避免不必要的异常
+                if(scriptDtls.getValueType().equalsIgnoreCase("CUR") && scriptDtls.getValue() < 1.0){
+                    scriptDtls.setValue(devCurr * scriptDtls.getValue());
+                }
+            }
         } else if (param.getIsPhaseSequence().equals(CommonEnum.COEFFICIENT_TEST.getValue())) {
             //系数
             queryWrapper.in(PqScriptDtls::getScriptIndex, param.getIndexList())

detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java

@@ -112,15 +112,15 @@ public class PqScriptServiceImpl extends ServiceImpl<PqScriptMapper, PqScript> i
     }
 
     @Override
-    public List<Map<String, Object>> listAllPqScript(String patternId) {
+    public List<PqScript> listAllPqScript(String patternId) {
         List<PqScript> pqScriptList = this.lambdaQuery().eq(StrUtil.isNotBlank(patternId), PqScript::getPattern, patternId).eq(PqScript::getState, DataStateEnum.ENABLE.getCode()).list();
-        List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
+//        List<Map<String, Object>> result = pqScriptList.stream().map(pqScript -> {
-            Map<String, Object> map = new HashMap<>();
+//            Map<String, Object> map = new HashMap<>();
-            map.put("id", pqScript.getId());
+//            map.put("id", pqScript.getId());
-            map.put("name", pqScript.getName());
+//            map.put("name", pqScript.getName());
-            return map;
+//            return map;
-        }).collect(Collectors.toList());
+//        }).collect(Collectors.toList());
-        return result;
+        return pqScriptList;
     }
 
     @Override

detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java

@@ -127,17 +127,5 @@ public class PqSourceController extends BaseController {
         List<SourceParam> result = pqSourceService.getSourceParam(sourceId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
-
-    @OperateInfo
-    @GetMapping("/aa")
-    @ApiOperation("按照检测源ID获取源参数")
-    @ApiImplicitParam(name = "pqSourceId", value = "检测源ID", required = true)
-    public HttpResult<SourceInitialize> aa(@RequestParam("sourceId") String sourceId) {
-        String methodDescribe = getMethodDescribe("getParam");
-        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, sourceId);
-        SourceInitialize sourceInitializeParam = pqSourceService.getSourceInitializeParam(sourceId);
-        String jsonString = JSON.toJSONString(sourceInitializeParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sourceInitializeParam, methodDescribe);
-    }
 }
 

detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java

@@ -81,7 +81,7 @@ public class DevTypeController extends BaseController {
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE)
     @PostMapping("/update")
     @ApiOperation("修改设备类型")
-    @ApiImplicitParam(name = "devTypeParam", value = "设备类型", required = true)
+    @ApiImplicitParam(name = "updateParam", value = "设备类型参数", required = true)
     public HttpResult<Boolean> update(@RequestBody @Validated DevTypeParam.UpdateParam updateParam) {
         String methodDescribe = getMethodDescribe("update");
         LogUtil.njcnDebug(log, "{}，修改数据为：{}", methodDescribe, updateParam);

detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java

@@ -40,7 +40,8 @@ public class DevTypeServiceImpl extends ServiceImpl<DevTypeMapper, DevType> impl
     @Override
     public List<DevType> listAll() {
         LambdaQueryWrapper<DevType> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode());
+        queryWrapper.eq(DevType::getState, DataStateEnum.ENABLE.getCode())
+                .orderByAsc(DevType::getName);
         List<DevType> devTypes = this.baseMapper.selectList(queryWrapper);
         return devTypes;
     }

entrance/src/main/resources/application.yml

@@ -6,10 +6,10 @@ spring:
   datasource:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-#      url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+#      url: jdbc:mysql://192.168.1.24:13306/pqs91002?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
 #      username: root
 #      password: njcnpqs
-      url: jdbc:mysql://localhost:13306/pqs9100member?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+      url: jdbc:mysql://192.168.2.125:3306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
       username: root
       password: njcnpqs
       #初始化建立物理连接的个数、最小、最大连接数
@@ -118,3 +118,7 @@ power-quality:
     harmonic-times: 50   # 谐波次数
     ib-add: false        # 电流基波叠加标志
     uharm-add: false     # 电压谐波叠加标志
+# 激活配置
+activate:
+  private-key: "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCcUyYhVqczGxblL+o/xZzF/8nf+LjrfUE/dS1aRHM7uMDD0cgCArhjtfneFePrMxt+Z7W8yNBzSarub8qsfhaVNikV7Es7oaeTygfjQXTi2n4AFkir3fM07J08RpWhl5M8f8uWTCuvFUYAw00gq55typqmnbkmJa2VIUy/iQf+cMCP7abz4/jNhUzUR3qA7TV4oMRgTdIEDUp63YF8dOC+JH8XxYrCVeHXV6fLCwmesdMzl0lB2VTEKMfLbXhOmF5g7P9y/16VCcN8UBuZlbyYfn+GAxJOSbeHi5HshOKfoSuD7Jz+3WQZpNavOWjIFExKIU38/CvnJCOP7XBCqpSTAgMBAAECggEAYeWokWRE3TpvwiOZnUpR/aVMdVi75a3ROL5XIpqPV61B+t/bU3cEpl0GF9C5pUeiRi0IoStZb3mI9D1KPW/REKyUWkhabQO1gFYbTnRlkNOn6MILzKX4cwJjDaZeeo4EBPU7N+qHyOOXrU6hdH5FfxhMdV983ajm5eeuupxER1C2kAcIklTeVpTX6EKOgZb5LBp5ssOVm2P42pOauvcRozRcvZmqnErXmukv0H4l3EVNt4rHpTn9riHUC63e8JfiYzVaF6zuNUxv6nHEft0/SRMw11XSTnNfDzcKqgjz6ksFBS/6eQQYKESk+ONC53HUuYHFAknkwsPupDCT2W8FIQKBgQDLHT/xCU3nxGr4vFKBDNaO2D5oK20ECbBO4oDvLWWmQG7f+6TsMy8PgVdMnoL4RfqGlwFAKEpS6KVFHnBVqnNEhcdy9uCI7x7Xx8UnyUtxj1EDTm76uta9Ki9OrlqB6tImDM9+Ya3vGktW37ht4WOx2OsJRhG1dbf6RLwFlH7DWwKBgQDFBxvi5I1BR6hg6Tj7xd2SqOT2Y+BED3xuSYENhWbmMhLJDResaB7mjztbxlYaY2mOE0holWm2uDmVFFhMh4jYXik4hYH8nmDzq9mDpZCZ9pyjYqnAP8THoAa8EbgrUWB8A6BPH4iL3KbMnBfBKY0pIr2xrvnjQjNBAgta7KDRKQKBgCe6oe4wxrdF2TKsC2tIqpMoQxS3Icy/ZGgZr+SYuaBKTCWtoDW/UT40K3JGMxIDBhzbXphBCUCsVt9tM8Xd4EwP6tJW7dZ7B0pnve2pVwNwaAVAiz6p2yUHIle+jN+Koe5lZRSwYIg7WW81tWpwwsJfzqFyvjYDP6hJV4mz4ROvAoGAaRcdnKvjXApomShMqJ4lTPChD3q+SA8qg3jZSOj6tZXHx00gb2kp8jg7pPvpOTIFPy6x1Ha9aCRjMk0ju84fA6lVuzwa1S907wOehUVuF3Eeo1cgy9Y3k3KbpPyeixxgpkUY4JslLdSHc2NemD0dee951qhJyRmqVOZOQDUuoeECgYEAqBw2cAFk3vM97WY06TSldGA8ajVHx3BYRjj+zl62NTQthy8fw3tqxb3c5e8toOmZWKjZvDhg2TRLhsDDQWEYg3LZG87REqVIjgEPcpjNLidjygGX8n3JF2o0O5I/EMvl0s/+LVQONfduOBvhwDqr8QNisbLsyneiAq7umewMolo="
+  public-key: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnFMmIVanMxsW5S/qP8Wcxf/J3/i4631BP3UtWkRzO7jAw9HIAgK4Y7X53hXj6zMbfme1vMjQc0mq7m/KrH4WlTYpFexLO6Gnk8oH40F04tp+ABZIq93zNOydPEaVoZeTPH/LlkwrrxVGAMNNIKuebcqapp25JiWtlSFMv4kH/nDAj+2m8+P4zYVM1Ed6gO01eKDEYE3SBA1Ket2BfHTgviR/F8WKwlXh11enywsJnrHTM5dJQdlUxCjHy214TpheYOz/cv9elQnDfFAbmZW8mH5/hgMSTkm3h4uR7ITin6Erg+yc/t1kGaTWrzloyBRMSiFN/Pwr5yQjj+1wQqqUkwIDAQAB"

entrance/src/main/resources/logback.xml

@@ -5,7 +5,7 @@
     <!-- 直接使用固定配置，避免Spring配置解析时机问题 -->
     <property name="log.projectName" value="entrance"/>
     <property name="logCommonLevel" value="info"/>
-    <property name="logHomeDir" value="D:\logs"/>
+    <property name="logHomeDir" value="${logHomeDir:-D:\logs}"/>
 
     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
     <conversionRule conversionWord="wex"

entrance/src/test/java/com/njcn/AnalysisServiceStreamTest.java

@@ -25,10 +25,10 @@ public class AnalysisServiceStreamTest {
     private ICompareWaveService compareWaveServiceImpl;
 
     // 测试文件路径 - 请根据实际情况修改
-    private static final String SOURCE_CFG_PATH = "C:\\Users\\hongawen\\Desktop\\Event\\192.168.1.239\\PQ_PQLD1_000574_20250910_135244_231.cfg";
+    private static final String SOURCE_CFG_PATH = "C:\\Users\\Administrator\\Desktop\\wave\\192.168.1.241\\PQ_PQLD2_000177_20251028_112422_833.cfg";
-    private static final String SOURCE_DAT_PATH = "C:\\Users\\hongawen\\Desktop\\Event\\192.168.1.239\\PQ_PQLD1_000574_20250910_135244_231.dat";
+    private static final String SOURCE_DAT_PATH = "C:\\Users\\Administrator\\Desktop\\wave\\192.168.1.241\\PQ_PQLD2_000177_20251028_112422_833.dat";
-    private static final String TARGET_CFG_PATH = "C:\\Users\\hongawen\\Desktop\\Event\\192.168.1.238\\PQ_PQLD2_000508_20250910_135244_197.cfg";
+    private static final String TARGET_CFG_PATH = "C:\\Users\\Administrator\\Desktop\\wave\\192.168.1.242\\PQ_PQLD2_000238_20251028_112422_518.cfg";
-    private static final String TARGET_DAT_PATH = "C:\\Users\\hongawen\\Desktop\\Event\\192.168.1.238\\PQ_PQLD2_000508_20250910_135244_197.dat";
+    private static final String TARGET_DAT_PATH = "C:\\Users\\Administrator\\Desktop\\wave\\192.168.1.242\\PQ_PQLD2_000238_20251028_112422_518.dat";
 
 
 //    private static final String SOURCE_CFG_PATH = "F:\\hatch\\wavecompare\\数据比对\\统计数据1\\B码\\217\\PQMonitor_PQM1_000006_20200430_115517_889.cfg";
@@ -105,6 +105,54 @@ public class AnalysisServiceStreamTest {
         }
     }
 
+    /**
+     * 测试段信息保留模式的波形分析（新方法）
+     * <p>不进行跨段的统一降采样，保留每个段的原始采样率（超过512才降到256）</p>
+     * <p>跨段的窗口会被丢弃，只计算不跨段的窗口</p>
+     */
+    @Test
+    public void testAnalyzeWithSegmentPreservation() throws Exception {
+        System.out.println("========================================");
+        System.out.println("开始执行电能质量分析（段信息保留模式）...");
+        System.out.println("========================================");
+
+        // 检查文件是否存在
+        checkFileExists(SOURCE_CFG_PATH, "源CFG文件");
+        checkFileExists(SOURCE_DAT_PATH, "源DAT文件");
+        checkFileExists(TARGET_CFG_PATH, "目标CFG文件");
+        checkFileExists(TARGET_DAT_PATH, "目标DAT文件");
+
+        long startTime = System.currentTimeMillis();
+
+        try (InputStream sourceCfgStream = new FileInputStream(SOURCE_CFG_PATH);
+             InputStream sourceDatStream = new FileInputStream(SOURCE_DAT_PATH);
+             InputStream targetCfgStream = new FileInputStream(TARGET_CFG_PATH);
+             InputStream targetDatStream = new FileInputStream(TARGET_DAT_PATH)) {
+
+            CompareWaveDTO result = compareWaveServiceImpl.analyzeWithSegmentPreservation(
+                    sourceCfgStream,
+                    sourceDatStream,
+                    targetCfgStream,
+                    targetDatStream,
+                    0  // 接线方式: 0=星型接线, 1=V型接线
+            );
+
+            long endTime = System.currentTimeMillis();
+            long duration = endTime - startTime;
+
+            // 输出分析结果
+            System.out.println("========================================");
+            System.out.println("分析完成！");
+            System.out.println("总耗时: " + duration + " ms (" + String.format("%.2f", duration / 1000.0) + " 秒)");
+            System.out.println("源文件有效窗口数: " + (result.getSourceResults() != null ? result.getSourceResults().size() : 0));
+            System.out.println("目标文件有效窗口数: " + (result.getTargetResults() != null ? result.getTargetResults().size() : 0));
+            System.out.println("========================================");
+            System.out.println("段信息保留模式测试完成！");
+            System.out.println("========================================");
+
+        }
+    }
+
     /**
      * 检查文件是否存在
      */

event_smart/.gitignore

@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

event_smart/pom.xml

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.njcn.gather</groupId>
-        <artifactId>CN_Gather</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <artifactId>event_smart</artifactId>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>njcn-common</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-redis</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-
-<!--        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>rocket-mq-springboot-starter</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>-->
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-            <version>2.7.12</version>
-        </dependency>
-
-        <!-- 多数据源切换，当数据源为oracle时需要使用 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.5.1</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>spingboot2.3.12</artifactId>
-            <version>2.3.12</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>mybatis-plus</artifactId>
-            <version>0.0.1</version>
-        </dependency>
-
-        <!--oracle驱动-->
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>21.6.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.database.nls</groupId>
-            <artifactId>orai18n</artifactId>
-            <version>21.1.0.0</version> <!-- 版本号需要与你的ojdbc版本匹配 -->
-        </dependency>
-
-        <!-- Spring Security -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <!-- JWT -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
-            <version>0.11.5</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
-            <version>0.11.5</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
-            <version>0.11.5</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>common-event</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>common-microservice</artifactId>
-                    <groupId>com.njcn</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>common-web</artifactId>
-                    <groupId>com.njcn</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>32.1.3-jre</version> <!-- 使用最新稳定版 -->
-        </dependency>
-
-
-    </dependencies>
-
-
-    <build>
-        <finalName>event_smart</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-
-    </build>
-
-</project>

event_smart/src/main/java/com/njcn/gather/event/EventSmartApplication.java

@@ -1,22 +0,0 @@
-package com.njcn.gather.event;
-
-import com.njcn.event.file.component.WavePicComponent;
-import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.FilterType;
-
-@Slf4j
-@SpringBootApplication(scanBasePackages = "com.njcn")
-//@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = WavePicComponent.class))
-@MapperScan("com.njcn.**.mapper")
-public class EventSmartApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(EventSmartApplication.class, args);
-    }
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/config/PqlineCache.java

@@ -1,84 +0,0 @@
-package com.njcn.gather.event.devcie.config;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.gather.event.devcie.mapper.PqLineMapper;
-import com.njcn.gather.event.devcie.pojo.po.PqLine;
-import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline;
-import com.njcn.gather.event.devcie.service.PqsDeptslineService;
-import com.njcn.gather.event.transientes.pojo.po.PqsDepts;
-import com.njcn.gather.event.transientes.service.PqsDeptsService;
-import com.njcn.redis.utils.RedisUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Description:
- * Date: 2025/07/28  上午 9:32【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Component
-@Slf4j
-public class PqlineCache {
-    @Autowired
-    private PqLineMapper pqLineMapper;
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private  PqsDeptslineService pqsDeptslineService;
-    @Autowired
-
-    private  PqsDeptsService pqsDeptsService;
-    private final static String NAME_KEY = "LineCache:";
-    @Value("${SYS_TYPE_ZT}")
-    private String sysTypeZt;
-    @PostConstruct
-    public void init() {
-        log.info("系统启动中。。。加载pqline");
-        List<PqLine> pqLines = pqLineMapper.selectList(null);
-        redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"pqLineList",pqLines);
-        List<PqsDepts> list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState, 1).list();
-        for (PqsDepts pqsDepts : list) {
-            List<String> deptAndChildren = pqsDeptsService.findDeptAndChildren(pqsDepts.getDeptsIndex());
-            List<PqsDeptsline> deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list();
-            List<Integer> deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
-
-            List<Integer> result = new ArrayList<>();
-            if(CollUtil.isNotEmpty(deptslineIds)){
-                if(deptslineIds.size()> 1000 ){
-                    List<List<Integer>> listList = CollUtil.split(deptslineIds,1000);
-                    for(List<Integer> li : listList){
-                        List<Integer> temList = pqLineMapper.getRunMonitorIds(li);
-                        result.addAll(temList);
-                    }
-                }else {
-                    result= pqLineMapper.getRunMonitorIds(deptslineIds);
-                }
-            }
-            redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),result);
-        }
-
-        List<PqsDepts> deptsList = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list();
-        redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"AllDept",deptsList);
-    }
-
-    @PreDestroy
-    public void destroy() {
-        log.info("系统运行结束");
-        redisUtil.deleteKeysByString(NAME_KEY);
-    }
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/job/LineCacheJob.java

@@ -1,80 +0,0 @@
-package com.njcn.gather.event.devcie.job;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.njcn.gather.event.devcie.mapper.PqDeviceMapper;
-import com.njcn.gather.event.devcie.mapper.PqLineMapper;
-import com.njcn.gather.event.devcie.pojo.po.PqLine;
-import com.njcn.gather.event.devcie.pojo.po.PqsDeptsline;
-import com.njcn.gather.event.devcie.service.PqsDeptslineService;
-import com.njcn.gather.event.transientes.pojo.po.PqsDepts;
-import com.njcn.gather.event.transientes.service.PqsDeptsService;
-import com.njcn.redis.utils.RedisUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Description:
- * Date: 2025/08/05  上午 10:17【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Component
-@EnableScheduling
-public class LineCacheJob {
-    @Autowired
-    private PqLineMapper pqLineMapper;
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
-    private PqsDeptslineService pqsDeptslineService;
-    @Autowired
-    private PqsDeptsService pqsDeptsService;
-
-    @Autowired
-    private PqDeviceMapper pqDeviceMapper;
-
-    private final static String NAME_KEY = "LineCache:";
-    @Value("${SYS_TYPE_ZT}")
-    private String sysTypeZt;
-    @Scheduled(cron="0 0 1 * * ?" ) // 每3钟执行一次
-    public void lineCache(){
-        redisUtil.deleteKeysByString(NAME_KEY);
-
-        List<PqLine> pqLines = pqLineMapper.selectList(null);
-        redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"pqLineList",pqLines);
-        List<PqsDepts> list = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState, 1).list();
-        for (PqsDepts pqsDepts : list) {
-            List<String> deptAndChildren = pqsDeptsService.findDeptAndChildren(pqsDepts.getDeptsIndex());
-            List<PqsDeptsline> deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list();
-            List<Integer> deptslineIds = deptslines.stream().map(PqsDeptsline::getLineIndex).collect(Collectors.toList());
-
-            List<Integer> result = new ArrayList<>();
-            if(CollUtil.isNotEmpty(deptslineIds)){
-                if(deptslineIds.size()> 1000 ){
-                 List<List<Integer>> listList = CollUtil.split(deptslineIds,1000);
-                 for(List<Integer> li : listList){
-                     List<Integer> temList = pqLineMapper.getRunMonitorIds(li);
-                     result.addAll(temList);
-                 }
-                }else {
-                    result= pqLineMapper.getRunMonitorIds(deptslineIds);
-                }
-            }
-            redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+pqsDepts.getDeptsIndex(),result);
-        }
-
-        List<PqsDepts> deptsList = pqsDeptsService.lambdaQuery().eq(PqsDepts::getState,1).list();
-        redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED+"AllDept",deptsList);
-
-    }
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceDetailMapper.java

@@ -1,13 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.po.PqDeviceDetail;
-
-/**
- * CN_Gather
- *
- * @author cdf
- * @date 2025/8/12
- */
-public interface PqDeviceDetailMapper extends BaseMapper<PqDeviceDetail> {
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java

@@ -1,29 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO;
-import com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqDevice;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:47【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqDeviceMapper extends BaseMapper<PqDevice> {
-    List<DeviceDTO> queryListByIds(@Param("ids") List<Integer> ids);
-
-    Page<DeviceDTO> selectDeviceDTOPage(Page<DeviceDTO> pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("devIndexs") List<Integer> devIndexs);
-
-    Page<DeviceDTO> queryListByLineIds(Page<DeviceDTO> pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("lineIds") List<Integer> lineIds);
-
-
-    List<DeviceDeptDTO> selectDeviceDept();
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqGdCompanyMapper.java

@@ -1,21 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqGdCompany;
-import com.njcn.gather.event.devcie.pojo.po.PqSubstation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:48【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqGdCompanyMapper extends BaseMapper<PqGdCompany> {
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLineMapper.java

@@ -1,28 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqLine;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:43【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqLineMapper extends BaseMapper<PqLine> {
-
-    List<LedgerBaseInfoDTO> getBaseLineInfo(@Param("ids")List<Integer> ids);
-
-
-    List<LedgerBaseInfoDTO> getBaseLedger(@Param("ids")List<Integer> ids,@Param("searchValue")String searchValue);
-
-
-    List<Integer> getRunMonitorIds(@Param("ids")List<Integer> ids);
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqLinedetailMapper.java

@@ -1,9 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.po.PqLinedetail;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface PqLinedetailMapper extends BaseMapper<PqLinedetail> {
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqSubstationMapper.java

@@ -1,20 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.dto.SubstationDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqSubstation;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 
- * Description:
- * Date: 2025/06/19  下午 1:48【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqSubstationMapper extends BaseMapper<PqSubstation> {
-    List<SubstationDTO> queryListByIds(@Param("ids")List<Integer> ids);
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqsStationMapMapper.java

@@ -1,22 +0,0 @@
-package com.njcn.gather.event.devcie.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqLine;
-import com.njcn.gather.event.devcie.pojo.po.PqsStationMap;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:43【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqsStationMapMapper extends BaseMapper<PqsStationMap> {
-
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.event.devcie.mapper.PqDeviceMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.gather.event.devcie.pojo.po.PqDevice">
-    <!--@mbg.generated-->
-    <!--@Table PQ_DEVICE-->
-    <id column="DEV_INDEX" jdbcType="DECIMAL" property="devIndex" />
-    <result column="GD_INDEX" jdbcType="DECIMAL" property="gdIndex" />
-    <result column="SUB_INDEX" jdbcType="DECIMAL" property="subIndex" />
-    <result column="NAME" jdbcType="VARCHAR" property="name" />
-    <result column="STATUS" jdbcType="DECIMAL" property="status" />
-    <result column="DEVTYPE" jdbcType="VARCHAR" property="devtype" />
-    <result column="LOGONTIME" jdbcType="TIMESTAMP" property="logontime" />
-    <result column="UPDATETIME" jdbcType="TIMESTAMP" property="updatetime" />
-    <result column="NODE_INDEX" jdbcType="DECIMAL" property="nodeIndex" />
-    <result column="PORTID" jdbcType="DECIMAL" property="portid" />
-    <result column="DEVFLAG" jdbcType="DECIMAL" property="devflag" />
-    <result column="DEV_SERIES" jdbcType="VARCHAR" property="devSeries" />
-    <result column="DEV_KEY" jdbcType="VARCHAR" property="devKey" />
-    <result column="IP" jdbcType="VARCHAR" property="ip" />
-    <result column="DEVMODEL" jdbcType="DECIMAL" property="devmodel" />
-    <result column="CALLFLAG" jdbcType="DECIMAL" property="callflag" />
-    <result column="DATATYPE" jdbcType="DECIMAL" property="datatype" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    DEV_INDEX, GD_INDEX, SUB_INDEX, "NAME", "STATUS", DEVTYPE, LOGONTIME, UPDATETIME,
-    NODE_INDEX, PORTID, DEVFLAG, DEV_SERIES, DEV_KEY, IP, DEVMODEL, CALLFLAG, DATATYPE
-  </sql>
-
-  <select id="queryListByIds" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDTO">
-    select
-    pq_device.dev_index devId,
-    pq_device.name devName,
-    pq_device.UpdateTime updateTime,
-    pq_device.DevFlag devFlag,
-    pq_device.IP ip,
-    pq_device.status status,
-    PQ_SUBSTATION.sub_index stationId,
-    PQ_SUBSTATION.name stationName,
-    PQ_GDINFORMATION.Name gdName
-    from
-    pq_device,
-    PQ_SUBSTATION,
-    PQ_GDINFORMATION
-    where
-     pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
-    and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
-    and pq_device.DEV_INDEX in
-    <foreach collection="ids" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-  </select>
-
-  <select id="selectDeviceDTOPage" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDTO">
-
-    SELECT  DISTINCT
-    pq_device.dev_index devId,
-    pq_device.name devName,
-    pq_device.UpdateTime updateTime,
-    pq_device.DevFlag devFlag,
-    pq_device.IP ip,
-    pq_device.status status,
-    PQ_DEVICEDETAIL.ThisTimeCheck thisTimeCheck,
-    PQ_DEVICEDETAIL.NextTimeCheck nextTimeCheck,
-    pq_device.LogonTime logonTime,
-    PQ_DEVICEDETAIL.MANUFACTURER
-    FROM
-    pq_device
-    inner JOIN PQ_DEVICEDETAIL ON PQ_DEVICEDETAIL.dev_index = pq_device.dev_index
-    <where>
-    pq_device.DEV_INDEX in
-    <foreach collection="devIndexs" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-    order by pq_device.updatetime
-    </where>
-  </select>
-
-<!--  <select id="selectDeviceDTOPage" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDTO">-->
-<!--    WITH temp AS(-->
-<!--    SELECT DISTINCT-->
-<!--    PQ_LINE.DEV_INDEX,-->
-<!--    PQS_DEPTS.DEPTSNAME-->
-<!--    FROM-->
-<!--    PQ_LINE,-->
-<!--    PQS_DEPTSLINE,-->
-<!--    PQS_DEPTS-->
-<!--    WHERE-->
-<!--    PQ_LINE.LINE_INDEX = PQS_DEPTSLINE.LINE_INDEX-->
-<!--    AND PQS_DEPTS.DEPTS_INDEX = PQS_DEPTSLINE.DEPTS_INDEX-->
-<!--    )-->
-<!--    SELECT  DISTINCT-->
-<!--    pq_device.dev_index devId,-->
-<!--    pq_device.name devName,-->
-<!--    pq_device.UpdateTime updateTime,-->
-<!--    pq_device.DevFlag devFlag,-->
-<!--    pq_device.IP ip,-->
-<!--    pq_device.status status,-->
-<!--    PQ_SUBSTATION.sub_index stationId,-->
-<!--    PQ_SUBSTATION.name stationName,-->
-<!--    PQ_GDINFORMATION.Name gdName,-->
-<!--    PQS_DICDATA.DIC_Name MANUFACTURER_Name,-->
-<!--    PQ_DEVICEDETAIL.ThisTimeCheck thisTimeCheck,-->
-<!--    PQ_DEVICEDETAIL.NextTimeCheck nextTimeCheck,-->
-<!--    pq_device.LogonTime logonTime,-->
-<!--    temp.DEPTSNAME deptName-->
-<!--    FROM-->
-<!--    pq_device-->
-<!--    LEFT JOIN PQ_SUBSTATION ON pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX-->
-<!--    LEFT JOIN PQ_GDINFORMATION ON pq_device.GD_INDEX = PQ_GDINFORMATION.GD_INDEX-->
-<!--    LEFT JOIN PQ_DEVICEDETAIL ON PQ_DEVICEDETAIL.dev_index = pq_device.dev_index-->
-<!--    LEFT JOIN PQS_DICDATA on  PQ_DEVICEDETAIL.MANUFACTURER = PQS_DICDATA.DIC_INDEX-->
-<!--    LEFT JOIN temp on temp.DEV_INDEX = pq_device.dev_index-->
-<!--    where 1=1-->
-<!--    <if test="searchValue!= null and searchValue!= ''">-->
-<!--      AND (-->
-<!--      pq_device.name LIKE '%' || #{searchValue} || '%'-->
-<!--      OR PQ_SUBSTATION.name LIKE '%' || #{searchValue} || '%'-->
-<!--      OR PQ_GDINFORMATION.Name LIKE '%' || #{searchValue} || '%'-->
-<!--      )-->
-<!--    </if>-->
-<!--    <if test="state!= null and state!= ''">-->
-<!--      and pq_device.status = #{state}-->
-<!--    </if>-->
-<!--    and pq_device.DEV_INDEX in-->
-<!--    <foreach collection="devIndexs" item="item" open="(" close=")" separator=",">-->
-<!--      #{item}-->
-<!--    </foreach>-->
-<!--    order by pq_device.updatetime-->
-<!--  </select>-->
-
-
-
-  <select id="queryListByLineIds" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDTO">
-    select distinct
-    pq_device.dev_index devId,
-    pq_device.name devName,
-    pq_device.UpdateTime updateTime,
-    pq_device.DevFlag devFlag,
-    pq_device.IP ip,
-    pq_device.status status,
-    PQ_SUBSTATION.sub_index stationId,
-    PQ_SUBSTATION.name stationName,
-    PQ_GDINFORMATION.Name gdName,
-    PQS_DICDATA.DIC_Name MANUFACTURER_Name
-    from
-    pq_line,
-    pq_device,
-    PQ_DEVICEDETAIL,
-    PQ_SUBSTATION,
-    PQ_GDINFORMATION,
-    PQS_DICDATA
-    where
-    pq_line.DEV_INDEX = pq_device.DEV_INDEX
-    and PQ_DEVICEDETAIL.dev_index =pq_device.dev_index
-    and pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
-    and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
-    and PQ_DEVICEDETAIL.MANUFACTURER = PQS_DICDATA.DIC_INDEX
-    and pq_line.LINE_INDEX in
-    <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-  </select>
-
-  <select id="selectDeviceDept" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO">
-
-        SELECT DISTINCT
-        PQ_LINE.DEV_INDEX devId,
-        PQS_DEPTS.DEPTSNAME deptName,
-        PQS_DEPTS.DEPTS_INDEX deptId
-        FROM
-        PQ_LINE,
-        PQS_DEPTSLINE,
-        PQS_DEPTS
-        WHERE
-        PQ_LINE.LINE_INDEX = PQS_DEPTSLINE.LINE_INDEX
-        AND PQS_DEPTS.DEPTS_INDEX = PQS_DEPTSLINE.DEPTS_INDEX
-
-  </select>
-</mapper>

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.event.devcie.mapper.PqLineMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.gather.event.devcie.pojo.po.PqLine">
-    <!--@mbg.generated-->
-    <!--@Table PQ_LINE-->
-    <id column="LINE_INDEX" jdbcType="DECIMAL" property="lineIndex" />
-    <result column="GD_INDEX" jdbcType="DECIMAL" property="gdIndex" />
-    <result column="SUB_INDEX" jdbcType="DECIMAL" property="subIndex" />
-    <result column="SUBV_INDEX" jdbcType="DECIMAL" property="subvIndex" />
-    <result column="DEV_INDEX" jdbcType="DECIMAL" property="devIndex" />
-    <result column="NAME" jdbcType="VARCHAR" property="name" />
-    <result column="PT1" jdbcType="FLOAT" property="pt1" />
-    <result column="PT2" jdbcType="FLOAT" property="pt2" />
-    <result column="CT1" jdbcType="FLOAT" property="ct1" />
-    <result column="CT2" jdbcType="FLOAT" property="ct2" />
-    <result column="DEVCMP" jdbcType="FLOAT" property="devcmp" />
-    <result column="DLCMP" jdbcType="FLOAT" property="dlcmp" />
-    <result column="JZCMP" jdbcType="FLOAT" property="jzcmp" />
-    <result column="XYCMP" jdbcType="FLOAT" property="xycmp" />
-    <result column="SUBV_NO" jdbcType="DECIMAL" property="subvNo" />
-    <result column="SCALE" jdbcType="VARCHAR" property="scale" />
-    <result column="SUBV_NAME" jdbcType="VARCHAR" property="subvName" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    LINE_INDEX, GD_INDEX, SUB_INDEX, SUBV_INDEX, DEV_INDEX, "NAME", PT1, PT2, CT1, CT2,
-    DEVCMP, DLCMP, JZCMP, XYCMP, SUBV_NO, "SCALE", SUBV_NAME
-  </sql>
-
-
-  <select id="getBaseLineInfo" resultType="com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO">
-
-      WITH temp AS(
-      select PQ_USER_LINE_ASS.LINE_INDEX LINE_INDEX,listagg(PQ_USER_LEDGER.CUSTOMER_NAME,';')  within GROUP (order by PQ_USER_LEDGER.CUSTOMER_NAME) objName from PQ_USER_LINE_ASS  ,PQ_USER_LEDGER where PQ_USER_LINE_ASS.USER_INDEX=PQ_USER_LEDGER.ID group by PQ_USER_LINE_ASS.LINE_INDEX
-      )
-      select
-      PQ_GDINFORMATION.name gdName,
-      pq_line.GD_INDEX gdIndex,
-      pq_line.line_index lineId,
-      pq_line.name lineName,
-      PQ_SUBVOLTAGE.SUBV_INDEX busBarId,
-      PQ_SUBVOLTAGE.name busBarName,
-      pq_device.dev_index devId,
-      pq_device.name devName,
-      pq_device.Status runFlag,
-      PQ_SUBSTATION.sub_index stationId,
-      PQ_SUBSTATION.name stationName,
-      temp.objName  objName
-      from
-      pq_line LEFT JOIN PQ_SUBVOLTAGE on pq_line.SUBV_INDEX = PQ_SUBVOLTAGE.SUBV_INDEX
-      LEFT JOIN
-      pq_device on PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX
-      LEFT JOIN PQ_SUBSTATION on pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
-      LEFT JOIN PQ_GDINFORMATION on pq_line.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
-      LEFT JOIN temp on temp.LINE_INDEX = pq_line.LINE_INDEX
-where 1=1
-      and pq_line.line_index in
-    <foreach collection="ids" item="item" open="(" close=")" separator=",">
-        #{item}
-    </foreach>
-  </select>
-
-
-    <select id="getBaseLedger" resultType="com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO">
-        select
-        PQ_GDINFORMATION.name gdName,
-        pq_line.GD_INDEX gdIndex,
-        pq_line.line_index lineId,
-        pq_line.name lineName,
-        PQ_SUBVOLTAGE.SUBV_INDEX busBarId,
-        PQ_SUBVOLTAGE.name busBarName,
-        pq_device.dev_index devId,
-        pq_device.name devName,
-        pq_device.Status runFlag,
-        PQ_SUBSTATION.sub_index stationId,
-        PQ_SUBSTATION.name stationName
-        from
-        pq_line inner JOIN PQ_SUBVOLTAGE on pq_line.SUBV_INDEX = PQ_SUBVOLTAGE.SUBV_INDEX
-        inner JOIN pq_device on PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX
-        inner JOIN PQ_SUBSTATION on pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
-        inner JOIN PQ_GDINFORMATION on pq_line.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
-        <where>
-        and pq_line.line_index in
-        <foreach collection="ids" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-            <if test="searchValue!=null and searchValue!=''">
-                and (
-                PQ_GDINFORMATION.name  LIKE '%' || #{searchValue} || '%'
-                or PQ_SUBSTATION.name  LIKE '%' || #{searchValue} || '%'
-                or pq_line.name  LIKE '%' || #{searchValue} || '%'
-                )
-            </if>
-        </where>
-    </select>
-
-    <select id="getRunMonitorIds" resultType="integer">
-        select DISTINCT pq_line.line_index from pq_line inner join pq_device on pq_line.DEV_INDEX = pq_device.DEV_INDEX
-        where pq_line.line_index in
-        <foreach collection="ids" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        and pq_device.DEVFLAG = 0
-    </select>
-
-
-</mapper>

event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqSubstationMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.gather.event.devcie.mapper.PqSubstationMapper">
-  <resultMap id="BaseResultMap" type="com.njcn.gather.event.devcie.pojo.po.PqSubstation">
-    <!--@mbg.generated-->
-    <!--@Table PQ_SUBSTATION-->
-    <id column="SUB_INDEX" jdbcType="DECIMAL" property="subIndex" />
-    <result column="GD_INDEX" jdbcType="DECIMAL" property="gdIndex" />
-    <result column="NAME" jdbcType="VARCHAR" property="name" />
-    <result column="SCALE" jdbcType="VARCHAR" property="scale" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    SUB_INDEX, GD_INDEX, "NAME", "SCALE"
-  </sql>
-
-  <select id="queryListByIds" resultType="com.njcn.gather.event.devcie.pojo.dto.SubstationDTO">
-    select
-    PQ_SUBSTATION.sub_index stationId,
-    PQ_SUBSTATION.name stationName,
-    PQ_GDINFORMATION.Name gdName,
-    PQS_MAP.LATITUDE LATITUDE,
-    PQS_MAP.LONGITUDE LONGITUDE
-    from
-    PQ_SUBSTATION left join
-    PQS_MAP on    PQ_SUBSTATION.SUB_INDEX =PQS_MAP.SUB_INDEX
-    left join
-    PQ_GDINFORMATION on     PQ_SUBSTATION.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
-
-    where
-    PQS_MAP.state=1
-    and PQ_SUBSTATION.SUB_INDEX in
-    <foreach collection="ids" item="item" open="(" close=")" separator=",">
-      #{item}
-    </foreach>
-  </select>
-</mapper>

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java

@@ -1,45 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-/**
- * Description:
- * Date: 2025/06/27  下午 3:25【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class DeviceDTO {
-   private Integer devId;
-   private String devName;
-   private Integer stationId;
-   private String stationName;
-   private String gdName;
-   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-   private LocalDateTime updateTime;
-   private String devFlag;
-   private String ip;
-   private String manufacturerName;
-
-   @JsonFormat(pattern = "yyyy-MM-dd")
-   private LocalDate thisTimeCheck;
-
-   @JsonFormat(pattern = "yyyy-MM-dd")
-   private LocalDate nextTimeCheck;
-
-   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-   private LocalDateTime logonTime;
-
-   private String deptName;
-   //通讯状态
-   private Integer runFlag=0;
-   //装置通讯状态（0：中断；1：正常）
-   private Integer  status;
-   private double onLineRate=0.00;
-   private double integrityRate = 0.00;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDeptDTO.java

@@ -1,21 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * Description:
- * Date: 2025/06/27  下午 3:25【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class DeviceDeptDTO {
-   private Integer devId;
-   private String deptId;
-   private String deptName;
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/LedgerBaseInfoDTO.java

@@ -1,41 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.dto;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @Author: cdf
- * @CreateTime: 2025-06-25
- * @Description:
- */
-@Data
-public class LedgerBaseInfoDTO {
-    private String gdName;
-    private String gdIndex;
-
-    private Integer lineId;
-
-    private String lineName;
-
-    private Integer busBarId;
-
-    private String busBarName;
-
-    private Integer devId;
-
-    private String devName;
-
-    private String objName;
-
-    private Integer stationId;
-
-    private String stationName;
-    //通讯状态
-    private Integer runFlag=0;
-
-    private Integer eventCount;
-
-
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/PqsDeptDTO.java

@@ -1,73 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.dto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * Description:
- * Date: 2025/07/29  下午 3:15【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class PqsDeptDTO {
-    /**
-     * 部门表Guid
-     */
-    private String deptsIndex;
-
-    /**
-     * 部门名称
-     */
-
-    private String deptsname;
-
-    /**
-     * 排序
-     */
-
-    private Integer deptsDesc;
-
-    /**
-     * （关联表PQS_User）用户表Guid
-     */
-
-    private String userIndex;
-
-    /**
-     * 更新时间
-     */
-
-    private LocalDateTime updatetime;
-
-    /**
-     * 部门描述
-     */
-
-    private String deptsDescription;
-
-    /**
-     * 角色状态0：删除；1：正常；
-     */
-
-    private Integer state;
-
-    /**
-     * 行政区域
-     */
-
-    private String area;
-
-    private String areaName;
-
-
-    private Integer customDept;
-
-
-    private String parentnodeid;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/SubstationDTO.java

@@ -1,22 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.dto;
-
-import lombok.Data;
-
-/**
- * Description:
- * Date: 2025/06/27  下午 3:37【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-public class SubstationDTO {
-
-   private Integer stationId;
-   private String stationName;
-   private String gdName;
-   private double longitude;
-   private double latitude;
-   private Integer runFlag=0;;
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDevice.java

@@ -1,127 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 
- * Description:
- * Date: 2025/06/19  下午 1:47【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-/**
- * 靠靠?
- */
-@Data
-@NoArgsConstructor
-@TableName(value = "PQ_DEVICE")
-public class PqDevice {
-    /**
-     * 靠靠
-     */
-    @TableId(value = "DEV_INDEX", type = IdType.INPUT)
-    private Integer devIndex;
-
-    /**
-     * 靠靠靠
-     */
-    @TableField(value = "GD_INDEX")
-    private Integer gdIndex;
-
-    /**
-     * 靠靠?
-     */
-    @TableField(value = "SUB_INDEX")
-    private Integer subIndex;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "\"NAME\"")
-    private String name;
-
-    /**
-     * 靠靠靠(0:靠;1:靠)
-     */
-    @TableField(value = "\"STATUS\"")
-    private Integer status;
-
-    /**
-     * (靠縋QS_Dicdata)靠靠Guid
-     */
-    @TableField(value = "DEVTYPE")
-    private String devtype;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "LOGONTIME")
-    private LocalDateTime logontime;
-
-    /**
-     * 靠靠靠
-     */
-    @TableField(value = "UPDATETIME")
-    private LocalDateTime updatetime;
-
-    /**
-     * 靠縉odeInformation)靠靠靠,靠靠靠靠靠靠靠?
-     */
-    @TableField(value = "NODE_INDEX")
-    private Integer nodeIndex;
-
-    /**
-     * 靠ID,靠靠靠
-     */
-    @TableField(value = "PORTID")
-    private Long portid;
-
-    /**
-     * 靠靠(0:靠;1:靠;2:靠)
-     */
-    @TableField(value = "DEVFLAG")
-    private Integer devflag;
-
-    /**
-     * 靠靠?靠3ds靠
-     */
-    @TableField(value = "DEV_SERIES")
-    private String devSeries;
-
-    /**
-     * 靠靠,靠3ds靠
-     */
-    @TableField(value = "DEV_KEY")
-    private String devKey;
-
-    /**
-     * IP靠
-     */
-    @TableField(value = "IP")
-    private String ip;
-
-    /**
-     * 靠靠(0:靠靠;1:靠靠)
-     */
-    @TableField(value = "DEVMODEL")
-    private Integer devmodel;
-
-    /**
-     * 靠靠?
-     */
-    @TableField(value = "CALLFLAG")
-    private Integer callflag;
-
-    /**
-     * 靠靠(0:靠靠;1:靠靠;2:靠靠)
-     */
-    @TableField(value = "DATATYPE")
-    private Integer datatype;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqDeviceDetail.java

@@ -1,72 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.Date;
-
-/**
- * CN_Gather
- *
- * @author cdf
- * @date 2025/8/12
- */
-@TableName(value = "PQ_DEVICEDETAIL")
-@Data
-public class PqDeviceDetail {
-
-
-        @TableId
-        @TableField(value = "DEV_INDEX")
-        private Long devIndex;
-
-        @TableField(value = "Manufacturer")
-        private String manufacturer;
-
-        @TableField(value = "CheckFlag")
-        private Long checkFlag;
-
-        @TableField(value="ThisTimeCheck")
-        private LocalDate ThisTimeCheck;
-
-        @TableField(value="NextTimeCheck")
-        private LocalDate NextTimeCheck;
-
-        @TableField(value="DATAPLAN")
-        private Long dataplan;
-
-        @TableField(value="NEWTRAFFIC")
-        private Long newtraffic;
-
-
-        @TableField(value = "electroplate")
-        private Integer electroplate = 0;
-
-        @TableField(value = "ONTIME")
-        private Integer ontime;
-        @TableField(value = "contract")
-        private String contract;
-
-        @TableField(value = "DEV_CATENA")
-        private String devCatnea;
-
-        @TableField(value = "SIM")
-        private String sim;
-
-        @TableField(value = "DEV_NO")
-        private String devNo;
-
-        @TableField(value = "DEV_LOCATION")
-        private String devLocation;
-
-        @TableField(value = "IS_ALARM")
-        private Integer isAlarm;
-
-
-
-
-    }

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqGdCompany.java

@@ -1,27 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * CN_Gather
- *
- * @author cdf
- * @date 2025/8/9
- */
-@Data
-@TableName(value = "PQ_GDINFORMATION")
-public class PqGdCompany {
-
-    @TableId
-    @TableField(value="GD_INDEX")
-    private Long gdIndex;
-
-    @TableField(value="NAME")
-    private String name;
-
-    @TableField(value="PROVINCE_INDEX")
-    private Long provinceIndex;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLine.java

@@ -1,133 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Transient;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:43【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-/**
- * 靠靠?
- */
-@Data
-@NoArgsConstructor
-@TableName(value = "PQ_LINE")
-public class PqLine {
-    /**
-     * 靠靠
-     */
-    @TableId(value = "LINE_INDEX", type = IdType.INPUT)
-    private Integer lineIndex;
-
-    /**
-     * 靠靠靠
-     */
-    @TableField(value = "GD_INDEX")
-    private Integer gdIndex;
-
-    /**
-     * 靠靠?
-     */
-    @TableField(value = "SUB_INDEX")
-    private Integer subIndex;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "SUBV_INDEX")
-    private Integer subvIndex;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "DEV_INDEX")
-    private Integer devIndex;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "\"NAME\"")
-    private String name;
-
-    /**
-     * PT靠靠
-     */
-    @TableField(value = "PT1")
-    private Double pt1;
-
-    /**
-     * PT靠靠
-     */
-    @TableField(value = "PT2")
-    private Double pt2;
-
-    /**
-     * CT靠靠
-     */
-    @TableField(value = "CT1")
-    private Double ct1;
-
-    /**
-     * CT靠靠
-     */
-    @TableField(value = "CT2")
-    private Double ct2;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "DEVCMP")
-    private Double devcmp;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "DLCMP")
-    private Double dlcmp;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "JZCMP")
-    private Double jzcmp;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "XYCMP")
-    private Double xycmp;
-
-    /**
-     * 靠?靠靠靠靠靠靠?
-     */
-    @TableField(value = "SUBV_NO")
-    private Integer subvNo;
-
-    /**
-     * (靠PQS_Dictionary?靠靠Guid
-     */
-    @TableField(value = "\"SCALE\"")
-    private String scale;
-
-    /**
-     * 靠靠
-     */
-    @TableField(value = "SUBV_NAME")
-    private String subvName;
-
-   @TableField(exist = false)
-    private String subName;
-
-    @TableField(exist = false)
-   private String deptName;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqLinedetail.java

@@ -1,52 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-/**
- * @Author: cdf
- * @CreateTime: 2025-06-26
- * @Description:
- */
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("PQ_LINEDETAIL")
-public class PqLinedetail {
-
-    @TableId(value = "LINE_INDEX", type = IdType.INPUT)
-    private Integer lineIndex;
-
-    private Integer gdIndex;
-
-    private Integer subIndex;
-
-    private String lineName;
-
-    private Integer pttype;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date lastTime;
-
-    private Integer tinterval;
-
-    private String loadtype;
-
-    private String businesstype;
-
-    private String remark;
-
-    private String monitorId;
-
-    private Integer powerid;
-
-    private String objname;
-
-    @TableField(fill = FieldFill.INSERT)
-    private Integer statflag;
-
-    private String lineGrade;
-
-    private String powerSubstationName;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqSubstation.java

@@ -1,45 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 
- * Description:
- * Date: 2025/06/19  下午 1:48【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-/**
- * 靠靠靠
- */
-@Data
-@NoArgsConstructor
-@TableName(value = "PQ_SUBSTATION")
-public class PqSubstation {
-    /**
-     * 靠靠?
-     */
-    @TableId(value = "SUB_INDEX", type = IdType.INPUT)
-    private Integer subIndex;
-
-    /**
-     * 靠靠靠
-     */
-    @TableField(value = "GD_INDEX")
-    private Integer gdIndex;
-
-    /**
-     * 靠靠?
-     */
-    @TableField(value = "\"NAME\"")
-    private String name;
-
-    @TableField(value = "\"SCALE\"")
-    private String scale;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsDeptsline.java

@@ -1,33 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 
- * Description:
- * Date: 2025/06/19  下午 3:45【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Data
-@NoArgsConstructor
-@TableName(value = "PQS_DEPTSLINE")
-public class PqsDeptsline {
-    /**
-     * 部门表Guid
-     */
-    @TableField(value = "DEPTS_INDEX")
-    private String deptsIndex;
-
-    @TableField(value = "LINE_INDEX")
-    private Integer lineIndex;
-
-    @TableField(value = "SYSTYPE")
-    private String systype;
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/po/PqsStationMap.java

@@ -1,58 +0,0 @@
-package com.njcn.gather.event.devcie.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * CN_Gather
- *
- * @author cdf
- * @date 2025/8/11
- */
-@TableName(value="PQS_MAP")
-@Data
-public class PqsStationMap {
-
-
-        @TableId
-        @TableField(value = "MAP_INDEX")
-        private String mapIndex;
-
-
-        @TableField(value = "SUB_INDEX")
-        private Long subIndex;
-
-
-        @TableField(value = "GD_INDEX")
-        private Long gdIndex;
-
-        //经度
-
-        @TableField(value = "LONGITUDE")
-        private Float longItude;
-
-        //纬度
-
-        @TableField(value = "LATITUDE")
-        private Float latItude;
-
-        //数据状态
-
-        @TableField(value = "STATE")
-        private Long state;
-
-        //用户ID
-
-        @TableField(value = "USER_INDEX")
-        private String userIndex;
-
-        //更新时间
-
-        @TableField(value = "UPDATETIME")
-        private Date updateTime;
-
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java

@@ -1,26 +0,0 @@
-package com.njcn.gather.event.devcie.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO;
-import com.njcn.gather.event.devcie.pojo.dto.DeviceDeptDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqDevice;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:47【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqDeviceService extends IService<PqDevice>{
-
-    List<DeviceDTO> queryListByIds(List<Integer> lineIds);
-
-    Page<DeviceDTO> selectDeviceDTOPage(Page<DeviceDTO> pqsEventdetailPage, String searchValue, List<Integer> devIndexs);
-
-    List<DeviceDeptDTO> selectDeviceDept();
-}

event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqLineService.java

@@ -1,25 +0,0 @@
-package com.njcn.gather.event.devcie.service;
-
-import com.njcn.gather.event.devcie.pojo.dto.DeviceDTO;
-import com.njcn.gather.event.devcie.pojo.dto.LedgerBaseInfoDTO;
-import com.njcn.gather.event.devcie.pojo.po.PqLine;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- *
- * Description:
- * Date: 2025/06/19  下午 1:43【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface PqLineService extends IService<PqLine>{
-
-
-    List<LedgerBaseInfoDTO> getBaseLineInfo(List<Integer> ids);
-
-    List<LedgerBaseInfoDTO> getBaseLedger(@Param("ids") List<Integer> ids, @Param("searchValue") String searchValue);
-}