微调

# Conflicts:
#	entrance/src/main/resources/application.yml

detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java

@@ -155,4 +155,25 @@ public class PreDetectionController extends BaseController {
         LogUtil.njcnDebug(log, "{}", methodDescribe);
         preDetectionService.exportAlignData();
     }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/canCoefficient")
+    @ApiOperation("比对模式是否能够进行系数校验")
+    public HttpResult<Boolean> canCoefficient() {
+        String methodDescribe = getMethodDescribe("canCoefficient");
+        LogUtil.njcnDebug(log, "{}", methodDescribe);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, preDetectionService.getCanCoefficient(), methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/startCoefficient")
+    @ApiOperation("比对模式开启系数校验")
+    public HttpResult<String> startCoefficient() {
+        String methodDescribe = getMethodDescribe("startCoefficient");
+        LogUtil.njcnDebug(log, "{}", methodDescribe);
+
+        preDetectionService.startCoefficient();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
 }

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

@@ -11,7 +11,9 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.google.common.collect.HashBiMap;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.gather.detection.pojo.dto.DevXiNumData;
 import com.njcn.gather.detection.pojo.dto.WaveCommandDTO;
 import com.njcn.gather.detection.pojo.dto.WaveResultDTO;
 import com.njcn.gather.detection.pojo.enums.*;
@@ -24,15 +26,17 @@ import com.njcn.gather.detection.pojo.vo.*;
 import com.njcn.gather.detection.service.IAdPariService;
 import com.njcn.gather.detection.service.impl.DetectionServiceImpl;
 import com.njcn.gather.detection.util.DetectionUtil;
-import com.njcn.gather.detection.util.socket.CnSocketUtil;
-import com.njcn.gather.detection.util.socket.FormalTestManager;
-import com.njcn.gather.detection.util.socket.MsgUtil;
-import com.njcn.gather.detection.util.socket.SocketManager;
+import com.njcn.gather.detection.util.socket.*;
 import com.njcn.gather.detection.util.socket.websocket.WebServiceManager;
 import com.njcn.gather.device.pojo.enums.PatternEnum;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqStandardDevGainRecordService;
+import com.njcn.gather.device.service.IPqStandardDevGainService;
 import com.njcn.gather.device.service.IPqStandardDevService;
+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.service.IAdPlanService;
@@ -62,6 +66,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -92,6 +97,8 @@ public class SocketContrastResponseService {
     private final IAdPariService adPairService;
     private final ICompareWaveService compareWaveService;
     private final IAdPlanTestConfigService adPlanTestConfigService;
+    private final IPqStandardDevGainService pqStandardDevGainService;
+    private final IPqStandardDevGainRecordService pqStandardDevGainRecordService;
 
 
     /**
@@ -120,7 +127,7 @@ public class SocketContrastResponseService {
 //    private SysRegRes contrastRegRes = null;
 
 
-    @Value("${log.homeDir}")
+    @Value("${report.reportDir}")
     private String alignDataFilePath;
 
     public static final Map<String, List<String>> testItemCodeMap = new HashMap() {{
@@ -182,9 +189,10 @@ public class SocketContrastResponseService {
         FormalTestManager.pstDataType = null;
         FormalTestManager.isPstData = false;
         FormalTestManager.isWaveCheck = false;
-//        FormalTestManager.isXu = param.getPhaseCheck() == 1 ? true : false;
-        FormalTestManager.isXu = true;
+        FormalTestManager.isXu = param.getPhaseCheck() == 1 ? true : false;
+//        FormalTestManager.isXu = true;
         FormalTestManager.nonWaveDataSourceEnum = null;
+        DetectionServiceImpl.vAndIResultMap = new HashMap<>();
 
         String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(",");
         for (String datasourceId : datasourceIds) {
@@ -377,6 +385,10 @@ public class SocketContrastResponseService {
             case RECORD_WAVE_STEP1:
                 this.recordWave(param, socketDataMsg);
                 break;
+            //系数校验
+            case Coefficient_Check:
+                this.coefficient(param, socketDataMsg);
+                break;
             //退出关闭
             case QUITE:
                 quitDeal(socketDataMsg, param);
@@ -1230,39 +1242,6 @@ public class SocketContrastResponseService {
                         }
                     }
                     this.setScheduler(targetCount, param.getUserPageId(), requestOperateCode, quitOperateCode);
-//                    if (Objects.isNull(FormalTestManager.scheduler)) {
-//                        FormalTestManager.scheduler = Executors.newScheduledThreadPool(1);
-//                        long delay = this.getDelay(targetCount);
-//                        FormalTestManager.scheduledFuture = FormalTestManager.scheduler.schedule(() -> {
-//                            if (!checkResult) {
-//                                System.out.println("正式检测-" + delay + "s内收集数据不完整！");
-//                                // 断开与设备的连接,但是不要将Socket移除
-//                                if (FormalTestManager.statisticsProtocol && quitOperateCode == SourceOperateCodeEnum.QUIT_INIT_02) {
-//                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_01, false);
-//                                }
-//                                if (FormalTestManager.voltageProtocol) {
-//                                    CnSocketUtil.contrastSendquit(param.getUserPageId(), SourceOperateCodeEnum.QUIT_INIT_03, false);
-//                                }
-//                                CnSocketUtil.contrastSendquit(param.getUserPageId(), quitOperateCode, false);
-//                                FormalTestManager.isTesting = false;
-//
-//                                this.clearData();
-//
-//                                Collection<String> disjunction = CollectionUtil.disjunction(FormalTestManager.pairsIpMap.keySet(), successPair.keySet());
-//                                // 向前端推送收集数据不完整的配对项
-//                                for (String key : disjunction) {
-//                                    webSend.setCode(SourceResponseCodeEnum.FAIL.getCode());
-//                                    webSend.setData(MsgUtil.getPairStr(key, FormalTestManager.pairsIpMap.inverse().get(key), FormalTestManager.devNameMapComm) + " 数据收集不完整！");
-//                                    WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
-//                                }
-//                                // 推送最终失败结果
-//                                webSend.setCode(SourceResponseCodeEnum.ALL_FAIL.getCode());//最终错误推送
-//                                WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(webSend));
-//                            }
-//                            FormalTestManager.scheduler.shutdown();
-//                            FormalTestManager.scheduler = null;
-//                        }, delay, TimeUnit.SECONDS);
-//                    }
 
                     String monitorId1 = devData.getId();
                     String devMonitorId = monitorId1;
@@ -1438,6 +1417,28 @@ public class SocketContrastResponseService {
                                                 pqDevService.updateResult(id1.split(CnSocketUtil.SPLIT_TAG)[0], param.getUserId());
                                             });
                                             FormalTestManager.isTesting = false;
+
+                                            if (CollUtil.isNotEmpty(DetectionServiceImpl.vAndIResultMap)) {
+                                                // 是否进行系数校准
+                                                //万一录波了这里就进不来了，但是在误差处理的时候DetectionServiceImpl.vAndIResultMap该集合会保留不符合的结果
+
+                                                XiNumberManager.xiDevList.clear();
+                                                XiNumberManager.devXiNumDataMap.clear();
+                                                List<String> stdIpList = DetectionServiceImpl.vAndIResultMap.values().stream().map(DetectionServiceImpl.VAndIResult::getIp).collect(Collectors.toList());
+                                                XiNumberManager.xiDevList = FormalTestManager.standardDevList.stream().filter(d -> stdIpList.contains(d.getDevIP())).collect(Collectors.toList());
+                                                // 逐一设备向通讯模块要原始系数
+                                                SocketMsg<String> socketMsg = new SocketMsg<>();
+                                                socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
+                                                socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue());
+                                                PreDetection preDetection = XiNumberManager.xiDevList.get(0);
+                                                Map<String, Object> map = new HashMap<>();
+                                                map.put("devIP", preDetection.getDevIP());
+                                                map.put("chnNum", preDetection.getDevChns());
+                                                socketMsg.setData(JSON.toJSONString(map));
+                                                SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG, JSON.toJSONString(socketMsg));
+
+                                                FormalTestManager.currentStep = SourceOperateCodeEnum.Coefficient_Check;
+                                            }
                                         }
                                     } else {
                                         // 配对关系入库
@@ -1715,6 +1716,160 @@ public class SocketContrastResponseService {
         }
     }
 
+    private void coefficient(PreDetectionParam param, SocketDataMsg socketDataMsg) {
+        SourceOperateCodeEnum sourceOperateCodeEnum = SourceOperateCodeEnum.getDictDataEnumByCode(socketDataMsg.getOperateCode());
+        SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
+        SocketMsg<String> xiSocket = new SocketMsg<>();
+        xiSocket.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
+
+        switch (Objects.requireNonNull(sourceOperateCodeEnum)) {
+            case DATA_CHNFACTOR$01:
+                //获取系数
+                switch (Objects.requireNonNull(dictDataEnumByCode)) {
+                    case SUCCESS:
+                        if (CollUtil.isNotEmpty(XiNumberManager.xiDevList)) {
+                            List<DevXiNumData.GF> gfList = JSON.parseArray(socketDataMsg.getData(), DevXiNumData.GF.class);
+                            DevXiNumData devXiNumData = new DevXiNumData();
+                            String ip = XiNumberManager.xiDevList.get(0).getDevIP();
+                            devXiNumData.setDevIP(ip);
+                            //String stdMonitorId = DetectionServiceImpl.vAndIResultMap.keySet().stream().filter(key -> key.contains(ip)).findFirst().get();
+
+                            List<PqStandardDevGain> pqStandardDevGainList = new ArrayList<>();
+                            List<PqStandardDevGainRecord> recordList = new ArrayList<>();
+                            for (int i = 0; i < gfList.size(); i++) {
+                                DevXiNumData.GF gf = gfList.get(i);
+                                String stdDevMonitorId = FormalTestManager.devIdMapComm.get(ip) + CnSocketUtil.SPLIT_TAG + (gf.getUMonitorPoint() + 1);
+                                String devMonitorId = FormalTestManager.pairsIdMap.inverse().get(stdDevMonitorId);
+                                PqStandardDevGain pqStandardDevGain = new PqStandardDevGain();
+                                pqStandardDevGain.setStdDevMonitorId(stdDevMonitorId);
+
+                                DevXiNumData.F f = gf.getF();
+                                pqStandardDevGain.setUaGain(f.getUa_gain());
+                                pqStandardDevGain.setUbGain(f.getUb_gain());
+                                pqStandardDevGain.setUcGain(f.getUc_gain());
+                                pqStandardDevGain.setU0Gain(f.getU0_gain());
+                                pqStandardDevGain.setIaGain(f.getIa_gain());
+                                pqStandardDevGain.setIbGain(f.getIb_gain());
+                                pqStandardDevGain.setIcGain(f.getIc_gain());
+                                pqStandardDevGain.setI0Gain(f.getI0_gain());
+                                pqStandardDevGain.setUabGain(f.getUab_gain());
+                                pqStandardDevGain.setUbcGain(f.getUbc_gain());
+                                pqStandardDevGain.setUcaGain(f.getUca_gain());
+                                pqStandardDevGain.setState(DataStateEnum.ENABLE.getCode());
+                                pqStandardDevGainList.add(pqStandardDevGain);
+                                DetectionServiceImpl.VAndIResult vAndIResult = DetectionServiceImpl.vAndIResultMap.get(ip + CnSocketUtil.SPLIT_TAG + (gf.getUMonitorPoint() + 1));
+                                if (ObjectUtil.isNotNull(vAndIResult)) {
+                                    int maxNum = pqStandardDevGainRecordService.getMaxNum(stdDevMonitorId, devMonitorId);
+                                    PqStandardDevGainRecord record = new PqStandardDevGainRecord();
+                                    record.setStdDevMonitorId(stdDevMonitorId);
+                                    record.setDevMonitorId(devMonitorId);
+                                    record.setNum(maxNum + 1);
+                                    recordList.add(record);
+                                    updateGfList(f, vAndIResult, stdDevMonitorId, maxNum);
+                                }
+                            }
+
+                            xiSocket.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$02.getValue());
+                            devXiNumData.setGf(gfList);
+                            xiSocket.setData(JSON.toJSONString(devXiNumData));
+                            SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG, JSON.toJSONString(xiSocket));
+
+                            // 原始系数入库
+                            pqStandardDevGainService.add(pqStandardDevGainList);
+                            pqStandardDevGainRecordService.addOrUpdate(recordList);
+                        }
+                        break;
+                    case UNPROCESSED_BUSINESS:
+                        break;
+                    case NORMAL_RESPONSE:
+                        break;
+                    case DATA_RESOLVE:
+                        break;
+                    case COMMUNICATION_ERR:
+                        break;
+                    default:
+                        break;
+                }
+
+                break;
+            case DATA_CHNFACTOR$02:
+                //系数下发后的响应
+                switch (Objects.requireNonNull(dictDataEnumByCode)) {
+                    case SUCCESS:
+                        //单台装置系数下发后，需要删除集合中存在的当前装置
+                        XiNumberManager.xiDevList.remove(0);
+                        //继续下发每台装置系数，只到集合为空
+                        if (CollUtil.isNotEmpty(XiNumberManager.xiDevList)) {
+                            xiSocket.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue());
+                            xiSocket.setData(JSON.toJSONString(XiNumberManager.devXiNumDataMap.get(XiNumberManager.xiDevList.get(0))));
+                            PreDetection preDetection = XiNumberManager.xiDevList.get(0);
+                            Map<String, Object> map = new HashMap<>();
+                            map.put("devIP", preDetection.getDevIP());
+                            map.put("chnNum", preDetection.getDevChns());
+                            xiSocket.setData(JSON.toJSONString(map));
+                            SocketManager.sendMsg(param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG, JSON.toJSONString(xiSocket));
+                        } else {
+                            //{"requestId":"Coefficient_Check","operateCode":"DATA_CHNFACTOR$02","data":"end","code":10200}
+                            // 通知前端全部下发系数完成
+                        }
+                        break;
+                    case UNPROCESSED_BUSINESS:
+                        break;
+                    case NORMAL_RESPONSE:
+                        break;
+                    case DATA_RESOLVE:
+                        //quitSend(param);
+                        break;
+                    case COMMUNICATION_ERR:
+                        break;
+                    default:
+                        break;
+                }
+                break;
+//            case DEV_DATA_REQUEST_02:
+//                //实时采集申请
+//                String data = socketDataMsg.getData();
+//                DevData devData = JSON.parseObject(data, DevData.class);
+//                if (ObjectUtil.isNotNull(dictDataEnumByCode)) {
+//                    switch (dictDataEnumByCode) {
+//                        case SUCCESS:
+//                            if (devData.getResult()) {
+//                                FormalTestManager.realDataXiList.add(devData);
+//                                successComm.add(devData.getId());
+//                                System.out.println(successComm.size() + " ==" + FormalTestManager.monitorIdListComm.size() + "FormalTestManager.realDataXiList:" + FormalTestManager.realDataXiList.size() + "当前步骤" + XiNumberManager.stepNumber);
+//                                if (successComm.size() == FormalTestManager.monitorIdListComm.size()) {
+//                                    processData(param, xiSocket);
+//                                }
+//                            } else {
+//                                System.out.println("系数校准抛除数据" + devData);
+//                            }
+//                            break;
+//                        case UNPROCESSED_BUSINESS:
+//                            WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(socketDataMsg));
+//                            break;
+//                        case NORMAL_RESPONSE:
+//                            if (devData.getResult()) {
+//                                FormalTestManager.realDataXiList.add(devData);
+//                            } else {
+//                                System.out.println("系数校准抛除数据" + devData);
+//                            }
+//                            break;
+//                        default:
+//                            xiSocket.setRequestId(socketDataMsg.getRequestId());
+//                            xiSocket.setOperateCode(socketDataMsg.getOperateCode());
+//                            xiSocket.setData(dictDataEnumByCode.getMessage());
+//                            WebServiceManager.sendMsg(param.getUserPageId(), JSON.toJSONString(xiSocket));
+//                            break;
+//                    }
+//                }
+//                break;
+            default:
+                WebServiceManager.sendUnknownErrorMessage(param.getUserPageId());
+                break;
+        }
+
+    }
+
 
     /**
      * 退出检测返回
@@ -1889,13 +2044,13 @@ public class SocketContrastResponseService {
      */
     private Integer getTargetCount() {
         if (FormalTestManager.isPstData) {
-            return FormalTestManager.curretntTestPlanConfig.getFlicker();
+            return FormalTestManager.curretntTestPlanConfig.getFlicker() * 2;
         }
         if (ObjectUtil.isNotNull(FormalTestManager.nonWaveDataSourceEnum)) {
             if (FormalTestManager.nonWaveDataSourceEnum == DataSourceEnum.REAL_DATA) {
-                return FormalTestManager.curretntTestPlanConfig.getRealTime();
+                return FormalTestManager.curretntTestPlanConfig.getRealTime() * 2;
             } else {
-                return FormalTestManager.curretntTestPlanConfig.getStatistics();
+                return FormalTestManager.curretntTestPlanConfig.getStatistics() * 2;
             }
         }
         return -1;
@@ -1981,8 +2136,13 @@ public class SocketContrastResponseService {
                         isStar = true;
                         isDelta = false;
                     } else {
-                        isStar = false;
-                        isDelta = true;
+                        if (DetectionCodeEnum.STAR.getCode().equals(monitorListDTO.getConnection())) {
+                            isStar = true;
+                            isDelta = false;
+                        } else {
+                            isStar = false;
+                            isDelta = true;
+                        }
                     }
                 }
 
@@ -2085,8 +2245,13 @@ public class SocketContrastResponseService {
                         isStar = true;
                         isDelta = false;
                     } else {
-                        isStar = false;
-                        isDelta = true;
+                        if (DetectionCodeEnum.STAR.getCode().equals(monitorListDTO.getConnection())) {
+                            isStar = true;
+                            isDelta = false;
+                        } else {
+                            isStar = false;
+                            isDelta = true;
+                        }
                     }
                 }
 
@@ -2149,7 +2314,7 @@ public class SocketContrastResponseService {
             });
         });
 
