From b3b299edccf1d3068edbf3ad9547c2972921f866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Wed, 28 Oct 2026 14:16:25 +0800 Subject: [PATCH] =?UTF-8?q?:feat:=20=E9=A1=B9=E7=9B=AE=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=88=E8=A7=84=E6=8E=A8=E9=80=81=E5=A2=9E=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=8A=B6=E6=80=81=E5=9B=9E=E5=86=99=E9=97=AD=E7=8E=AF?= =?UTF-8?q?=EF=BC=8C=E4=BB=85=E5=8E=9F=E9=A1=B9=E7=9B=AE=E5=B7=B2=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=90=88=E8=A7=84=E7=9A=84=E5=8F=98=E6=9B=B4=E5=8D=95?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectChangeController.java | 14 +++++-------- .../service/IProjectChangeService.java | 9 +++++++++ .../impl/ProjectChangeServiceImpl.java | 20 ++++++++++++++++++- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectChangeController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectChangeController.java index c697286c..7bfdf1e6 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectChangeController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProjectChangeController.java @@ -33,6 +33,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; +import org.springblade.transport.constant.HcsSyncConstant; import org.springblade.transport.pojo.entity.ProjectChange; import org.springblade.transport.pojo.vo.ProjectChangeVO; import org.springblade.transport.service.IProjectChangeService; @@ -110,17 +111,12 @@ public class ProjectChangeController extends BladeController { hcsImmediatePushSupport.pushProjectAndWait(projectId); String syncFailure = HcsImmediatePushSupport.pollSyncFailure(); if (syncFailure != null) { - ProjectChange projectChange = projectChangeService.getById(id); - if (projectChange != null) { - projectChange.setSyncStatus("failed"); - projectChangeService.updateById(projectChange); - } + projectChangeService.writeBackSyncStatus(projectId, HcsSyncConstant.HCS_STATUS_FAILED); return R.data(Boolean.FALSE, "审批通过，但合规推送失败：" + syncFailure); } - ProjectChange projectChange = projectChangeService.getById(id); - if (projectChange != null) { - projectChange.setSyncStatus("synced"); - projectChangeService.updateById(projectChange); + // 即时推送未开启时（开关关闭不触发推送）不标记已推送，待推送状态由定时扫描任务推送后闭环 + if (hcsImmediatePushSupport.isImmediateEnabled()) { + projectChangeService.writeBackSyncStatus(projectId, HcsSyncConstant.HCS_STATUS_SYNCED); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectChangeService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectChangeService.java index 1cbafa62..81fd622a 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectChangeService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProjectChangeService.java @@ -67,4 +67,13 @@ public interface IProjectChangeService extends BaseService { boolean removeDraft(String ids); + /** + * 按原项目回写最近一条待同步变更单的同步状态（审批即时推送/定时任务推送后调用） + * + * @param projectId 原项目ID + * @param syncStatus 同步状态（synced/failed） + * @return 是否回写成功（无待同步变更单时返回 false） + */ + boolean writeBackSyncStatus(Long projectId, String syncStatus); + } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java index 313573b9..ecb31750 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProjectChangeServiceImpl.java @@ -188,7 +188,11 @@ public class ProjectChangeServiceImpl extends BaseServiceImpllambdaUpdate() + .eq(ProjectChange::getProjectId, projectId) + .eq(ProjectChange::getApprovalStatus, STATUS_APPROVED) + .in(ProjectChange::getSyncStatus, List.of(HcsSyncConstant.HCS_STATUS_UNSYNCED, HcsSyncConstant.HCS_STATUS_FAILED)) + .set(ProjectChange::getSyncStatus, syncStatus) + .last("order by approved_time desc limit 1")); + } + private LambdaQueryWrapper buildQuery(ProjectChangeVO projectChange) { TransportBusinessSupport.validateAllDept(projectChange.getAllDept(), "项目变更"); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery().eq(ProjectChange::getIsDeleted, 0);