feat(REQ-3282): 添加dto层。提供对外暴露的公共对象。

orgmanax-api/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>common-lib</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.axzo.orgmanax</groupId>
+            <artifactId>orgmanax-dto</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/cooperateship/feign/OrgCooperateShipApi.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.api.cooperateship.feign;
 
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.cooperateship.resp.OrgCooperateShipDTO;
+import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
+import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/node/feign/OrgNodeApi.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.api.node.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/nodeuser/feign/OrgNodeUserApi.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.api.nodeuser.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.resp.NodeUserDTO;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ProcessNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/feign/OrgJobApi.java

@@ -2,18 +2,16 @@ package cn.axzo.orgmanax.api.orgjob.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.orgjob.req.CreateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.DeleteOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.UpdateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 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;
-
 @FeignClient(
         value = "orgmanax",
         url = "${axzo.service.orgmanax:http://orgmanax:8080}")

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orguser/feign/OrgUserApi.java

@@ -2,8 +2,8 @@ package cn.axzo.orgmanax.api.orguser.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
-import cn.axzo.orgmanax.api.orguser.resp.OrgUserDTO;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.dto.OrgUserDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitApi.java

@@ -3,12 +3,12 @@ package cn.axzo.orgmanax.api.unit.feign;
 
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.unit.req.CreateUnitReq;
-import cn.axzo.orgmanax.api.unit.req.ListUnitReq;
-import cn.axzo.orgmanax.api.unit.req.UpdateUnitReq;
-import cn.axzo.orgmanax.api.unit.resp.CreateUnitResp;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitDTO;
-import cn.axzo.orgmanax.api.unit.resp.UpdateUnitResp;
+import cn.axzo.orgmanax.dto.unit.req.CreateUnitReq;
+import cn.axzo.orgmanax.dto.unit.req.ListUnitReq;
+import cn.axzo.orgmanax.dto.unit.req.UpdateUnitReq;
+import cn.axzo.orgmanax.dto.unit.resp.CreateUnitResp;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.unit.resp.UpdateUnitResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;

orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitContactApi.java

@@ -1,9 +1,9 @@
 package cn.axzo.orgmanax.api.unit.feign;
 
 import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq;
-import cn.axzo.orgmanax.api.unit.resp.CreateUnitContactResp;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO;
+import cn.axzo.orgmanax.dto.unit.req.CreateUnitContactReq;
+import cn.axzo.orgmanax.dto.unit.resp.CreateUnitContactResp;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitContactDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 

orgmanax-dto/pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.axzo.orgmanax</groupId>
+        <artifactId>orgmanax</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>orgmanax-dto</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.axzo.foundation</groupId>
+            <artifactId>common-lib</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.axzo.orgmanax</groupId>
+            <artifactId>orgmanax-dto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/common/DistinctRule.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.nodeuser.req;
+package cn.axzo.orgmanax.dto.common;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/common/IdentityPair.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.nodeuser.req;
+package cn.axzo.orgmanax.dto.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/dto/OrgCooperateShipDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.resp;
+package cn.axzo.orgmanax.dto.cooperateship.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/enums/CooperateShipStatusEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.resp;
+package cn.axzo.orgmanax.dto.cooperateship.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/enums/CooperateShipTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.resp;
+package cn.axzo.orgmanax.dto.cooperateship.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/enums/OrganizationalNodeTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.enums;
+package cn.axzo.orgmanax.dto.cooperateship.enums;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/enums/SaasCooperateShipCooperateTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.enums;
+package cn.axzo.orgmanax.dto.cooperateship.enums;
 
 import java.util.Arrays;
 import java.util.HashMap;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/cooperateship/req/ListOrgCooperateShipReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.cooperateship.req;
+package cn.axzo.orgmanax.dto.cooperateship.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.resp;
+package cn.axzo.orgmanax.dto.job.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/enums/OrgJobFlagEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.enums;
+package cn.axzo.orgmanax.dto.job.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/enums/OrgJobGroupFlagEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.enums;
+package cn.axzo.orgmanax.dto.job.enums;
 
 import cn.axzo.orgmanax.api.cooperateship.enums.SaasCooperateShipCooperateTypeEnum;
 import java.util.Arrays;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/enums/OrgJobTypeEnum.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.enums;
