From 282f9cf4ebefde836a7b8253a803b912a9d72fad Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 25 May 2026 14:27:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=9F=E6=88=90?= =?UTF-8?q?=E3=80=81=E6=A3=80=E6=B5=8B=E7=BB=93=E6=9E=9C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/gather/report/pojo/DevReportParam.java | 5 +++++ .../report/service/impl/PqReportServiceImpl.java | 12 ++++++++++-- .../njcn/gather/result/pojo/vo/FormContentVO.java | 5 +++++ .../result/service/impl/ResultServiceImpl.java | 5 +++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/report/pojo/DevReportParam.java b/detection/src/main/java/com/njcn/gather/report/pojo/DevReportParam.java index 78517bc0..992244de 100644 --- a/detection/src/main/java/com/njcn/gather/report/pojo/DevReportParam.java +++ b/detection/src/main/java/com/njcn/gather/report/pojo/DevReportParam.java @@ -39,4 +39,9 @@ public class DevReportParam implements Serializable { * 批量下载时传递的被检设备id列表 */ private List devIdList; + + /** + * 检测报告模板 + */ + private String reportTemplateName; } diff --git a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java index acb83abb..28f0da5c 100644 --- a/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java @@ -41,6 +41,7 @@ import com.njcn.gather.err.pojo.po.PqErrSys; import com.njcn.gather.err.service.IPqErrSysService; import com.njcn.gather.monitor.pojo.po.PqMonitor; import com.njcn.gather.monitor.service.IPqMonitorService; +import com.njcn.gather.plan.mapper.AdPlanMapper; import com.njcn.gather.plan.pojo.enums.DataSourceEnum; import com.njcn.gather.plan.pojo.enums.PlanReportStateEnum; import com.njcn.gather.plan.pojo.po.AdPlan; @@ -175,6 +176,7 @@ public class PqReportServiceImpl extends ServiceImpl i private final IPqDevSubService iPqDevSubService; private final IDictDataService dictDataService; private final IAdPlanService adPlanService; + private final AdPlanMapper pqPlanMapper; private final IPqScriptDtlsService pqScriptDtlsService; private final SimAndDigNonHarmonicService adNonHarmonicService; private final SimAndDigHarmonicService adHarmonicService; @@ -788,6 +790,9 @@ public class PqReportServiceImpl extends ServiceImpl i * @param devReportParam 设备信息 */ private void generateReportByPlanContrast(AdPlan plan, DevReportParam devReportParam) { + String reportTemplateName = devReportParam.getReportTemplateName(); + String[] split = reportTemplateName.split("_"); + String reportTemplateId = pqPlanMapper.getReportIdByNameAndVersion(split[0], split[1]); // 支持批量生成报告 devReportParam.getDevIdList().forEach(devId -> { // 准备被检设备的基础信息 @@ -802,7 +807,7 @@ public class PqReportServiceImpl extends ServiceImpl i if (Objects.isNull(devType)) { throw new BusinessException(ReportResponseEnum.DEVICE_TYPE_NOT_EXIST); } - PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); + PqReport report = this.lambdaQuery().eq(PqReport::getId, reportTemplateId).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); if (Objects.isNull(report)) { throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST); } @@ -866,6 +871,9 @@ public class PqReportServiceImpl extends ServiceImpl i * @param devReportParam 设备信息 */ private void generateReportByPlan(AdPlan plan, DevReportParam devReportParam) { + String reportTemplateName = devReportParam.getReportTemplateName(); + String[] split = reportTemplateName.split("_"); + String reportTemplateId = pqPlanMapper.getReportIdByNameAndVersion(split[0], split[1]); // 支持批量生成报告 devReportParam.getDevIdList().forEach(devId -> { // 准备被检设备的基础信息 @@ -879,7 +887,7 @@ public class PqReportServiceImpl extends ServiceImpl i if (Objects.isNull(devType)) { throw new BusinessException(ReportResponseEnum.DEVICE_TYPE_NOT_EXIST); } - PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); + PqReport report = this.lambdaQuery().eq(PqReport::getId, reportTemplateId).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); if (Objects.isNull(report)) { throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST); } diff --git a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java index 25c5f3f5..186bb58c 100644 --- a/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java +++ b/detection/src/main/java/com/njcn/gather/result/pojo/vo/FormContentVO.java @@ -31,4 +31,9 @@ public class FormContentVO { * 有多少次波形录制 */ private Integer waveNumTotal; + + /** + * 报表模板 + */ + private String reportTemplateName; } 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 b47e36de..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 @@ -41,6 +41,7 @@ import com.njcn.gather.device.service.IPqStandardDevService; import com.njcn.gather.err.service.IPqErrSysService; import com.njcn.gather.monitor.pojo.po.PqMonitor; import com.njcn.gather.monitor.service.IPqMonitorService; +import com.njcn.gather.plan.mapper.AdPlanMapper; import com.njcn.gather.plan.pojo.enums.DataSourceEnum; import com.njcn.gather.plan.pojo.po.AdPlan; import com.njcn.gather.plan.pojo.po.AdPlanTestConfig; @@ -52,6 +53,7 @@ import com.njcn.gather.report.pojo.constant.PowerConstant; import com.njcn.gather.report.pojo.enums.AffectEnum; import com.njcn.gather.report.pojo.enums.ItemReportKeyEnum; import com.njcn.gather.report.pojo.enums.PowerIndexEnum; +import com.njcn.gather.report.pojo.po.PqReport; import com.njcn.gather.report.pojo.result.ContrastTestResult; import com.njcn.gather.report.pojo.result.SingleTestResult; import com.njcn.gather.result.pojo.enums.ResultUnitEnum; @@ -112,6 +114,7 @@ import static com.njcn.gather.plan.pojo.enums.DataSourceEnum.*; public class ResultServiceImpl implements IResultService { private final IAdPlanService adPlanService; + private final AdPlanMapper adPlanMapper; private final IAdPlanTestConfigService adPlanTestConfigService; private final IPqDevService pqDevService; private final IPqStandardDevService pqStandardDevService; @@ -144,6 +147,8 @@ public class ResultServiceImpl implements IResultService { FormContentVO formContentVO = new FormContentVO(); AdPlan plan = adPlanService.getById(queryParam.getPlanId()); formContentVO.setErrorSysId(plan.getErrorSysId()); + PqReport report = adPlanMapper.getPqReportById(plan.getReportTemplateId()); + formContentVO.setReportTemplateName(report.getName() + "_" + report.getVersion()); String scriptId = null; if (ObjectUtil.isNotNull(plan)) { formContentVO.setDataRule(plan.getDataRule()); 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 2/2] =?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 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 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> 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 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 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 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()); } /**