-        ExcelUtil.saveExcel(alignDataFilePath, "实时数据.xlsx", sheetsList);
+        ExcelUtil.saveExcel(alignDataFilePath, "对齐数据.xlsx", sheetsList);
     }
 
     /**
@@ -2306,8 +2471,13 @@ public class SocketContrastResponseService {
                 isStar = true;
                 isDelta = false;
             } else {
-                isStar = false;
-                isDelta = true;
+                if (DetectionCodeEnum.STAR.getCode().equals(monitorListDTO.getConnection())) {
+                    isStar = true;
+                    isDelta = false;
+                } else {
+                    isStar = false;
+                    isDelta = true;
+                }
             }
         }
 
@@ -2625,18 +2795,30 @@ public class SocketContrastResponseService {
                     devInfo = pqDevService.getDevInfo(Collections.singletonList(devId));
                 }
                 Integer usePhaseIndex = devInfo.get(0).getUsePhaseIndex();
-
                 List<String> allDesc = data.getSqlData().stream().map(x -> x.getDesc()).collect(Collectors.toList());
                 allDesc.addAll(data.getSqlDataHarm().stream().map(x -> x.getDesc()).collect(Collectors.toList()));
 
+                String bzDevId = devId;
+                if (isStdDev) {
+                    String s = FormalTestManager.pairsIdMap.inverse().get(devId + CnSocketUtil.SPLIT_TAG + splitArr[1]);
+                    bzDevId = s.split(CnSocketUtil.SPLIT_TAG)[0];
+                }
+                PqMonitor monitor = pqMonitorService.getByDevIdAndNum(bzDevId, Integer.parseInt(splitArr[1]));
+                DictData dictData = dictDataService.getById(monitor.getConnection());
                 for (DevData.SqlDataDTO sqlDataDTO : data.getSqlData()) {
                     if (usePhaseIndex.equals(1)) {
                         if (DetectionCodeEnum.PVRMS.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.PU1.getCode().equals(sqlDataDTO.getDesc())) {
                             continue;
                         }
                     } else {
-                        if (DetectionCodeEnum.VRMS.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.U1.getCode().equals(sqlDataDTO.getDesc())) {
-                            continue;
+                        if (DetectionCodeEnum.STAR.getCode().equals(dictData.getCode())) {
+                            if (DetectionCodeEnum.PVRMS.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.PU1.getCode().equals(sqlDataDTO.getDesc())) {
+                                continue;
+                            }
+                        } else {
+                            if ((DetectionCodeEnum.VRMS.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.U1.getCode().equals(sqlDataDTO.getDesc()))) {
+                                continue;
+                            }
                         }
                     }
 
@@ -2684,8 +2866,14 @@ public class SocketContrastResponseService {
                             continue;
                         }
                     } else {
-                        if (DetectionCodeEnum.V2_50.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.SV_1_49.getCode().equals(sqlDataDTO.getDesc())) {
-                            continue;
+                        if (DetectionCodeEnum.STAR.getCode().equals(dictData.getCode())) {
+                            if (DetectionCodeEnum.PV2_50.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.PSV_1_49.getCode().equals(sqlDataDTO.getDesc())) {
+                                continue;
+                            }
+                        } else {
+                            if (DetectionCodeEnum.V2_50.getCode().equals(sqlDataDTO.getDesc()) || DetectionCodeEnum.SV_1_49.getCode().equals(sqlDataDTO.getDesc())) {
+                                continue;
+                            }
                         }
                     }
 
@@ -3322,4 +3510,46 @@ public class SocketContrastResponseService {
         devData.setSqlDataHarm(sqlDataHarmDTOS);
         return devData;
     }
+
+    /**
+     * 修改通道系数
+     *
+     * @param f
+     */
+    private void updateGfList(DevXiNumData.F f, DetectionServiceImpl.VAndIResult vAndIResult, String stdDevMonitorId, int maxNum) {
+        DevXiNumData.F originF = BeanUtil.copyProperties(f, DevXiNumData.F.class);
+        if (maxNum != 0) {
+            PqStandardDevGain pqStandardDevGain = pqStandardDevGainService.get(stdDevMonitorId);
+            originF.setUa_gain(pqStandardDevGain.getUaGain());
+            originF.setUb_gain(pqStandardDevGain.getUbGain());
+            originF.setUc_gain(pqStandardDevGain.getUcGain());
+            originF.setU0_gain(pqStandardDevGain.getU0Gain());
+            originF.setIa_gain(pqStandardDevGain.getIaGain());
+            originF.setIb_gain(pqStandardDevGain.getIbGain());
+            originF.setIc_gain(pqStandardDevGain.getIcGain());
+            originF.setI0_gain(pqStandardDevGain.getI0Gain());
+            originF.setUab_gain(pqStandardDevGain.getUabGain());
+            originF.setUbc_gain(pqStandardDevGain.getUbcGain());
+            originF.setUca_gain(pqStandardDevGain.getUcaGain());
+        }
+
+        if (vAndIResult.getVa() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getVaXi() * 10000), BigDecimal.valueOf(originF.getUa_gain() * 0.95), BigDecimal.valueOf(originF.getUa_gain() * 1.05))) {
+            f.setUa_gain(BigDecimal.valueOf(f.getUa_gain()).multiply(BigDecimal.valueOf(vAndIResult.getVaXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (vAndIResult.getVb() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getVbXi() * 10000), BigDecimal.valueOf(originF.getUb_gain() * 0.95), BigDecimal.valueOf(originF.getUb_gain() * 1.05))) {
+            f.setUb_gain(BigDecimal.valueOf(f.getUb_gain()).multiply(BigDecimal.valueOf(vAndIResult.getVbXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (vAndIResult.getVc() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getVcXi() * 10000), BigDecimal.valueOf(originF.getUc_gain() * 0.95), BigDecimal.valueOf(originF.getUc_gain() * 1.05))) {
+            f.setUc_gain(BigDecimal.valueOf(f.getUc_gain()).multiply(BigDecimal.valueOf(vAndIResult.getVcXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (vAndIResult.getIa() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getIaXi() * 10000), BigDecimal.valueOf(originF.getIa_gain() * 0.95), BigDecimal.valueOf(originF.getIa_gain() * 1.05))) {
+            f.setIa_gain(BigDecimal.valueOf(f.getIa_gain()).multiply(BigDecimal.valueOf(vAndIResult.getIaXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (vAndIResult.getIb() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getIbXi() * 10000), BigDecimal.valueOf(originF.getIb_gain() * 0.95), BigDecimal.valueOf(originF.getIb_gain() * 1.05))) {
+            f.setIb_gain(BigDecimal.valueOf(f.getIb_gain()).multiply(BigDecimal.valueOf(vAndIResult.getIbXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (vAndIResult.getIc() && NumberUtil.isIn(BigDecimal.valueOf(vAndIResult.getIcXi() * 10000), BigDecimal.valueOf(originF.getIc_gain() * 0.95), BigDecimal.valueOf(originF.getIc_gain() * 1.05))) {
+            f.setIc_gain(BigDecimal.valueOf(f.getIc_gain()).multiply(BigDecimal.valueOf(vAndIResult.getIcXi())).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+    }
 }

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

@@ -688,7 +688,7 @@ public class SocketDevResponseService {
      */
     private Double reduceList(List<Double> valList) {
         // valList.subList(0, 5).clear();
-        valList.subList(valList.size() - 2, valList.size()).clear();
+         valList.subList(valList.size() - 2, valList.size()).clear();
         return valList.stream().mapToDouble(Double::doubleValue).average().getAsDouble();
     }
 

detection/src/main/java/com/njcn/gather/detection/service/PreDetectionService.java

@@ -4,6 +4,7 @@ import com.njcn.gather.detection.pojo.param.ContrastDetectionParam;
 import com.njcn.gather.detection.pojo.param.PreDetectionParam;
 import com.njcn.gather.detection.pojo.param.SimulateDetectionParam;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -63,4 +64,8 @@ public interface PreDetectionService {
      * 导出实时数据对齐过程中的数据
      */
     void exportAlignData();
+
+    boolean getCanCoefficient();
+
+    void startCoefficient();
 }

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

@@ -16,8 +16,10 @@ import com.njcn.gather.detection.pojo.vo.DetectionData;
 import com.njcn.gather.detection.pojo.vo.DevLineTestResult;
 import com.njcn.gather.detection.util.DetectionUtil;
 import com.njcn.gather.detection.util.socket.CnSocketUtil;
+import com.njcn.gather.detection.util.socket.FormalTestManager;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import com.njcn.gather.device.service.IPqDevService;
+import com.njcn.gather.device.service.IPqStandardDevGainRecordService;
 import com.njcn.gather.err.pojo.param.PqErrSysParam;
 import com.njcn.gather.err.pojo.po.PqErrSysDtls;
 import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO;
@@ -36,7 +38,10 @@ import com.njcn.gather.system.cfg.pojo.po.SysTestConfig;
 import com.njcn.gather.system.cfg.service.ISysTestConfigService;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.util.StorageUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -56,6 +61,7 @@ import java.util.stream.Stream;
  * @description
  * @date 2024/12/20 13:52
  */
+@Log4j
 @Service
 @RequiredArgsConstructor
 public class DetectionServiceImpl {
@@ -66,6 +72,7 @@ public class DetectionServiceImpl {
     private final ISysTestConfigService sysTestConfigService;
     private final IPqMonitorService pqMonitorService;
     private final IPqDevService pqDevService;
+    private final IPqStandardDevGainRecordService pqStandardDevGainRecordService;
 
     public static final String TYPE_A = "A";
     public static final String TYPE_B = "B";
@@ -82,6 +89,44 @@ public class DetectionServiceImpl {
     private static final Integer INHARMONIC_FLAG = 1;
     private static final Integer HARMONIC_FLAG = 2;
 
+//    @Value("${error.removeCount:14}")
+//    private Integer removeErrorValueCount;
+
+    @Data
+    @AllArgsConstructor
+    public static class VAndIResult {
+        private String ip;
+        private Integer chnNum;
+        private Boolean va;
+        private Boolean vb;
+        private Boolean vc;
+        private Boolean ia;
+        private Boolean ib;
+        private Boolean ic;
+        private Double vaXi;
+        private Double vbXi;
+        private Double vcXi;
+        private Double iaXi;
+        private Double ibXi;
+        private Double icXi;
+        // 皮尔逊相关系数
+        private BigDecimal pearsonCorrelationCoefficientVa;
+        private BigDecimal pearsonCorrelationCoefficientVb;
+        private BigDecimal pearsonCorrelationCoefficientVc;
+        private BigDecimal pearsonCorrelationCoefficientIa;
+        private BigDecimal pearsonCorrelationCoefficientIb;
+        private BigDecimal pearsonCorrelationCoefficientIc;
+        // 比值一致性 CV 系数
+        private BigDecimal cVCoefficientVa;
+        private BigDecimal cVCoefficientVb;
+        private BigDecimal cVCoefficientVc;
+        private BigDecimal cVCoefficientIa;
+        private BigDecimal cVCoefficientIb;
+        private BigDecimal cVCoefficientIc;
+    }
+
+    public static Map<String, VAndIResult> vAndIResultMap = null;
+
 
     /**
      * 开始处理指标类型
@@ -809,6 +854,9 @@ public class DetectionServiceImpl {
                     ))
                     .collect(Collectors.toList());
             DetectionData a = setDetectionData(isQualified, dataRule, mag, fData, dur, magErrList, channelTypeAList, TYPE_A, scale);
+            if (CollUtil.isEmpty(mag.get(TYPE_A))) {
+                a.setIsData(2);
+            }
             result.setAValue(JSON.toJSONString(a));
             result.setTValue(JSON.toJSONString(a));
             result.setResultFlag(a.getIsData());
@@ -1569,6 +1617,23 @@ public class DetectionServiceImpl {
         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());
+
+            boolean isRemoveMaxElement = ObjectUtil.isNotNull(waveNum) ? false : true;
+//            List<Double> freqStdDevData = standardDevDataList.stream().flatMap(standardDevData -> standardDevData.getSqlData().stream())
+//                    .filter(sqlDataDTO -> DetectionCodeEnum.FREQ.getCode().equals(sqlDataDTO.getDesc()))
+//                    .map(sqlDataDTO -> sqlDataDTO.getList().getT()).collect(Collectors.toList());
+
+//            Double maxFreq = CollUtil.isNotEmpty(freqStdDevData) ? CollUtil.max(freqStdDevData) : null;
+//            Double minFreq = CollUtil.isNotEmpty(freqStdDevData) ? CollUtil.min(freqStdDevData) : null;
+
+//            if (maxFreq != null && minFreq != null) {
+//                isRemoveMaxElement = DictDataEnum.AVG_VALUE.equals(dataRule);
+//                double freqErrorValue = maxFreq - minFreq;
+//                if (NumberUtil.isGreaterOrEqual(BigDecimal.valueOf(freqErrorValue), BigDecimal.valueOf(0.02))) {
+//                    isRemoveMaxElement = isRemoveMaxElement && true;
+//                }
+//            }
+
             // 处理谐波数据
             SysTestConfig oneConfig = sysTestConfigService.getOneConfig();
             String[] split1 = devDataList.get(0).getId().split("_");
@@ -1615,12 +1680,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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.FREQ.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fHz, DetectionCodeEnum.FREQ.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        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, isRemoveMaxElement));
                         break;
                     case IRMS:
 //                        if (ObjectUtil.isNotNull(waveNum) && (waveNum.equals(2) || waveNum.equals(5))) {
@@ -1631,33 +1696,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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.I.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, true, fIn, DetectionCodeEnum.IRMS.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.IMBV.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fUn, DetectionCodeEnum.V_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.IMBA.getKey(), isQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, false, fIn, DetectionCodeEnum.I_UNBAN.getCode(), dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.HV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.HI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.HP.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, HP, fUn * fIn, HARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.HSV.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, U, fUn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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, dataSourceEnum));
+                        resultMap.put(PowerIndexEnum.HSI.getKey(), isHarmQualified(devDataList, standardDevDataList, devIdMapComm, pqErrSysDtls, I, fIn, INHARMONIC_FLAG, isDelta && isExitDelta, dataRule, num, code, oneConfig.getScale(), waveNum, dataSourceEnum, isRemoveMaxElement));
                         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));
+                        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, isRemoveMaxElement));
                         break;
                     case UNKNOWN_ERROR:
                         break;
@@ -1731,22 +1796,29 @@ public class DetectionServiceImpl {
                                 String code,
                                 Integer scale,
                                 Integer waveNum,
-                                DataSourceEnum dataSourceEnum) {
+                                DataSourceEnum dataSourceEnum,
+                                boolean isRemoveMaxElement) {
         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);
+            Map<String, List<List<Double>>> phaseValueList = this.getPhaseValueList(devDataList, standardDevDataList, desc);
+            Map<String, List<List<Double>>> map = devListMap(phaseValueList, dataRule, isRemoveMaxElement);
             if (ObjectUtil.isNull(map)) {
                 return 4;
             }
             ContrastNonHarmonicResult result = new ContrastNonHarmonicResult();
             result.setWaveNum(waveNum);
 
-            String[] split1 = devDataList.get(0).getId().split(CnSocketUtil.SPLIT_TAG);
-            String[] split2 = standardDevDataList.get(0).getId().split(CnSocketUtil.SPLIT_TAG);
+            String devId = devDataList.get(0).getId();
+            String stdId = standardDevDataList.get(0).getId();
+
+            String[] split1 = devId.split(CnSocketUtil.SPLIT_TAG);
+            String[] split2 = stdId.split(CnSocketUtil.SPLIT_TAG);
             result.setNum(num);
-            result.setDevMonitorId(devIdMapComm.get(split1[0]) + "_" + split1[1]);
-            result.setStdDevMonitorId(devIdMapComm.get(split2[0]) + "_" + split2[1]);
+            String devMonitorId = devIdMapComm.get(split1[0]) + "_" + split1[1];
+            result.setDevMonitorId(devMonitorId);
+            String stdDevMonitorId = devIdMapComm.get(split2[0]) + "_" + split2[1];
+            result.setStdDevMonitorId(stdDevMonitorId);
             result.setAdType(errSysDtls.get(0).getScriptType());
             result.setDataType(dataSourceEnum.getValue());
             if (ObjectUtil.isNotNull(waveNum)) {
@@ -1787,6 +1859,78 @@ public class DetectionServiceImpl {
                     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);
+                    if (FormalTestManager.isTesting && ObjectUtil.isNull(waveNum)) { //只有“正式检测并且不是录波数据”的时候才能进入这段代码，重新计算、切换误差体系额操作不会进入这段代码，提升效率。
+//                    if (true) { //只有“正式检测并且不是录波数据”的时候才能进入这段代码，重新计算、切换误差体系额操作不会进入这段代码，提升效率。
+                        if (DetectionCodeEnum.PVRMS.getCode().equals(desc) || DetectionCodeEnum.VRMS.getCode().equals(desc) || DetectionCodeEnum.IRMS.getCode().equals(desc)) {
+                            Integer phaseResultFlag = setResultFlag(phaseList);
+                            boolean b = phaseResultFlag == 2 ? true : false;
+
+                            SysTestConfig oneConfig = sysTestConfigService.getOneConfig();
+                            if (b && oneConfig.getCoefficient() == 1) {
+                                BigDecimal pearsonCorrelationCoefficient = DetectionUtil.getPearsonCorrelationCoefficient(phaseValueList.get(phase).get(0), phaseValueList.get(phase).get(1));
+                                if (NumberUtil.isGreaterOrEqual(pearsonCorrelationCoefficient, BigDecimal.valueOf(0.8))) {
+                                    BigDecimal cvCoefficient = DetectionUtil.getCvCoefficient(phaseValueList.get(phase).get(0), phaseValueList.get(phase).get(1));
+                                    if (NumberUtil.isLess(cvCoefficient, BigDecimal.valueOf(0.05))) {
+                                        int maxNum = pqStandardDevGainRecordService.getMaxNum(stdDevMonitorId, devMonitorId);
+                                        // 如果没有超出次数限制
+                                        if (maxNum + 1 <= 5) {
+                                            VAndIResult vAndIResult = vAndIResultMap.getOrDefault(stdId, new VAndIResult(split2[0], Integer.valueOf(split2[1]), false, false, false, false, false, false,
+                                                    1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
+                                                    BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO,
+                                                    BigDecimal.valueOf(0.2), BigDecimal.valueOf(0.2), BigDecimal.valueOf(0.2), BigDecimal.valueOf(0.2), BigDecimal.valueOf(0.2), BigDecimal.valueOf(0.2)));
+
+                                            Double newXi = DetectionUtil.getNewXi(map.get(phase).get(0), map.get(phase).get(1));
+                                            switch (phase) {
+                                                case TYPE_A:
+                                                    if (DetectionCodeEnum.IRMS.getCode().equals(desc)) {
+                                                        vAndIResult.setIa(b);
+                                                        vAndIResult.setIaXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientIa(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientIa(cvCoefficient);
+                                                    } else {
+                                                        vAndIResult.setVa(b);
+                                                        vAndIResult.setVaXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientVa(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientVa(cvCoefficient);
+                                                    }
+                                                    break;
+                                                case TYPE_B:
+                                                    if (DetectionCodeEnum.IRMS.getCode().equals(desc)) {
+                                                        vAndIResult.setIb(b);
+                                                        vAndIResult.setIbXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientIb(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientIb(cvCoefficient);
+                                                    } else {
+                                                        vAndIResult.setVb(b);
+                                                        vAndIResult.setVbXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientVb(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientVb(cvCoefficient);
+                                                    }
+                                                    break;
+                                                case TYPE_C:
+                                                    if (DetectionCodeEnum.IRMS.getCode().equals(desc)) {
+                                                        vAndIResult.setIc(b);
+                                                        vAndIResult.setIcXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientIc(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientIc(cvCoefficient);
+                                                    } else {
+                                                        vAndIResult.setVc(b);
+                                                        vAndIResult.setVcXi(newXi);
+                                                        vAndIResult.setPearsonCorrelationCoefficientVc(pearsonCorrelationCoefficient);
+                                                        vAndIResult.setCVCoefficientVc(cvCoefficient);
+                                                    }
+                                                    break;
+                                                default:
+                                                    break;
+                                            }
+
+                                            vAndIResultMap.put(stdId, vAndIResult);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
                     BiConsumer<ContrastNonHarmonicResult, List<DetectionData>> setter = setters.get(phase);
                     setter.accept(result, phaseList);
                 }
@@ -1996,7 +2140,8 @@ public class DetectionServiceImpl {
                                    String code,
                                    Integer scale,
                                    Integer waveNum,
-                                   DataSourceEnum dataSourceEnum) {
+                                   DataSourceEnum dataSourceEnum,
+                                   boolean isRemoveMaxElement) {
         List<ContrastHarmonicResult> info = new ArrayList<>();
         if (CollUtil.isNotEmpty(devDataList) && CollUtil.isNotEmpty(standardDevDataList) && CollUtil.isNotEmpty(errSysDtls)) {
             String fundCode = "";
@@ -2031,7 +2176,7 @@ public class DetectionServiceImpl {
                 harmCode = DetectionCodeEnum.P2_50.getCode();
             }
 
-            Map<String, List<Map<Double, List<Double>>>> devMap = devHarmListMap(devDataList, standardDevDataList, fundCode, harmCode, harmonicFlag, dataRule);
+            Map<String, List<Map<Double, List<Double>>>> devMap = devHarmListMap(devDataList, standardDevDataList, fundCode, harmCode, harmonicFlag, dataRule, isRemoveMaxElement);
             if (ObjectUtil.isNull(devMap)) {
                 return 4;
             }
@@ -2138,14 +2283,285 @@ public class DetectionServiceImpl {
     /**
      * 处理非谐波类取值
      *
-     * @param dev         被检设备原始数据
-     * @param standardDev 与之对齐的标准设备原始数据
-     * @param desc        检测项
-     * @param dataRule    数据处理原则
+     * @param dataRule 数据处理原则
      */
-    public Map<String, List<List<Double>>> devListMap(List<DevData> dev, List<DevData> standardDev, String desc, DictDataEnum dataRule) {
+    public Map<String, List<List<Double>>> devListMap(Map<String, List<List<Double>>> phaseValueList, DictDataEnum dataRule, boolean isRemoveMaxElement) {
         Map<String, List<List<Double>>> resultMap = new HashMap<>(3);
 
+        List<Double> aDev = new ArrayList<>();
+        List<Double> aStandardDev = new ArrayList<>();
+
+        if (phaseValueList.containsKey(TYPE_A)) {
+            if (phaseValueList.get(TYPE_A).size() >= 1) {
+                aDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_A).get(0), Double.class));
+                aStandardDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_A).get(1), Double.class));
+            } else {
+                log.error("数据异常，phaseValueList.get(TYPE_A).size()=" + phaseValueList.get(TYPE_A).size());
+            }
+        } else {
+            log.equals("数据异常，phaseValueList.containsKey(TYPE_A)=" + phaseValueList.containsKey(TYPE_A));
+        }
+
+        List<Double> bDev = new ArrayList<>();
+        List<Double> bStandardDev = new ArrayList<>();
+
+        if (phaseValueList.containsKey(TYPE_B)) {
+            if (phaseValueList.get(TYPE_B).size() >= 1) {
+                bDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_B).get(0), Double.class));
+                bStandardDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_B).get(1), Double.class));
+            } else {
+                log.error("数据异常，phaseValueList.get(TYPE_B).size()=" + phaseValueList.get(TYPE_B).size());
+            }
+        } else {
+            log.equals("数据异常，phaseValueList.containsKey(TYPE_B)=" + phaseValueList.containsKey(TYPE_B));
+        }
+
+        List<Double> cDev = new ArrayList<>();
+        List<Double> cStandardDev = new ArrayList<>();
+        if (phaseValueList.containsKey(TYPE_C)) {
+            if (phaseValueList.get(TYPE_C).size() >= 1) {
+                cDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_C).get(0), Double.class));
+                cStandardDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_C).get(1), Double.class));
+            } else {
+                log.error("数据异常，phaseValueList.get(TYPE_C).size()=" + phaseValueList.get(TYPE_C).size());
+            }
+        } else {
+            log.equals("数据异常，phaseValueList.containsKey(TYPE_C)=" + phaseValueList.containsKey(TYPE_C));
+        }
+
+        List<Double> tDev = new ArrayList<>();
+        List<Double> tStandardDev = new ArrayList<>();
+        if (phaseValueList.containsKey(TYPE_T)) {
+            if (phaseValueList.get(TYPE_T).size() >= 1) {
+                tDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_T).get(0), Double.class));
+                tStandardDev.addAll(BeanUtil.copyToList(phaseValueList.get(TYPE_T).get(1), Double.class));
+            } else {
+                log.error("数据异常，phaseValueList.get(TYPE_T).size()=" + phaseValueList.get(TYPE_T).size());
+            }
+        } else {
+            log.equals("数据异常，phaseValueList.containsKey(TYPE_T)=" + phaseValueList.containsKey(TYPE_T));
+        }
+
+        if (isRemoveMaxElement) {
+            List<Double> aErrorValueList = new ArrayList<>();
+            List<Double> bErrorValueList = new ArrayList<>();
+            List<Double> cErrorValueList = new ArrayList<>();
+            List<Double> tErrorValueList = new ArrayList<>();
+            for (int i = 0; i < aStandardDev.size(); i++) {
+                aErrorValueList.add(Math.abs(aStandardDev.get(i) - aDev.get(i)));
+            }
+            for (int i = 0; i < bStandardDev.size(); i++) {
+                bErrorValueList.add(Math.abs(bStandardDev.get(i) - bDev.get(i)));
+            }
+            for (int i = 0; i < cStandardDev.size(); i++) {
+                cErrorValueList.add(Math.abs(cStandardDev.get(i) - cDev.get(i)));
+            }
+            for (int i = 0; i < tStandardDev.size(); i++) {
+                tErrorValueList.add(Math.abs(tStandardDev.get(i) - tDev.get(i)));
+            }
+            List<Integer> aErrorValueIdxs = DetectionUtil.sort(aErrorValueList, false);
+            List<Integer> bErrorValueIdxs = DetectionUtil.sort(bErrorValueList, false);
+            List<Integer> cErrorValueIdxs = DetectionUtil.sort(cErrorValueList, false);
+            List<Integer> tErrorValueIdxs = DetectionUtil.sort(tErrorValueList, false);
+
+            int removeCount = aErrorValueIdxs.size() / 2;
+            List<Double> newArray = DetectionUtil.getNewArray(aStandardDev, aErrorValueIdxs.subList(removeCount, aErrorValueIdxs.size()));
+            aStandardDev.clear();
+            aStandardDev.addAll(newArray);
+            newArray = DetectionUtil.getNewArray(aDev, aErrorValueIdxs.subList(removeCount, aErrorValueIdxs.size()));
+            aDev.clear();
+            aDev.addAll(newArray);
+
+            removeCount = bErrorValueIdxs.size() / 2;
+            newArray = DetectionUtil.getNewArray(bStandardDev, bErrorValueIdxs.subList(removeCount, bErrorValueIdxs.size()));
+            bStandardDev.clear();
+            bStandardDev.addAll(newArray);
+            newArray = DetectionUtil.getNewArray(bDev, bErrorValueIdxs.subList(removeCount, bErrorValueIdxs.size()));
+            bDev.clear();
+            bDev.addAll(newArray);
+
+            removeCount = cErrorValueIdxs.size() / 2;
+            newArray = DetectionUtil.getNewArray(cStandardDev, cErrorValueIdxs.subList(removeCount, cErrorValueIdxs.size()));
+            cStandardDev.clear();
+            cStandardDev.addAll(newArray);
+            newArray = DetectionUtil.getNewArray(cDev, cErrorValueIdxs.subList(removeCount, cErrorValueIdxs.size()));
+            cDev.clear();
+            cDev.addAll(newArray);
+
+            removeCount = tErrorValueIdxs.size() / 2;
+            newArray = DetectionUtil.getNewArray(tStandardDev, tErrorValueIdxs.subList(removeCount, tErrorValueIdxs.size()));
+            tStandardDev.clear();
+            tStandardDev.addAll(newArray);
+            newArray = DetectionUtil.getNewArray(tDev, tErrorValueIdxs.subList(removeCount, tErrorValueIdxs.size()));
+            tDev.clear();
+            tDev.addAll(newArray);
+        }
+
+        switch (dataRule) {
+            case SECTION_VALUE: {
+                List<Integer> aIdxs = DetectionUtil.sort(aStandardDev, false);
+                List<Integer> bIdxs = DetectionUtil.sort(bStandardDev, false);
+                List<Integer> cIdxs = DetectionUtil.sort(cStandardDev, false);
+                List<Integer> tIdxs = DetectionUtil.sort(tStandardDev, false);
+                if (aStandardDev.size() > 2) {
+                    aStandardDev.remove(0);
+                    aStandardDev.remove(aStandardDev.size() - 1);
+                    List<Double> newArray = DetectionUtil.getNewArray(aDev, aIdxs.subList(1, aIdxs.size() - 1));
+                    aDev.clear();
+                    aDev.addAll(newArray);
+                }
+                if (bStandardDev.size() > 2) {
+                    bStandardDev.remove(0);
+                    bStandardDev.remove(bStandardDev.size() - 1);
+                    List<Double> newArray = DetectionUtil.getNewArray(bDev, bIdxs.subList(1, bIdxs.size() - 1));
+                    bDev.clear();
+                    bDev.addAll(newArray);
+                }
+                if (cStandardDev.size() > 2) {
+                    cStandardDev.remove(0);
+                    cStandardDev.remove(cStandardDev.size() - 1);
+                    List<Double> newArray = DetectionUtil.getNewArray(cDev, cIdxs.subList(1, cIdxs.size() - 1));
+                    cDev.clear();
+                    cDev.addAll(newArray);
+                }
+                if (tStandardDev.size() > 2) {
+                    tStandardDev.remove(0);
+                    tStandardDev.remove(tStandardDev.size() - 1);
+                    List<Double> newArray = DetectionUtil.getNewArray(tDev, tIdxs.subList(1, tIdxs.size() - 1));
+                    tDev.clear();
+                    tDev.addAll(newArray);
+                }
+            }
+            break;
+            case CP95_VALUE: {
+                List<Integer> aIdxs = DetectionUtil.sort(aStandardDev, false);
+                List<Integer> bIdxs = DetectionUtil.sort(bStandardDev, false);
+                List<Integer> cIdxs = DetectionUtil.sort(cStandardDev, false);
+                List<Integer> tIdxs = DetectionUtil.sort(tStandardDev, false);
+                if (CollUtil.isNotEmpty(aStandardDev)) {
+                    int cp95Idx = DetectionUtil.getCP95Idx(aStandardDev);
+                    aStandardDev = Collections.singletonList(aStandardDev.get(cp95Idx));
+                    aDev = Collections.singletonList(aDev.get(aIdxs.get(cp95Idx)));
+                }
+                if (CollUtil.isNotEmpty(bStandardDev)) {
+                    int cp95Idx = DetectionUtil.getCP95Idx(bStandardDev);
+                    bStandardDev = Collections.singletonList(bStandardDev.get(cp95Idx));
+                    bDev = Collections.singletonList(bDev.get(bIdxs.get(cp95Idx)));
+                }
+                if (CollUtil.isNotEmpty(cStandardDev)) {
+                    int cp95Idx = DetectionUtil.getCP95Idx(cStandardDev);
+                    cStandardDev = Collections.singletonList(cStandardDev.get(cp95Idx));
+                    cDev = Collections.singletonList(cDev.get(cIdxs.get(cp95Idx)));
+                }
+                if (CollUtil.isNotEmpty(tStandardDev)) {
+                    int cp95Idx = DetectionUtil.getCP95Idx(tStandardDev);
+                    tStandardDev = Collections.singletonList(tStandardDev.get(cp95Idx));
+                    tDev = Collections.singletonList(tDev.get(tIdxs.get(cp95Idx)));
+                }
+            }
+            break;
+            case AVG_VALUE:
+                aDev = DetectionUtil.getAvgDoubles(aDev);
+                bDev = DetectionUtil.getAvgDoubles(bDev);
+                cDev = DetectionUtil.getAvgDoubles(cDev);
+                tDev = DetectionUtil.getAvgDoubles(tDev);
+
+                aStandardDev = DetectionUtil.getAvgDoubles(aStandardDev);
+                bStandardDev = DetectionUtil.getAvgDoubles(bStandardDev);
+                cStandardDev = DetectionUtil.getAvgDoubles(cStandardDev);
+                tStandardDev = DetectionUtil.getAvgDoubles(tStandardDev);
+                break;
+            case Own_value:
+                break;
+            case AT_WILL_VALUE:
+                if (isRemoveMaxElement) {
+                    if (CollUtil.isNotEmpty(aStandardDev) && CollUtil.isNotEmpty(aDev)) {
+                        aStandardDev = aStandardDev.subList(aStandardDev.size() - 1, aStandardDev.size());
+                        aDev = aDev.subList(aDev.size() - 1, aDev.size());
+                    }
+                    if (CollUtil.isNotEmpty(bStandardDev) && CollUtil.isNotEmpty(bDev)) {
+                        bStandardDev = bStandardDev.subList(bStandardDev.size() - 1, bStandardDev.size());
+                        bDev = bDev.subList(bDev.size() - 1, bDev.size());
+                    }
+                    if (CollUtil.isNotEmpty(cStandardDev) && CollUtil.isNotEmpty(cDev)) {
+                        cStandardDev = cStandardDev.subList(cStandardDev.size() - 1, cStandardDev.size());
+                        cDev = cDev.subList(cDev.size() - 1, cDev.size());
+                    }
+                    if (CollUtil.isNotEmpty(tStandardDev) && CollUtil.isNotEmpty(tDev)) {
+                        tStandardDev = tStandardDev.subList(tStandardDev.size() - 1, tStandardDev.size());
+                        tDev = tDev.subList(tDev.size() - 1, tDev.size());
+                    }
+                } else {
+                    List<Double> aErrorValueList = new ArrayList<>();
+                    List<Double> bErrorValueList = new ArrayList<>();
+                    List<Double> cErrorValueList = new ArrayList<>();
+                    List<Double> tErrorValueList = new ArrayList<>();
+                    for (int i = 0; i < aStandardDev.size(); i++) {
+                        aErrorValueList.add(Math.abs(aStandardDev.get(i) - aDev.get(i)));
+                    }
+                    for (int i = 0; i < bStandardDev.size(); i++) {
+                        bErrorValueList.add(Math.abs(bStandardDev.get(i) - bDev.get(i)));
+                    }
+                    for (int i = 0; i < cStandardDev.size(); i++) {
+                        cErrorValueList.add(Math.abs(cStandardDev.get(i) - cDev.get(i)));
+                    }
+                    for (int i = 0; i < tStandardDev.size(); i++) {
+                        tErrorValueList.add(Math.abs(tStandardDev.get(i) - tDev.get(i)));
+                    }
+                    List<Integer> aErrorValueIdxs = DetectionUtil.sort(aErrorValueList, true);
+                    List<Integer> bErrorValueIdxs = DetectionUtil.sort(bErrorValueList, true);
+                    List<Integer> cErrorValueIdxs = DetectionUtil.sort(cErrorValueList, true);
+                    List<Integer> tErrorValueIdxs = DetectionUtil.sort(tErrorValueList, true);
+
+                    if (CollUtil.isNotEmpty(aStandardDev) && CollUtil.isNotEmpty(aDev)) {
+                        Double v = aStandardDev.get(aErrorValueIdxs.get(0));
+                        aStandardDev.clear();
+                        aStandardDev.add(v);
+                        v = aDev.get(aErrorValueIdxs.get(0));
+                        aDev.clear();
+                        aDev.add(v);
+                    }
+
+                    if (CollUtil.isNotEmpty(bStandardDev) && CollUtil.isNotEmpty(bDev)) {
+                        Double v = bStandardDev.get(bErrorValueIdxs.get(0));
+                        bStandardDev.clear();
+                        bStandardDev.add(v);
+                        v = bDev.get(bErrorValueIdxs.get(0));
+                        bDev.clear();
+                        bDev.add(v);
+                    }
+
+                    if (CollUtil.isNotEmpty(cStandardDev) && CollUtil.isNotEmpty(cDev)) {
+                        Double v = cStandardDev.get(cErrorValueIdxs.get(0));
+                        cStandardDev.clear();
+                        cStandardDev.add(v);
+                        v = cDev.get(cErrorValueIdxs.get(0));
+                        cDev.clear();
+                        cDev.add(v);
+                    }
+
+                    if (CollUtil.isNotEmpty(tStandardDev) && CollUtil.isNotEmpty(tDev)) {
+                        Double v = tStandardDev.get(tErrorValueIdxs.get(0));
+                        tStandardDev.clear();
+                        tStandardDev.add(v);
+                        v = tDev.get(tErrorValueIdxs.get(0));
+                        tDev.clear();
+                        tDev.add(v);
+                    }
+                }
+                break;
+        }
+        resultMap.put(TYPE_A, Arrays.asList(aDev, aStandardDev));
+        resultMap.put(TYPE_B, Arrays.asList(bDev, bStandardDev));
+        resultMap.put(TYPE_C, Arrays.asList(cDev, cStandardDev));
+        if (CollUtil.isNotEmpty(tDev)) {
+            resultMap.put(TYPE_T, Arrays.asList(tDev, tStandardDev));
+        }
+        return resultMap;
+    }
+
+    private Map<String, List<List<Double>>> getPhaseValueList(List<DevData> dev, List<DevData> standardDev, String desc) {
+        Map<String, List<List<Double>>> resultMap = new HashMap<>(3);
         List<Double> aDev = new ArrayList<>();
         List<Double> aStandardDev = new ArrayList<>();
         List<Double> bDev = new ArrayList<>();
@@ -2199,87 +2615,12 @@ public class DetectionServiceImpl {
                     .map(x -> x.getT().doubleValue())
                     .collect(Collectors.toList()));
         }
