From b540bf09198191c1b90d3a036b842e4dd526ec42 Mon Sep 17 00:00:00 2001 From: liuyang Date: Mon, 9 Dec 2024 10:36:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3282]=20=E5=88=A0=E9=99=A4=E4=BC=AA?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/nodeuser/common/BaseProcessor.java | 10 ---- .../controller/NodeUserController.java | 36 ------------- .../dto/AddOrgNodeUserRequestDTO.java | 26 ---------- .../dto/AddOrgNodeUserResponseDTO.java | 23 -------- .../service/IOrgNodeUserAppService.java | 14 ----- .../service/OrgNodeUserAppServiceImpl.java | 52 ------------------- .../AddNodeUserBaseCheckProcessor.java | 11 ---- .../addnodeuser/AddNodeUserProcessor.java | 13 ----- .../addnodeuser/BaseAddNodeUserProcessor.java | 8 --- .../SendNodeUserAddedMsgProcessor.java | 14 ----- .../nodeuser/temp/INodeUserGateway.java | 5 -- .../server/nodeuser/temp/IOrgNodeGateway.java | 8 --- .../server/nodeuser/temp/OrgNode.java | 4 -- .../server/nodeuser/temp/OrgNodeUser.java | 7 --- 14 files changed, 231 deletions(-) delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/common/BaseProcessor.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/NodeUserController.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserRequestDTO.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserResponseDTO.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/IOrgNodeUserAppService.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/OrgNodeUserAppServiceImpl.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserBaseCheckProcessor.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserProcessor.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/BaseAddNodeUserProcessor.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/SendNodeUserAddedMsgProcessor.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/INodeUserGateway.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/IOrgNodeGateway.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNode.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNodeUser.java diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/common/BaseProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/common/BaseProcessor.java deleted file mode 100644 index d1e44e1..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/common/BaseProcessor.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.common; - -/** - * 流程处理者 - * @param - * @param - */ -public abstract class BaseProcessor { - public abstract R process(R r, T t); -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/NodeUserController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/NodeUserController.java deleted file mode 100644 index ee3fca8..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/NodeUserController.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.controller; - -import cn.axzo.framework.domain.web.result.ApiResult; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; -import cn.axzo.orgmanax.server.nodeuser.service.IOrgNodeUserAppService; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.validation.Valid; - -/** - * 节点用户相关接口 - */ -@RestController -@RequestMapping("node-user") -@RequiredArgsConstructor -public class NodeUserController { - - private final IOrgNodeUserAppService nodeUserAppService; - - /** - * 新增节点用户 - * @param request - * @return - */ - @PostMapping("add") - public ApiResult addOrgNodeUser(@RequestBody @Valid AddOrgNodeUserRequestDTO request) { - return ApiResult.ok(nodeUserAppService.addOrgNodeUser(request)); - } - - -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserRequestDTO.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserRequestDTO.java deleted file mode 100644 index 8b7bc4f..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserRequestDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.controller.dto; - -import lombok.Data; - -@Data -public class AddOrgNodeUserRequestDTO { - - - /** - * 业务类型 TEAM班组业务 GROUP小组业务 - */ - private String bizCode; - - /** - * 所属节点 - */ - private Long nodeId; - - /** - * 用户ID - */ - private Long personId; - - - -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserResponseDTO.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserResponseDTO.java deleted file mode 100644 index 453579a..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/dto/AddOrgNodeUserResponseDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.controller.dto; - -import lombok.Data; - -@Data -public class AddOrgNodeUserResponseDTO { - - /** - * 所属节点 - */ - private Long nodeId; - - /** - * 用户ID - */ - private Long personId; - - /** - * 节点用户ID - */ - private Long orgNodeUserId; - -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/IOrgNodeUserAppService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/IOrgNodeUserAppService.java deleted file mode 100644 index d56aa51..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/IOrgNodeUserAppService.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service; - -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; - -public interface IOrgNodeUserAppService { - - /** - * 新增节点用户 - * @param request - */ - AddOrgNodeUserResponseDTO addOrgNodeUser(AddOrgNodeUserRequestDTO request); - -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/OrgNodeUserAppServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/OrgNodeUserAppServiceImpl.java deleted file mode 100644 index b54bf3e..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/OrgNodeUserAppServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service; - -import cn.axzo.orgmanax.infra.dao.node.DO.OrganizationalNode; -import cn.axzo.orgmanax.server.nodeuser.common.BaseProcessor; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; -import cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser.AddNodeUserBaseCheckProcessor; -import cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser.AddNodeUserProcessor; -import cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser.SendNodeUserAddedMsgProcessor; -import cn.axzo.orgmanax.server.nodeuser.temp.INodeUserGateway; -import cn.axzo.orgmanax.server.nodeuser.temp.IOrgNodeGateway; -import cn.axzo.orgmanax.server.nodeuser.temp.OrgNodeUser; -import cn.hutool.core.lang.Assert; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; - -/** - * 节点用户相关接口 - */ -@RequiredArgsConstructor -@Service -public class OrgNodeUserAppServiceImpl implements IOrgNodeUserAppService { - - private INodeUserGateway nodeUserGateway; - private IOrgNodeGateway orgNodeUserGateway; - - @Override - public AddOrgNodeUserResponseDTO addOrgNodeUser(AddOrgNodeUserRequestDTO request) { - - // 1. 获取上下文 - OrganizationalNode orgNode = orgNodeUserGateway.getById(request.getNodeId()); - Assert.isTrue(orgNode != null, "部门节点不存在"); - OrgNodeUser orgNodeUser = nodeUserGateway.getByNodeIdAndUserId(request.getNodeId(), request.getPersonId()); - Assert.isTrue(orgNodeUser != null, "重新加入"); - - // 2. 流程编排处理 - List> processors = Arrays.asList( - // 基础校验 - new AddNodeUserBaseCheckProcessor(), - // 添加部门 - new AddNodeUserProcessor(), - // 发送消息 - new SendNodeUserAddedMsgProcessor() - ); - AddOrgNodeUserResponseDTO result = new AddOrgNodeUserResponseDTO(); - processors.forEach(p -> p.process(result, request)); - return result; - } -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserBaseCheckProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserBaseCheckProcessor.java deleted file mode 100644 index d8a6a0c..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserBaseCheckProcessor.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser; - -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; - -public class AddNodeUserBaseCheckProcessor extends BaseAddNodeUserProcessor { - @Override - public AddOrgNodeUserResponseDTO process(AddOrgNodeUserResponseDTO addOrgNodeUserResponseDTO, AddOrgNodeUserRequestDTO addOrgNodeUserRequestDTO) { - return null; - } -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserProcessor.java deleted file mode 100644 index c06d6e4..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/AddNodeUserProcessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser; - -import cn.axzo.orgmanax.server.nodeuser.common.BaseProcessor; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; - -public class AddNodeUserProcessor extends BaseProcessor { - - @Override - public AddOrgNodeUserResponseDTO process(AddOrgNodeUserResponseDTO result, AddOrgNodeUserRequestDTO addOrgNodeUserRequestDTO) { - return result; - } -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/BaseAddNodeUserProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/BaseAddNodeUserProcessor.java deleted file mode 100644 index 7bf75e1..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/BaseAddNodeUserProcessor.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser; - -import cn.axzo.orgmanax.server.nodeuser.common.BaseProcessor; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; - -public abstract class BaseAddNodeUserProcessor extends BaseProcessor { -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/SendNodeUserAddedMsgProcessor.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/SendNodeUserAddedMsgProcessor.java deleted file mode 100644 index 5cfcf58..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/addnodeuser/SendNodeUserAddedMsgProcessor.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.service.processor.addnodeuser; - -import cn.axzo.orgmanax.server.nodeuser.common.BaseProcessor; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserRequestDTO; -import cn.axzo.orgmanax.server.nodeuser.controller.dto.AddOrgNodeUserResponseDTO; - -public class SendNodeUserAddedMsgProcessor extends BaseProcessor { - - - @Override - public AddOrgNodeUserResponseDTO process(AddOrgNodeUserResponseDTO result, AddOrgNodeUserRequestDTO addOrgNodeUserRequestDTO) { - return result; - } -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/INodeUserGateway.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/INodeUserGateway.java deleted file mode 100644 index fdc62dd..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/INodeUserGateway.java +++ /dev/null @@ -1,5 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.temp; - -public interface INodeUserGateway { - OrgNodeUser getByNodeIdAndUserId(Long nodeId, Long personId); -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/IOrgNodeGateway.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/IOrgNodeGateway.java deleted file mode 100644 index aa7fcbc..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/IOrgNodeGateway.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.temp; - -import cn.axzo.orgmanax.infra.dao.node.DO.OrganizationalNode; - -public interface IOrgNodeGateway { - - OrganizationalNode getById(Long nodeId); -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNode.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNode.java deleted file mode 100644 index 54e701c..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNode.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.temp; - -public class OrgNode { -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNodeUser.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNodeUser.java deleted file mode 100644 index a07aa0b..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/temp/OrgNodeUser.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.axzo.orgmanax.server.nodeuser.temp; - -import lombok.Data; - -@Data -public class OrgNodeUser { -}