diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitContactApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitContactApi.java index 00cdaaa..0fdb46c 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitContactApi.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/feign/OrgUnitContactApi.java @@ -3,7 +3,7 @@ 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.OrgUnitContactResp; +import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -21,7 +21,7 @@ public interface OrgUnitContactApi { * 通过单位id获取单位联系人列表 */ @PostMapping("/api/unit/contact/list") - ApiResult> list(List ouIds); + ApiResult> list(List ouIds); /** diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactResp.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactDTO.java similarity index 92% rename from orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactResp.java rename to orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactDTO.java index f3af83d..6d5ca58 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactResp.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactDTO.java @@ -11,7 +11,7 @@ import java.io.Serializable; @SuperBuilder @Data @AllArgsConstructor -public class OrgUnitContactResp implements Serializable { +public class OrgUnitContactDTO implements Serializable { /** * 联系人id diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitContactController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitContactController.java index ff0cda2..c70a5bc 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitContactController.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/controller/UnitContactController.java @@ -4,7 +4,7 @@ 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.OrgUnitContactResp; +import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO; import cn.axzo.orgmanax.server.unit.service.UnitContactService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,7 +26,7 @@ public class UnitContactController implements OrgUnitContactApi { private final UnitContactService unitContactService; @Override - public ApiResult> list(List ouIds) { + public ApiResult> list(List ouIds) { Set ouIdSet = new HashSet<>(ouIds); return ApiResult.success(unitContactService.list(ouIdSet)); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitContactService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitContactService.java index d28049b..1073c93 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/UnitContactService.java +++ b/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.OrgUnitContactResp; +import cn.axzo.orgmanax.api.unit.resp.OrgUnitContactDTO; import java.util.List; import java.util.Set; @@ -10,5 +10,5 @@ public interface UnitContactService { /** * 查询单位联系人信息 */ - List list(Set ouIds); + List list(Set ouIds); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitContactServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitContactServiceImpl.java index 9e285da..abce788 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/unit/service/impl/UnitContactServiceImpl.java +++ b/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.OrgUnitContactResp; +import cn.axzo.orgmanax.api.unit.resp.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; @@ -26,7 +26,7 @@ public class UnitContactServiceImpl implements UnitContactService { private final UnitContactQueryRepository unitContactQueryRepository; @Override - public List list(Set ouIds) { + public List list(Set ouIds) { if (CollUtil.isEmpty(ouIds)) { return Collections.emptyList(); } @@ -36,7 +36,7 @@ public class UnitContactServiceImpl implements UnitContactService { if (CollUtil.isEmpty(respList)) { return Collections.emptyList(); } - List resultList = BeanUtil.copyToList(respList, OrgUnitContactResp.class); + List resultList = BeanUtil.copyToList(respList, OrgUnitContactDTO.class); resultList.forEach(e -> e.setPhoneEncode(DataSecurityHelper.encrypt(e.getPhone()))); return resultList; }