-        List<Integer> aIdxs = DetectionUtil.sort(aStandardDev, false);
-        List<Integer> bIdxs = DetectionUtil.sort(bStandardDev, false);
-        List<Integer> cIdxs = DetectionUtil.sort(cStandardDev, false);
-        List<Integer> tIdxs = DetectionUtil.sort(tStandardDev, false);
-        switch (dataRule) {
-            case SECTION_VALUE:
-                if (aStandardDev.size() > 2) {
-                    aStandardDev.remove(aIdxs.get(0));
-                    aStandardDev.remove(aIdxs.get(aIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(aDev, aIdxs.subList(1, aIdxs.size() - 1));
-                    aDev.clear();
-                    aDev.addAll(newArray);
-                }
 
-                if (bStandardDev.size() > 2) {
-                    bStandardDev.remove(bIdxs.get(0));
-                    bStandardDev.remove(bIdxs.get(bIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(bDev, bIdxs.subList(1, bIdxs.size() - 1));
-                    bDev.clear();
-                    bDev.addAll(newArray);
-                }
-
-                if (cStandardDev.size() > 2) {
-                    cStandardDev.remove(cIdxs.get(0));
-                    cStandardDev.remove(cIdxs.get(cIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(cDev, cIdxs.subList(1, cIdxs.size() - 1));
-                    cDev.clear();
-                    cDev.addAll(newArray);
-                }
-
-                if (tStandardDev.size() > 2) {
-                    tStandardDev.remove(tIdxs.get(0));
-                    tStandardDev.remove(tIdxs.get(tIdxs.size() - 1));
-                    List<Double> newArray = DetectionUtil.getNewArray(tDev, tIdxs.subList(1, tIdxs.size() - 1));
-                    tDev.clear();
-                    tDev.addAll(newArray);
-                }
-                break;
-            case CP95_VALUE:
-                if (CollUtil.isNotEmpty(aStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(aStandardDev);
-                    aStandardDev = Collections.singletonList(aStandardDev.get(cp95Idx));
-                    aDev = Collections.singletonList(aDev.get(aIdxs.get(cp95Idx)));
-                }
-                if (CollUtil.isNotEmpty(bStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(bStandardDev);
-                    bStandardDev = Collections.singletonList(bStandardDev.get(cp95Idx));
-                    bDev = Collections.singletonList(bDev.get(bIdxs.get(cp95Idx)));
-                }
-
-                if (CollUtil.isNotEmpty(cStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(cStandardDev);
-                    cStandardDev = Collections.singletonList(cStandardDev.get(cp95Idx));
-                    cDev = Collections.singletonList(cDev.get(cIdxs.get(cp95Idx)));
-                }
-
-                if (CollUtil.isNotEmpty(tStandardDev)) {
-                    int cp95Idx = DetectionUtil.getCP95Idx(tStandardDev);
-                    tStandardDev = Collections.singletonList(tStandardDev.get(cp95Idx));
-                    tDev = Collections.singletonList(tDev.get(tIdxs.get(cp95Idx)));
-                }
-
-                break;
-            case AVG_VALUE:
-                aDev = DetectionUtil.getAvgDoubles(aDev);
-                bDev = DetectionUtil.getAvgDoubles(bDev);
-                cDev = DetectionUtil.getAvgDoubles(cDev);
-                tDev = DetectionUtil.getAvgDoubles(tDev);
-
-                aStandardDev = DetectionUtil.getAvgDoubles(aStandardDev);
-                bStandardDev = DetectionUtil.getAvgDoubles(bStandardDev);
-                cStandardDev = DetectionUtil.getAvgDoubles(cStandardDev);
-                tStandardDev = DetectionUtil.getAvgDoubles(tStandardDev);
-                break;
-        }
         resultMap.put(TYPE_A, Arrays.asList(aDev, aStandardDev));
         resultMap.put(TYPE_B, Arrays.asList(bDev, bStandardDev));
         resultMap.put(TYPE_C, Arrays.asList(cDev, cStandardDev));
-        if (CollUtil.isNotEmpty(tDev)) {
-            resultMap.put(TYPE_T, Arrays.asList(tDev, tStandardDev));
-        }
+        resultMap.put(TYPE_T, Arrays.asList(tDev, tStandardDev));
+
         return resultMap;
     }
 
@@ -2299,8 +2640,7 @@ public class DetectionServiceImpl {
                                                                        String fundCode,
                                                                        String harmCode,
                                                                        Integer harmonicFlag,
-                                                                       DictDataEnum dataRule) {
-        System.out.println("aaa" + dev.size() + "  " + standardDev.size());
+                                                                       DictDataEnum dataRule, boolean isRemoveMaxElement) {
         Map<String, List<Map<Double, List<Double>>>> resultMap = new HashMap<>(3);
 
         // key为相别、value{key为谐波次数，value为按数据处理原则处理后的数据}
@@ -2325,27 +2665,6 @@ public class DetectionServiceImpl {
                 first1 = devSqlData.stream().filter(j -> fundCode.equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
                 first2 = standardDevSqlData.stream().filter(j -> fundCode.equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
             }
-//            // 如果角型接法中，不存在线电压谐波电压基波有效值，则取相电压谐波电压基波有效值进行计算
-//            if (!first1.isPresent()) {
-//                if (DetectionCodeEnum.PU1.getCode().equals(fundCode)) {
-//                    first1 = devSqlData.stream().filter(j -> DetectionCodeEnum.U1.getCode().equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
-//                }
-//            } else {
-//                // 防止出现有PU1而没有PV2_50、SV_1_49的情况
-//                if ((DetectionCodeEnum.PV2_50.getCode().equals(harmCode) || DetectionCodeEnum.PSV_1_49.getCode().equals(harmCode)) && DetectionCodeEnum.PU1.getCode().equals(fundCode)) {
-//                    first1 = devSqlData.stream().filter(j -> DetectionCodeEnum.U1.getCode().equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
-//                }
-//            }
-//            if (!first2.isPresent()) {
-//                if (DetectionCodeEnum.PU1.getCode().equals(fundCode)) {
-//                    first2 = devSqlData.stream().filter(j -> DetectionCodeEnum.U1.getCode().equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
-//                }
-//            } else {
-//                // 防止出现有PU1而没有PV2_50、SV_1_49的情况
-//                if ((DetectionCodeEnum.PV2_50.getCode().equals(harmCode) || DetectionCodeEnum.PSV_1_49.getCode().equals(harmCode)) && DetectionCodeEnum.PU1.getCode().equals(fundCode)) {
-//                    first2 = devSqlData.stream().filter(j -> DetectionCodeEnum.U1.getCode().equals(j.getDesc())).collect(Collectors.toList()).stream().findFirst();
-//                }
-//            }
 
             DevData.SqlDataDTO fund1 = null;
             DevData.SqlDataDTO fund2 = null;
@@ -2362,23 +2681,6 @@ public class DetectionServiceImpl {
             if (CollUtil.isEmpty(devHarmList) || CollUtil.isEmpty(stdDevHarmList)) {
                 return null;
             }
-//            // 如果角型接法中，不存在线电压谐波电压含有率，则取相电压谐波电压含有率进行计算
-//            if (CollUtil.isEmpty(devHarmList)) {
-//                if (DetectionCodeEnum.PV2_50.getCode().equals(harmCode)) {
-//                    devHarmList = dev.get(i).getSqlDataHarm().stream().filter(x -> DetectionCodeEnum.V2_50.getCode().equals(x.getDesc())).collect(Collectors.toList());
-//                }
-//                if (DetectionCodeEnum.PSV_1_49.getCode().equals(harmCode)) {
-//                    devHarmList = dev.get(i).getSqlDataHarm().stream().filter(x -> DetectionCodeEnum.SV_1_49.getCode().equals(x.getDesc())).collect(Collectors.toList());
-//                }
-//            }
-//            if (CollUtil.isEmpty(stdDevHarmList)) {
-//                if (DetectionCodeEnum.PV2_50.getCode().equals(harmCode)) {
-//                    stdDevHarmList = standardDev.get(i).getSqlDataHarm().stream().filter(x -> DetectionCodeEnum.V2_50.getCode().equals(x.getDesc())).collect(Collectors.toList());
-//                }
-//                if (DetectionCodeEnum.PSV_1_49.getCode().equals(harmCode)) {
-//                    stdDevHarmList = standardDev.get(i).getSqlDataHarm().stream().filter(x -> DetectionCodeEnum.SV_1_49.getCode().equals(x.getDesc())).collect(Collectors.toList());
-//                }
-//            }
 
             if (CollUtil.isNotEmpty(devHarmList) && CollUtil.isNotEmpty(stdDevHarmList)) {
                 DevData.SqlDataHarmDTO devHarm = devHarmList.get(0);
@@ -2400,38 +2702,87 @@ public class DetectionServiceImpl {
                 }
             }
         }
-        standardDevMap.forEach((typeKey, typeValue) -> {
-            typeValue.forEach((key, value) -> {
+        standardDevMap.forEach((phase, harmonicMap) -> {
+            harmonicMap.forEach((harmonicNum, value) -> {
+                List<Double> devPhaseHarmData = devMap.get(phase).get(harmonicNum);
+                if (isRemoveMaxElement) {
+                    List<Double> errorValueList = new ArrayList<>();
+                    for (int i = 0; i < value.size(); i++) {
+                        errorValueList.add(Math.abs(value.get(i) - devPhaseHarmData.get(i)));
+                    }
+
+                    List<Integer> idxErrorValueList = DetectionUtil.sort(errorValueList, false);
+                    int removeCount = idxErrorValueList.size() / 2;
+                    List<Double> newArray = DetectionUtil.getNewArray(value, idxErrorValueList.subList(removeCount, idxErrorValueList.size()));
+                    value.clear();
+                    value.addAll(newArray);
+                    newArray = DetectionUtil.getNewArray(devPhaseHarmData, idxErrorValueList.subList(removeCount, idxErrorValueList.size()));
+                    devPhaseHarmData.clear();
+                    devPhaseHarmData.addAll(newArray);
+                }
+
                 if (CollUtil.isNotEmpty(value)) {
-                    List<Integer> idx = DetectionUtil.sort(value, false);
+
                     switch (dataRule) {
-                        case SECTION_VALUE:
+                        case SECTION_VALUE: {
+                            List<Integer> idx = DetectionUtil.sort(value, false);
                             if (value.size() > 2) {
-                                value.remove(idx.get(0));
-                                value.remove(idx.get(idx.size() - 1));
-                                List<Double> newArray = DetectionUtil.getNewArray(devMap.get(typeKey).get(key), idx.subList(1, idx.size() - 1));
-                                devMap.get(typeKey).get(key).clear();
-                                devMap.get(typeKey).get(key).addAll(newArray);
+                                value.remove(0);
+                                value.remove(value.size() - 1);
+                                List<Double> newArray = DetectionUtil.getNewArray(devPhaseHarmData, idx.subList(1, idx.size() - 1));
+                                devPhaseHarmData.clear();
+                                devPhaseHarmData.addAll(newArray);
                             }
-                            break;
+                        }
+                        break;
                         case CP95_VALUE:
                             if (CollUtil.isNotEmpty(value)) {
+                                List<Integer> idx = DetectionUtil.sort(value, false);
                                 int cp95Idx = DetectionUtil.getCP95Idx(value);
                                 List<Double> newValue = Collections.singletonList(value.get(cp95Idx));
                                 value.clear();
                                 value.addAll(newValue);
-                                Double devCP95Data = devMap.get(typeKey).get(key).get(idx.get(cp95Idx));
-                                devMap.get(typeKey).get(key).clear();
-                                devMap.get(typeKey).get(key).add(devCP95Data);
+                                Double devCP95Data = devPhaseHarmData.get(idx.get(cp95Idx));
+                                devPhaseHarmData.clear();
+                                devPhaseHarmData.add(devCP95Data);
                             }
                             break;
                         case AVG_VALUE:
                             List<Double> avgDoubles = DetectionUtil.getAvgDoubles(value);
                             value.clear();
                             value.addAll(avgDoubles);
-                            List<Double> devAvgData = DetectionUtil.getAvgDoubles(devMap.get(typeKey).get(key));
-                            devMap.get(typeKey).get(key).clear();
-                            devMap.get(typeKey).get(key).addAll(devAvgData);
+                            List<Double> devAvgData = DetectionUtil.getAvgDoubles(devMap.get(phase).get(harmonicNum));
+                            devPhaseHarmData.clear();
+                            devPhaseHarmData.addAll(devAvgData);
+                            break;
+                        case Own_value:
+                            break;
+                        case AT_WILL_VALUE:
+                            if (isRemoveMaxElement) {
+                                if (CollUtil.isNotEmpty(value)) {
+                                    Double v = value.get(value.size() - 1);
+                                    value.clear();
+                                    value.add(v);
+                                }
+                                if (CollUtil.isNotEmpty(devPhaseHarmData)) {
+                                    Double v = devPhaseHarmData.get(devPhaseHarmData.size() - 1);
+                                    devPhaseHarmData.clear();
+                                    devPhaseHarmData.add(v);
+                                }
+                            } else {
+                                List<Double> errorValueList = new ArrayList<>();
+                                for (int i = 0; i < value.size(); i++) {
+                                    errorValueList.add(Math.abs(value.get(i) - devPhaseHarmData.get(i)));
+                                }
+
+                                List<Integer> idxErrorValueList = DetectionUtil.sort(errorValueList, true);
+                                Double v = value.get(idxErrorValueList.get(0));
+                                value.clear();
+                                value.add(v);
+                                v = devPhaseHarmData.get(idxErrorValueList.get(0));
+                                devPhaseHarmData.clear();
+                                devPhaseHarmData.add(v);
+                            }
                             break;
                     }
                 }

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

@@ -21,6 +21,8 @@ import com.njcn.gather.detection.util.business.DetectionCommunicateUtil;
 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.detection.util.socket.XiNumberManager;
+import com.njcn.gather.detection.util.socket.cilent.NettyContrastClientHandler;
 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;
@@ -38,6 +40,7 @@ import com.njcn.gather.script.service.IPqScriptCheckDataService;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
 import com.njcn.gather.source.pojo.po.SourceInitialize;
 import com.njcn.gather.source.service.IPqSourceService;
+import com.njcn.gather.system.cfg.service.ISysTestConfigService;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.system.dictionary.service.IDictDataService;
 import com.njcn.web.utils.HttpServletUtil;
@@ -75,8 +78,10 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     private final SocketContrastResponseService socketContrastResponseService;
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final SocketManager socketManager;
+    private final ISysTestConfigService sysTestConfigService;
 
-    @Value("${log.homeDir}")
+
+    @Value("${report.reportDir}")
     private String alignDataFilePath;
 
 
@@ -337,7 +342,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 + "\"");
@@ -358,6 +363,36 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         }
     }
 
+    @Override
+    public boolean getCanCoefficient() {
+        return CollUtil.isNotEmpty(DetectionServiceImpl.vAndIResultMap);
+    }
+
+    @Override
+    public void startCoefficient() {
+        if (CollUtil.isNotEmpty(DetectionServiceImpl.vAndIResultMap)) {
+            // 是否进行系数校准
+            //万一录波了这里就进不来了，但是在误差处理的时候DetectionServiceImpl.vAndIResultMap该集合会保留不符合的结果
+
+            XiNumberManager.xiDevList.clear();
+            XiNumberManager.devXiNumDataMap.clear();
+            List<String> stdIpList = DetectionServiceImpl.vAndIResultMap.values().stream().map(DetectionServiceImpl.VAndIResult::getIp).collect(Collectors.toList());
+            XiNumberManager.xiDevList = FormalTestManager.standardDevList.stream().filter(d -> stdIpList.contains(d.getDevIP())).collect(Collectors.toList());
+            // 逐一设备向通讯模块要原始系数
+            SocketMsg<String> socketMsg = new SocketMsg<>();
+            socketMsg.setRequestId(SourceOperateCodeEnum.Coefficient_Check.getValue());
+            socketMsg.setOperateCode(SourceOperateCodeEnum.DATA_CHNFACTOR$01.getValue());
+            PreDetection preDetection = XiNumberManager.xiDevList.get(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("devIP", preDetection.getDevIP());
+            map.put("chnNum", preDetection.getDevChns());
+            socketMsg.setData(JSON.toJSONString(map));
+            SocketManager.sendMsg(NettyContrastClientHandler.param.getUserPageId() + CnSocketUtil.CONTRAST_DEV_TAG, JSON.toJSONString(socketMsg));
+
+            FormalTestManager.currentStep = SourceOperateCodeEnum.Coefficient_Check;
+        }
+    }
+
     /**
      * 比对式-与通信模块进行连接
      *

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

@@ -1,6 +1,7 @@
 package com.njcn.gather.detection.util;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.gather.detection.pojo.po.DevData;
 import lombok.extern.slf4j.Slf4j;
@@ -421,7 +422,7 @@ public class DetectionUtil {
             }
             return newList;
         }
-        return null;
+        return Collections.emptyList();
     }
 
     /**
@@ -437,4 +438,94 @@ public class DetectionUtil {
             System.out.println("  文件大小: " + file.length() + " bytes");
         }
     }
+
+    /**
+     * 获取皮尔逊系数
+     *
+     * <p>相关系数绝对值|r|所代表的相关强度</p>
+     * <ul>
+     *     <li>0.8 - 1.0：极强相关</li>
+     *     <li>0.6 - 0.8：强相关</li>
+     *     <li>0.4 - 0.6：中等程度相关</li>
+     *     <li>0.2 - 0.4：弱相关</li>
+     *     <li>0.0 - 0.2：极弱相关或无相关</li>
+     * </ul>
+     *
+     * @return
+     */
+    public static BigDecimal getPearsonCorrelationCoefficient(List<Double> x, List<Double> y) {
+        Double xAvg = x.parallelStream().mapToDouble(Double::doubleValue).average().orElse(0.0);
+        Double yAvg = y.parallelStream().mapToDouble(Double::doubleValue).average().orElse(0.0);
+
+        // 协方差求和
+        BigDecimal covarianceSum = BigDecimal.ZERO;
+        // x的方差
+        BigDecimal varianceX = BigDecimal.ZERO;
+        // y的方差
+        BigDecimal varianceY = BigDecimal.ZERO;
+        for (int i = 0; i < x.size(); i++) {
+            covarianceSum = covarianceSum.add(BigDecimal.valueOf((x.get(i) - xAvg) * (y.get(i) - yAvg)));
+            varianceX = varianceX.add(BigDecimal.valueOf(Math.pow(x.get(i) - xAvg, 2)));
+            varianceY = varianceY.add(BigDecimal.valueOf(Math.pow(y.get(i) - yAvg, 2)));
+        }
+        BigDecimal fm = BigDecimal.valueOf(Math.sqrt(varianceX.doubleValue()) * Math.sqrt(varianceY.doubleValue()));
+        if (NumberUtil.equals(fm.doubleValue(), BigDecimal.ZERO.doubleValue())) {
+            if (NumberUtil.equals(covarianceSum, BigDecimal.ZERO)) {
+                return BigDecimal.valueOf(1.0);
+            } else {
+                return BigDecimal.ZERO;
+            }
+        } else {
+            return BigDecimal.valueOf(Math.abs(covarianceSum.divide(fm, 8, BigDecimal.ROUND_HALF_UP).doubleValue())); //相关系数
+        }
+    }
+
+    /**
+     * 比值一致性，获取CV系数
+     *
+     * <p>一致性等级</p>
+     * <ul>
+     *     <li>CV<1%：非常优秀</li>
+     *     <li>1%≤CV＜5%：优良</li>
+     *     <li>5%≤CV＜10%：良好</li>
+     *     <li>10%≤CV＜20%：中等</li>
+     *     <li>20%≤CV：较差</li>
+     * </ul>
+     *
+     * @param x
+     * @param y
+     * @return
+     */
+    public static BigDecimal getCvCoefficient(List<Double> x, List<Double> y) {
+        List<BigDecimal> ratioList = new ArrayList<>();
+        for (int i = 0; i < x.size(); i++) {
+            ratioList.add(BigDecimal.valueOf(x.get(i) / y.get(i)));
+        }
+
+        BigDecimal avg = BigDecimal.valueOf(ratioList.parallelStream().mapToDouble(BigDecimal::doubleValue).average().orElse(0.0));
+        BigDecimal variance = BigDecimal.valueOf(
+                ratioList.parallelStream().mapToDouble(BigDecimal::doubleValue)
+                        .map(v -> Math.pow(v - avg.doubleValue(), 2)).average().orElse(0.0));
+
+        return BigDecimal.valueOf(Math.sqrt(variance.doubleValue()) / avg.doubleValue());
+    }
+
+    /**
+     * 计算新的系数
+     *
+     * @param devList
+     * @param stdDevList
+     * @return
+     */
+    public static Double getNewXi(List<Double> devList, List<Double> stdDevList) {
+        ArrayList<Double> xiList = new ArrayList<>();
+        for (int i = 0; i < stdDevList.size(); i++) {
+            if (!stdDevList.get(i).equals(0)) {
+                BigDecimal bigDecimalDev = BigDecimal.valueOf(devList.get(i));
+                BigDecimal bigDecimalStdDev = BigDecimal.valueOf(stdDevList.get(i));
+                xiList.add((bigDecimalDev.subtract(bigDecimalStdDev)).divide(BigDecimal.valueOf(2.0).multiply(bigDecimalDev), 8, BigDecimal.ROUND_HALF_UP).doubleValue() + 1.0);
+            }
+        }
+        return xiList.stream().mapToDouble(Double::doubleValue).average().orElse(1.0);
+    }
 }

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

@@ -336,7 +336,7 @@ public class NettyDevClientHandler extends SimpleChannelInboundHandler<String> {
         devLineTestResult.setDeviceName(dev.getDevName());
 
         Integer[] resultFlags = dev.getMonitorList().stream()
-                .map(monitor -> ResultEnum.NETWORK_TIMEOUT)
+                .map(monitor -> ResultEnum.NETWORK_TIMEOUT.getValue())
                 .toArray(Integer[]::new);
         devLineTestResult.setChnResult(resultFlags);
 

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

@@ -12,6 +12,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.service.IPqStandardDevService;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.utils.FileUtil;
@@ -55,10 +56,10 @@ public class PqStandardDevController extends BaseController {
     @GetMapping("/getById")
     @ApiOperation("根据id查询标准设备")
     @ApiImplicitParam(name = "id", value = "标准设备id", required = true)
-    public HttpResult<PqStandardDev> getById(@RequestParam("id") String id) {
+    public HttpResult<PqStandardDevVO> getById(@RequestParam("id") String id) {
         String methodDescribe = getMethodDescribe("getById");
         LogUtil.njcnDebug(log, "{}，查询ID为：{}", methodDescribe, id);
-        PqStandardDev result = pqStandardDevService.getPqStandardDevById(id);
+        PqStandardDevVO result = pqStandardDevService.getPqStandardDevById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

detection/src/main/java/com/njcn/gather/device/mapper/PqStandardDevGainMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.gather.device.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+public interface PqStandardDevGainMapper extends MPJBaseMapper<PqStandardDevGain> {
+
+}
+

detection/src/main/java/com/njcn/gather/device/mapper/PqStandardDevGainRecordMapper.java

@@ -0,0 +1,13 @@
+package com.njcn.gather.device.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+public interface PqStandardDevGainRecordMapper extends MPJBaseMapper<PqStandardDevGainRecord> {
+
+}
+

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

@@ -0,0 +1,7 @@
+<?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.device.mapper.PqStandardDevGainMapper">
+
+
+</mapper>
+

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

@@ -0,0 +1,7 @@
+<?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.device.mapper.PqStandardDevGainRecordMapper">
+
+
+</mapper>
+

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

@@ -0,0 +1,61 @@
+package com.njcn.gather.device.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.mybatisplus.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("pq_standard_dev_gain")
+public class PqStandardDevGain extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = -46280767885558804L;
+
+
+    /**
+     * 标准设备Id_通道号
+     */
+    @TableId
+    private String stdDevMonitorId;
+
+    private Integer uaGain;
+
+    private Integer ubGain;
+
+
+    private Integer ucGain;
+
+
+    private Integer u0Gain;
+
+
+    private Integer iaGain;
+
+
+    private Integer ibGain;
+
+
+    private Integer icGain;
+
+
+    private Integer i0Gain;
+
+
+    private Integer uabGain;
+
+
+    private Integer ubcGain;
+
+
+    private Integer ucaGain;
+
+    private Integer state;
+}
+

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

@@ -0,0 +1,35 @@
+package com.njcn.gather.device.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.mybatisplus.bo.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+@Data
+@TableName("pq_standard_dev_gain_record")
+public class PqStandardDevGainRecord implements Serializable {
+    private static final long serialVersionUID = 477276215572686991L;
+
+    /**
+     * 标准设备监测点id,由设备id_通道号组成
+     */
+    private String stdDevMonitorId;
+
+    /**
+     * 被检设备监测点id,由设备id_通道号组成
+     */
+    private String devMonitorId;
+
+    /**
+     * 系数下发次数
+     */
+    private Integer num;
+
+}
+

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

@@ -0,0 +1,20 @@
+package com.njcn.gather.device.pojo.vo;
+
+import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @data 2026-01-19
+ */
+@Data
+public class PqStandardDevVO extends PqStandardDev {
+
+    /**
+     * 通道系数
+     */
+    List<PqStandardDevGain> gainList;
+}

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

@@ -0,0 +1,29 @@
+package com.njcn.gather.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+public interface IPqStandardDevGainRecordService extends IService<PqStandardDevGainRecord> {
+
+    /**
+     * 获取最大下发系数的次数
+     *
+     * @param stdDevMonitorId
+     * @param devMonitorId
+     * @return
+     */
+    int getMaxNum(String stdDevMonitorId, String devMonitorId);
+
+    /**
+     * 批量新增或更新记录
+     * @param recordList
+     * @return
+     */
+    boolean addOrUpdate(List<PqStandardDevGainRecord> recordList);
+}

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

@@ -0,0 +1,19 @@
+package com.njcn.gather.device.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+public interface IPqStandardDevGainService extends IService<PqStandardDevGain> {
+
+    boolean add(List<PqStandardDevGain> pqStandardDevGainList);
+
+    PqStandardDevGain get(String stdDevMonitorId);
+
+    List<PqStandardDevGain> list(String stdDevId);
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,7 +31,7 @@ public interface IPqStandardDevService extends IService<PqStandardDev> {
      * @param id 设备id
      * @return 设备对象
      */
-    PqStandardDev getPqStandardDevById(String id);
+    PqStandardDevVO getPqStandardDevById(String id);
 
     /**
      * 新增标准设备

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

@@ -0,0 +1,45 @@
+package com.njcn.gather.device.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.gather.device.mapper.PqStandardDevGainRecordMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGainRecord;
+import com.njcn.gather.device.service.IPqStandardDevGainRecordService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author caozehui
+ * @date 2026-01-15
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqStandardDevGainRecordServiceImpl extends ServiceImpl<PqStandardDevGainRecordMapper, PqStandardDevGainRecord> implements IPqStandardDevGainRecordService {
+
+    @Override
+    public int getMaxNum(String stdDevMonitorId, String devMonitorId) {
+        return this.lambdaQuery().eq(PqStandardDevGainRecord::getStdDevMonitorId, stdDevMonitorId)
+                .eq(PqStandardDevGainRecord::getDevMonitorId, devMonitorId)
+                .list().stream().mapToInt(PqStandardDevGainRecord::getNum).max().orElse(0);
+    }
+
+    @Override
+    public boolean addOrUpdate(List<PqStandardDevGainRecord> recordList) {
+        recordList.forEach(record -> {
+            List<PqStandardDevGainRecord> list = this.lambdaQuery().eq(PqStandardDevGainRecord::getStdDevMonitorId, record.getStdDevMonitorId())
+                    .eq(PqStandardDevGainRecord::getDevMonitorId, record.getDevMonitorId()).list();
+            if (CollectionUtil.isNotEmpty(list)) {
+                this.lambdaUpdate().eq(PqStandardDevGainRecord::getStdDevMonitorId, record.getStdDevMonitorId())
+                        .eq(PqStandardDevGainRecord::getDevMonitorId, record.getDevMonitorId())
+                        .set(PqStandardDevGainRecord::getNum, record.getNum()).update();
+            } else {
+                this.save(record);
+            }
+        });
+        return true;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.njcn.gather.device.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.gather.device.mapper.PqStandardDevGainMapper;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
+import com.njcn.gather.device.service.IPqStandardDevGainService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author caozehui
+ * @date 2026-01-12
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqStandardDevGainServiceImpl extends ServiceImpl<PqStandardDevGainMapper, PqStandardDevGain> implements IPqStandardDevGainService {
+
+    @Override
+    public boolean add(List<PqStandardDevGain> pqStandardDevGainList) {
+        log.info("add PqStandardDevGainList: {}", pqStandardDevGainList.size());
+        List<String> stdMonitorIdList = pqStandardDevGainList.stream().map(PqStandardDevGain::getStdDevMonitorId).distinct().collect(Collectors.toList());
+        List<String> existingStdMonitorIdList = this.listByIds(stdMonitorIdList).stream().map(PqStandardDevGain::getStdDevMonitorId).collect(Collectors.toList());
+
+        pqStandardDevGainList = pqStandardDevGainList.stream().filter(pqStandardDevGain -> !existingStdMonitorIdList.contains(pqStandardDevGain.getStdDevMonitorId())).collect(Collectors.toList());
+        return this.saveBatch(pqStandardDevGainList);
+    }
+
+    @Override
+    public PqStandardDevGain get(String stdDevMonitorId) {
+        return this.lambdaQuery().eq(PqStandardDevGain::getStdDevMonitorId, stdDevMonitorId).one();
+    }
+
+    @Override
+    public List<PqStandardDevGain> list(String stdDevId) {
+        return this.lambdaQuery().likeRight(PqStandardDevGain::getStdDevMonitorId, stdDevId).orderByAsc(PqStandardDevGain::getStdDevMonitorId).list();
+    }
+}

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

@@ -19,8 +19,11 @@ import com.njcn.common.utils.EncryptionUtil;
 import com.njcn.gather.device.mapper.PqStandardDevMapper;
 import com.njcn.gather.device.pojo.param.PqStandardDevParam;
 import com.njcn.gather.device.pojo.po.PqStandardDev;
+import com.njcn.gather.device.pojo.po.PqStandardDevGain;
 import com.njcn.gather.device.pojo.vo.PqStandardDevExcel;
+import com.njcn.gather.device.pojo.vo.PqStandardDevVO;
 import com.njcn.gather.device.pojo.vo.PreDetection;
+import com.njcn.gather.device.service.IPqStandardDevGainService;
 import com.njcn.gather.device.service.IPqStandardDevService;
 import com.njcn.gather.plan.mapper.AdPlanStandardDevMapper;
 import com.njcn.gather.plan.service.IAdPlanStandardDevService;
@@ -58,8 +61,7 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
     private final IDevTypeService devTypeService;
     private final IDictDataService dictDataService;
     private final IDictTypeService dictTypeService;
-    private final AdPlanStandardDevMapper adPlanStandardDevMapper;
-    private final IAdPlanStandardDevService adPlanStandardDevService;
+    private final IPqStandardDevGainService pqStandardDevGainService;
 
     @Override
     public Page<PqStandardDev> listPqStandardDevs(PqStandardDevParam.QueryParam queryParam) {
@@ -73,13 +75,17 @@ public class PqStandardDevServiceImpl extends ServiceImpl<PqStandardDevMapper, P
     }
 
     @Override
-    public PqStandardDev getPqStandardDevById(String id) {
+    public PqStandardDevVO getPqStandardDevById(String id) {
         PqStandardDev standardDev = this.getById(id);
+        PqStandardDevVO pqStandardDevVO = BeanUtil.copyProperties(standardDev, PqStandardDevVO.class);
         if (standardDev.getEncryptionFlag() == 1) {
-            standardDev.setSeries(EncryptionUtil.decoderString(1, standardDev.getSeries()));
-            standardDev.setDevKey(EncryptionUtil.decoderString(1, standardDev.getDevKey()));
+            pqStandardDevVO.setSeries(EncryptionUtil.decoderString(1, standardDev.getSeries()));
+            pqStandardDevVO.setDevKey(EncryptionUtil.decoderString(1, standardDev.getDevKey()));
         }
-        return standardDev;
+
+        List<PqStandardDevGain> gainList = pqStandardDevGainService.list(id);
+        pqStandardDevVO.setGainList(gainList);
+        return pqStandardDevVO;
     }
 
     @Override

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

@@ -137,6 +137,10 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
 //        String workDir = "D:\\program\\CN_Gather";
         // 获取映射文件存放文件夹
         String dirPath = workDir + "\\9100";
+        int index = workDir.indexOf("\\resources\\extraResources\\java");
+        if (index != -1) {
+            dirPath = workDir.substring(0, workDir.indexOf("\\resources\\extraResources\\java")) + "\\9100";
+        }
         return dirPath;
     }
 
@@ -190,6 +194,17 @@ public class PqIcdPathServiceImpl extends ServiceImpl<PqIcdPathMapper, PqIcdPath
     @Override
     @Transactional
     public boolean deleteIcd(List<String> ids) {
+        List<PqIcdPath> pqIcdPaths = this.listByIds(ids);
+        String commInstallPath = this.getCommInstallPath();
+        pqIcdPaths.forEach(pqIcdPath -> {
+            String mappingFilePath = commInstallPath + "\\DeviceControl\\Config\\" + pqIcdPath.getName() + ".txt";
+            Path path = Paths.get(mappingFilePath);
+            File file = path.toFile();
+            if (file.exists()) {
+                file.delete();
+            }
+        });
+
         return this.lambdaUpdate().in(PqIcdPath::getId, ids).set(PqIcdPath::getState, DataStateEnum.DELETED.getCode()).update();
     }
 

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

@@ -121,8 +121,8 @@ public interface IPqMonitorService extends IService<PqMonitor> {
 
     /**
      * 根据被检设备id和监测点编号获取监测点信息
-     * @param id 被检设备id
+     * @param devId 设备id
      * @param monitorNum 监测点编号
      */
-    PqMonitor getByDevAndNum(String id, int monitorNum);
+    PqMonitor getByDevIdAndNum(String devId, int monitorNum);
 }

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

@@ -84,6 +84,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
             if (ObjectUtil.isNotNull(pqMonitor)) {
                 BeanUtil.copyProperties(monitorList.get(0), pqMonitor, "id", "realtimeResult", "statisticsResult", "recordedResult", "realtimeNum", "statisticsNum", "recordedNum", "resultType", "qualifiedNum");
                 newMonitorList.add(pqMonitor);
+                existedMonitorList.remove(pqMonitor);
             } else {
                 newMonitorList.addAll(monitorList);
             }
@@ -168,6 +169,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
                 this.baseMapper.updatePlanReportRState(plan.getId(), PlanReportStateEnum.REPORT_STATE_NOT_GENERATED.getValue());
             }
         }
+        this.removeByIds(existedMonitorList.stream().map(PqMonitor::getId).collect(Collectors.toList()));
         return this.saveOrUpdateBatch(newMonitorList);
     }
 
@@ -438,7 +440,7 @@ public class PqMonitorServiceImpl extends ServiceImpl<PqMonitorMapper, PqMonitor
     }
 
     @Override
-    public PqMonitor getByDevAndNum(String devId, int monitorNum) {
+    public PqMonitor getByDevIdAndNum(String devId, int monitorNum) {
         QueryWrapper<PqMonitor> wrapper = new QueryWrapper<>();
         wrapper.eq("pq_monitor.Dev_Id", devId)
                 .eq("pq_monitor.Num", monitorNum);

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

@@ -554,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());
@@ -1721,8 +1722,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             String zipFileName = URLEncoder.encode(subPlan.getName() + ".zip", "UTF-8");
             File zipFile = FileUtil.file(tempDir, zipFileName);
 
-            // 先将json文件添加到zip中
-            ZipUtil.zip(jsonFile.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 先将json文件添加到zip中（使用UTF-8编码）
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, jsonFile);
 
 
             // 创建一个临时目录存放两个文件
@@ -1744,8 +1745,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             }
 
 
-            // 重新创建zip文件，包含所有文件
-            ZipUtil.zip(tempZipDir.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 重新创建zip文件，包含所有文件，使用UTF-8编码
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, FileUtil.file(tempZipDir));
 
             // 删除临时目录
             FileUtil.del(tempZipDir);
@@ -1779,9 +1780,9 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             File zipFile = FileUtil.file(tempDir, file.getOriginalFilename());
             file.transferTo(zipFile);
 
-            // 解压zip文件
+            // 解压zip文件，使用UTF-8编码
             File unzipDir = FileUtil.mkdir(FileUtil.file(tempDir, "unzip"));
-            ZipUtil.unzip(zipFile.getAbsolutePath(), unzipDir.getAbsolutePath());
+            ZipUtil.unzip(zipFile, unzipDir, CharsetUtil.CHARSET_UTF_8);
 
             // 查找解压目录中的json文件
             File[] files = unzipDir.listFiles();
@@ -2099,8 +2100,8 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
                 }
             }
 
-            // 重新创建zip文件，包含所有文件
-            ZipUtil.zip(tempZipDir.getAbsolutePath(), zipFile.getAbsolutePath());
+            // 重新创建zip文件，包含所有文件，使用UTF-8编码
+            ZipUtil.zip(zipFile, CharsetUtil.CHARSET_UTF_8, false, FileUtil.file(tempZipDir));
 
             // 删除临时目录
             FileUtil.del(tempZipDir);

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

@@ -39,7 +39,10 @@ public enum BaseReportKeyEnum {
     CREATE_DATE("createDate","生产日期"),
     TEMPERATURE("temp","温度"),
     HUMIDITY("hum","相对湿度"),
-    DELEGATE("delegate","委托方");
+    DELEGATE("delegate","委托方"),
+    CREATEDATE("createDate","出厂日期"),
+    HW_VERSION("hardwareVersion","硬件版本"),
+    SW_VERSION("softwareVersion","软件版本");
 
     private String key;
 

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

@@ -61,6 +61,7 @@ import com.njcn.gather.report.service.IPqReportService;
 import com.njcn.gather.result.service.IResultService;
 import com.njcn.gather.script.pojo.vo.PqScriptDtlDataVO;
 import com.njcn.gather.script.service.IPqScriptDtlsService;
+import com.njcn.gather.storage.pojo.param.SingleNonHarmParam;
 import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult;
 import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult;
 import com.njcn.gather.storage.service.SimAndDigHarmonicService;
@@ -88,6 +89,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPReply;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.docx4j.jaxb.Context;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart;
@@ -115,6 +117,7 @@ import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -164,6 +167,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     @Value("${qr.gcDev.path}")
     private String gcDevPath;
 
+    @Value("${report.dateFormat}")
+    private String dateFormat;
 
     private final IPqDevService iPqDevService;
     private final PqDevMapper pqDevMapper;
@@ -310,7 +315,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) {
@@ -329,13 +335,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
                     throw new BusinessException(ReportResponseEnum.FILE_SIZE_ERROR);
                 }
 
-                pqReport.setBasePath(newDir + baseOriginalFilename);
-                pqReport.setDetailPath(newDir + detailOriginalFilename);
+                pqReport.setBasePath(relativePath + baseOriginalFilename);
+                pqReport.setDetailPath(relativePath + detailOriginalFilename);
 
                 this.createDirectory(newDir);
                 this.clearDirectory(newDir);
-                this.uploadFile(baseFile, pqReport.getBasePath());
-                this.uploadFile(detailFile, pqReport.getDetailPath());
+                this.uploadFile(baseFile, newDir + baseOriginalFilename);
+                this.uploadFile(detailFile, newDir + detailOriginalFilename);
             } else {
                 throw new BusinessException(ReportResponseEnum.FILE_NOT_NULL);
             }
@@ -383,34 +389,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);
@@ -418,16 +424,16 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             }
 
             if (!baseFileOriginalFilename.isEmpty()) {
-                pqReport.setBasePath(newDir + baseFileOriginalFilename);
-                Paths.get(oldPqReport.getBasePath()).toFile().delete();
+                pqReport.setBasePath(relativePath + baseFileOriginalFilename);
+                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);
-                Paths.get(oldPqReport.getDetailPath()).toFile().delete();
+                pqReport.setDetailPath(relativePath + detailFileOriginalFilename);
+                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);
             }
         }
     }
@@ -800,8 +806,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 detailPath = Paths.get(report.getDetailPath());
+                Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
+                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);
@@ -877,8 +883,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 detailPath = Paths.get(report.getDetailPath());
+            Path basePath = Paths.get(templatePath + File.separator + report.getBasePath());
+            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);
@@ -1167,7 +1173,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             Integer monitorNum = next.getKey();
             // 线路下的指标数据
             List<ContrastTestResult> contrastTestResults = next.getValue();
-            PqMonitor pqMonitor = pqMonitorService.getByDevAndNum(pqDevVO.getId(), monitorNum);
+            PqMonitor pqMonitor = pqMonitorService.getByDevIdAndNum(pqDevVO.getId(), monitorNum);
             // 插入回路号前，先换个页
             todoInsertList.add(Docx4jUtil.createPageBreakParagraph());
             // 回路标题
@@ -2019,6 +2025,18 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
         baseModelMap.put(BaseReportKeyEnum.DEV_TYPE.getKey(), devType.getName());
         // 检测员
         baseModelMap.put(BaseReportKeyEnum.INSPECTOR.getKey(), pqDevVO.getCheckBy() + "");
+        baseModelMap.put(BaseReportKeyEnum.INSPECTOR.getKey(), pqDevVO.getCheckBy() + "");
+        String datePattern = DatePattern.NORM_DATE_PATTERN;
+        if (DatePattern.CHINESE_DATE_PATTERN.equals(dateFormat)) {
+            datePattern = DatePattern.CHINESE_DATE_PATTERN;
+        }
+
+        // 出厂日期
+        baseModelMap.put(BaseReportKeyEnum.CREATEDATE.getKey(), pqDevVO.getCreateDate().format(DateTimeFormatter.ofPattern(datePattern)));
+        // 硬件版本
+        baseModelMap.put(BaseReportKeyEnum.HW_VERSION.getKey(), StrUtil.isNotBlank(pqDevVO.getHardwareVersion()) ? pqDevVO.getHardwareVersion() : StrUtil.EMPTY);
+        // 软件版本
+        baseModelMap.put(BaseReportKeyEnum.SW_VERSION.getKey(), StrUtil.isNotBlank(pqDevVO.getSoftwareVersion()) ? pqDevVO.getSoftwareVersion() : StrUtil.EMPTY);
         // 调试日期
         if (pqDevVO.getCheckTime() != null) {
             baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(pqDevVO.getCheckTime(), DatePattern.CHINESE_DATE_PATTERN));
@@ -2045,7 +2063,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 {
@@ -2159,7 +2177,19 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
     private void dealDataModel(List<InputStream> wordFileInputStreams, DevReportParam devReportParam, PqDevVO pqDevVO) throws Exception {
         Integer devChns = pqDevVO.getDevChns();
         for (int i = 1; i <= devChns; i++) {
-            ClassPathResource resource = new ClassPathResource("/model/report_table.docx");
+            String path = "/model/report_table.docx";
+            DevType devType = devTypeService.getById(pqDevVO.getDevType());
+            if (devType.getName().equals("PQ-COM")) {
+                path = "/model/report_table - PQ-COM.docx";
+            }
+            ClassPathResource resource = new ClassPathResource(path);
+            XWPFDocument dataModelDocumentTemp = new XWPFDocument(resource.getInputStream());
+
+            SingleNonHarmParam singleNonHarmParam = new SingleNonHarmParam();
+            singleNonHarmParam.setPlanCode(devReportParam.getPlanCode());
+            singleNonHarmParam.setDevId(pqDevVO.getId());
+            singleNonHarmParam.setChannelNo(i);
+
             // 获取数据
             Map<String, String> dataModelMap = new HashMap<>(16);
             // 读取模板文件中的占位符
@@ -2177,11 +2207,20 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
             List<SimAndDigHarmonicResult> adHarmonicResultList = adHarmonicService.listAllResultData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + i);
 
             // 填充数据
+            int finalI = i;
             indexKeysMap.forEach((index, keys) -> {
                 String s1 = keys.stream().findFirst().get();
                 // 谐波类
                 if (DetectionCodeEnum.V2_50.getCode().equals(s1) || DetectionCodeEnum.I2_50.getCode().equals(s1) || DetectionCodeEnum.SV_1_49.getCode().equals(s1) || DetectionCodeEnum.SI_1_49.getCode().equals(s1)) {
-                    fillMapValueHarm(adHarmonicResultList, dataModelMap, keys, index);
+                    // 查找一下U1
+                    double u1 = 57.74;
+                    List<SimAndDigHarmonicResult> rawData = adHarmonicService.listAllRawData(devReportParam.getScriptId(), devReportParam.getPlanCode(), devReportParam.getDevId() + "_" + finalI);
+                    SimAndDigHarmonicResult adHarmonicResult = rawData.stream().filter(obj -> obj.getAdType().equals(DetectionCodeEnum.V2_50.getCode())).sorted((obj1, obj2) -> obj2.getTimeId().compareTo(obj1.getTimeId())).findFirst().orElse(null);
+                    if (ObjectUtil.isNotNull(adHarmonicResult)) {
+                        String aValue1 = adHarmonicResult.getAValue1();
+                        u1 = Double.parseDouble(aValue1);
+                    }
+                    fillMapValueHarm(adHarmonicResultList, dataModelMap, keys, index, u1);
                 } else {
                     // 非谐波类
                     if (DetectionCodeEnum.V_UNBAN.getCode().equals(s1) || DetectionCodeEnum.FREQ.getCode().equals(s1)) {
@@ -2249,14 +2288,14 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      * @param keys                  key
      * @param index                 index
      */
-    private void fillMapValueHarm(List<SimAndDigHarmonicResult> allHarmonicResultList, Map<String, String> dataModelMap, Set<String> keys, String index) {
+    private void fillMapValueHarm(List<SimAndDigHarmonicResult> allHarmonicResultList, Map<String, String> dataModelMap, Set<String> keys, String index, double baseValue) {
         keys.forEach(key -> {
             List<SimAndDigHarmonicResult> resultList = allHarmonicResultList.stream().filter(obj -> obj.getAdType().equals(key) && obj.getSort().toString().equals(index)).collect(Collectors.toList());
             if (CollectionUtil.isNotEmpty(resultList)) {
                 SimAndDigHarmonicResult adHarmonicResult = resultList.get(0);
                 if (Objects.nonNull(adHarmonicResult)) {
                     if (DetectionCodeEnum.V2_50.getCode().equals(key) || DetectionCodeEnum.SV_1_49.getCode().equals(key)) {
-                        fillHarm(dataModelMap, adHarmonicResult, index, key, 57.74, 100);
+                        fillHarm(dataModelMap, adHarmonicResult, index, key, baseValue, 100);
                     }
                     if (DetectionCodeEnum.I2_50.getCode().equals(key) || DetectionCodeEnum.SI_1_49.getCode().equals(key)) {
                         fillHarm(dataModelMap, adHarmonicResult, index, key, 1, 1);
@@ -2464,7 +2503,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
      * 创建回路标题到报告中
      */
     private P getContrastLineTitle(Map<String, List<Docx4jUtil.HeadingContent>> contentMap, int monitorNum, int index, ObjectFactory factory, PqDevVO pqDevVO) {
-        PqMonitor pqMonitor = pqMonitorService.getByDevAndNum(pqDevVO.getId(), monitorNum);
+        PqMonitor pqMonitor = pqMonitorService.getByDevIdAndNum(pqDevVO.getId(), monitorNum);
         String monitorInfoName = "";
         if (StrUtil.isNotBlank(pqDevVO.getSubName()) && Objects.nonNull(pqMonitor)) {
             monitorInfoName = "(" + pqDevVO.getSubName() + "-" + pqMonitor.getName() + ")";

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

@@ -198,7 +198,7 @@ public class ResultController extends BaseController {
         String methodDescribe = getMethodDescribe("getCheckItem");
 
         LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, monitorQueryParam);
-        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum());
+        List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum(), monitorQueryParam.getCode());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }

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

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

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

@@ -75,6 +75,8 @@ public class ResultParam {
 
         // 模式id
         private String patternId;
+
+        private String code;
     }
 
     @Data
@@ -104,5 +106,8 @@ public class ResultParam {
 
         @ApiModelProperty(value = "通道号", required = true)
         private String chnNum;
+
+        @ApiModelProperty(value = "数据处理原则", required = true)
+        private String dataRuleId;
     }
 }

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

@@ -123,9 +123,10 @@ public interface IResultService {
      * @param devId
      * @param chnNum
      * @param num
+     * @param code
      * @return
      */
-    List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num);
+    List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num,String code);
 
     /**
      * 获取设备比对式结果，用于出比对检测的报告

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

@@ -146,11 +146,11 @@ public class ResultServiceImpl implements IResultService {
         formContentVO.setErrorSysId(plan.getErrorSysId());
         String scriptId = null;
         if (ObjectUtil.isNotNull(plan)) {
+            formContentVO.setDataRule(plan.getDataRule());
             scriptId = plan.getScriptId();
             adPlanService.visualize(Collections.singletonList(plan));
+            formContentVO.setScriptName(plan.getScriptId());
         }
-        formContentVO.setScriptName(plan.getScriptId());
-        formContentVO.setDataRule(plan.getDataRule());
         formContentVO.setDeviceName(pqDevService.getById(queryParam.getDeviceId()).getName());
 
         List<Map<String, String>> chnList = new ArrayList<>();
@@ -341,10 +341,19 @@ public class ResultServiceImpl implements IResultService {
     private void dipScriptTypeName(List<PqScriptDtls> subValue, List<TreeDataVO> subTypeList, Map<Integer, Set<Integer>> finalResultMap, Boolean isValueType, String name, Integer start, Integer end) {
         List<TreeDataVO> info = new ArrayList<>();
         List<PqScriptDtls> dip = subValue.stream()
-                .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase()))
+//                .filter(x -> "Dip".equals(x.getValueType()) && "A".equals(x.getPhase()))
+                .filter(x -> "Dip".equals(x.getValueType()))
                 .filter(x -> x.getTransValue() >= start && x.getTransValue() <= end)
                 .sorted(Comparator.comparing(PqScriptDtls::getScriptIndex))
                 .collect(Collectors.toList());
+        LinkedHashMap<Integer, List<PqScriptDtls>> idxDipMap = dip.stream().collect(Collectors.groupingBy(d -> d.getScriptIndex(), LinkedHashMap::new, Collectors.toList()));
+
+        dip.clear();
+        idxDipMap.forEach((idx, scriptDtlList) -> {
+            scriptDtlList.sort(Comparator.comparing(PqScriptDtls::getPhase));
+            dip.add(scriptDtlList.get(0));
+        });
+
         TreeDataVO vo = new TreeDataVO();
         vo.setScriptTypeName(name);
         vo.setScriptTypeCode("Base_" + start + "_" + end);
@@ -983,10 +992,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(), param.getChnNum());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode() + "_temp", param.getErrorSysId(), param.getDeviceId(), false, 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());
         }
     }
 
@@ -1000,9 +1009,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(), param.getChnNum());
+            this.contrastCalculateResult(param.getPlanId(), param.getCode(), param.getErrorSysId(), param.getDeviceId(), true, 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());
         }
     }
 
@@ -1533,8 +1542,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(dictData.getName());
+        formContentVO.setDataRule(plan.getDataRule());
         formContentVO.setDeviceName(dev.getName());
         formContentVO.setErrorSysId(plan.getErrorSysId());
 
@@ -1581,8 +1589,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());
@@ -1604,8 +1610,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.setRawDataMap(this.getRawDataMap(dictTree, adTypeList, queryParam.getDeviceId() + CnSocketUtil.SPLIT_TAG + queryParam.getChnNum(), unit, queryParam.getNum(), queryParam.getWaveNum(), queryParam.getIsWave(), String.valueOf(plan.getCode()), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList())));
+        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(), queryParam.getCode(), contrastResultVO.getResultMap().keySet().stream().collect(Collectors.toList())));
         return contrastResultVO;
     }
 
@@ -1886,10 +1892,10 @@ public class ResultServiceImpl implements IResultService {
     }
 
     @Override
-    public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num) {
+    public List<ContrastTestItemVO> getCheckItem(String planId, String devId, String chnNum, Integer num, String code) {
 //        PqDev dev = pqDevService.getById(devId);
         AdPlan plan = adPlanService.getById(planId);
-        String code = String.valueOf(plan.getCode());
+//        String code = String.valueOf(plan.getCode());
 
         String monitorId = devId + CnSocketUtil.SPLIT_TAG + chnNum;
 
@@ -3067,7 +3073,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);
@@ -3085,8 +3091,8 @@ public class ResultServiceImpl implements IResultService {
 //        } else {
 //            dataRule = DictDataEnum.SECTION_VALUE;
 //        }
-        AdPlan plan = adPlanService.getById(planId);
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+//        AdPlan plan = adPlanService.getById(planId);
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
@@ -3144,9 +3150,9 @@ public class ResultServiceImpl implements IResultService {
      * @param code
      * @param errorSysId
      * @param deviceId
-     * @param chnNum
+     * @param updateResult
      */
-    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, String chnNum) {
+    private void contrastCalculateResult(String planId, String code, String errorSysId, String deviceId, boolean updateResult, String dataRuleId) {
         String oldCode = code.replace("_temp", "");
 
         Map<String, String> devIdMapComm = new HashMap<>();
@@ -3189,35 +3195,38 @@ public class ResultServiceImpl implements IResultService {
         }
 
         DictDataEnum dataRule;
-        DictData dictData = dictDataService.getDictDataById(plan.getDataRule());
+        DictData dictData = dictDataService.getDictDataById(dataRuleId);
         if (ObjectUtil.isNotNull(dictData)) {
             dataRule = DictDataEnum.getDictDataEnumByCode(dictData.getCode());
         } else {
             dataRule = DictDataEnum.SECTION_VALUE;
         }
 
-        pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null)
-                .set(PqMonitor::getRealtimeNum, null)
-                .set(PqMonitor::getRecordedResult, null)
-                .set(PqMonitor::getRecordedNum, null)
-                .set(PqMonitor::getStatisticsResult, null)
-                .set(PqMonitor::getStatisticsNum, null)
-                .set(PqMonitor::getResultType, null)
-                .set(PqMonitor::getQualifiedNum, 0)
-                .eq(PqMonitor::getDevId, deviceId)
-                .eq(PqMonitor::getNum, Integer.parseInt(chnNum))
-                .eq(PqMonitor::getCheckFlag, 1)
-                .update();
-        String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum;
-        List<AdPair> adPairList = adPairService.listByDevIds(Arrays.asList(monitorId));
+        if (updateResult) {
+            pqMonitorService.lambdaUpdate().set(PqMonitor::getRecordedResult, null)
+                    .set(PqMonitor::getRealtimeNum, null)
+                    .set(PqMonitor::getRecordedResult, null)
+                    .set(PqMonitor::getRecordedNum, null)
+                    .set(PqMonitor::getStatisticsResult, null)
+                    .set(PqMonitor::getStatisticsNum, null)
+                    .set(PqMonitor::getResultType, null)
+                    .set(PqMonitor::getQualifiedNum, 0)
+                    .eq(PqMonitor::getDevId, deviceId)
+//                    .eq(PqMonitor::getNum, Integer.parseInt(chnNum))
+                    .eq(PqMonitor::getCheckFlag, 1)
+                    .update();
+        }
+
+//        String monitorId = deviceId + CnSocketUtil.SPLIT_TAG + chnNum;
+        List<AdPair> adPairList = adPairService.listByDevIds(Arrays.asList(deviceId));
         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();
             Map<String, Integer> numMap = new HashMap<>();
             Map<String, List<AdPair>> devMonitroIdMap = pairList.stream().collect(Collectors.groupingBy(AdPair::getDevMonitorId, Collectors.toList()));
             devMonitroIdMap.forEach((devMonitorId, pairList1) -> {
+                BiMap<String, String> parsIp = HashBiMap.create();
+                BiMap<String, String> parsId = HashBiMap.create();
                 String[] split1 = devMonitorId.split(CnSocketUtil.SPLIT_TAG);
                 AdPair adPair = pairList1.get(0);
                 String[] split2 = adPair.getStdDevMonitorId().split(CnSocketUtil.SPLIT_TAG);
@@ -3228,42 +3237,40 @@ public class ResultServiceImpl implements IResultService {
                 numMap.put(devMonitorId, num);
                 numMap.put(adPair.getStdDevMonitorId(), num);
                 devIdMapComm.put(standardDev.getIp(), standardDev.getId());
-            });
 
-            List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null);
-            List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null);
-            List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, monitorId, null);
-            List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, monitorId, null);
+                List<ContrastNonHarmonicResult> devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null);
+                List<ContrastNonHarmonicResult> stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null);
+                List<ContrastHarmonicResult> devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 0, devMonitorId, null);
+                List<ContrastHarmonicResult> stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, null, false, null, 1, devMonitorId, null);
 
-            List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
-            List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
+                List<DevData> devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
+                List<DevData> standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
 
-            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);
+                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, finalNonWaveDataSourceEnum, num, null, oldCode);
-                    pqDevService.updateResult(split[0], null);
-                });
-            }
+                    if (updateResult) {
+                        pqMonitorService.updateMonitorResult(devMonitorId, null, finalNonWaveDataSourceEnum, num, null, oldCode);
+                        pqDevService.updateResult(split1[0], null);
+                    }
+                }
 
-            AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId);
-            for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) {
-                devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null);
-                stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null);
-                devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, monitorId, null);
-                stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, monitorId, null);
+                AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(planId);
+                for (int i = 1; i <= adPlanTestConfig.getWaveRecord(); i++) {
+                    devNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null);
+                    stdDevNonHarmonicRawDataList = contrastNonHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null);
+                    devHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 0, devMonitorId, null);
+                    stdDevHarmonicRawDataList = contrastHarmonicService.listAllRawData(oldCode, num, i, true, null, 1, devMonitorId, null);
 
