Merge remote-tracking branch 'origin/hainan' into hainan

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

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

@@ -181,11 +181,11 @@ public class PreDetectionController extends BaseController {
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/startFreqConverter")
     @ApiOperation("开启变频器测试")
-    public HttpResult<String> startFreqConverter(@RequestParam("userId") String userId, @RequestParam("converterId") String converterId, @RequestParam("monitorId") String monitorId) {
+    public HttpResult<String> startFreqConverter(@RequestParam("userId") String userId, @RequestParam("converterId") String converterId, @RequestParam("monitorId") String monitorId, @RequestParam("reset") Boolean reset) {
         String methodDescribe = getMethodDescribe("startFreqConverter");
         LogUtil.njcnDebug(log, "{}", methodDescribe);
 
-        preDetectionService.startFreqConverter(userId, converterId, monitorId);
+        preDetectionService.startFreqConverter(userId, converterId, monitorId,reset);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 

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

@@ -74,13 +74,15 @@ public class SocketFreqConverterDevService {
         });
     }
 
-    private void init(String userId, String converterId, String monitorId) {
+    private void init(String userId, String converterId, String monitorId, Boolean reset) {
         FormalTestManager.freqConverterDevStep = null;
 //        FormalTestManager.stopFlag = false;
         FormalTestManager.isRemoveSocket = false;
         FormalTestManager.pendingDipTaskMap.clear();
-        pqDipDataService.clearAllData(FormalTestManager.freqConverterTableSuffix);
-        pqFreqConverterTestResService.clearAllData(FormalTestManager.freqConverterTableSuffix);
+        if (reset) {
+            pqDipDataService.clearAllData(FormalTestManager.freqConverterTableSuffix);
+            pqFreqConverterTestResService.clearAllData(FormalTestManager.freqConverterTableSuffix);
+        }
         this.userId = userId;
         this.monitorId = monitorId;
     }
@@ -88,8 +90,8 @@ public class SocketFreqConverterDevService {
     /**
      * 连接设备
      */
-    public void connectionDev(String userId, String devTag, String converterId, String monitorId) {
-        this.init(userId, converterId, monitorId);
+    public void connectionDev(String userId, String devTag, String converterId, String monitorId, Boolean reset) {
+        this.init(userId, converterId, monitorId, reset);
 
         String payload = buildSingleMonitorPayload(monitorId);
         if (StrUtil.isBlank(payload)) {
@@ -298,7 +300,7 @@ public class SocketFreqConverterDevService {
         }
 
         List<FreqConverterStatus> statusList = freqConverterService.getDipDurationStatusData(suffix, lastStatusData.getTimestamp(), pqDipData.getStartTime().plusNanos(pqDipData.getDurationMs() * 1000_000L));
-        boolean originalTolerant = lastStatusData.getStatusWord1() != freqConverterConfig.getNoTolerant();
+        Integer originalTolerant = (lastStatusData.getStatusWord1() == freqConverterConfig.getTolerant()) ? 1 : 0;
         LocalDateTime targetEndTime = pqDipData.getStartTime()
                 .plusNanos(pqDipData.getDurationMs() * 1000_000L)
                 .plusNanos(freqConverterConfig.getDt() * 1000_000L);
@@ -307,7 +309,9 @@ public class SocketFreqConverterDevService {
             FreqConverterStatus status = statusList.get(statusList.size() - 1);
             PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
             testRes.setDipId(pqDipData.getId());
-            testRes.setTolerant(originalTolerant ? status.getStatusWord1() != freqConverterConfig.getNoTolerant() : false);
+            testRes.setTolerant(originalTolerant == 1 ?
+                    (status.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0)
+                    : 0);
             testRes.setStartTime(lastStatusData.getTimestamp());
 
             FormalTestManager.pendingDipTaskMap.put(pqDipData.getId(), new FormalTestManager.PendingDipTask(
@@ -345,8 +349,28 @@ public class SocketFreqConverterDevService {
     }
 
     public void cleanup(String devTag) {
+        String currentUserId = this.userId;
         FormalTestManager.freqConverterDevStep = null;
         FormalTestManager.isRemoveSocket = true;
         SocketManager.removeUser(devTag);
+        clearStateIfStopped(currentUserId);
+        this.userId = null;
+        this.monitorId = null;
+    }
+
+    /**
+     * 如果设备已停止，则清除共享的运行时状态
+     * @param currentUserId 当前用户ID
+     */
+    private void clearStateIfStopped(String currentUserId) {
+        if (StrUtil.isBlank(currentUserId)) {
+            FormalTestManager.clearFreqConverterRuntimeState();
+            return;
+        }
+        String freqConverterTag = currentUserId + CnSocketUtil.FREQ_CONVERTER_TAG;
+        // 避免过早把 freqConverterTableSuffix 等全局值清掉，造成变频器无法使用全局变量
+        if (!SocketManager.isChannelActive(freqConverterTag)) {
+            FormalTestManager.clearFreqConverterRuntimeState();
+        }
     }
 }

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

@@ -9,6 +9,7 @@ import com.njcn.gather.detection.pojo.dto.FreqConverterRespDTO;
 import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
 import com.njcn.gather.detection.pojo.vo.SocketDataMsg;
 import com.njcn.gather.detection.pojo.vo.SocketMsg;
+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.cilent.NettyClient;
@@ -104,12 +105,14 @@ public class SocketFreqConverterService {
         }
     }
 
-    public void init(String userId, String converterId, String monitorId) {
+    public void init(String userId, String converterId, String monitorId, Boolean reset) {
         this.userId = userId;
         FormalTestManager.freqConverterStep = null;
         FormalTestManager.currentFreqConverterId = converterId;
         Integer suffix = pqFreqConverterConfigService.getSuffix(converterId);
-        freqConverterService.clearAllData(suffix);
+        if (reset) {
+            freqConverterService.clearAllData(suffix);
+        }
         FormalTestManager.freqConverterTableSuffix = suffix;
         FormalTestManager.isRemoveSocket = false;
         FormalTestManager.pendingDipTaskMap.clear();
@@ -120,8 +123,8 @@ public class SocketFreqConverterService {
     /**
      * 连接变频器
      */
-    public void connectionFreqConverter(String userId, String freqConverterTag, String converterId, String monitorId) {
-        this.init(userId, converterId, monitorId);
+    public void connectionFreqConverter(String userId, String freqConverterTag, String converterId, String monitorId, Boolean reset) {
+        this.init(userId, converterId, monitorId, reset);
 
         SocketMsg<Map<String, Object>> socketMsg = new SocketMsg<>();
         socketMsg.setOperateCode(SourceOperateCodeEnum.CMD_INIT_SERIAL.getValue());
@@ -147,16 +150,23 @@ public class SocketFreqConverterService {
     public void handleRead(String converterChannelTag, String msg) {
         FreqConverterRespDTO respDTO = JSON.parseObject(msg, FreqConverterRespDTO.class);
 
-        switch (FormalTestManager.freqConverterStep) {
-            case CMD_INIT_SERIAL:
-                handleInitSerial(converterChannelTag, respDTO);
-                break;
-            case CMD_GET_DEVICE_STATUS:
-                handleGetDeviceStatus(converterChannelTag, respDTO);
-                break;
-            case CMD_CLOSE_SERIAL:
-                handleCloseSerial(converterChannelTag, respDTO);
-                break;
+        if (respDTO.getCode() != 0) {
+            SocketDataMsg socketDataMsg = new SocketDataMsg();
+            socketDataMsg.setRequestId(FormalTestManager.freqConverterStep.getValue());
+            socketDataMsg.setCode(respDTO.getCode());
+            WebServiceManager.sendMsg(this.userId, JSON.toJSONString(socketDataMsg));
+        } else {
+            switch (FormalTestManager.freqConverterStep) {
+                case CMD_INIT_SERIAL:
+                    handleInitSerial(converterChannelTag, respDTO);
+                    break;
+                case CMD_GET_DEVICE_STATUS:
+                    handleGetDeviceStatus(converterChannelTag, respDTO);
+                    break;
+                case CMD_CLOSE_SERIAL:
+                    handleCloseSerial(converterChannelTag, respDTO);
+                    break;
+            }
         }
     }
 
@@ -166,11 +176,15 @@ public class SocketFreqConverterService {
     }
 
     public void cleanup(String converterChannelTag) {
+        String currentUserId = this.userId;
         clearScheduleTask();
         FormalTestManager.freqConverterStep = null;
 //        FormalTestManager.stopFlag = false;
         FormalTestManager.isRemoveSocket = true;
         SocketManager.removeUser(converterChannelTag);
+        updateCurrentTestStatus();
+        clearStateIfStopped(currentUserId);
+        this.userId = null;
     }
 
     private void handleInitSerial(String converterChannelTag, FreqConverterRespDTO respDTO) {
@@ -251,6 +265,29 @@ public class SocketFreqConverterService {
         }
     }
 
+    private void updateCurrentTestStatus() {
+        if (StrUtil.isNotBlank(FormalTestManager.currentFreqConverterId)) {
+            pqFreqConverterConfigService.updateTestStatus(FormalTestManager.currentFreqConverterId, 1);
+        }
+    }
+
+    /**
+     * 如果变频器已停止，则清除共享的运行时状态
+     *
+     * @param currentUserId 当前用户ID
+     */
+    private void clearStateIfStopped(String currentUserId) {
+        if (StrUtil.isBlank(currentUserId)) {
+            FormalTestManager.clearFreqConverterRuntimeState();
+            return;
+        }
+        String devTag = currentUserId + CnSocketUtil.DEV_TAG;
+        // 避免过早把 freqConverterTableSuffix 等全局值清掉，造成设备无法使用全局变量
+        if (!SocketManager.isChannelActive(devTag)) {
+            FormalTestManager.clearFreqConverterRuntimeState();
+        }
+    }
+
     private void consumePendingDipTasks(FreqConverterStatus freqConverterStatus) {
         if (FormalTestManager.pendingDipTaskMap.isEmpty()) {
             return;
@@ -269,7 +306,8 @@ public class SocketFreqConverterService {
             testRes.setEndTime(freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())
                     ? freqConverterStatus.getTimestamp()
                     : task.getTargetEndTime());
-            testRes.setTolerant(testRes.getTolerant() && (freqConverterStatus.getStatusWord1() != freqConverterConfig.getNoTolerant()));
+
+            testRes.setTolerant(testRes.getTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
             testResList.add(testRes);
 
             if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) {

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

@@ -65,7 +65,7 @@ public interface PreDetectionService {
 
     void startCoefficient();
 
-    void startFreqConverter(String userId, String converterId, String monitorId);
+    void startFreqConverter(String userId, String converterId, String monitorId,Boolean reset);
 
     void stopFreqConverter(String converterId, String monitorId);
 }

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

@@ -394,7 +394,7 @@ public class PreDetectionServiceImpl implements PreDetectionService {
     }
 
     @Override
-    public void startFreqConverter(String userId, String converterId, String monitorId) {
+    public void startFreqConverter(String userId, String converterId, String monitorId, Boolean reset) {
         String freqConverterTag = userId + CnSocketUtil.FREQ_CONVERTER_TAG;
         String devTag = userId + CnSocketUtil.DEV_TAG;
 //        socketFreqConverterService.init(userId, converterId, monitorId);
@@ -406,8 +406,8 @@ public class PreDetectionServiceImpl implements PreDetectionService {
         while (true) {
             if (SocketManager.isChannelActive(freqConverterTag) && SocketManager.isChannelActive(devTag)) {
 //            if (SocketManager.isChannelActive(devTag)) {
-                socketFreqConverterService.connectionFreqConverter(userId, freqConverterTag, converterId, monitorId);
-                socketFreqConverterDevService.connectionDev(userId, devTag, converterId, monitorId);
+                socketFreqConverterService.connectionFreqConverter(userId, freqConverterTag, converterId, monitorId, reset);
+                socketFreqConverterDevService.connectionDev(userId, devTag, converterId, monitorId,reset);
                 break;
             }
 

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

@@ -226,14 +226,25 @@ public class FormalTestManager {
      */
     public static boolean isXu;
 
+    /**
+     * 清理变频器耐受实验运行态数据
+     */
+    public static void clearFreqConverterRuntimeState() {
+        freqConverterStep = null;
+        freqConverterDevStep = null;
+        currentFreqConverterId = null;
+        freqConverterTableSuffix = null;
+        pendingDipTaskMap.clear();
+    }
+
     @Data
     public static class PendingDipTask {
         private PqDipData pqDipData;
 
         private LocalDateTime targetEndTime;
-        private Boolean originalTolerant;
+        private Integer originalTolerant;
 
-        public PendingDipTask(PqDipData pqDipData, LocalDateTime targetEndTime, Boolean originalTolerant) {
+        public PendingDipTask(PqDipData pqDipData, LocalDateTime targetEndTime, Integer originalTolerant) {
             this.pqDipData = pqDipData;
             this.targetEndTime = targetEndTime;
             this.originalTolerant = originalTolerant;

detection/src/main/java/com/njcn/gather/freqConverter/config/FreqConverterConfig.java

@@ -13,6 +13,6 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "freq-converter")
 public class FreqConverterConfig {
     private Long schedulePeriod;
-    private Integer noTolerant;
+    private Integer tolerant;
     private Integer dt;
 }

detection/src/main/java/com/njcn/gather/freqConverter/controller/FreqConverterController.java

@@ -95,12 +95,22 @@ public class FreqConverterController extends BaseController {
     }
 
     @GetMapping("/result")
-    @ApiOperation("查询耐受实验结果")
+    @ApiOperation("查询变频器测试结果")
     @ApiImplicitParam(name = "param", value = "查询参数", required = true)
     public HttpResult<List<TolerantPointVO>> result(@RequestParam("converterId") String converterId) {
         String methodDescribe = getMethodDescribe("result");
         LogUtil.njcnDebug(log, "{}，查询ID数据为：{}", methodDescribe, converterId);
-        List<TolerantPointVO> tolerantPoints = freqConverterService.getTolerantPoints(converterId);
+        List<TolerantPointVO> tolerantPoints = freqConverterService.getDipPoints(converterId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tolerantPoints, methodDescribe);
+    }
+
+    @GetMapping("/scurve")
+    @ApiOperation("获取绘制特性曲线的point点")
+    @ApiImplicitParam(name = "converterId", value = "变频器ID", required = true)
+    public HttpResult<List<TolerantPointVO>> getScurvePoints(@RequestParam("converterId") String converterId) {
+        String methodDescribe = getMethodDescribe("getScurvePoints");
+        LogUtil.njcnDebug(log, "{}，查询ID数据为：{}", methodDescribe, converterId);
+        List<TolerantPointVO> tolerantPoints = freqConverterService.getFeaturesScurvePoints(converterId);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tolerantPoints, methodDescribe);
     }
 }

detection/src/main/java/com/njcn/gather/freqConverter/pojo/po/PqFreqConverterTestRes.java

@@ -23,9 +23,9 @@ public class PqFreqConverterTestRes {
     private String dipId;
 
     /**
-     * 0为不耐受，1为耐受
+     * 0为不耐受，1为耐受，2为特性曲线点
      */
-    private Boolean tolerant;
+    private Integer tolerant;
 
     /**
      * 该暂降时期对应变频器的起始时间戳

detection/src/main/java/com/njcn/gather/freqConverter/pojo/vo/TolerantPointVO.java

@@ -19,7 +19,7 @@ public class TolerantPointVO {
     private Double residualVoltage;
 
     /**
-     * 是否耐受
+     * 是否耐受。0-否，1-是，2-表示特性曲线点
      */
-    private boolean tolerant;
+    private Integer tolerant;
 }

detection/src/main/java/com/njcn/gather/freqConverter/service/IFreqConverterService.java

@@ -46,9 +46,17 @@ public interface IFreqConverterService extends IService<FreqConverterStatus> {
      * @param converterId 变频器Id
      * @return 是否耐受
      */
-    List<TolerantPointVO> getTolerantPoints(String converterId);
+    List<TolerantPointVO> getDipPoints(String converterId);
 
     List<FreqConverterStatus> getDipDurationStatusData(Integer suffix, LocalDateTime startTime, LocalDateTime endTime);
 
     FreqConverterStatus getLastStatusData(Integer suffix, LocalDateTime startTime);
+
+    /**
+     * 获取变频器特性曲线点
+     *
+     * @param converterId 变频器ID
+     * @return
+     */
+    List<TolerantPointVO> getFeaturesScurvePoints(String converterId);
 }

detection/src/main/java/com/njcn/gather/freqConverter/service/impl/FreqConverterServiceImpl.java

@@ -21,6 +21,8 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -41,13 +43,14 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
     private final IPqDipDataService dipDataService;
     private final IPqFreqConverterTestResService pqFreqConverterTestResService;
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean saveFreqConverterStatus(Integer suffix, FreqConverterStatus status) {
         if (status.getId() == null) {
             status.setId(IdUtil.fastSimpleUUID());
         }
-        DynamicTableNameHandler.setTableName("pq_freq_converter_status_" + suffix);
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix);
         boolean result = this.save(status);
         DynamicTableNameHandler.remove();
         return result;
@@ -57,7 +60,7 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
     public List<FreqConverterStatus> listStatusData(String converterId) {
         Integer suffix = pqFreqConverterConfigService.getSuffix(converterId);
 
-        DynamicTableNameHandler.setTableName("pq_freq_converter_status_" + suffix);
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix);
         LambdaQueryChainWrapper<FreqConverterStatus> wrapper = this.lambdaQuery().orderByAsc(FreqConverterStatus::getTimestamp);
         List<FreqConverterStatus> result = wrapper.list();
         DynamicTableNameHandler.remove();
@@ -68,38 +71,36 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void clearAllData(Integer suffix) {
-        DynamicTableNameHandler.setTableName("pq_freq_converter_status_" + suffix);
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix);
         this.remove(null);
         DynamicTableNameHandler.remove();
     }
 
     @Override
-    public List<TolerantPointVO> getTolerantPoints(String converterId) {
+    public List<TolerantPointVO> getDipPoints(String converterId) {
         Integer suffix = pqFreqConverterConfigService.getSuffix(converterId);
-        List<PqDipData> dipDataList = dipDataService.listDipData(suffix);
-        List<PqFreqConverterTestRes> testResList = pqFreqConverterTestResService.listTestRes(suffix);
-        dipDataList.sort(Comparator.comparing(PqDipData::getDurationMs));
 
-        List<TolerantPointVO> res = new ArrayList<>();
-        for (PqDipData dipData : dipDataList) {
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
+        List<PqFreqConverterTestRes> pqFreqConverterTestResList = pqFreqConverterTestResService.list();
+        DynamicTableNameHandler.remove();
+        List<TolerantPointVO> result = pqFreqConverterTestResList.stream().map(item -> {
+            DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_DIP_DATA_TB_PREFIX + suffix);
+            PqDipData pqDipData = dipDataService.getById(item.getDipId());
+            DynamicTableNameHandler.remove();
             TolerantPointVO tolerantPointVO = new TolerantPointVO();
-            tolerantPointVO.setDurationMs(dipData.getDurationMs());
-            tolerantPointVO.setResidualVoltage(dipData.getResidualVoltage());
-            List<PqFreqConverterTestRes> matchedResList = testResList.stream()
-                    .filter(item -> dipData.getId().equals(item.getDipId()))
-                    .collect(Collectors.toList());
+            tolerantPointVO.setDurationMs(pqDipData.getDurationMs());
+            tolerantPointVO.setResidualVoltage(pqDipData.getResidualVoltage());
+            tolerantPointVO.setTolerant(item.getTolerant());
+            return tolerantPointVO;
+        }).sorted(Comparator.comparingInt(TolerantPointVO::getDurationMs)).collect(Collectors.toList());
 
-            boolean tolerant = matchedResList.stream().allMatch(PqFreqConverterTestRes::getTolerant);
-            tolerantPointVO.setTolerant(tolerant);
 
-            res.add(tolerantPointVO);
-        }
-        return res;
+        return result;
     }
 
     @Override
     public List<FreqConverterStatus> getDipDurationStatusData(Integer suffix, LocalDateTime startTime, LocalDateTime endTime) {
-        DynamicTableNameHandler.setTableName("pq_freq_converter_status_" + suffix);
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix);
         List<FreqConverterStatus> result = this.lambdaQuery()
                 .between(FreqConverterStatus::getTimestamp, startTime, endTime)
                 .orderByAsc(FreqConverterStatus::getTimestamp)
@@ -110,7 +111,7 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
 
     @Override
     public FreqConverterStatus getLastStatusData(Integer suffix, LocalDateTime startTime) {
-        DynamicTableNameHandler.setTableName("pq_freq_converter_status_" + suffix);
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix);
         FreqConverterStatus one = this.lambdaQuery().le(FreqConverterStatus::getTimestamp, startTime)
                 .orderByDesc(FreqConverterStatus::getTimestamp)
                 .last("limit 1")
@@ -118,4 +119,39 @@ public class FreqConverterServiceImpl extends ServiceImpl<FreqConverterStatusMap
         DynamicTableNameHandler.remove();
         return one;
     }
+
+    @Override
+    public List<TolerantPointVO> getFeaturesScurvePoints(String converterId) {
+        List<TolerantPointVO> dipPoints = this.getDipPoints(converterId);
+        if (dipPoints == null || dipPoints.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        Map<Integer, List<TolerantPointVO>> durationPointMap = dipPoints.stream()
+                .collect(Collectors.groupingBy(TolerantPointVO::getDurationMs));
+
+        List<TolerantPointVO> result = new ArrayList<>();
+        durationPointMap.entrySet().stream()
+                .sorted(Map.Entry.comparingByKey())
+                .forEach(entry -> {
+                    List<TolerantPointVO> sameDurationPoints = entry.getValue().stream()
+                            .sorted(Comparator.comparing(TolerantPointVO::getResidualVoltage, Comparator.reverseOrder()))
+                            .collect(Collectors.toList());
+
+                    for (int index = 0; index < sameDurationPoints.size() - 1; index++) {
+                        TolerantPointVO currentPoint = sameDurationPoints.get(index);
+                        TolerantPointVO nextPoint = sameDurationPoints.get(index + 1);
+                        if (!Objects.equals(currentPoint.getTolerant(), nextPoint.getTolerant())) {
+                            TolerantPointVO featurePoint = new TolerantPointVO();
+                            featurePoint.setDurationMs(entry.getKey());
+                            featurePoint.setResidualVoltage((currentPoint.getResidualVoltage() + nextPoint.getResidualVoltage()) / 2D);
+                            featurePoint.setTolerant(2);
+                            result.add(featurePoint);
+                            break;
+                        }
+                    }
+                });
+
+        return result;
+    }
 }

detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterConfigServiceImpl.java

@@ -28,6 +28,13 @@ import java.util.List;
 public class PqFreqConverterConfigServiceImpl extends ServiceImpl<PqFreqConverterConfigMapper, PqFreqConverterConfig> implements IPqFreqConverterConfigService {
     private final TableGenMapper tableGenMapper;
 
+    /**
+     * 表名前缀
+     */
+    public static final String PQ_FREQ_CONVERTER_STATUS_TB_PREFIX = "pq_freq_converter_status_";
+    public static final String PQ_DIP_DATA_TB_PREFIX = "pq_dip_data_";
+    public static final String PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX = "pq_freq_converter_test_res_";
+
     @Override
     public Page<PqFreqConverterConfig> listPqFreqConverterConfigs(PqFreqConverterParam.QueryParam queryParam) {
         QueryWrapper wrapper = new QueryWrapper<>();
@@ -53,7 +60,7 @@ public class PqFreqConverterConfigServiceImpl extends ServiceImpl<PqFreqConverte
             maxSuffix = freqConverterConfig.getSuffix() + 1;
         }
 
-        String tableSql = "CREATE TABLE `pq_freq_converter_status_" + maxSuffix + "` (" +
+        String tableSql = "CREATE TABLE `" + PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + maxSuffix + "`(" +
                 "  `id` char(32) NOT NULL COMMENT '主键ID'," +
                 "  `slave_address` int(11) DEFAULT NULL COMMENT '从机地址'," +
                 "  `status_word1` int(11) DEFAULT NULL COMMENT '状态字1'," +
@@ -63,7 +70,7 @@ public class PqFreqConverterConfigServiceImpl extends ServiceImpl<PqFreqConverte
                 ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='变频器状态表';";
         tableGenMapper.genTable(tableSql);
 
-        tableSql = "CREATE TABLE `pq_dip_data_" + maxSuffix + "` (" +
+        tableSql = "CREATE TABLE `" + PQ_DIP_DATA_TB_PREFIX + maxSuffix + "` (" +
                 "   `id` char(32) NOT NULL COMMENT '主键ID'," +
                 "   `start_time` datetime(3) NOT NULL COMMENT '起始时间戳'," +
                 "   `residual_voltage` decimal(6,2) NOT NULL COMMENT '残余电压(%Ur)'," +
@@ -72,7 +79,7 @@ public class PqFreqConverterConfigServiceImpl extends ServiceImpl<PqFreqConverte
                 ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='电压暂降数据表';";
         tableGenMapper.genTable(tableSql);
 
-        tableSql = "CREATE TABLE `pq_freq_converter_test_res_" + maxSuffix + "` (" +
+        tableSql = "CREATE TABLE `" + PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + maxSuffix + "` (" +
                 "   `id` char(32) NOT NULL COMMENT '主键ID'," +
                 "   `dip_id` char(32) NOT NULL COMMENT '装置暂降数据id'," +
                 "   `start_time` datetime(3) DEFAULT NULL COMMENT '该暂降时期对应变频器的起始时间戳'," +
@@ -105,9 +112,9 @@ public class PqFreqConverterConfigServiceImpl extends ServiceImpl<PqFreqConverte
         List<PqFreqConverterConfig> pqFreqConverterConfigs = this.listByIds(ids);
         for (PqFreqConverterConfig pqFreqConverterConfig : pqFreqConverterConfigs) {
             Integer suffix = pqFreqConverterConfig.getSuffix();
-            sql.append("pq_freq_converter_status_" + suffix + ",")
-                    .append("pq_dip_data_" + suffix + ",")
-                    .append("pq_freq_converter_test_res_" + suffix + ",");
+            sql.append(PQ_FREQ_CONVERTER_STATUS_TB_PREFIX + suffix + ",")
+                    .append(PQ_DIP_DATA_TB_PREFIX + suffix + ",")
+                    .append(PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix + ",");
         }
 
         sql.deleteCharAt(sql.length() - 1);

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

@@ -1265,7 +1265,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         for (int i = 1; i <= maxTime; i++) {
             row2[i] = i + "次检测";
             int tempI = i;
-            List<PqDevVO> tempDevList = devList.stream().filter(dev -> dev.getRecheckNum() <= tempI).collect(Collectors.toList());
+            List<PqDevVO> tempDevList = devList.stream().filter(dev -> dev.getRecheckNum() == tempI).collect(Collectors.toList());
             long passCount = tempDevList.stream().filter(dev -> dev.getCheckResult() == CheckResultEnum.ACCORD.getValue()).count();
             row3[i] = passCount + "";
             row4[i] = total + "";

entrance/src/main/resources/application.yml

@@ -129,5 +129,5 @@ activate:
 
 freq-converter:
   schedule-period: 200 #定时器运行间隔
-  no-tolerant: 4 #不耐受状态
+  tolerant: 1 #耐受状态
   dt: 200 #延迟时间ms