diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java index 13b5a5e1..2da4db57 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterDevService.java +++ b/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)); } } diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java index 3c1cbc94..5d0ed3b9 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketFreqConverterService.java @@ -303,7 +303,8 @@ public class SocketFreqConverterService { Integer suffix = FormalTestManager.freqConverterTableSuffix; List finishedTestResIdList = new ArrayList<>(); - List testResList = new ArrayList<>(); + List saveTestResList = new ArrayList<>(); + List updateTestResList = new ArrayList<>(); FormalTestManager.pendingDipTaskMap.forEach((key, task) -> { if (freqConverterStatus.getTimestamp().isAfter(task.getTargetEndTime())) { @@ -355,17 +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; - testResList.add(testRes); + updateTestResList.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); diff --git a/detection/src/main/java/com/njcn/gather/freqConverter/service/IPqFreqConverterTestResService.java b/detection/src/main/java/com/njcn/gather/freqConverter/service/IPqFreqConverterTestResService.java index 8291f840..7a5040be 100644 --- a/detection/src/main/java/com/njcn/gather/freqConverter/service/IPqFreqConverterTestResService.java +++ b/detection/src/main/java/com/njcn/gather/freqConverter/service/IPqFreqConverterTestResService.java @@ -27,6 +27,24 @@ public interface IPqFreqConverterTestResService extends IService testResList); + /** + * 新增结果记录 + * + * @param suffix 表后缀 + * @param testResList 结果数据 + * @return 是否成功 + */ + boolean saveTestRes(Integer suffix, List testResList); + + /** + * 更新结果记录 + * + * @param suffix 表后缀 + * @param testResList 结果数据 + * @return 是否成功 + */ + boolean updateTestRes(Integer suffix, List testResList); + /** * 查询结果记录 * diff --git a/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java b/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java index 8f861237..9b614640 100644 --- a/detection/src/main/java/com/njcn/gather/freqConverter/service/impl/PqFreqConverterTestResServiceImpl.java +++ b/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,24 +24,21 @@ public class PqFreqConverterTestResServiceImpl extends ServiceImpl testResList) { - DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix); + return this.updateTestRes(suffix, testResList); + } - List existTestResList = new ArrayList<>(); - List newTestResList = new ArrayList<>(); - for (PqFreqConverterTestRes testRes : testResList) { - PqFreqConverterTestRes existTestRes = this.getById(testRes.getId()); - if (ObjectUtil.isNotNull(existTestRes)) { - existTestResList.add(existTestRes); - }else{ - newTestResList.add(testRes); - } - } - if(existTestResList.size() > 0){ - this.updateBatchById(existTestResList); - } - if(newTestResList.size() > 0){ - this.saveBatch(newTestResList); - } + @Override + public boolean saveTestRes(Integer suffix, List testResList) { + DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix); + this.saveBatch(testResList); + DynamicTableNameHandler.remove(); + return true; + } + + @Override + public boolean updateTestRes(Integer suffix, List testResList) { + DynamicTableNameHandler.setTableName(PqFreqConverterConfigServiceImpl.PQ_FREQ_CONVERTER_TEST_RES_TB_PREFIX + suffix); + this.updateBatchById(testResList); DynamicTableNameHandler.remove(); return true; }