-                devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
-                standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
-                detectionServiceImpl.processing(devData, standardDevData, parsIp, devIdMapComm, testItemMap.keySet().stream().collect(Collectors.toList()), errorSysId, dataRule, numMap, oldCode, i, DataSourceEnum.WAVE_DATA);
-            }
+                    devData = contrastToList(devNonHarmonicRawDataList, devHarmonicRawDataList, testItemMap, 0);
+                    standardDevData = contrastToList(stdDevNonHarmonicRawDataList, stdDevHarmonicRawDataList, testItemMap, 1);
+                    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, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode);
-                pqDevService.updateResult(split[0], null);
+                if (updateResult) {
+                    pqMonitorService.updateMonitorResult(devMonitorId, null, WAVE_DATA, num, adPlanTestConfig.getWaveRecord(), oldCode);
+                    pqDevService.updateResult(split1[0], null);
+                }
             });
         });
     }

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

@@ -92,6 +92,18 @@ public class PqScriptDtls implements Serializable {
     @TableField("RetainTime")
     private Double retainTime;
 
+    /**
+     * 暂态前延时间（S）
+     */
+    @TableField("FPreTime")
+    private Double fPreTime;
+
+    /**
+     * 暂态后延时间（S）
+     */
+    @TableField("FAfterTime")
+    private Double fAfterTime;
+
     /**
      * 变动频度（次/min）
      */

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

@@ -68,14 +68,14 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     private final static String INHARM_I = "InHarm_I";
     private final static String DIP = "Dip";
     private final static String FLICKER = "Flicker";
-    @Value("${Dip.fPreTime}")
-    private Double fPreTime;
+//    @Value("${Dip.fPreTime}")
+//    private Double fPreTime;
     @Value("${Dip.fRampIn}")
     private Double fRampIn;
     @Value("${Dip.fRampOut}")
     private Double fRampOut;
-    @Value("${Dip.fAfterTime}")
-    private Double fAfterTime;
+//    @Value("${Dip.fAfterTime}")
+//    private Double fAfterTime;
     @Value("${Flicker.waveFluType}")
     private String waveFluType;
     @Value("${Flicker.waveType}")
@@ -385,6 +385,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                             dip.setPhase(phase);
                             dip.setTransValue(dipData.getFTransValue());
                             dip.setRetainTime(dipData.getRetainTime());
+                            dip.setFPreTime(dipData.getFPreTime());
+                            dip.setFAfterTime(dipData.getFAfterTime());
                             info.add(dip);
                         }
                     }
