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 { * @return */ List> 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 impleme return result; } + @Override + public boolean updateTestState(String planId) { + return this.update(new LambdaUpdateWrapper() + .set(AdPlan::getTestState,CheckStateEnum.CHECKING.getValue()) + .eq(AdPlan::getId,planId)); + } + /** * 逆向可视化 *