+package cn.axzo.orgmanax.dto.job.enums;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/CreateOrgJobReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.req;
+package cn.axzo.orgmanax.dto.job.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/DeleteOrgJobReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.req;
+package cn.axzo.orgmanax.dto.job.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/ListOrgJobReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.req;
+package cn.axzo.orgmanax.dto.job.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import lombok.*;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/PageOrgJobReq.java

@@ -1,9 +1,9 @@
-package cn.axzo.orgmanax.api.orgjob.req;
+package cn.axzo.orgmanax.dto.job.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.PageReqV2;
-import cn.axzo.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum;
+import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/UpdateOrgJobReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orgjob.req;
+package cn.axzo.orgmanax.dto.job.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/dto/OrgNodeDTO.java

@@ -1,8 +1,7 @@
-package cn.axzo.orgmanax.api.node.resp;
+package cn.axzo.orgmanax.dto.node.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ListNodeReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.node.req;
+package cn.axzo.orgmanax.dto.node.req;
 
 import cn.axzo.foundation.page.PageReqV2;
 import lombok.*;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/node/req/ProcessNodeReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.node.req;
+package cn.axzo.orgmanax.dto.node.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AccessLevel;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/dto/NodeUserDTO.java

@@ -1,8 +1,8 @@
-package cn.axzo.orgmanax.api.nodeuser.resp;
+package cn.axzo.orgmanax.dto.nodeuser.dto;
 
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/enums/NodeUserTypeEnum.java

@@ -0,0 +1,38 @@
+package cn.axzo.orgmanax.dto.nodeuser.enums;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public enum NodeUserTypeEnum {
+    ALL_TYPE(0, "默认节点类型"),
+    DEPARTMENT(1, "部门"),
+    TEAM(2, "平台班组"),
+    GROUP(3, "小组"),
+    PROJECT_TEAM(4, "项目内班组"),
+    PROJECT_GROUP(5, "项目内小组"),
+    PROJECT_DEPARTMENT(6, "项目部门");
+
+    private final Integer value;
+    private final String desc;
+
+    private static final Map<Integer, NodeUserTypeEnum> byValueMap = Arrays.stream(NodeUserTypeEnum.values())
+            .collect(Collectors.toMap(NodeUserTypeEnum::getValue, Function.identity()));
+
+    /**
+     * 根据value返回NodeType，可能为null
+     *
+     * @param value
+     * @return
+     */
+    public static NodeUserTypeEnum getByValue(Integer value) {
+        return byValueMap.get(value);
+    }
+}

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ListNodeUserReq.java

@@ -1,8 +1,10 @@
-package cn.axzo.orgmanax.api.nodeuser.req;
+package cn.axzo.orgmanax.dto.nodeuser.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
 import cn.axzo.foundation.page.PageReqV2;
+import cn.axzo.orgmanax.dto.common.DistinctRule;
+import cn.axzo.orgmanax.dto.common.IdentityPair;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/nodeuser/req/ProcessNodeUserReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.nodeuser.req;
+package cn.axzo.orgmanax.dto.nodeuser.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AccessLevel;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/orguser/dto/OrgUserDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orguser.resp;
+package cn.axzo.orgmanax.dto.orguser.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/orguser/req/ListOrgUserReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.orguser.req;
+package cn.axzo.orgmanax.dto.orguser.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/dto/OrgUnitContactDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.resp;
+package cn.axzo.orgmanax.dto.unit.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/dto/OrgUnitDTO.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.resp;
+package cn.axzo.orgmanax.dto.unit.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/CreateUnitContactReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.req;
+package cn.axzo.orgmanax.dto.unit.req;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/CreateUnitReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.req;
+package cn.axzo.orgmanax.dto.unit.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/ListUnitReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.req;
+package cn.axzo.orgmanax.dto.unit.req;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/req/UpdateUnitReq.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.req;
+package cn.axzo.orgmanax.dto.unit.req;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/resp/CreateUnitContactResp.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.resp;
+package cn.axzo.orgmanax.dto.unit.resp;
 
 import lombok.Data;
 

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/resp/CreateUnitResp.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.resp;
+package cn.axzo.orgmanax.dto.unit.resp;
 
 import lombok.Data;
 

orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/unit/resp/UpdateUnitResp.java

@@ -1,4 +1,4 @@
-package cn.axzo.orgmanax.api.unit.resp;
+package cn.axzo.orgmanax.dto.unit.resp;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/repository/CooperateShipQueryRepository.java

@@ -2,7 +2,6 @@ package cn.axzo.orgmanax.infra.dao.cooperateship.repository;
 
 import cn.axzo.foundation.dao.support.wrapper.CriteriaField;
 import cn.axzo.foundation.dao.support.wrapper.Operator;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
 import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.Preconditions;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/cooperateship/repository/impl/CooperateShipQueryRepositoryImpl.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.infra.dao.cooperateship.repository.impl;
 
 import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
 import cn.axzo.orgmanax.infra.dao.cooperateship.dao.SaasCooperateShipDao;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
 import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/entity/OrganizationalNode.java

@@ -1,19 +1,16 @@
 package cn.axzo.orgmanax.infra.dao.node.entity;
 
+import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum;
 import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonValue;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -21,12 +18,8 @@ import lombok.experimental.SuperBuilder;
 import org.springframework.data.annotation.Transient;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.Map;
 import java.util.Objects;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * 组织节点表表实体类
@@ -64,7 +57,7 @@ public class OrganizationalNode implements Serializable {
     /**
      * 节点类型
      *
-     * @see TypeEnum
+     * @see NodeUserTypeEnum
      */
     @TableField("node_type")
     private Integer nodeType;
@@ -168,35 +161,5 @@ public class OrganizationalNode implements Serializable {
         return Objects.equals(topNodeId, id);
     }
 
-    @Getter
-    @AllArgsConstructor(access = AccessLevel.PRIVATE)
-    public enum TypeEnum {
-        ALL_TYPE(0, "默认节点类型"),
-        DEPARTMENT(1, "部门"),
-        TEAM(2, "平台班组"),
-        GROUP(3, "小组"),
-        PROJECT_TEAM(4, "项目内班组"),
-        PROJECT_GROUP(5, "项目内小组"),
-        PROJECT_DEPARTMENT(6, "项目部门");
-
-        @EnumValue
-        @JsonValue
-        private final Integer value;
-        private final String desc;
-
-        private static final Map<Integer, TypeEnum> byValueMap = Arrays.stream(TypeEnum.values())
-                .collect(Collectors.toMap(TypeEnum::getValue, Function.identity()));
-
-        /**
-         * 根据value返回NodeType，可能为null
-         *
-         * @param value
-         * @return
-         */
-        public static TypeEnum getByValue(Integer value) {
-            return byValueMap.get(value);
-        }
-    }
-
 }
 

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/repository/NodeQueryRepository.java

@@ -2,7 +2,7 @@ package cn.axzo.orgmanax.infra.dao.node.repository;
 
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
 import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/node/repository/impl/NodeQueryRepositoryImpl.java

@@ -3,7 +3,7 @@ package cn.axzo.orgmanax.infra.dao.node.repository.impl;
 import cn.axzo.foundation.dao.support.converter.PageConverter;
 import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
 import cn.axzo.orgmanax.infra.dao.node.dao.NodeDao;
 import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
 import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/repository/NodeUserQueryRepository.java

@@ -1,7 +1,7 @@
 package cn.axzo.orgmanax.infra.dao.nodeuser.repository;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
 import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
 import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser;
 import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/nodeuser/repository/impl/NodeUserQueryRepositoryImpl.java

@@ -3,8 +3,8 @@ package cn.axzo.orgmanax.infra.dao.nodeuser.repository.impl;
 import cn.axzo.foundation.dao.support.converter.PageConverter;
 import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
 import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
 import cn.axzo.orgmanax.infra.dao.nodeuser.dao.NodeUserDao;
 import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroup.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.entity;
 
-import cn.axzo.orgmanax.api.orgjob.enums.OrgJobGroupFlagEnum;
+import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobHistory.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.infra.dao.orgjob.entity;
 
-import cn.axzo.orgmanax.api.orgjob.enums.OrgJobTypeEnum;
+import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/repository/OrgUserQueryRepository.java