@@ -1054,10 +1056,10 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             dipDataDTO.setFTransValue(0.0);
             dipDataDTO.setFRetainTime(0.0);
 
-            dipDataDTO.setFPreTime(fPreTime);
+//            dipDataDTO.setFPreTime(fPreTime);
             dipDataDTO.setFRampIn(fRampIn);
             dipDataDTO.setFRampOut(fRampOut);
-            dipDataDTO.setFAfterTime(fAfterTime);
+//            dipDataDTO.setFAfterTime(fAfterTime);
 
 
             channelListDTO.setDipData(dipDataDTO);
@@ -1104,6 +1106,8 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         if (CollUtil.isNotEmpty(dipList)) {
                             PqScriptDtls dip = dipList.get(0);
                             dipDataDTO.setFTransValue(dip.getTransValue());
+                            dipDataDTO.setFPreTime(dip.getFPreTime());
+                            dipDataDTO.setFAfterTime(dip.getFAfterTime());
                             if (devFly) {
 //                                if (isValueType) {
                                 dipDataDTO.setFTransValue(dip.getTransValue());

entrance/src/main/resources/application.yml

@@ -36,9 +36,9 @@ mybatis-plus:
     #驼峰命名
     map-underscore-to-camel-case: true
     #配置sql日志输出
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     #关闭日志输出
-  #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       #指定主键生成策略
@@ -85,6 +85,7 @@ log:
 report:
   template: D:\template
   reportDir: D:\report
+  dateFormat: yyyy年MM月dd日
 data:
   homeDir: D:\data
 qr:

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"

license.key

@@ -0,0 +1 @@
+AoNUHvLQag9nPPxWDsf5EwwBqifh5wnoFjrU01w+kIA7TPdRl0AQDBSA3IU7AY28Liubt6Rl8CsDtxEDrz8L5m0FqQrmZ1TmIJtZWbBR16NxXRgf8izM5JurYEY6ZbjU021yCu0fitxB0DJZ8LB8zfUDsV1MFGHl+yPjh4ZQrYDffID4rk/mRe/EE6F7bS19upStSOnQxVQVJSXwCVVHgsuFXqiuagM21OmxpYNjqaPnvAKoHRXTTxXn9BrSgZBocxuHB/IE+a0a+Q2eQo4RZa2IQpneEA/QIKEqezqsABxmM33duQ4eKt17hAttISV1J0R1cKpwZ4tYuSoHCuMONA==

system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java

@@ -28,6 +28,9 @@ public class SysTestConfigParam {
     @ApiModelProperty(value = "场景")
     private String scene;
 
+    @ApiModelProperty(value = "比对监测后，当电压、电流不符合时，是否对标准设备进行系数校准")
+    private Integer coefficient;
+
     @Data
     public static class UpdateParam extends SysTestConfigParam {
         @ApiModelProperty("id")

system/src/main/java/com/njcn/gather/system/cfg/pojo/po/SysTestConfig.java

@@ -51,6 +51,11 @@ public class SysTestConfig extends BaseEntity implements Serializable {
      */
     private Integer scale;
 
+    /**
+     * 比对监测后，当电压、电流不符合时，是否对标准设备进行系数校准
+     */
+    private Integer coefficient;
+
 
     /**
      * 状态：0-删除 1-正常

system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java

@@ -49,6 +49,7 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
         oneConfig.setScale(ObjectUtil.isNotNull(param.getScale()) ? param.getScale() : oneConfig.getScale());
         oneConfig.setMaxTime(ObjectUtil.isNotNull(param.getMaxTime()) ? param.getMaxTime() : oneConfig.getMaxTime());
         oneConfig.setScene(StringUtils.isNotBlank(param.getScene()) ? param.getScene() : oneConfig.getScene());
+        oneConfig.setCoefficient(param.getCoefficient());
         return this.updateById(oneConfig);
     }