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 2fa9d4f8..5341f93a 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,16 +201,4 @@ public class ResultController extends BaseController { List 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 canTest(@RequestBody List 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 953cbdd8..f17675e0 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,12 +138,4 @@ public interface IResultService { Map> getContrastResultForReport(DevReportParam devReportParam, PqDevVO pqDevVO); ContrastTestResult getContrastResultHarm(MonitorResultVO monitorResultVO, List scriptId, Integer planCode, DictTree dictTree); - - /** - * 判断设备是否可以测试 - * - * @param devIds - * @return - */ - boolean canTest(List 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 1b8347fe..f7ab1dd3 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,6 +130,7 @@ 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; @@ -2148,19 +2149,6 @@ public class ResultServiceImpl implements IResultService { return null; } - @Override - public boolean canTest(List 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; - } - /** * 判断值是否为零 * @@ -3157,7 +3145,7 @@ public class ResultServiceImpl implements IResultService { checkDataParam.setIsValueTypeName(false); List valueType = iPqScriptCheckDataService.getValueType(checkDataParam); - pqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity()); + iPqDevService.updateResult(param.getDevIds(), valueType, param.getCode(), param.getUserId(), param.getTemperature(), param.getHumidity()); } /**