From 033330b0055c673a4829a5f315171ac1cec773e4 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 19 Nov 2025 09:35:49 +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/SocketContrastResponseService.java | 11 ++++++++--- .../detection/pojo/param/ContrastDetectionParam.java | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java index f47a744d..eaa8c490 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketContrastResponseService.java @@ -182,8 +182,7 @@ public class SocketContrastResponseService { FormalTestManager.pstDataType = null; FormalTestManager.isPstData = false; FormalTestManager.isWaveCheck = false; - FormalTestManager.isXu = true; -// FormalTestManager.isXu = param.getXXu(); + FormalTestManager.isXu = param.getPhaseCheck() == 1 ? true : false; FormalTestManager.nonWaveDataSourceEnum = null; String[] datasourceIds = FormalTestManager.currentTestPlan.getDatasourceId().split(","); @@ -221,7 +220,13 @@ public class SocketContrastResponseService { FormalTestManager.isRemoveSocket = false; FormalTestManager.waveCheckFlag = false; FormalTestManager.scheduler = null; - FormalTestManager.scheduledFuture = null; + if (FormalTestManager.scheduledFuture != null) { + FormalTestManager.scheduledFuture.cancel(true); + if (FormalTestManager.scheduler != null) { + FormalTestManager.scheduler.shutdown(); + } + FormalTestManager.scheduledFuture = null; + } HashBiMap hashBiMap = HashBiMap.create(param.getPairs()); FormalTestManager.pairsIdMap.clear(); diff --git a/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java b/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java index f4850a60..795cff86 100644 --- a/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java +++ b/detection/src/main/java/com/njcn/gather/detection/pojo/param/ContrastDetectionParam.java @@ -47,5 +47,5 @@ public class ContrastDetectionParam { /** * 是否进行相许校验 */ - private Boolean xXu; + private Integer phaseCheck; }