From 95c564595f4b18e2759cc7efa49571e2e79efd35 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 16 May 2025 16:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 2 -- .../plan/service/impl/AdPlanServiceImpl.java | 2 -- .../service/IPqScriptCheckDataService.java | 8 ------- .../impl/PqScriptCheckDataServiceImpl.java | 21 ------------------- .../service/impl/AdHarmonicServiceImpl.java | 4 ++++ 5 files changed, 4 insertions(+), 33 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index bbdf5544..a1c62ff8 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -856,8 +856,6 @@ public class SocketDevResponseService { storageParam.setDevId(devId); indexes.addAll(adHarmonicService.getIndex(storageParam)); }); - List notErrorCheckIndex = pqScriptCheckDataService.listNotErrorCheckIndex(param.getScriptId()); - indexes.removeAll(notErrorCheckIndex); issueParam.setIndexList(indexes.stream().collect(Collectors.toList())); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.RE_ERROR_TEST.getValue()); } else { diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 11460c0d..e84c568b 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -332,7 +332,6 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // } - List notErrorCheckIndex = pqScriptCheckDataService.listNotErrorCheckIndex(scriptId); Set indexes = new HashSet<>(); StorageParam storageParam = new StorageParam(); storageParam.setCode(adPlan.getCode() + ""); @@ -341,7 +340,6 @@ public class AdPlanServiceImpl extends ServiceImpl impleme storageParam.setDevId(devId); indexes.addAll(adHarmonicService.getIndex(storageParam)); }); - indexes.removeAll(notErrorCheckIndex); scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); } diff --git a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java index 077aa87c..ac320d83 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java @@ -51,12 +51,4 @@ public interface IPqScriptCheckDataService extends IService { * @return */ boolean deleteByScriptIds(List ids); - - /** - * 根据脚本id查询出不参与误差比较的检查项对应的index - * - * @param scriptId - * @return - */ - List listNotErrorCheckIndex(String scriptId); } diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java index a7f8589b..d254487f 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java @@ -145,25 +145,4 @@ public class PqScriptCheckDataServiceImpl extends ServiceImpl ids) { return this.remove(new LambdaQueryWrapper().in(PqScriptCheckData::getScriptId, ids)); } - - @Override - public List listNotErrorCheckIndex(String scriptId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.select(PqScriptCheckData::getScriptIndex) - .eq(PqScriptCheckData::getScriptId, scriptId) - .eq(PqScriptCheckData::getErrorFlag, 0); - - List list1 = this.list(wrapper).stream().map(PqScriptCheckData::getScriptIndex).distinct().collect(Collectors.toList()); - for (int i = list1.size() - 1; i >= 0; i--) { - wrapper.clear(); - wrapper.eq(PqScriptCheckData::getScriptId, scriptId); - wrapper.eq(PqScriptCheckData::getScriptIndex, list1.get(i)); - List list = this.list(wrapper); - long count = list.stream().filter(x -> x.getErrorFlag() == 1).count(); - if (count != 0) { - list1.remove(i); - } - } - return list1; - } } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index 66f2b050..f008bc7d 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -209,6 +209,8 @@ public class AdHarmonicServiceImpl extends ServiceImpl adHarmonicResultList = this.list(lambdaQueryWrapper); List indexes = new ArrayList<>(adHarmonicResultList.stream().map(AdHarmonicResult::getSort).distinct().collect(Collectors.toList())); @@ -218,6 +220,8 @@ public class AdHarmonicServiceImpl extends ServiceImpl nonHarmonicResults = adNonHarmonicMapper.selectList(resultLambdaQueryWrapper); indexes.addAll(nonHarmonicResults.stream().map(AdNonHarmonicResult::getSort).distinct().collect(Collectors.toList()));