diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java index 5f0ddd1..ae64fe9 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudCorpFacadeImpl.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.facade; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.api.CorpInfoServiceI; @@ -8,15 +9,18 @@ import com.zcloud.basic.info.dto.CorpInfoAddCmd; import com.zcloud.basic.info.dto.CorpInfoPageQry; import com.zcloud.basic.info.dto.CorpInfoUpdateCmd; import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; +import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.gbscommon.zcloudcorp.face.ZcloudCorpFacade; import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoAddCmd; import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoPageQry; import com.zcloud.gbscommon.zcloudcorp.request.ZcloudCorpInfoUpdateCmd; import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO; +import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; import javax.annotation.Resource; +import java.util.Collection; import java.util.List; @DubboService @@ -56,4 +60,18 @@ public class ZcloudCorpFacadeImpl implements ZcloudCorpFacade { corpInfoService.edit(updateCmd); return SingleResponse.buildSuccess(); } + + @Override + public MultiResponse getCorpList() { + List list = corpInfoService.getCorpList(); + List zcloudCorpCo = corpInfoCoConvertor.converCOsToDubboCOs(list); + return MultiResponse.of(zcloudCorpCo); + } + + @Override + public MultiResponse listByCorpIds(Collection collection) { + List list = corpInfoService.listByCorpIds(collection); + List zcloudCorpCo = corpInfoCoConvertor.converCOsToDubboCOs(list); + return MultiResponse.of(zcloudCorpCo); + } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java index 4be9697..47c5da6 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.facade; +import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.api.DepartmentServiceI; @@ -9,26 +10,28 @@ import com.zcloud.basic.info.dto.DepartmentPageQry; import com.zcloud.basic.info.dto.DepartmentUpdateCmd; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentInfoCO; +import com.zcloud.basic.info.dto.clientobject.PostCO; import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade; import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentAddCmd; import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentPageQry; import com.zcloud.gbscommon.zclouddepartment.request.ZcloudDepartmentUpdateCmd; import com.zcloud.gbscommon.zclouddepartment.response.ZcloudDepartmentInfoCo; +import com.zcloud.gbscommon.zcloudpost.response.ZcloudPostCO; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; import javax.annotation.Resource; +import java.util.Collection; import java.util.List; /** - * * @author lin */ @DubboService public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade { @Resource - private DepartmentServiceI departmentService; + private DepartmentServiceI departmentService; @Resource private DepartmentCoConvertor departmentCoConvertor; @@ -51,16 +54,30 @@ public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade { @Override public SingleResponse addDepartment(ZcloudDepartmentAddCmd zcloudDepartmentAddCmd) { - DepartmentAddCmd addCmd =new DepartmentAddCmd(); + DepartmentAddCmd addCmd = new DepartmentAddCmd(); BeanUtils.copyProperties(zcloudDepartmentAddCmd, addCmd); return departmentService.add(addCmd); } @Override public SingleResponse editDepartment(ZcloudDepartmentUpdateCmd zcloudDepartmentUpdateCmd) { - DepartmentUpdateCmd updateCmd =new DepartmentUpdateCmd(); + DepartmentUpdateCmd updateCmd = new DepartmentUpdateCmd(); BeanUtils.copyProperties(zcloudDepartmentUpdateCmd, updateCmd); departmentService.edit(updateCmd); return SingleResponse.buildSuccess(); } + + @Override + public MultiResponse getDeptList() { + List list = departmentService.getDeptList(); + List zcloudUserCo = departmentCoConvertor.converCOsToDubboCOs(list); + return MultiResponse.of(zcloudUserCo); + } + + @Override + public MultiResponse listByDeptIds(Collection collection) { + List listed = departmentService.listByDepartIds(collection); + List zcloudPostCo = departmentCoConvertor.converCOsToDubboCOs(listed); + return MultiResponse.of(zcloudPostCo); + } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java index fef1be8..dae8995 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudPostFacadeImpl.java @@ -3,22 +3,22 @@ package com.zcloud.basic.info.facade; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.api.PostServiceI; +import com.zcloud.basic.info.command.convertor.PostCoConvertor; import com.zcloud.basic.info.dto.PostListQry; import com.zcloud.basic.info.dto.clientobject.PostCO; import com.zcloud.basic.info.dto.clientobject.PostDepartmentCO; +import com.zcloud.basic.info.dto.clientobject.UserCO; import com.zcloud.gbscommon.utils.DeepCopyUtil; import com.zcloud.gbscommon.zcloudpost.facade.ZcloudPostFacade; import com.zcloud.gbscommon.zcloudpost.request.ZcloudPostQry; import com.zcloud.gbscommon.zcloudpost.response.ZcloudPostCO; import com.zcloud.gbscommon.zcloudpost.response.ZcloudPostDepartmentCO; +import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.BeanUtils; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; /** * @author SondonYong @@ -30,7 +30,11 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade { @Resource private PostServiceI postService; + @Resource + private PostCoConvertor postCoConvertor; + + @Override public SingleResponse listByPostId(ZcloudPostQry qry){ if(Objects.isNull(qry) || Objects.isNull(qry.getPostId())){ return null; @@ -50,6 +54,7 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade { return SingleResponse.of(zcloudPostCO); } + @Override public MultiResponse listByPostIds(ZcloudPostQry qry){ if(qry == null || qry.getPostIds() == null || qry.getPostIds().length == 0){ @@ -73,4 +78,18 @@ public class ZcloudPostFacadeImpl implements ZcloudPostFacade { return MultiResponse.of(zcloudPostCOList); } + + @Override + public MultiResponse listByPostIds(Collection collection) { + List postCOS = postService.listByPostIds(collection); + List zcloudPostCo = postCoConvertor.converCOsToDubboCOs(postCOS); + return MultiResponse.of(zcloudPostCo); + } + + @Override + public MultiResponse getPostList() { + List list = postService.getPostList(); + List zcloudUserCo = postCoConvertor.converCOsToDubboCOs(list); + return MultiResponse.of(zcloudUserCo); + } } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java index fa28671..4694dcd 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java @@ -2,18 +2,30 @@ package com.zcloud.basic.info.facade; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; +import com.zcloud.basic.info.api.CorpInfoServiceI; +import com.zcloud.basic.info.api.UserServiceI; +import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; +import com.zcloud.basic.info.command.convertor.UserCoConvertor; +import com.zcloud.basic.info.dto.clientobject.UserCO; import com.zcloud.gbscommon.zclouduser.facade.ZcloudUserFacade; import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; import org.apache.dubbo.config.annotation.DubboService; +import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Collection; +import java.util.List; /** - * * @author lin */ @DubboService public class ZcloudUserFacadeImpl implements ZcloudUserFacade { + @Resource + private UserServiceI userServiceI; + @Resource + private UserCoConvertor userCoConvertor; + @Override public MultiResponse listByUserIdAndDeptId() { System.out.println("listByUserIdAndDeptId"); @@ -28,4 +40,18 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { public SingleResponse getInfoByUserId(Long aLong) { return null; } + + @Override + public MultiResponse listByUserIds(Collection collection) { + List users = userServiceI.listByUserIds(collection); + List zcloudUserCo = userCoConvertor.converCOsToDubboCOs(users); + return MultiResponse.of(zcloudUserCo); + } + + @Override + public MultiResponse getUserList() { + List users = userServiceI.getUserList(); + List zcloudUserCo = userCoConvertor.converCOsToDubboCOs(users); + return MultiResponse.of(zcloudUserCo); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java index 282b07b..81168b0 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/DepartmentCoConvertor.java @@ -28,5 +28,7 @@ public interface DepartmentCoConvertor { List converCOsToDoubbpCOs(List departmentCOList); + + List converCOsToDubboCOs(List listed); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/PostCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/PostCoConvertor.java index 5a0bec4..707339d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/PostCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/PostCoConvertor.java @@ -1,7 +1,10 @@ package com.zcloud.basic.info.command.convertor; +import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; import com.zcloud.basic.info.dto.clientobject.PostCO; import com.zcloud.basic.info.persistence.dataobject.PostDO; +import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO; +import com.zcloud.gbscommon.zcloudpost.response.ZcloudPostCO; import org.mapstruct.Mapper; import java.util.List; @@ -20,5 +23,6 @@ public interface PostCoConvertor { * @return */ List converDOsToCOs(List postDOs); + List converCOsToDubboCOs(List data); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java index 78ac093..27daa1e 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java @@ -4,6 +4,7 @@ import com.jjb.saas.system.client.user.request.FacadeUserAddCmd; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.dto.clientobject.UserCO; import com.zcloud.basic.info.persistence.dataobject.UserDO; +import com.zcloud.gbscommon.zclouduser.response.ZcloudUserCo; import org.mapstruct.Mapper; import java.util.List; @@ -22,8 +23,8 @@ public interface UserCoConvertor { * @return */ List converDOsToCOs(List userDOs); - FacadeUserAddCmd converEToFacadeUserAddCmd(UserE userE); + List converCOsToDubboCOs(List userCOList); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index b4ab3a1..ac01651 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.system.client.tenant.request.TenantAddCmd; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.domain.model.CorpDepartmentE; @@ -25,10 +26,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -106,5 +104,17 @@ public class CorpInfoQueryExe { return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } + + public List getCorpList() { + List list = corpInfoRepository.list(); + return corpInfoCoConvertor.converDOsToCOs(list); + } + + public List listByCorpIds(Collection collection) { + QueryWrapper dOQueryWrapper = new QueryWrapper<>(); + dOQueryWrapper.in("id", collection); + List list = corpInfoRepository.list(dOQueryWrapper); + return corpInfoCoConvertor.converDOsToCOs(list); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 697c1d5..66830ea 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.domain.model.DepartmentE; @@ -14,6 +15,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentInfoCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; +import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; @@ -90,5 +92,16 @@ public class DepartmentQueryExe { } + public List listByDepartIds(Collection collection) { + QueryWrapper dOQueryWrapper = new QueryWrapper<>(); + dOQueryWrapper.in("id", collection); + List list = departmentRepository.list(dOQueryWrapper); + return departmentCoConvertor.converDOsToCOs(list); + } + + public List getDeptList() { + List list = departmentRepository.list(); + return departmentCoConvertor.converDOsToCOs(list); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java index ac40f23..a242f47 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.command.convertor.DepartmentCoConvertor; import com.zcloud.basic.info.command.convertor.PostCoConvertor; import com.zcloud.basic.info.command.convertor.PostDepartmentCoConvertor; @@ -14,6 +15,7 @@ import com.zcloud.basic.info.dto.clientobject.PostDepartmentCO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.dataobject.PostDepartmentDO; +import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.repository.DepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostDepartmentRepository; import com.zcloud.basic.info.persistence.repository.PostRepository; @@ -54,7 +56,7 @@ public class PostQueryExe { Map params = PageQueryHelper.toHashMap(postPageQry); PageResponse pageResponse = postRepository.listPage(params); - if(CollUtil.isEmpty(pageResponse.getData())){ + if (CollUtil.isEmpty(pageResponse.getData())) { List postCOList = new ArrayList<>(); return PageResponse.of(postCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -64,18 +66,15 @@ public class PostQueryExe { // Map<部门id, 部门名称> Map departmentMap = new HashMap<>(); - if(CollUtil.isNotEmpty(departmentDOList)) { + if (CollUtil.isNotEmpty(departmentDOList)) { List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); - departmentMap = departmentCOList.stream().collect(Collectors.toMap( - DepartmentCO::getId, - DepartmentCO::getName - )); + departmentMap = departmentCOList.stream().collect(Collectors.toMap(DepartmentCO::getId, DepartmentCO::getName)); } List postCOList = postCoConvertor.converDOsToCOs(pageResponse.getData()); - if(CollUtil.isNotEmpty(postCOList)) { + if (CollUtil.isNotEmpty(postCOList)) { for (PostCO postCO : postCOList) { - if(CollUtil.isNotEmpty(departmentMap)) { + if (CollUtil.isNotEmpty(departmentMap)) { postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); } } @@ -86,6 +85,7 @@ public class PostQueryExe { /** * 查询集合 + * * @param qry * @return */ @@ -94,7 +94,7 @@ public class PostQueryExe { // 岗位集合 MultiResponse postMRDO = postRepository.list(params); - if(postMRDO == null || CollUtil.isEmpty(postMRDO.getData())) { + if (postMRDO == null || CollUtil.isEmpty(postMRDO.getData())) { return new MultiResponse<>(); } Long[] postIds = postMRDO.getData().stream().map(PostDO::getId).toArray(Long[]::new); @@ -105,29 +105,26 @@ public class PostQueryExe { // Map<岗位id, List<岗位部门对象>> Map> postDepartmentMap = new HashMap<>(); - if(CollUtil.isNotEmpty(postDepartmentDOList)) { + if (CollUtil.isNotEmpty(postDepartmentDOList)) { List postDepartmentCOList = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOList); postDepartmentMap = postDepartmentCOList.stream().collect(Collectors.groupingBy(PostDepartmentCO::getPostId)); } // Map<部门id, 部门名称> Map departmentMap = new HashMap<>(); - if(CollUtil.isNotEmpty(departmentDOList)) { + if (CollUtil.isNotEmpty(departmentDOList)) { List departmentCOList = departmentCoConvertor.converDOsToCOs(departmentDOList); - departmentMap = departmentCOList.stream().collect(Collectors.toMap( - DepartmentCO::getId, - DepartmentCO::getName - )); + departmentMap = departmentCOList.stream().collect(Collectors.toMap(DepartmentCO::getId, DepartmentCO::getName)); } // 赋值 List postDOList = postMRDO.getData(); List postCOList = postCoConvertor.converDOsToCOs(postDOList); - if(CollUtil.isNotEmpty(postCOList)) { + if (CollUtil.isNotEmpty(postCOList)) { for (PostCO postCO : postCOList) { - if(CollUtil.isNotEmpty(postDepartmentMap) && CollUtil.isNotEmpty(postDepartmentMap.get(postCO.getId()))) { + if (CollUtil.isNotEmpty(postDepartmentMap) && CollUtil.isNotEmpty(postDepartmentMap.get(postCO.getId()))) { postCO.setDepartmentList(postDepartmentMap.get(postCO.getId())); } - if(CollUtil.isNotEmpty(departmentMap)) { + if (CollUtil.isNotEmpty(departmentMap)) { postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); } } @@ -141,6 +138,7 @@ public class PostQueryExe { /** * 查询单条 + * * @param id * @return */ @@ -156,7 +154,7 @@ public class PostQueryExe { postCO.getData().setDepartmentName(departmentDO.getName()); // 岗位-部门权限关联代码 - if(co.getSupervisionFlag() == 1){ + if (co.getSupervisionFlag() == 1) { PostDepartmentPageQry qry = new PostDepartmentPageQry(); qry.setEqPostId(id); Map params = PageQueryHelper.toHashMap(qry); @@ -168,5 +166,17 @@ public class PostQueryExe { return postCO; } + public List listByPostIds(Collection collection) { + QueryWrapper dOQueryWrapper = new QueryWrapper<>(); + dOQueryWrapper.in("id", collection); + List list = postRepository.list(dOQueryWrapper); + return postCoConvertor.converDOsToCOs(list); + + } + + public List getPostList() { + List list = postRepository.list(); + return postCoConvertor.converDOsToCOs(list); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 4a5c765..59d9176 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.command.query; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.dto.UserPageQry; import com.zcloud.basic.info.dto.UserQryCmd; @@ -15,6 +16,7 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -59,6 +61,16 @@ public class UserQueryExe { } + public List listByUserIds(Collection collection) { + QueryWrapper userDOQueryWrapper = new QueryWrapper<>(); + userDOQueryWrapper.in("id",collection); + List list = userRepository.list(userDOQueryWrapper); + return userCoConvertor.converDOsToCOs(list); + } + public List getUserList() { + List list = userRepository.list(); + return userCoConvertor.converDOsToCOs(list); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java index 4e0d571..abfb776 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java @@ -16,6 +16,10 @@ import org.apache.shiro.crypto.hash.SimpleHash; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * web-app * @@ -106,5 +110,15 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI { return corpInfoQueryExe.corpUserMiddlePage(qry); } + + @Override + public List getCorpList() { + return corpInfoQueryExe.getCorpList(); + } + + @Override + public List listByCorpIds(Collection collection) { + return corpInfoQueryExe.listByCorpIds(collection); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index c441979..306c63a 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -16,6 +16,8 @@ import lombok.AllArgsConstructor; import org.checkerframework.checker.units.qual.A; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; import java.util.List; /** @@ -70,6 +72,15 @@ public class DepartmentServiceImpl implements DepartmentServiceI { return departmentQueryExe.info(id); } + @Override + public List listByDepartIds(Collection collection) { + return departmentQueryExe.listByDepartIds(collection); + } + + @Override + public List getDeptList() { + return departmentQueryExe.getDeptList(); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java index 014590a..96e6105 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/PostServiceImpl.java @@ -17,6 +17,10 @@ import com.alibaba.cola.dto.SingleResponse; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * web-app * @@ -67,5 +71,15 @@ public class PostServiceImpl implements PostServiceI { public void removeBatch(Long[] ids) { postRemoveExe.execute(ids); } + + @Override + public List listByPostIds(Collection collection) { + return postQueryExe.listByPostIds(collection); + } + + @Override + public List getPostList() { + return postQueryExe.getPostList(); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index db36216..99855f3 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -3,6 +3,8 @@ package com.zcloud.basic.info.service; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.api.UserServiceI; import com.zcloud.basic.info.command.UserAddExe; import com.zcloud.basic.info.command.UserRemoveExe; @@ -10,9 +12,15 @@ import com.zcloud.basic.info.command.UserUpdateExe; import com.zcloud.basic.info.command.query.UserQueryExe; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.UserCO; +import com.zcloud.basic.info.persistence.dataobject.UserDO; +import com.zcloud.basic.info.persistence.repository.UserRepository; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + /** * web-app * @Author zhangyue @@ -65,5 +73,16 @@ public class UserServiceImpl implements UserServiceI { public MultiResponse listAll(UserQryCmd userQryCmd) { return userQueryExe.executeListAll(userQryCmd); } + + @Override + public List listByUserIds(Collection collection) { + return userQueryExe.listByUserIds(collection); + + } + + @Override + public List getUserList() { + return userQueryExe.getUserList(); + } } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java index ab8bffb..9d71e3b 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java @@ -7,6 +7,7 @@ import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.CorpInfoCO; import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; +import java.util.Collection; import java.util.List; /** @@ -37,5 +38,9 @@ public interface CorpInfoServiceI { void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd); PageResponse corpUserMiddlePage(CorpUserMiddleQry qry); + + List getCorpList(); + + List listByCorpIds(Collection collection); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index 83fec4c..31ce5c5 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -8,6 +8,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentInfoCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; +import java.util.Collection; import java.util.List; /** @@ -31,5 +32,8 @@ public interface DepartmentServiceI { DepartmentInfoCO info(Long id); + List listByDepartIds(Collection collection); + + List getDeptList(); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/PostServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/PostServiceI.java index b5286b3..d243ce8 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/PostServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/PostServiceI.java @@ -10,6 +10,9 @@ import com.zcloud.basic.info.dto.clientobject.PostCO; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; +import java.util.Collection; +import java.util.List; + /** * web-client * @@ -30,5 +33,9 @@ public interface PostServiceI { void remove(Long id); void removeBatch(Long[] ids); + + List listByPostIds(Collection collection); + + List getPostList(); } diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index 600cfbe..8253dd7 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -7,6 +7,9 @@ import com.alibaba.cola.dto.SingleResponse; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.UserCO; +import java.util.Collection; +import java.util.List; + /** * web-client * @Author zhangyue @@ -26,5 +29,9 @@ public interface UserServiceI { void removeBatch(Long[] ids); MultiResponse listAll(UserQryCmd userQryCmd); + + List listByUserIds(Collection collection); + + List getUserList(); }