From 952d3b42902873e9f782715d8ea38f191044be50 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Wed, 23 Sep 2026 17:44:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A8=E9=80=81=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8A=A5=E5=91=8A=E6=8E=A8=E9=80=81=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E4=BB=BB=E5=8A=A1id=E7=94=A8=E9=80=97=E5=8F=B7?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../insreporttask/mapper/InspectionReportTaskMapper.java | 8 ++++++++ .../inspect/reportpush/service/ReportPushService.java | 4 ++-- .../controller/DonghuanReportExportController.java | 9 +++++++++ .../resources/mapper/task/InspectionReportTaskMapper.xml | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/insreporttask/mapper/InspectionReportTaskMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/insreporttask/mapper/InspectionReportTaskMapper.java index 0fd85ce..2f628a4 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/insreporttask/mapper/InspectionReportTaskMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/insreporttask/mapper/InspectionReportTaskMapper.java @@ -25,4 +25,12 @@ public interface InspectionReportTaskMapper { */ List selectInspectionReportsByTaskPatrolledId(@Param("taskPatrolledId") String taskPatrolledId, @Param("filter") String filter); + + /** + * 按报告主键查询该报告关联的所有任务执行标识。 + * + * @param reportLineId 报告主键 inspection_report.line_id + * @return 任务执行标识列表 inspection_report_task.task_patrolled_id + */ + List selectTaskPatrolledIdsByReportLineId(@Param("reportLineId") Long reportLineId); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportPushService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportPushService.java index ff28941..a97ce3b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportPushService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportPushService.java @@ -101,8 +101,8 @@ public class ReportPushService { message.setFilePath(filePath); message.setReportInfo(reportInfo.toJSONString()); reportPushPublisher.publish(message); - log.info("[REPORT_PUSH] 报告推送消息已发布: reportId={}, filePath={}, username={}", - report.getLineId(), filePath, username); + log.info("[REPORT_PUSH] 报告推送消息已发布: reportId={}, filePath={}, username={}, message={}", + report.getLineId(), filePath, username, message); } /** diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/DonghuanReportExportController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/DonghuanReportExportController.java index fb03cf6..3424499 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/DonghuanReportExportController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/DonghuanReportExportController.java @@ -13,6 +13,7 @@ import com.inspect.insreport.domain.InspectionReport; import com.inspect.insreport.service.IInspectionReportService; import com.inspect.insreportdata.domain.InspectionReportData; import com.inspect.insreportdata.service.IInspectionReportDataService; +import com.inspect.insreporttask.mapper.InspectionReportTaskMapper; import com.inspect.message.MessageUtils; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.service.IPatrolResultService; @@ -279,6 +280,7 @@ public class DonghuanReportExportController extends BaseController { private final IInspectionReportDataService inspectionReportDataService; private final IInspectionReportImgService inspectionReportImgService; private final IInspectionReportService inspectionReportService; + private final InspectionReportTaskMapper inspectionReportTaskMapper; private final SftpClient sftpClient; private final ReportPushService reportPushService; private final ReportPushProperties reportPushProperties; @@ -294,6 +296,7 @@ public class DonghuanReportExportController extends BaseController { IInspectionReportDataService inspectionReportDataService, IInspectionReportImgService inspectionReportImgService, IInspectionReportService inspectionReportService, + InspectionReportTaskMapper inspectionReportTaskMapper, SftpClient sftpClient, ReportPushService reportPushService, ReportPushProperties reportPushProperties, @@ -303,6 +306,7 @@ public class DonghuanReportExportController extends BaseController { this.inspectionReportDataService = inspectionReportDataService; this.inspectionReportImgService = inspectionReportImgService; this.inspectionReportService = inspectionReportService; + this.inspectionReportTaskMapper = inspectionReportTaskMapper; this.sftpClient = sftpClient; this.reportPushService = reportPushService; this.reportPushProperties = reportPushProperties; @@ -589,6 +593,11 @@ public class DonghuanReportExportController extends BaseController { try { inspectionReport.setFilePath(basePath + reportName + ".docx"); inspectionReport.setLineIds(reportIds); + // 报告的 task_patrolled_id：按 report_line_id 取 inspection_report_task 下所有任务执行标识 + List taskPatrolledIds = inspectionReportTaskMapper + .selectTaskPatrolledIdsByReportLineId(lineId); + inspectionReport.setTaskPatrolledId( + taskPatrolledIds == null ? null : StringUtils.join(taskPatrolledIds, ",")); inspectionReportService.updateInspectionReportFilePath(inspectionReport); // 报告生成并上传完成后，发布消息到 RabbitMQ，由消费者异步 HTTP 上传外部平台（自动归档与手动归档均推送） reportPushService.pushReport(inspectionReport, username); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportTaskMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportTaskMapper.xml index 9e5df03..f5828fc 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportTaskMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/InspectionReportTaskMapper.xml @@ -61,4 +61,9 @@ and r.filter = #{filter} order by r.line_id desc + +