From 40b0e535cbbc8599b5beec5e75e532e3b842ac09 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 9 May 2025 08:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E9=A1=B9=E5=A4=8D?= =?UTF-8?q?=E6=A3=80bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 16 ++++++++++------ .../gather/plan/controller/AdPlanController.java | 2 +- .../njcn/gather/plan/pojo/param/AdPlanParam.java | 2 +- .../njcn/gather/plan/service/IAdPlanService.java | 4 ++-- .../plan/service/impl/AdPlanServiceImpl.java | 10 +++++++--- 5 files changed, 21 insertions(+), 13 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 fce1bd64..c1800d5d 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 @@ -844,10 +844,14 @@ public class SocketDevResponseService { if (param.getOperateType().equals(SourceOperateCodeEnum.RE_ERROR_TEST.getValue())) { //不合格项复检 + List indexes = new ArrayList<>(); StorageParam storageParam = new StorageParam(); storageParam.setCode(param.getCode()); storageParam.setScriptId(param.getScriptId()); - List indexes = adHarmonicService.getIndex(storageParam, true); + param.getDevIds().forEach(devId -> { + storageParam.setDevId(devId); + indexes.addAll(adHarmonicService.getIndex(storageParam, true)); + }); issueParam.setIndexList(indexes); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.RE_ERROR_TEST.getValue()); } else { @@ -909,7 +913,7 @@ public class SocketDevResponseService { } else { // 发送下一个脚本与icd校验 String icdType = icdTypeList.stream().filter(it -> !icdCheckDataMap.containsKey(it)).findFirst().orElse(null); - if(ObjectUtil.isNotNull(icdType)){ + if (ObjectUtil.isNotNull(icdType)) { Map map = new HashMap<>(2); map.put("dataType", dataTypeList); map.put("icdType", icdType); @@ -1623,8 +1627,8 @@ public class SocketDevResponseService { initXiManager(param); } - harmonicRelationMap.put(DetectionCodeEnum.V2_50.getCode(),DetectionCodeEnum.U1.getCode()); - harmonicRelationMap.put(DetectionCodeEnum.I2_50.getCode(),DetectionCodeEnum.I1.getCode()); + harmonicRelationMap.put(DetectionCodeEnum.V2_50.getCode(), DetectionCodeEnum.U1.getCode()); + harmonicRelationMap.put(DetectionCodeEnum.I2_50.getCode(), DetectionCodeEnum.I1.getCode()); } //初始化系数校验参数 @@ -1728,7 +1732,7 @@ public class SocketDevResponseService { } } else { - for(int j=0;jit.getDesc().equals(dui)).collect(Collectors.toList()).get(0).getList(); + DevData.SqlDataDTO.ListDTO vvv = data.getSqlData().stream().filter(it -> it.getDesc().equals(dui)).collect(Collectors.toList()).get(0).getList(); Double aV = vvv.getA(); Double bV = vvv.getB(); Double cV = vvv.getC(); diff --git a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java index 997db9f0..da832704 100644 --- a/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java +++ b/detection/src/main/java/com/njcn/gather/plan/controller/AdPlanController.java @@ -155,7 +155,7 @@ public class AdPlanController extends BaseController { public HttpResult>> getBigTestItem(@RequestBody AdPlanParam.CheckParam checkParam) { String methodDescribe = getMethodDescribe("getBigTestItem"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, checkParam); - List> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevId()); + List> result = adPlanService.getBigTestItem(checkParam.getReCheckType(), checkParam.getPlanId(), checkParam.getDevIds()); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java b/detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java index bbd3109f..93aa506f 100644 --- a/detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java +++ b/detection/src/main/java/com/njcn/gather/plan/pojo/param/AdPlanParam.java @@ -110,6 +110,6 @@ public class AdPlanParam { // 0:不合格项复检 1:全部复检 private Integer reCheckType; private String planId; - private String devId; + private List devIds; } } diff --git a/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java b/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java index a6cb92cb..4c016a9d 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/IAdPlanService.java @@ -70,10 +70,10 @@ public interface IAdPlanService extends IService { * * @param reCheckType 0:不合格项复检 1:全部复检 * @param planId 检测计划Id - * @param devId 设备Id + * @param devIds 设备Id列表 * @return */ - List> getBigTestItem(Integer reCheckType, String planId, String devId); + List> getBigTestItem(Integer reCheckType, String planId, List devIds); /** * 修改计划状态 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 e27f1c41..d5cc55a7 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 @@ -308,7 +308,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme } @Override - public List> getBigTestItem(Integer reCheckType, String planId, String devId) { + public List> getBigTestItem(Integer reCheckType, String planId, List devIds) { List> result = new ArrayList<>(); AdPlan adPlan = this.getById(planId); if (ObjectUtil.isNull(adPlan)) { @@ -330,11 +330,15 @@ public class AdPlanServiceImpl extends ServiceImpl impleme // // scriptDtlsList = scriptDtlsList.stream().filter(obj -> !sortSet.contains(obj.getScriptIndex())).collect(Collectors.toList()); // } + List indexes = new ArrayList<>(); StorageParam storageParam = new StorageParam(); - storageParam.setDevId(devId); storageParam.setCode(adPlan.getCode() + ""); storageParam.setScriptId(adPlan.getScriptId()); - List indexes = adHarmonicService.getIndex(storageParam, true); + devIds.forEach(devId -> { + storageParam.setDevId(devId); + indexes.addAll(adHarmonicService.getIndex(storageParam, true)); + }); + scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); }