@@ -1,7 +1,7 @@
 package cn.axzo.orgmanax.infra.dao.orguser.repository;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
 import cn.axzo.orgmanax.infra.client.profile.dto.ProfilePersonResp;
 import cn.axzo.orgmanax.infra.dao.orguser.entity.OrgUser;
 import cn.hutool.core.bean.BeanUtil;

orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orguser/repository/impl/OrgUserQueryRepositoryImpl.java

@@ -3,7 +3,7 @@ package cn.axzo.orgmanax.infra.dao.orguser.repository.impl;
 import cn.axzo.foundation.dao.support.converter.PageConverter;
 import cn.axzo.foundation.dao.support.mysql.QueryWrapperHelper;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
 import cn.axzo.orgmanax.infra.client.profile.PersonProfileGateway;
 import cn.axzo.orgmanax.infra.client.profile.dto.ProfilePersonResp;
 import cn.axzo.orgmanax.infra.dao.orguser.dao.OrgUserDao;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/controller/CooperateShipController.java

@@ -2,8 +2,8 @@ package cn.axzo.orgmanax.server.cooperateship.controller;
 
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.cooperateship.feign.OrgCooperateShipApi;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.cooperateship.resp.OrgCooperateShipDTO;
+import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
+import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
 import cn.axzo.orgmanax.server.cooperateship.service.CooperateShipService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.server.cooperateship.foundation.impl;
 
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
 import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
 import cn.axzo.orgmanax.server.cooperateship.foundation.CooperateShipFoundationService;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/CooperateShipService.java

@@ -1,10 +1,9 @@
 package cn.axzo.orgmanax.server.cooperateship.service;
 
 import cn.axzo.foundation.exception.Axssert;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.cooperateship.resp.OrgCooperateShipDTO;
+import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
+import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
-import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/service/impl/CooperateShipServiceImpl.java

@@ -5,10 +5,10 @@ import cn.axzo.apollo.workspace.api.v2.workspace.resp.WorkspaceDetailResp;
 import cn.axzo.foundation.event.support.Event;
 import cn.axzo.foundation.event.support.producer.EventProducer;
 import cn.axzo.foundation.exception.Axssert;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.cooperateship.resp.CooperateShipStatusEnum;
-import cn.axzo.orgmanax.api.cooperateship.resp.CooperateShipTypeEnum;
-import cn.axzo.orgmanax.api.cooperateship.resp.OrgCooperateShipDTO;
+import cn.axzo.orgmanax.dto.cooperateship.req.ListOrgCooperateShipReq;
+import cn.axzo.orgmanax.dto.cooperateship.enums.CooperateShipStatusEnum;
+import cn.axzo.orgmanax.dto.cooperateship.enums.CooperateShipTypeEnum;
+import cn.axzo.orgmanax.dto.cooperateship.dto.OrgCooperateShipDTO;
 import cn.axzo.orgmanax.common.config.BizResultCode;
 import cn.axzo.orgmanax.infra.client.workspace.WorkspaceGateway;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/controller/NodeController.java

@@ -4,9 +4,9 @@ import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.node.feign.OrgNodeApi;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
 import cn.axzo.orgmanax.server.node.service.NodeService;
 import cn.axzo.orgmanax.server.node.service.processor.NodeProcessor;
 import com.alibaba.fastjson.JSONObject;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/foundation/req/NodeCreate.java

@@ -2,11 +2,11 @@ package cn.axzo.orgmanax.server.node.foundation.req;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.orgmanax.common.config.BizResultCode;
+import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum;
 import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.base.Enums;
 import com.google.common.collect.ImmutableMap;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -88,7 +88,7 @@ public class NodeCreate {
         Axssert.check(parentId >= 0, BizResultCode.INVALID_PARAM, "父id不能为负");
         Axssert.notNull(operatorId, BizResultCode.INVALID_PARAM, "操作人不能为空");
         Axssert.notNull(organizationalUnitId, BizResultCode.INVALID_PARAM, "部门所属单位不能为空");
-        OrganizationalNode.TypeEnum nodeTypeEnum = OrganizationalNode.TypeEnum.getByValue(nodeType);
+        NodeUserTypeEnum nodeTypeEnum = NodeUserTypeEnum.getByValue(nodeType);
         Axssert.check(nodeTypeEnum != null, BizResultCode.INVALID_PARAM, "部门类型不能为空{}", nodeTypeEnum);
     }
 }

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/NodeService.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.server.node.service;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
 import cn.axzo.orgmanax.common.config.BizResultCode;
 import cn.axzo.orgmanax.server.node.service.processor.NodeProcessor;
 import com.alibaba.fastjson.JSONObject;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.server.node.service.impl;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
