From 1b3bc9f0f2a8cba30d1a7518ee4dc571fa657ae1 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 21 Jan 2025 09:29:56 +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 --- .../detection/service/impl/DetectionServiceImpl.java | 9 ++------- .../njcn/gather/plan/service/impl/AdPlanServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 47fbc816..1c247357 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -423,13 +423,8 @@ public class DetectionServiceImpl { AdNonHarmonicResult magResult = voltageResult(dev.get(0).getId(), devIdMapComm, sourceIssue, dataRule, mag, magErrList, sourceIssue.getFUn(), MAG); AdNonHarmonicResult durResult = voltageResult(dev.get(0).getId(), devIdMapComm, sourceIssue, dataRule, dur, durErrList, sourceIssue.getFFreq(), DUR); detectionDataDealService.acceptAdNonResult(Arrays.asList(magResult, durResult), code); - List numbers = Arrays.asList(magResult.getResultFlag(), durResult.getResultFlag()).stream().distinct().collect(Collectors.toList()); - if (numbers.contains(4)) { - return 4; - } else if (numbers.contains(2)) { - return 2; - } - return 1; + List numbers = Arrays.asList(magResult.getResultFlag(), durResult.getResultFlag()).stream().filter(x -> 4 != x).distinct().collect(Collectors.toList()); + return getInteger(numbers); } /** 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 095037bc..396c84c1 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 @@ -144,7 +144,8 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // 修改检测计划、检测源关联 adPlanSourceService.updateAdPlanSource(param.getId(), param.getSourceIds()); - pqDevService.bind(param.getId(), param.getDevIds()); + + adPlan.setTestState(pqDevService.bind(param.getId(), param.getDevIds())); return this.updateById(adPlan); }