From 8048b6c8f6b4962ad63c341c0ee1786cbdb443f1 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 21 Jan 2025 10:37:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3488]=20=E8=BF=BD=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgmanax/dto/node/req/ProcessNodeReq.java | 20 +++++++++++++++ .../dao/node/entity/OrganizationalNode.java | 2 +- .../node/service/impl/NodeServiceImpl.java | 25 ------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ProcessNodeReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ProcessNodeReq.java index 0c1e594..59dfcd9 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ProcessNodeReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ProcessNodeReq.java @@ -14,10 +14,30 @@ import lombok.experimental.SuperBuilder; @Data @SuperBuilder public class ProcessNodeReq { + + /** + * 业务id + */ private Long id; + + /** + * 操作人 + */ private Long operatorId; + + /** + * 描述 + */ private String description; + + /** + * 执行行为 + */ private Action action; + + /** + * 业务参数 + */ private JSONObject param; @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java index 2c0e9b8..5b49ffa 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java @@ -61,7 +61,7 @@ public class OrganizationalNode implements Serializable { /** * 节点类型 * - * @see NodeUserTypeEnum + * @see cn.axzo.orgmanax.dto.node.enums.NodeTypeEnum */ @TableField("node_type") private Integer nodeType; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java index 29d4553..e020eee 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java @@ -3,41 +3,16 @@ package cn.axzo.orgmanax.server.node.service.impl; import cn.axzo.foundation.exception.Axssert; import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.common.config.BizResultCode; -import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO; import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO; import cn.axzo.orgmanax.dto.node.req.ListNodeReq; import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq; -import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO; -import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq; -import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip; -import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository; import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode; import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository; -import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser; -import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository; -import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository; -import cn.axzo.orgmanax.server.node.foundation.NodeFoundationService; import cn.axzo.orgmanax.server.node.service.NodeService; import cn.axzo.orgmanax.server.node.service.executor.ListNodeCmdExe; import cn.axzo.orgmanax.server.node.service.processor.NodeProcessor; -import cn.axzo.orgmanax.server.nodeuser.foundation.NodeUserFoundationService; -import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.BooleanUtil; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service;