From 251e302e59b9436100383689e90a6165f4b80037 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 12 May 2026 10:36:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80sourceId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/SocketDevResponseService.java | 16 +++++++++++----- .../service/impl/PreDetectionServiceImpl.java | 3 ++- .../service/impl/PqScriptDtlsServiceImpl.java | 12 ++++++++---- 3 files changed, 21 insertions(+), 10 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 14a875ce..8cc97db7 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 @@ -33,6 +33,8 @@ import com.njcn.gather.script.pojo.param.PqScriptIssueParam; import com.njcn.gather.script.pojo.po.SourceIssue; import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.script.service.IPqScriptDtlsService; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.service.IPqSourceService; import com.njcn.gather.storage.pojo.param.StorageParam; import com.njcn.gather.storage.pojo.po.SimAndDigHarmonicResult; import com.njcn.gather.storage.pojo.po.SimAndDigNonHarmonicResult; @@ -76,6 +78,7 @@ public class SocketDevResponseService { private final SimAndDigHarmonicService adHarmonicService; private final IAdPlanService adPlanService; private final IDictDataService dictDataService; + private final IPqSourceService pqSourceService; /** * 存储的装置相序数据 @@ -391,6 +394,8 @@ public class SocketDevResponseService { if (param.getTestItemList().get(2)) { //如果后续做正式检测 PqScriptIssueParam issueParam = new PqScriptIssueParam(); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setPlanId(param.getPlanId()); issueParam.setSourceId(param.getSourceId()); issueParam.setDevIds(param.getDevIds()); @@ -893,10 +898,9 @@ public class SocketDevResponseService { //开始下源控制脚本 PqScriptIssueParam issueParam = new PqScriptIssueParam(); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setPlanId(param.getPlanId()); - issueParam.setSourceId(param.getSourceId()); - issueParam.setDevIds(param.getDevIds()); - issueParam.setScriptId(param.getScriptId()); socketMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); List sourceIssues; @@ -1162,8 +1166,9 @@ public class SocketDevResponseService { } else if (param.getTestItemList().get(2)) { // 后续做正式检测 PqScriptIssueParam issueParam = new PqScriptIssueParam(); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setPlanId(param.getPlanId()); - issueParam.setSourceId(param.getSourceId()); issueParam.setDevIds(param.getDevIds()); issueParam.setScriptId(param.getScriptId()); @@ -1816,8 +1821,9 @@ public class SocketDevResponseService { XiNumberManager.devParameterList.add(devParameterSmall); PqScriptIssueParam issueParam = new PqScriptIssueParam(); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setPlanId(param.getPlanId()); - issueParam.setSourceId(param.getSourceId()); issueParam.setDevIds(param.getDevIds()); issueParam.setScriptId(param.getScriptId()); issueParam.setIsPhaseSequence(CommonEnum.COEFFICIENT_TEST.getValue()); diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java index 87cd8833..e0488f12 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java @@ -289,7 +289,8 @@ public class PreDetectionServiceImpl implements PreDetectionService { } //组装源控制脚本 PqScriptIssueParam issueParam = new PqScriptIssueParam(); - issueParam.setSourceId(param.getSourceId()); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setScriptId(param.getScriptId()); issueParam.setType(1); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.SIMULATE_TEST.getValue()); diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java index 87e1069c..68cb898a 100644 --- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java @@ -34,6 +34,8 @@ import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.script.service.IPqScriptDtlsService; import com.njcn.gather.script.util.ScriptDtlsDesc; import com.njcn.gather.script.util.ThreePhaseUnbalance; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.service.IPqSourceService; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import com.njcn.gather.system.dictionary.service.IDictTreeService; import com.njcn.gather.system.pojo.enums.DicDataEnum; @@ -68,13 +70,13 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl getScriptToIcdCheckInfo(PreDetectionParam param) { PqScriptIssueParam issueParam = new PqScriptIssueParam(); - issueParam.setSourceId(param.getSourceId()); + SourceInitialize sourceInitialize = pqSourceService.getSourceInitializeParam(param.getSourceId()); + issueParam.setSourceId(sourceInitialize.getSourceId()); issueParam.setDevIds(param.getDevIds()); issueParam.setScriptId(param.getScriptId()); issueParam.setIsPhaseSequence(CommonEnum.FORMAL_TEST.getValue()); @@ -974,7 +978,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl