From 23d8bf88707dd6c09be28310b863a83e0ed75d81 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Mon, 13 Jan 2025 17:55:07 +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/handler/SocketDevResponseService.java       | 6 +++++-
 .../java/com/njcn/gather/plan/service/IAdPlanService.java | 7 +++++++
 .../njcn/gather/plan/service/impl/AdPlanServiceImpl.java  | 8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

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 a34f23db..b73a0074 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
@@ -20,6 +20,7 @@ import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam;
 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.plan.service.IAdPlanService;
 import com.njcn.gather.storage.pojo.param.StorageParam;
 import com.njcn.gather.storage.pojo.po.AdHarmonicResult;
 import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult;
@@ -29,7 +30,6 @@ import com.njcn.gather.system.config.pojo.po.SysTestConfig;
 import com.njcn.gather.system.config.service.ISysTestConfigService;
 import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum;
 import com.njcn.gather.system.pojo.enums.DicDataEnum;
-import com.njcn.gather.system.reg.pojo.vo.SysRegResVO;
 import com.njcn.gather.system.reg.service.ISysRegResService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -78,6 +78,9 @@ public class SocketDevResponseService {
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
     private final ISysTestConfigService sysTestConfigService;
     private final AdHarmonicService adHarmonicService;
+    private final IAdPlanService adPlanService;
+
+
     private final ExecutorService executorPool = Executors.newFixedThreadPool(10);
 
 
@@ -881,6 +884,7 @@ public class SocketDevResponseService {
                     System.out.println(sourceIssue.getType() + splitTag + sourceIssue.getIndex() + "当前测试小项读取数据已经全部结束。。。。。。。。。");
                     //修改装置为监测中
                     iPqDevService.updateCheckState(param.getDevIds());
+                    adPlanService.updateTestState(param.getPlanId());
                     //开启线程进行入库原始数据操作
                     baseDataInsert(realDataXiList, sourceIssue, param, SocketManager.valueTypeMap);
                     
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 74ffcbc9..8c4eeaa0 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
@@ -92,4 +92,11 @@ public interface IAdPlanService extends IService<AdPlan> {
      * @return
      */
     List<Map<String, String>> getBigTestItem(String planId);
+
+    /**
+     * 修改计划状态
+     * @param planId
+     * @return
+     */
+    boolean updateTestState(String planId);
 }
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 b9cc2532..26d1f7eb 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
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
@@ -329,6 +330,13 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         return result;
     }
 
+    @Override
+    public boolean updateTestState(String planId) {
+        return this.update(new LambdaUpdateWrapper<AdPlan>()
+                        .set(AdPlan::getTestState,CheckStateEnum.CHECKING.getValue())
+                .eq(AdPlan::getId,planId));
+    }
+
     /**
      * 逆向可视化
      *