From 5edb86019033052d7077149e79574059a62d863c Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Thu, 2 Apr 2026 14:06:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:DM=E9=A1=B5=E9=9D=A2=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A9=E5=85=83=E4=BA=A8=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../honeycom/spdm/controller/SpdmFlowController.java | 11 +++++++---- .../spdm/controller/SpdmTenantController.java | 7 +++++++ .../honeycom/spdm/feign/RemoteTenantServiceFeign.java | 4 ++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmFlowController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmFlowController.java index 1b1c7c6..ab0adae 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmFlowController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmFlowController.java @@ -49,6 +49,7 @@ import org.apache.commons.collections4.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -91,10 +92,12 @@ public class SpdmFlowController { @Operation(summary = "流程结束评审状态通知SPDM") @PostMapping(value = "/flowEndStatusNotice") public void flowEndStatusNotice(@RequestBody Map approveResultDto) { - R result = spdmServiceFeignClient.approveStatusNotice(ApproveResultDto.builder() - .approveStatus(SpdmApproveStatusEnum.getSpdmStatus((Integer) approveResultDto.get("approveStatus"))) - .cidFlowId((String) approveResultDto.get("cidFlowId")).build()); - log.info("[flowEndStatusNotice] param:{}, result:{}", JSONUtil.toJsonStr(approveResultDto), JSONUtil.toJsonStr(result)); + CompletableFuture.runAsync(() -> { + R result = spdmServiceFeignClient.approveStatusNotice(ApproveResultDto.builder() + .approveStatus(SpdmApproveStatusEnum.getSpdmStatus((Integer) approveResultDto.get("approveStatus"))) + .cidFlowId((String) approveResultDto.get("cidFlowId")).build()); + log.info("[flowEndStatusNotice] param:{}, result:{}", JSONUtil.toJsonStr(approveResultDto), JSONUtil.toJsonStr(result)); + }); } @Operation(summary = "根据组名查询组内流程模板") diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java index a0a8571..0568eb1 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/controller/SpdmTenantController.java @@ -106,5 +106,12 @@ public class SpdmTenantController { } } + @Operation(summary = "同步利元亨用户" , description = "同步利元亨用户" ) + @GetMapping("/allSyncLyricUsers" ) + public ResponseR allSyncLyricUsers() { + remoteTenantServiceFeign.allSyncLyricUsers(new ArrayList<>()); + return ResponseR.ok(); + } + } diff --git a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java index bda71e9..72a005f 100644 --- a/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java +++ b/honeycom-spdm/src/main/java/com/honeycombis/honeycom/spdm/feign/RemoteTenantServiceFeign.java @@ -15,6 +15,7 @@ import com.honeycombis.honeycom.tenant.entity.SysStaffEntity; import com.honeycombis.honeycom.tenant.vo.SysDeptVO; import com.honeycombis.honeycom.tenant.vo.SysRoleVO; import com.honeycombis.honeycom.tenant.vo.SysStaffVO; +import com.honeycombis.honeycom.tenant.vo.lyric.LyricUserDto; import com.honeycombis.honeycom.tenant.vo.tenant.SysTenantVO; import com.honeycombis.honeycom.tenant.vo.tenant.TenantVO; import com.honeycombis.honeycom.tenant.vo.tenant.TenantViewVO; @@ -60,4 +61,7 @@ public interface RemoteTenantServiceFeign { @GetMapping("/sysTenant/getAll" ) R> getAll(); + @PostMapping("/hrSync/allSyncLyricUsers" ) + R allSyncLyricUsers(@RequestBody List userDtoList); + }