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 + +