+import cn.axzo.orgmanax.dto.node.req.ListNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO;
 import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
 import cn.axzo.orgmanax.common.config.BizResultCode;
 import cn.axzo.orgmanax.infra.dao.cooperateship.repository.CooperateShipQueryRepository;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/NodeProcessor.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.server.node.service.processor;
 
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
 import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AccessLevel;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/processor/impl/CreateNodeProcessor.java

@@ -2,8 +2,9 @@ package cn.axzo.orgmanax.server.node.service.processor.impl;
 
 import cn.axzo.apollo.workspace.api.v2.workspace.req.WorkspaceListReq;
 import cn.axzo.apollo.workspace.api.v2.workspace.resp.WorkspaceDetailListResp;
-import cn.axzo.orgmanax.api.cooperateship.resp.CooperateShipTypeEnum;
+import cn.axzo.orgmanax.dto.cooperateship.enums.CooperateShipTypeEnum;
 import cn.axzo.orgmanax.common.config.BizResultCode;
+import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum;
 import cn.axzo.orgmanax.infra.client.workspace.WorkspaceGateway;
 import cn.axzo.orgmanax.infra.client.workspace.dto.Workspace;
 import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
@@ -50,7 +51,7 @@ public class CreateNodeProcessor implements NodeProcessor {
             return;
         }
         // 平台班组，不需要创建协同关系
