From e7b0ce96f583e9e65bbb52d654f9bc4897a71169 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 14 Jan 2025 16:27:27 +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 --- .../service/impl/PreDetectionServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 a17830af..6b73cb21 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 @@ -26,10 +26,12 @@ import com.njcn.gather.detection.util.socket.SocketManager; import com.njcn.gather.detection.util.socket.cilent.NettyClient; import com.njcn.gather.detection.util.socket.cilent.NettySourceClientHandler; import com.njcn.gather.device.device.service.IPqDevService; +import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; import com.njcn.gather.device.script.pojo.po.PqScriptDtls; import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.device.script.service.IPqScriptCheckDataService; import com.njcn.gather.device.script.service.IPqScriptDtlsService; import com.njcn.gather.device.source.pojo.po.PqSource; import com.njcn.gather.device.source.pojo.po.SourceInitialize; @@ -69,8 +71,7 @@ public class PreDetectionServiceImpl implements PreDetectionService { private final SocketDevResponseService socketDevResponseService; private final SocketSourceResponseService socketSourceResponseService; - private final AdHarmonicService adHarmonicService; - + private final IPqScriptCheckDataService iPqScriptCheckDataService; @Value("${socket.source.ip:192.168.1.136}") private String ip; @@ -214,7 +215,12 @@ public class PreDetectionServiceImpl implements PreDetectionService { SocketManager.sendMsg(param.getUserPageId() + source, JSON.toJSONString(xuMsg)); } else { //TODO 是否最终检测完成需要推送给用户 - iPqDevService.updateResult(param.getDevIds(), param.getCode()); + PqScriptCheckDataParam checkDataParam=new PqScriptCheckDataParam(); + checkDataParam.setScriptId(param.getScriptId()); + checkDataParam.setIsValueTypeName(false); + List valueType = iPqScriptCheckDataService.getValueType(checkDataParam); + + iPqDevService.updateResult(param.getDevIds(), valueType,param.getCode()); CnSocketUtil.quitSend(param); }