wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/REQ-3282' into feature/REQ-3282

Browse Source
This commit is contained in:
liuyang 2024-12-20 13:48:24 +08:00
commit fad1d08bb6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ package cn.axzo.orgmanax.api.unit.feign;
import cn.axzo.foundation.result.ApiResult; import cn.axzo.foundation.result.ApiResult;
import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq; import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq;
import cn.axzo.orgmanax.api.unit.resp.CreateUnitContactResp; 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.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -21,7 +21,7 @@ public interface OrgUnitContactApi {
* 通过单位id获取单位联系人列表 * 通过单位id获取单位联系人列表
*/ */
@PostMapping("/api/unit/contact/list") @PostMapping("/api/unit/contact/list")
ApiResult<List<OrgUnitContactResp>> list(List<Long> ouIds); ApiResult<List<OrgUnitContactDTO>> list(List<Long> ouIds);
/** /**

2
orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactResp.java → orgmanax-api/src/main/java/cn/axzo/orgmanax/api/unit/resp/OrgUnitContactDTO.java
View File

@ -11,7 +11,7 @@ import java.io.Serializable;
@SuperBuilder @SuperBuilder
@Data @Data
@AllArgsConstructor @AllArgsConstructor
public class OrgUnitContactResp implements Serializable { public class OrgUnitContactDTO implements Serializable {
/** /**
* 联系人id * 联系人id

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

@ -4,7 +4,7 @@ import cn.axzo.foundation.result.ApiResult;
import cn.axzo.orgmanax.api.unit.feign.OrgUnitContactApi; import cn.axzo.orgmanax.api.unit.feign.OrgUnitContactApi;
import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq; import cn.axzo.orgmanax.api.unit.req.CreateUnitContactReq;
import cn.axzo.orgmanax.api.unit.resp.CreateUnitContactResp; 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 cn.axzo.orgmanax.server.unit.service.UnitContactService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -26,7 +26,7 @@ public class UnitContactController implements OrgUnitContactApi {
private final UnitContactService unitContactService; private final UnitContactService unitContactService;
@Override @Override
public ApiResult<List<OrgUnitContactResp>> list(List<Long> ouIds) { public ApiResult<List<OrgUnitContactDTO>> list(List<Long> ouIds) {
Set<Long> ouIdSet = new HashSet<>(ouIds); Set<Long> ouIdSet = new HashSet<>(ouIds);
return ApiResult.success(unitContactService.list(ouIdSet)); return ApiResult.success(unitContactService.list(ouIdSet));
} }

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

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.server.unit.service; 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.List;
import java.util.Set; import java.util.Set;
@ -10,5 +10,5 @@ public interface UnitContactService {
/** /**
* 查询单位联系人信息 * 查询单位联系人信息
*/ */
List<OrgUnitContactResp> list(Set<Long> ouIds); List<OrgUnitContactDTO> list(Set<Long> ouIds);
} }

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

@ -1,6 +1,6 @@
package cn.axzo.orgmanax.server.unit.service.impl; 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.infra.dao.unit.repository.UnitContactQueryRepository;
import cn.axzo.orgmanax.server.unit.service.UnitContactService; import cn.axzo.orgmanax.server.unit.service.UnitContactService;
import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper; import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper;
@ -26,7 +26,7 @@ public class UnitContactServiceImpl implements UnitContactService {
private final UnitContactQueryRepository unitContactQueryRepository; private final UnitContactQueryRepository unitContactQueryRepository;
@Override @Override
public List<OrgUnitContactResp> list(Set<Long> ouIds) { public List<OrgUnitContactDTO> list(Set<Long> ouIds) {
if (CollUtil.isEmpty(ouIds)) { if (CollUtil.isEmpty(ouIds)) {
return Collections.emptyList(); return Collections.emptyList();
} }
@ -36,7 +36,7 @@ public class UnitContactServiceImpl implements UnitContactService {
if (CollUtil.isEmpty(respList)) { if (CollUtil.isEmpty(respList)) {
return Collections.emptyList(); return Collections.emptyList();
} }
List<OrgUnitContactResp> resultList = BeanUtil.copyToList(respList, OrgUnitContactResp.class); List<OrgUnitContactDTO> resultList = BeanUtil.copyToList(respList, OrgUnitContactDTO.class);
resultList.forEach(e -> e.setPhoneEncode(DataSecurityHelper.encrypt(e.getPhone()))); resultList.forEach(e -> e.setPhoneEncode(DataSecurityHelper.encrypt(e.getPhone())));
return resultList; return resultList;
} }