-        if (Objects.equals(node.getNodeType(), OrganizationalNode.TypeEnum.TEAM.getValue())) {
+        if (Objects.equals(node.getNodeType(), NodeUserTypeEnum.TEAM.getValue())) {
             return;
         }
 

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/controller/NodeUserController.java

@@ -4,9 +4,9 @@ import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.nodeuser.feign.OrgNodeUserApi;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.resp.NodeUserDTO;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ProcessNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
 import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService;
 import cn.axzo.orgmanax.server.nodeuser.service.processor.NodeUserProcessor;
 import com.alibaba.fastjson.JSONObject;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java

@@ -4,12 +4,12 @@ import cn.axzo.foundation.event.support.Event;
 import cn.axzo.foundation.event.support.producer.EventProducer;
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.orgmanax.common.config.BizResultCode;
+import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum;
 import cn.axzo.orgmanax.infra.client.profile.PersonProfileGateway;
 import cn.axzo.orgmanax.infra.client.profile.dto.ProfileIdentityResp;
 import cn.axzo.orgmanax.infra.client.profile.dto.ProfilePersonResp;
 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;
@@ -141,7 +141,7 @@ public class NodeUserFoundationServiceImpl implements NodeUserFoundationService
     }
 
     private Long resolveWorkspaceId(NodeQueryRepository.NodeResp node) {
-        if (Objects.equals(node.getNodeType(), OrganizationalNode.TypeEnum.TEAM.getValue())) {
+        if (Objects.equals(node.getNodeType(), NodeUserTypeEnum.TEAM.getValue())) {
             return 0L;
         }
         return cooperateShipQueryRepository.oneOpt(CooperateShipQueryRepository.OneReq.builder()

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/NodeUserService.java

@@ -2,10 +2,10 @@ package cn.axzo.orgmanax.server.nodeuser.service;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.resp.NodeUserDTO;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ProcessNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
 import cn.axzo.orgmanax.common.config.BizResultCode;
 import cn.axzo.orgmanax.server.nodeuser.service.processor.NodeUserProcessor;
 import com.alibaba.fastjson.JSONObject;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/impl/NodeUserServiceImpl.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.server.nodeuser.service.impl;
 
 import cn.axzo.foundation.exception.Axssert;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.nodeuser.req.ListNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.api.nodeuser.resp.NodeUserDTO;
+import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.req.ProcessNodeUserReq;
+import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO;
 import cn.axzo.orgmanax.common.config.BizResultCode;
 import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
 import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/service/processor/NodeUserProcessor.java

@@ -1,8 +1,6 @@
 package cn.axzo.orgmanax.server.nodeuser.service.processor;
 
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.nodeuser.req.ProcessNodeUserReq;
-import cn.axzo.orgmanax.infra.dao.node.repository.NodeQueryRepository;
+import cn.axzo.orgmanax.dto.nodeuser.req.ProcessNodeUserReq;
 import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
 import com.alibaba.fastjson.JSONObject;
 import lombok.AccessLevel;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/controller/OrgJobController.java

@@ -3,11 +3,11 @@ package cn.axzo.orgmanax.server.orgjob.controller;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.orgjob.feign.OrgJobApi;
-import cn.axzo.orgmanax.api.orgjob.req.CreateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.DeleteOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.UpdateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 import cn.axzo.orgmanax.server.orgjob.service.OrgJobService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobFoundationService.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.server.orgjob.foundation;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 import cn.axzo.orgmanax.server.orgjob.foundation.dto.OrgJobCreator;
 
 /**

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.server.orgjob.foundation.impl;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob;
 import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository;
 import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobUpsertRepository;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobService.java

@@ -1,13 +1,11 @@
 package cn.axzo.orgmanax.server.orgjob.service;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
-import cn.axzo.orgmanax.api.orgjob.req.CreateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.DeleteOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.UpdateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 
 public interface OrgJobService {
 

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java

@@ -1,12 +1,11 @@
 package cn.axzo.orgmanax.server.orgjob.service.impl;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.foundation.result.ApiResult;
-import cn.axzo.orgmanax.api.orgjob.req.CreateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.DeleteOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.ListOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.req.UpdateOrgJobReq;
-import cn.axzo.orgmanax.api.orgjob.resp.OrgJobDTO;
+import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq;
+import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq;
+import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO;
 import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobFoundationService;
 import cn.axzo.orgmanax.server.orgjob.foundation.dto.OrgJobCreator;
 import cn.axzo.orgmanax.server.orgjob.service.OrgJobService;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/controller/OrgUserController.java

@@ -3,8 +3,8 @@ package cn.axzo.orgmanax.server.orguser.controller;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.orguser.feign.OrgUserApi;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
-import cn.axzo.orgmanax.api.orguser.resp.OrgUserDTO;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.dto.OrgUserDTO;
 import cn.axzo.orgmanax.server.orguser.service.OrgUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/service/OrgUserService.java

@@ -1,12 +1,8 @@
 package cn.axzo.orgmanax.server.orguser.service;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.cooperateship.req.ListOrgCooperateShipReq;
-import cn.axzo.orgmanax.api.cooperateship.resp.OrgCooperateShipDTO;
-import cn.axzo.orgmanax.api.node.req.ListNodeReq;
-import cn.axzo.orgmanax.api.node.resp.OrgNodeDTO;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
-import cn.axzo.orgmanax.api.orguser.resp.OrgUserDTO;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.dto.OrgUserDTO;
 
 import java.util.List;
 

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orguser/service/impl/OrgUserServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.server.orguser.service.impl;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.orguser.req.ListOrgUserReq;
-import cn.axzo.orgmanax.api.orguser.resp.OrgUserDTO;
+import cn.axzo.orgmanax.dto.orguser.req.ListOrgUserReq;
+import cn.axzo.orgmanax.dto.orguser.dto.OrgUserDTO;
 import cn.axzo.orgmanax.infra.dao.orguser.repository.OrgUserQueryRepository;
 import cn.axzo.orgmanax.server.orguser.service.OrgUserService;
 import cn.hutool.core.bean.BeanUtil;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitContactController.java

@@ -2,9 +2,9 @@ package cn.axzo.orgmanax.server.unit.controller;
 
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.unit.feign.OrgUnitContactApi;
-import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq;
-import cn.axzo.orgmanax.api.unit.resp.CreateUnitContactResp;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO;
+import cn.axzo.orgmanax.dto.unit.req.CreateUnitContactReq;
+import cn.axzo.orgmanax.dto.unit.resp.CreateUnitContactResp;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitContactDTO;
 import cn.axzo.orgmanax.server.unit.service.UnitContactService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitController.java

@@ -3,12 +3,12 @@ package cn.axzo.orgmanax.server.unit.controller;
 import cn.axzo.foundation.page.PageResp;
 import cn.axzo.foundation.result.ApiResult;
 import cn.axzo.orgmanax.api.unit.feign.OrgUnitApi;
-import cn.axzo.orgmanax.api.unit.req.CreateUnitReq;
-import cn.axzo.orgmanax.api.unit.req.ListUnitReq;
-import cn.axzo.orgmanax.api.unit.req.UpdateUnitReq;
-import cn.axzo.orgmanax.api.unit.resp.CreateUnitResp;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitDTO;
-import cn.axzo.orgmanax.api.unit.resp.UpdateUnitResp;
+import cn.axzo.orgmanax.dto.unit.req.CreateUnitReq;
+import cn.axzo.orgmanax.dto.unit.req.ListUnitReq;
+import cn.axzo.orgmanax.dto.unit.req.UpdateUnitReq;
+import cn.axzo.orgmanax.dto.unit.resp.CreateUnitResp;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.unit.resp.UpdateUnitResp;
 import cn.axzo.orgmanax.server.unit.service.UnitService;
 import cn.hutool.core.bean.BeanUtil;
 import lombok.RequiredArgsConstructor;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitContactService.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.server.unit.service;
 
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitContactDTO;
 
 import java.util.List;
 import java.util.Set;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitService.java

@@ -1,8 +1,8 @@
 package cn.axzo.orgmanax.server.unit.service;
 
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.unit.req.ListUnitReq;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.unit.req.ListUnitReq;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
 import cn.axzo.orgmanax.server.unit.service.dto.CreateUnitReq;
 import cn.axzo.orgmanax.server.unit.service.dto.CreateUnitResp;
 import cn.axzo.orgmanax.server.unit.service.dto.UpdateUnitReq;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitContactServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.axzo.orgmanax.server.unit.service.impl;
 
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitContactDTO;
 import cn.axzo.orgmanax.infra.dao.unit.repository.UnitContactQueryRepository;
 import cn.axzo.orgmanax.server.unit.service.UnitContactService;
 import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper;

orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitServiceImpl.java

@@ -4,11 +4,11 @@ import java.util.Date;
 
 import cn.axzo.apollo.workspace.api.v2.workspace.req.WorkspaceUpsertReq;
 import cn.axzo.foundation.page.PageResp;
-import cn.axzo.orgmanax.api.node.req.ProcessNodeReq;
-import cn.axzo.orgmanax.api.unit.req.ListUnitReq;
-import cn.axzo.orgmanax.api.unit.resp.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq;
+import cn.axzo.orgmanax.dto.unit.req.ListUnitReq;
+import cn.axzo.orgmanax.dto.unit.dto.OrgUnitDTO;
+import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum;
 import cn.axzo.orgmanax.infra.client.workspace.WorkspaceGateway;
-import cn.axzo.orgmanax.infra.dao.node.entity.OrganizationalNode;
 import cn.axzo.orgmanax.infra.dao.unit.entity.OrganizationalUnit;
 import cn.axzo.orgmanax.infra.dao.unit.repository.UnitQueryRepository;
 import cn.axzo.orgmanax.server.node.foundation.req.NodeCreate;
@@ -51,7 +51,7 @@ public class UnitServiceImpl implements UnitService {
             NodeCreate nodeCreate = new  NodeCreate();
             nodeCreate.setOrganizationalUnitId(unit.getId());
             nodeCreate.setNodeName(unit.getName());
-            nodeCreate.setNodeType(OrganizationalNode.TypeEnum.DEPARTMENT.getValue());
+            nodeCreate.setNodeType(NodeUserTypeEnum.DEPARTMENT.getValue());
             nodeCreate.setParentId(0L);
             nodeCreate.setRemark("");
             nodeCreate.setOperatorId(req.getOperatorId());

pom.xml

@@ -40,6 +40,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>cn.axzo.orgmanax</groupId>
+        <artifactId>orgmanax-dto</artifactId>
+        <version>${revision}</version>
+      </dependency>
       <dependency>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -116,5 +121,6 @@
     <module>orgmanax-infra</module>
     <module>orgmanax-starter</module>
     <module>orgmanax-integration</module>
+    <module>orgmanax-dto</module>
   </modules>
 </project>