From b113788e542f5ff8b5f6f5f973fa24cfd8687649 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 25 May 2026 18:41:15 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=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 This reverts commit 282f9cf4ebefde836a7b8253a803b912a9d72fad. --- .../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, 2 insertions(+), 25 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 992244de..78517bc0 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,9 +39,4 @@ 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 28f0da5c..acb83abb 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,7 +41,6 @@ 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; @@ -176,7 +175,6 @@ 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; @@ -790,9 +788,6 @@ 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 -> { // 准备被检设备的基础信息 @@ -807,7 +802,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, reportTemplateId).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); + PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); if (Objects.isNull(report)) { throw new BusinessException(ReportResponseEnum.REPORT_TEMPLATE_NOT_EXIST); } @@ -871,9 +866,6 @@ 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 -> { // 准备被检设备的基础信息 @@ -887,7 +879,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, reportTemplateId).eq(PqReport::getState, DataStateEnum.ENABLE.getCode()).one(); + PqReport report = this.lambdaQuery().eq(PqReport::getId, plan.getReportTemplateId()).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 186bb58c..25c5f3f5 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,9 +31,4 @@ 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 f7ab1dd3..b47e36de 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,7 +41,6 @@ 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; @@ -53,7 +52,6 @@ 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; @@ -114,7 +112,6 @@ 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; @@ -147,8 +144,6 @@ 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());