微调

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

@@ -321,7 +321,7 @@ public class SocketFreqConverterDevService {
                     originalTolerant
             ));
 
-            pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, Collections.singletonList(testRes));
+            pqFreqConverterTestResService.saveTestRes(suffix, Collections.singletonList(testRes));
         }
     }
 

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

@@ -303,16 +303,17 @@ public class SocketFreqConverterService {
 
         Integer suffix = FormalTestManager.freqConverterTableSuffix;
         List<String> finishedTestResIdList = new ArrayList<>();
-        List<PqFreqConverterTestRes> testResList = new ArrayList<>();
+        List<PqFreqConverterTestRes> saveTestResList = new ArrayList<>();
+        List<PqFreqConverterTestRes> updateTestResList = new ArrayList<>();
 
         FormalTestManager.pendingDipTaskMap.forEach((key, task) -> {
-            PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
-            testRes.setId(key);
-            testRes.setDurationMs(task.getPqDipData().getDurationMs());
-            testRes.setResidualVoltage(task.getPqDipData().getResidualVoltage());
-            testRes.setTolerant(task.getOriginalTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
-
             if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) {
+                PqFreqConverterTestRes testRes = new PqFreqConverterTestRes();
+                testRes.setId(key);
+                testRes.setDurationMs(task.getPqDipData().getDurationMs());
+                testRes.setResidualVoltage(task.getPqDipData().getResidualVoltage());
+                testRes.setTolerant(task.getOriginalTolerant() & (freqConverterStatus.getStatusWord1() == freqConverterConfig.getTolerant() ? 1 : 0));
+
                 finishedTestResIdList.add(key);
 
                 SocketDataMsg socketDataMsg = new SocketDataMsg();
@@ -355,16 +356,22 @@ public class SocketFreqConverterService {
                             featureTestRes.setDurationMs(featurePointVO.getDurationMs());
                             featureTestRes.setResidualVoltage(featurePointVO.getResidualVoltage());
                             featureTestRes.setTolerant(2);
-                            testResList.add(featureTestRes);
+                            saveTestResList.add(featureTestRes);
                         }
                     }
                 }
                 this.lastTolerancePoint = newTolerantPointVO;
+                updateTestResList.add(testRes);
             }
-            testResList.add(testRes);
+
         });
 
-        pqFreqConverterTestResService.saveOrUpdateTestRes(suffix, testResList);
+        if (!saveTestResList.isEmpty()) {
+            pqFreqConverterTestResService.saveTestRes(suffix, saveTestResList);
+        }
+        if (!updateTestResList.isEmpty()) {
+            pqFreqConverterTestResService.updateTestRes(suffix, updateTestResList);
+        }
 
         for (String dipId : finishedTestResIdList) {
             FormalTestManager.pendingDipTaskMap.remove(dipId);
@@ -381,7 +388,7 @@ public class SocketFreqConverterService {
     private boolean isNewGroup(TolerantPointVO lastTolerancePoint, TolerantPointVO newTolerantPointVO) {
         // 横向分组
         if (freqConverterConfig.getDirection() == 0) {
-            return lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() <= -10;
+            return lastTolerancePoint.getDurationMs() - newTolerantPointVO.getDurationMs() >= 10;
         }
         // 纵向分租
         if (freqConverterConfig.getDirection() == 1) {

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

@@ -27,6 +27,24 @@ public interface IPqFreqConverterTestResService extends IService<PqFreqConverter
      */
     boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
 
+    /**
+     * 新增结果记录
+     *
+     * @param suffix 表后缀
+     * @param testResList 结果数据
+     * @return 是否成功
+     */
+    boolean saveTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
+
+    /**
+     * 更新结果记录
+     *
+     * @param suffix 表后缀
+     * @param testResList 结果数据
+     * @return 是否成功
+     */
+    boolean updateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList);
+
     /**
      * 查询结果记录
      *

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

@@ -1,6 +1,5 @@
 package com.njcn.gather.freqConverter.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.db.mybatisplus.handler.DynamicTableNameHandler;
 import com.njcn.gather.freqConverter.mapper.PqFreqConverterTestResMapper;
@@ -8,7 +7,6 @@ import com.njcn.gather.freqConverter.pojo.po.PqFreqConverterTestRes;
 import com.njcn.gather.freqConverter.service.IPqFreqConverterTestResService;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,8 +24,21 @@ public class PqFreqConverterTestResServiceImpl extends ServiceImpl<PqFreqConvert
 
     @Override
     public boolean saveOrUpdateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
+        return this.updateTestRes(suffix, testResList);
+    }
+
+    @Override
+    public boolean saveTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
         DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
-        this.saveOrUpdateBatch(testResList);
+        this.saveBatch(testResList);
+        DynamicTableNameHandler.remove();
+        return true;
+    }
+
+    @Override
+    public boolean updateTestRes(Integer suffix, List<PqFreqConverterTestRes> testResList) {
+        DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix);
+        this.updateBatchById(testResList);
         DynamicTableNameHandler.remove();
         return true;
     }