From 230b2fc6b253686f4b617f15a01c1d60a4024e4f Mon Sep 17 00:00:00 2001 From: zhanghonghao Date: Thu, 6 Mar 2025 19:04:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3714):=20=E5=BA=95=E5=BA=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nodeuser/feign/OrgNodeUserCheckApi.java | 41 +++++++++++++++++++ .../req/BatchDeleteNodeUserCheckReq.java | 30 ++++++++++++++ .../resp/BatchDeleteNodeUserCheckResp.java | 25 +++++++++++ .../OrgNodeUserCheckController.java | 32 +++++++++++++++ 4 files changed, 128 insertions(+) create mode 100644 orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/feign/OrgNodeUserCheckApi.java create mode 100644 orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/BatchDeleteNodeUserCheckReq.java create mode 100644 orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/resp/BatchDeleteNodeUserCheckResp.java create mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/OrgNodeUserCheckController.java diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/feign/OrgNodeUserCheckApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/feign/OrgNodeUserCheckApi.java new file mode 100644 index 0000000..12901b8 --- /dev/null +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/feign/OrgNodeUserCheckApi.java @@ -0,0 +1,41 @@ +package cn.axzo.orgmanax.api.nodeuser.feign; + +import cn.axzo.foundation.result.ApiResult; +import cn.axzo.orgmanax.dto.nodeuser.req.BatchDeleteNodeUserCheckReq; +import cn.axzo.orgmanax.dto.nodeuser.resp.BatchDeleteNodeUserCheckResp; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * 部门相关基础API + * + * @author tanjie@axzo.cn + * @date 2024/12/2 15:40 + */ +@FeignClient( + value = "orgmanax", + url = "${axzo.service.orgmanax:http://orgmanax:8080}") +public interface OrgNodeUserCheckApi { + + /** + * 根据条件聚合查询节点用户 + * + * @param req + * @return + */ + @PostMapping("/api/node-user/batchDelete/check/unit") + ApiResult> checkUnit(@RequestBody @Validated BatchDeleteNodeUserCheckReq req); + + /** + * 根据条件聚合查询节点用户 + * + * @param req + * @return + */ + @PostMapping("/api/node-user/batchDelete/check/workspace") + ApiResult> checkWorkspace(@RequestBody @Validated BatchDeleteNodeUserCheckReq req); +} diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/BatchDeleteNodeUserCheckReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/BatchDeleteNodeUserCheckReq.java new file mode 100644 index 0000000..b155739 --- /dev/null +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/BatchDeleteNodeUserCheckReq.java @@ -0,0 +1,30 @@ +package cn.axzo.orgmanax.dto.nodeuser.req; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author : zhanghonghao@axzo.cn + * @since : 2025/3/6 + */ +@Data +public class BatchDeleteNodeUserCheckReq { + + /** + * personIds + */ + @NotNull(message = "personIds不可以为空!") + private List personIds; + + private Long workspaceId; + + private Long ouId; + + /** + * 删除项目人员的时候传入 + * 节点ID + */ + private Long nodeId; +} diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/resp/BatchDeleteNodeUserCheckResp.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/resp/BatchDeleteNodeUserCheckResp.java new file mode 100644 index 0000000..5b0b3a4 --- /dev/null +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/resp/BatchDeleteNodeUserCheckResp.java @@ -0,0 +1,25 @@ +package cn.axzo.orgmanax.dto.nodeuser.resp; + +import lombok.Data; + +import java.util.List; + +/** + * @author : zhanghonghao@axzo.cn + * @since : 2025/3/6 + */ +@Data +public class BatchDeleteNodeUserCheckResp { + + private Long personId; + + private List failInfos; + + @Data + public static class CheckFailInfo { + + private Integer type; + + private Integer count; + } +} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/OrgNodeUserCheckController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/OrgNodeUserCheckController.java new file mode 100644 index 0000000..0b98c20 --- /dev/null +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/OrgNodeUserCheckController.java @@ -0,0 +1,32 @@ +package cn.axzo.orgmanax.server.nodeuser.controller; + +import cn.axzo.foundation.result.ApiResult; +import cn.axzo.orgmanax.api.nodeuser.feign.OrgNodeUserCheckApi; +import cn.axzo.orgmanax.dto.nodeuser.req.BatchDeleteNodeUserCheckReq; +import cn.axzo.orgmanax.dto.nodeuser.resp.BatchDeleteNodeUserCheckResp; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author : zhanghonghao@axzo.cn + * @since : 2025/3/6 + */ +@RestController +@RequestMapping +@RequiredArgsConstructor +public class OrgNodeUserCheckController implements OrgNodeUserCheckApi { + + + @Override + public ApiResult> checkUnit(BatchDeleteNodeUserCheckReq req) { + return null; + } + + @Override + public ApiResult> checkWorkspace(BatchDeleteNodeUserCheckReq req) { + return null; + } +} \ No newline at end of file