From 186d701dcbf64fd237dfa0ba996517039ef25356 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 1 Apr 2025 14:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/detection/handler/SocketDevResponseService.java  | 2 +-
 .../gather/detection/service/impl/DetectionServiceImpl.java | 3 +++
 .../gather/err/service/impl/PqErrSysDtlsServiceImpl.java    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
index 7c8347b1..f620d0d9 100644
--- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
+++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
@@ -993,7 +993,7 @@ public class SocketDevResponseService {
      */
     public void formalDeal(PreDetectionParam param, SocketDataMsg socketDataMsg) {
         String data = socketDataMsg.getData();
-        DevData devData = JSON.parseObject(data, DevData.class);
+        DevData devData = JSON.parseObject(data, DevData.class); //DevData的id值为 设备id_通道号 这种形式
         SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
         SourceIssue sourceIssue = SocketManager.getSourceList().get(0);
 
diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
index 11e48c6a..2ddf7db0 100644
--- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java
@@ -66,6 +66,7 @@ public class DetectionServiceImpl {
     /**
      * 开始处理指标类型
      * 一共20组数据，开始处理格式
+     * 返回值：key为设备id_通道号，value为检测结果
      */
     public Map<String, Integer> processing(List<DevData> dev, PreDetectionParam detection, Map<String, String> devIdMapComm, SourceIssue issue, DictDataEnum dataRule) {
         Map<String, List<DevData>> devDataMap = dev.stream().collect(Collectors.groupingBy(DevData::getId));
@@ -372,6 +373,7 @@ public class DetectionServiceImpl {
         List<AdNonHarmonicResult> info = new ArrayList<>();
         List<String> devValueTypeList = sourceIssue.getDevValueTypeList();
         for (String s : devValueTypeList) {
+            // 根据数据处理规则取值。key为相别，value为值列表
             Map<String, List<Double>> map = devListMap(dev, dataRule, s.split("\\$")[1]);
             Double fData = 1.0;
             if (U.equals(type)) {
@@ -933,6 +935,7 @@ public class DetectionServiceImpl {
      */
     private void setDetection(DictDataEnum dataRule, List<Double> harmDataList, PqErrSysDtls errSysDtl, DetectionData data, Double v) {
         if (CollUtil.isNotEmpty(harmDataList)) {
+            // 存放合格的数据
             List<Double> qualifiedList = harmDataList.stream()
                     .filter(x -> v == 0 ? NumberUtil.isIn(devSubtractChannelData(x, v, errSysDtl.getErrorValueType()),
                             BigDecimal.valueOf(-errSysDtl.getMaxErrorValue()),
diff --git a/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java
index 5e4230e8..2a773393 100644
--- a/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java
@@ -106,7 +106,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
                 (key1, key2) -> key1));
 
         //获取误差体系
-        Map<String, List<PqErrSysDtls>> errMap = new HashMap<>(3);
+        Map<String, List<PqErrSysDtls>> errMap = new HashMap<>(3); //key为误差详情的ScriptType，value为List<PqErrSysDtls>
         if (CollUtil.isNotEmpty(valueType)) {
             List<PqErrSysDtls> errSysDtls = this.list(new MPJLambdaWrapper<PqErrSysDtls>().selectAll(PqErrSysDtls.class)
                     .selectAll(PqErrSysDtls.class)
@@ -142,12 +142,12 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
             if (valueType.containsKey(script.getValueType())) {
                 //默认值4.无法处理 5.不参与误差比较
                 Integer i = valueType.get(script.getValueType());
-                if (i == 1) {
+                if (i == 1) { //参与误差比较
                     dataVO.setIsQualified(4);
                     if (errMap.containsKey(script.getValueType())) {
                         dataVO.setErrSysDtls(errMap.get(script.getValueType()));
                     }
-                } else {
+                } else { //不参与误差比较
                     dataVO.setIsQualified(5);
                 }
             }