From b975ffaa6026145b0fd2f538ba8698ca83137f89 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 12 Feb 2025 13:43:20 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3201:=20=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ess/server/dao/EssContractDao.java | 2 + .../nanopart/ess/server/dao/EssLogDao.java | 4 +- .../nanopart/ess/server/dao/EssOrgDao.java | 6 +- .../nanopart/ess/server/dao/EssPersonDao.java | 6 +- .../nanopart/ess/server/dao/EssSealDao.java | 6 +- .../ess/server/dao/EssSealPersonDao.java | 6 +- .../ess/server/entity/EssContract.java | 1 + .../nanopart/ess/server/entity/EssLog.java | 2 +- .../nanopart/ess/server/entity/EssOrg.java | 2 +- .../nanopart/ess/server/entity/EssPerson.java | 2 +- .../nanopart/ess/server/entity/EssSeal.java | 4 +- .../ess/server/ess/ContractManager.java | 20 +++---- .../nanopart/ess/server/ess/EssClient.java | 20 +++---- .../ess/server/ess/EssController.java | 58 +++++++++---------- .../ess/server/ess/EssQueryService.java | 38 ++++++------ .../nanopart/ess/server/ess/OrgManager.java | 26 ++++----- .../ess/server/ess/domain/EssSealPersons.java | 2 +- .../ess/server/ess/domain/OrgAndPerson.java | 4 +- .../ess/server/ess/domain/SealAndPerson.java | 4 +- .../ess/server/ess/support/EssSupport.java | 13 +++-- .../ess/server/mapper/EssContractMapper.java | 2 +- .../ess/server/mapper/EssLogMapper.java | 2 +- .../ess/server/mapper/EssOrgMapper.java | 2 +- .../ess/server/mapper/EssPersonMapper.java | 2 +- .../ess/server/mapper/EssSealMapper.java | 2 +- .../server/mapper/EssSealPersonMapper.java | 2 +- 26 files changed, 121 insertions(+), 117 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java index 4b756f4d..673cb5cb 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssContractDao.java @@ -1,5 +1,7 @@ package cn.axzo.nanopart.ess.server.dao; +import cn.axzo.nanopart.ess.api.enums.EssContractState; +import cn.axzo.nanopart.ess.server.entity.EssContract; import cn.axzo.nanopart.ess.server.mapper.EssContractMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssLogDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssLogDao.java index a9595c90..e40d05cc 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssLogDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssLogDao.java @@ -1,7 +1,7 @@ package cn.axzo.nanopart.ess.server.dao; -import cn.axzo.nanopart.visa.server.domain.EssLog; -import cn.axzo.nanopart.visa.server.mapper.EssLogMapper; +import cn.axzo.nanopart.ess.server.entity.EssLog; +import cn.axzo.nanopart.ess.server.mapper.EssLogMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java index 9061db7e..b7e3758c 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssOrgDao.java @@ -1,8 +1,8 @@ package cn.axzo.nanopart.ess.server.dao; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.mapper.EssOrgMapper; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.mapper.EssOrgMapper; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java index 55a0bacf..fd88d6e5 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssPersonDao.java @@ -1,8 +1,8 @@ package cn.axzo.nanopart.ess.server.dao; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.mapper.EssPersonMapper; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.mapper.EssPersonMapper; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java index c130dfa8..2392979f 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealDao.java @@ -1,8 +1,8 @@ package cn.axzo.nanopart.ess.server.dao; -import cn.axzo.nanopart.visa.api.enums.EssSealState; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.mapper.EssSealMapper; +import cn.axzo.nanopart.ess.api.enums.EssSealState; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.mapper.EssSealMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java index 5448c65a..cf75c04b 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/dao/EssSealPersonDao.java @@ -1,9 +1,9 @@ package cn.axzo.nanopart.ess.server.dao; import cn.axzo.nanopart.ess.server.dao.domain.OuAndPersonId; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; -import cn.axzo.nanopart.visa.server.mapper.EssSealPersonMapper; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; +import cn.axzo.nanopart.ess.server.mapper.EssSealPersonMapper; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java index 1ff4f6e2..072d2233 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssContract.java @@ -1,6 +1,7 @@ package cn.axzo.nanopart.ess.server.entity; import cn.axzo.foundation.dao.support.mysql.type.BaseListTypeHandler; +import cn.axzo.nanopart.ess.api.enums.EssContractState; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssLog.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssLog.java index 65309cb8..2c726567 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssLog.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssLog.java @@ -1,7 +1,7 @@ package cn.axzo.nanopart.ess.server.entity; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssOrg.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssOrg.java index 70aeaead..17c21273 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssOrg.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssOrg.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.entity; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java index ab8df7c6..15c5dd87 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssPerson.java @@ -1,7 +1,7 @@ package cn.axzo.nanopart.ess.server.entity; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSeal.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSeal.java index 6ff0ca7d..b0b4b4dc 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSeal.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/entity/EssSeal.java @@ -1,8 +1,8 @@ package cn.axzo.nanopart.ess.server.entity; +import cn.axzo.nanopart.ess.api.enums.EssSealState; +import cn.axzo.nanopart.ess.api.enums.EssSealType; import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; -import cn.axzo.nanopart.visa.api.enums.EssSealState; -import cn.axzo.nanopart.visa.api.enums.EssSealType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java index 4c339078..9976c232 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/ContractManager.java @@ -1,18 +1,18 @@ package cn.axzo.nanopart.ess.server.ess; import cn.axzo.basics.common.exception.ServiceException; -import cn.axzo.nanopart.visa.api.enums.EssContractState; -import cn.axzo.nanopart.visa.api.request.ess.CreateContractRequest; -import cn.axzo.nanopart.visa.server.dao.EssContractDao; -import cn.axzo.nanopart.visa.server.dao.EssOrgDao; -import cn.axzo.nanopart.visa.server.dao.EssSealPersonDao; +import cn.axzo.nanopart.ess.api.enums.EssContractState; +import cn.axzo.nanopart.ess.api.request.CreateContractRequest; +import cn.axzo.nanopart.ess.server.dao.EssContractDao; +import cn.axzo.nanopart.ess.server.dao.EssOrgDao; +import cn.axzo.nanopart.ess.server.dao.EssSealPersonDao; import cn.axzo.nanopart.ess.server.dao.domain.OuAndPersonId; -import cn.axzo.nanopart.visa.server.domain.EssContract; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.server.entity.EssContract; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.domain.EssSealPersons; -import cn.axzo.nanopart.visa.server.utils.BizAssertions; +import cn.axzo.nanopart.ess.server.utils.BizAssertions; import com.alibaba.fastjson.JSON; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import lombok.RequiredArgsConstructor; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java index 4e35b0b6..fe5fa276 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssClient.java @@ -3,20 +3,20 @@ package cn.axzo.nanopart.ess.server.ess; import cn.axzo.basics.common.exception.ServiceException; import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO; -import cn.axzo.nanopart.visa.api.enums.EssConsoleUrlEndpoint; -import cn.axzo.nanopart.visa.api.enums.EssEmbedType; -import cn.axzo.nanopart.visa.server.dao.EssLogDao; -import cn.axzo.nanopart.visa.server.domain.EssLog; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.api.enums.EssConsoleUrlEndpoint; +import cn.axzo.nanopart.ess.api.enums.EssEmbedType; +import cn.axzo.nanopart.ess.server.dao.EssLogDao; +import cn.axzo.nanopart.ess.server.entity.EssLog; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.domain.EssOuOpenId; import cn.axzo.nanopart.ess.server.ess.domain.EssPersonOpenId; import cn.axzo.nanopart.ess.server.ess.support.EssProps; import cn.axzo.nanopart.ess.server.ess.support.EssSupport; -import cn.axzo.nanopart.visa.server.utils.BizAssertions; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.utils.BizAssertions; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.google.common.base.Throwables; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssController.java index efd4d5a8..6cbb7f48 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssController.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssController.java @@ -1,37 +1,37 @@ package cn.axzo.nanopart.ess.server.ess; import cn.axzo.framework.domain.web.result.ApiResult; -import cn.axzo.nanopart.visa.api.enums.EssContractState; -import cn.axzo.nanopart.visa.api.ess.EssApi; -import cn.axzo.nanopart.visa.api.request.ess.AddSealAuthorizationRequest; -import cn.axzo.nanopart.visa.api.request.ess.AddSealPersonsRequest; -import cn.axzo.nanopart.visa.api.request.ess.CreateConsoleLoginUrlRequest; -import cn.axzo.nanopart.visa.api.request.ess.CreateContractRequest; -import cn.axzo.nanopart.visa.api.request.ess.DownloadSingedContractPdfRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetEmbedWebUrlRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetPersonAuthStateRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetSealsRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetUnitAuthStatesRequest; -import cn.axzo.nanopart.visa.api.request.ess.RemoveSealAuthorizationRequest; -import cn.axzo.nanopart.visa.api.request.ess.RemoveSealPersonRequest; -import cn.axzo.nanopart.visa.api.request.ess.SealAndPersonRequest; -import cn.axzo.nanopart.visa.api.response.ess.CreateConsoleLoginUrlResponse; -import cn.axzo.nanopart.visa.api.response.ess.CreateContractResponse; -import cn.axzo.nanopart.visa.api.response.ess.DownloadSingedContractPdfResponse; -import cn.axzo.nanopart.visa.api.response.ess.GetEmbedWebUrlResponse; -import cn.axzo.nanopart.visa.api.response.ess.GetPersonAuthStateResponse; -import cn.axzo.nanopart.visa.api.response.ess.GetUnitAuthStatesResponse; -import cn.axzo.nanopart.visa.api.response.domain.EssOrgAndSealInfo; -import cn.axzo.nanopart.visa.server.dao.EssContractDao; -import cn.axzo.nanopart.visa.server.dao.EssSealDao; -import cn.axzo.nanopart.visa.server.dao.EssSealPersonDao; -import cn.axzo.nanopart.visa.server.domain.EssContract; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.api.EssApi; +import cn.axzo.nanopart.ess.api.domain.EssOrgAndSealInfo; +import cn.axzo.nanopart.ess.api.enums.EssContractState; +import cn.axzo.nanopart.ess.api.request.AddSealAuthorizationRequest; +import cn.axzo.nanopart.ess.api.request.AddSealPersonsRequest; +import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest; +import cn.axzo.nanopart.ess.api.request.CreateContractRequest; +import cn.axzo.nanopart.ess.api.request.DownloadSingedContractPdfRequest; +import cn.axzo.nanopart.ess.api.request.GetEmbedWebUrlRequest; +import cn.axzo.nanopart.ess.api.request.GetPersonAuthStateRequest; +import cn.axzo.nanopart.ess.api.request.GetSealsRequest; +import cn.axzo.nanopart.ess.api.request.GetUnitAuthStatesRequest; +import cn.axzo.nanopart.ess.api.request.RemoveSealAuthorizationRequest; +import cn.axzo.nanopart.ess.api.request.RemoveSealPersonRequest; +import cn.axzo.nanopart.ess.api.request.SealAndPersonRequest; +import cn.axzo.nanopart.ess.api.response.CreateConsoleLoginUrlResponse; +import cn.axzo.nanopart.ess.api.response.CreateContractResponse; +import cn.axzo.nanopart.ess.api.response.DownloadSingedContractPdfResponse; +import cn.axzo.nanopart.ess.api.response.GetEmbedWebUrlResponse; +import cn.axzo.nanopart.ess.api.response.GetPersonAuthStateResponse; +import cn.axzo.nanopart.ess.api.response.GetUnitAuthStatesResponse; +import cn.axzo.nanopart.ess.server.dao.EssContractDao; +import cn.axzo.nanopart.ess.server.dao.EssSealDao; +import cn.axzo.nanopart.ess.server.dao.EssSealPersonDao; +import cn.axzo.nanopart.ess.server.entity.EssContract; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.domain.OrgAndPerson; import cn.axzo.nanopart.ess.server.ess.domain.SealAndPerson; -import cn.axzo.nanopart.visa.server.utils.BizAssertions; +import cn.axzo.nanopart.ess.server.utils.BizAssertions; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RestController; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssQueryService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssQueryService.java index f80a7be4..cf525496 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssQueryService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssQueryService.java @@ -2,28 +2,28 @@ package cn.axzo.nanopart.ess.server.ess; import cn.axzo.basics.common.BeanMapper; import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; -import cn.axzo.nanopart.visa.api.enums.EssSealState; -import cn.axzo.nanopart.visa.api.request.ess.GetPersonAuthStateRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetSealsRequest; -import cn.axzo.nanopart.visa.api.request.ess.GetUnitAuthStatesRequest; -import cn.axzo.nanopart.visa.api.response.ess.GetPersonAuthStateResponse; -import cn.axzo.nanopart.visa.api.response.ess.GetUnitAuthStatesResponse; -import cn.axzo.nanopart.visa.api.response.domain.EssOrgAndSealInfo; -import cn.axzo.nanopart.visa.api.response.domain.EssOrgInfo; -import cn.axzo.nanopart.visa.api.response.domain.EssSealInfo; -import cn.axzo.nanopart.visa.api.response.domain.EssSealPersonInfo; -import cn.axzo.nanopart.visa.server.dao.EssOrgDao; -import cn.axzo.nanopart.visa.server.dao.EssPersonDao; -import cn.axzo.nanopart.visa.server.dao.EssSealDao; -import cn.axzo.nanopart.visa.server.dao.EssSealPersonDao; +import cn.axzo.nanopart.ess.api.domain.EssOrgAndSealInfo; +import cn.axzo.nanopart.ess.api.domain.EssOrgInfo; +import cn.axzo.nanopart.ess.api.domain.EssSealInfo; +import cn.axzo.nanopart.ess.api.domain.EssSealPersonInfo; +import cn.axzo.nanopart.ess.api.enums.EssSealState; +import cn.axzo.nanopart.ess.api.request.GetPersonAuthStateRequest; +import cn.axzo.nanopart.ess.api.request.GetSealsRequest; +import cn.axzo.nanopart.ess.api.request.GetUnitAuthStatesRequest; +import cn.axzo.nanopart.ess.api.response.GetPersonAuthStateResponse; +import cn.axzo.nanopart.ess.api.response.GetUnitAuthStatesResponse; +import cn.axzo.nanopart.ess.server.dao.EssOrgDao; +import cn.axzo.nanopart.ess.server.dao.EssPersonDao; +import cn.axzo.nanopart.ess.server.dao.EssSealDao; +import cn.axzo.nanopart.ess.server.dao.EssSealPersonDao; import cn.axzo.nanopart.ess.server.dao.domain.OuAndPersonId; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.support.EssSupport; import cn.axzo.nanopart.ess.server.ess.support.PersonProfiles; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java index a7a1cf4b..c2bb8559 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/OrgManager.java @@ -1,21 +1,21 @@ package cn.axzo.nanopart.ess.server.ess; -import cn.axzo.nanopart.visa.api.enums.EssSealState; -import cn.axzo.nanopart.visa.api.enums.EssSealType; -import cn.axzo.nanopart.visa.api.request.ess.CreateConsoleLoginUrlRequest; -import cn.axzo.nanopart.visa.server.dao.EssOrgDao; -import cn.axzo.nanopart.visa.server.dao.EssPersonDao; -import cn.axzo.nanopart.visa.server.dao.EssSealDao; -import cn.axzo.nanopart.visa.server.dao.EssSealPersonDao; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.api.enums.EssSealState; +import cn.axzo.nanopart.ess.api.enums.EssSealType; +import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest; +import cn.axzo.nanopart.ess.server.dao.EssOrgDao; +import cn.axzo.nanopart.ess.server.dao.EssPersonDao; +import cn.axzo.nanopart.ess.server.dao.EssSealDao; +import cn.axzo.nanopart.ess.server.dao.EssSealPersonDao; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import cn.axzo.nanopart.ess.server.ess.domain.EssSealPersons; import cn.axzo.nanopart.ess.server.ess.domain.OrgAndPerson; import cn.axzo.nanopart.ess.server.ess.support.EssSupport; -import cn.axzo.nanopart.visa.server.utils.BizAssertions; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.server.utils.BizAssertions; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import com.google.common.collect.Sets; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/EssSealPersons.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/EssSealPersons.java index b7dfb324..40bb526f 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/EssSealPersons.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/EssSealPersons.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.ess.domain; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/OrgAndPerson.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/OrgAndPerson.java index 79e9fe45..0db3f936 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/OrgAndPerson.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/OrgAndPerson.java @@ -1,7 +1,7 @@ package cn.axzo.nanopart.ess.server.ess.domain; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/SealAndPerson.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/SealAndPerson.java index bf76c054..b914debe 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/SealAndPerson.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/domain/SealAndPerson.java @@ -1,7 +1,7 @@ package cn.axzo.nanopart.ess.server.ess.domain; -import cn.axzo.nanopart.visa.server.domain.EssSeal; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.server.entity.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssSupport.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssSupport.java index 43b8f394..3d8e7f8b 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssSupport.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/EssSupport.java @@ -5,11 +5,11 @@ import cn.axzo.basics.profiles.dto.basic.PersonProfileDto; import cn.axzo.maokai.api.client.OrganizationalUnitApi; import cn.axzo.maokai.api.vo.request.OrganizationalUnitQuery; import cn.axzo.maokai.api.vo.response.OrganizationalUnitVO; -import cn.axzo.nanopart.visa.api.request.ess.CreateConsoleLoginUrlRequest; -import cn.axzo.nanopart.visa.server.domain.EssOrg; -import cn.axzo.nanopart.visa.server.domain.EssPerson; -import cn.axzo.nanopart.visa.server.utils.BizAssertions; -import cn.axzo.nanopart.visa.server.utils.YesOrNo; +import cn.axzo.nanopart.ess.api.request.CreateConsoleLoginUrlRequest; +import cn.axzo.nanopart.ess.server.entity.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssPerson; +import cn.axzo.nanopart.ess.server.utils.BizAssertions; +import cn.axzo.nanopart.ess.server.utils.YesOrNo; import lombok.RequiredArgsConstructor; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Component; @@ -18,7 +18,8 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import static cn.axzo.nanopart.visa.server.utils.BizAssertions.assertResponse; +import static cn.axzo.nanopart.ess.server.utils.BizAssertions.assertResponse; + /** * @author yanglin diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssContractMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssContractMapper.java index a5952b98..ca5e5c0c 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssContractMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssContractMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssContract; +import cn.axzo.nanopart.ess.server.entity.EssContract; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssLogMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssLogMapper.java index 10d9b347..acc97088 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssLogMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssLogMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssLog; +import cn.axzo.nanopart.ess.server.entity.EssLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssOrgMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssOrgMapper.java index ccb35330..91ac4a08 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssOrgMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssOrgMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssOrg; +import cn.axzo.nanopart.ess.server.entity.EssOrg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssPersonMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssPersonMapper.java index 7f59fb00..0158664d 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssPersonMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssPersonMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssPerson; +import cn.axzo.nanopart.ess.server.entity.EssPerson; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealMapper.java index ef802e97..5ce9b6d5 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssSeal; +import cn.axzo.nanopart.ess.server.entity.EssSeal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealPersonMapper.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealPersonMapper.java index 91e3108f..05622887 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealPersonMapper.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/mapper/EssSealPersonMapper.java @@ -1,6 +1,6 @@ package cn.axzo.nanopart.ess.server.mapper; -import cn.axzo.nanopart.visa.server.domain.EssSealPerson; +import cn.axzo.nanopart.ess.server.entity.EssSealPerson; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /**