From 6fd180b4d472121f88fe86f09512721f5e8bcfbd Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 25 May 2026 16:20:06 +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

---
 .../result/controller/ResultController.java      | 12 ++++++++++++
 .../gather/result/service/IResultService.java    |  8 ++++++++
 .../result/service/impl/ResultServiceImpl.java   | 16 ++++++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
index 5341f93a..2fa9d4f8 100644
--- a/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
+++ b/detection/src/main/java/com/njcn/gather/result/controller/ResultController.java
@@ -201,4 +201,16 @@ public class ResultController extends BaseController {
         List<ContrastTestItemVO> result = resultService.getCheckItem(monitorQueryParam.getPlanId(), monitorQueryParam.getDevId(), monitorQueryParam.getChnNum(), monitorQueryParam.getNum(), monitorQueryParam.getCode());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/canTest")
+    @ApiOperation("是否还能进行检测")
+    @ApiImplicitParam(name = "devIds", value = "设备id", required = true)
+    public HttpResult<Boolean> canTest(@RequestBody List<String> devIds) {
+        String methodDescribe = getMethodDescribe("canTest");
+        LogUtil.njcnDebug(log, "{}，查询数据为，devIds=：{}", methodDescribe, devIds);
+
+        boolean result = resultService.canTest(devIds);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
 }
diff --git a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
index f17675e0..953cbdd8 100644
--- a/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
+++ b/detection/src/main/java/com/njcn/gather/result/service/IResultService.java
@@ -138,4 +138,12 @@ public interface IResultService {
     Map<Integer, List<ContrastTestResult>> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO);
 
     ContrastTestResult getContrastResultHarm(MonitorResultVO monitorResultVO, List<String> scriptId, Integer planCode, DictTree dictTree);
+
+    /**
+     * 判断设备是否可以测试
+     *
+     * @param devIds
+     * @return
+     */
+    boolean canTest(List<String> devIds);
 }
diff --git a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
index f7ab1dd3..1b8347fe 100644
--- a/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/result/service/impl/ResultServiceImpl.java
@@ -130,7 +130,6 @@ public class ResultServiceImpl implements IResultService {
     private final DetectionServiceImpl detectionServiceImpl;
     private final IDictDataService dictDataService;
     private final IPqScriptCheckDataService iPqScriptCheckDataService;
-    private final IPqDevService iPqDevService;
     private final IAdPariService adPairService;
     private final IPqMonitorService pqMonitorService;
     private final IPqErrSysService pqErrSysService;
@@ -2149,6 +2148,19 @@ public class ResultServiceImpl implements IResultService {
         return null;
     }
 
+    @Override
+    public boolean canTest(List<String> devIds) {
+        for (String devId : devIds) {
+            PqDevVO pqDevVO = pqDevService.getPqDevById(devId);
+            AdPlanTestConfig adPlanTestConfig = adPlanTestConfigService.getByPlanId(pqDevVO.getPlanId());
+            Integer maxTime = adPlanTestConfig.getMaxTime();
+            if (maxTime != null && maxTime <= pqDevVO.getRecheckNum()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * 判断值是否为零
      *
@@ -3145,7 +3157,7 @@ public class ResultServiceImpl implements IResultService {
         checkDataParam.setIsValueTypeName(false);
         List<String> valueType = iPqScriptCheckDataService.getValueType(checkDataParam);
 
-        iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
+        pqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity());
     }
 
     /**