diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/config/ReportPushProperties.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/config/ReportPushProperties.java index c250944..b5333bd 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/config/ReportPushProperties.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/config/ReportPushProperties.java @@ -17,9 +17,12 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "inspect.report-push") public class ReportPushProperties { - /** 是否启用自动归档 + 推送 */ + /** 是否启用推送 */ private boolean enabled = true; + /** 是否启用自动归档 */ + private boolean archive = true; + /** 自动归档审核人 */ private String checkPerson = "admin"; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportAutoArchiveService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportAutoArchiveService.java index b58b19e..2feca77 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportAutoArchiveService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/reportpush/service/ReportAutoArchiveService.java @@ -64,8 +64,9 @@ public class ReportAutoArchiveService { @Async public void onTaskCompleted(PatrolTaskStatus taskStatus) { try { - if (!properties.isEnabled()) { - log.info("[AUTO_ARCHIVE] 未启用 inspect.report-push.enabled,跳过自动归档: taskPatrolledId={}", + + if (!properties.isArchive()) { + log.info("[AUTO_ARCHIVE] 未启用 inspect.report-push.archive,跳过自动归档: taskPatrolledId={}", taskStatus == null ? null : taskStatus.getTaskPatrolledId()); return; } 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 75d741e..ff28941 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 @@ -91,7 +91,7 @@ public class ReportPushService { reportInfo.put("inspectDeviceName", properties.getInspectDeviceName()); reportInfo.put("inspectContent", StringUtils.isNotEmpty(report.getPatrolStatistics()) ? report.getPatrolStatistics() : report.getInspectionTaskName()); - reportInfo.put("taskId", StringUtils.isNotEmpty(report.getTaskId()) ? report.getTaskId() : ""); + reportInfo.put("taskId", StringUtils.isNotEmpty(report.getTaskPatrolledId()) ? report.getTaskPatrolledId() : ""); reportInfo.put("taskName", report.getInspectionTaskName()); // 报告发起人:归档入口捕获的当前登录账号,为空时取配置审核人 reportInfo.put("username", StringUtils.isNotEmpty(username) ? username : properties.getCheckPerson());