diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java index 8748ac0..1d7fe0a 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java @@ -1,8 +1,6 @@ package com.zcloud.basic.info.web; -import cn.hutool.core.util.StrUtil; -import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.api.PostServiceI; import com.zcloud.basic.info.dto.*; import com.zcloud.basic.info.dto.clientobject.PostCO; @@ -10,17 +8,12 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.apache.commons.lang.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; -import java.util.Objects; - /** * web-adapter @@ -38,7 +31,6 @@ public class PostController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody PostAddCmd cmd) { -// SSOUser ssoUser = AuthContext.getCurrentUser(); return postService.add(cmd); } @@ -52,18 +44,12 @@ public class PostController { @ApiOperation("分页") @PostMapping("/list") public PageResponse page(@Validated @RequestBody PostPageQry qry) { - if(qry.getCorpFlag() == 2){ - qry.setEqCorpinfoId(AuthContext.getTenantId()); - } return postService.listPage(qry); } @ApiOperation("所有数据") @PostMapping("/listAll") public MultiResponse listAll(@Validated @RequestBody PostListQry qry) { - if(qry.getCorpFlag() == 2){ - qry.setCorpinfoId(AuthContext.getTenantId()); - } return postService.list(qry); } @@ -83,15 +69,9 @@ public class PostController { @ApiOperation("删除多个") @PutMapping("/removeBatch") public Response removeBatch(@Validated @RequestBody PostRemoveCmd cmd) { - - if(cmd.getIds()== null || cmd.getIds().length == 0){ - throw new BizException("请选择要删除的项。"); - } - postService.removeBatch(cmd.getIds()); return SingleResponse.buildSuccess(); } - } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java index d4423ef..6ad0283 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java @@ -1,7 +1,6 @@ package com.zcloud.basic.info.web; -import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.api.UserQualificationInfoServiceI; import com.zcloud.basic.info.dto.UserQualificationInfoAddCmd; import com.zcloud.basic.info.dto.UserQualificationInfoPageQry; @@ -12,19 +11,12 @@ import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.Response; import com.alibaba.cola.dto.SingleResponse; -import com.jjb.saas.framework.auth.model.SSOUser; -import com.jjb.saas.framework.auth.utils.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; -import org.apache.commons.lang.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Objects; - /** * web-adapter * @Author SondonYong @@ -40,14 +32,12 @@ public class UserQualificationInfoController { @ApiOperation("新增") @PostMapping("/save") public SingleResponse add(@Validated @RequestBody UserQualificationInfoAddCmd cmd) { - SSOUser ssoUser = AuthContext.getCurrentUser(); return userQualificationInfoService.add(cmd); } @ApiOperation("修改") @PutMapping("/edit") public SingleResponse edit(@Validated @RequestBody UserQualificationInfoUpdateCmd cmd) { - userQualificationInfoService.edit(cmd); return SingleResponse.buildSuccess(); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java index 8f6790c..057ef1c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java @@ -1,10 +1,6 @@ package com.zcloud.basic.info.command; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway; import com.zcloud.basic.info.domain.gateway.PostGateway; -import com.zcloud.basic.info.domain.model.PostDepartmentE; import com.zcloud.basic.info.domain.model.PostE; import com.zcloud.basic.info.dto.PostAddCmd; import com.alibaba.cola.exception.BizException; @@ -28,7 +24,6 @@ import java.util.Objects; @AllArgsConstructor public class PostAddExe { private final PostGateway postGateway; - private final PostDepartmentGateway postDepartmentGateway; @Transactional(rollbackFor = Exception.class) public boolean execute(PostAddCmd cmd) { @@ -43,14 +38,6 @@ public class PostAddExe { res = true; } - // 岗位部门关联 -// if(res && cmd.getSupervisionFlag() != null && cmd.getSupervisionFlag() == 1) { -// List postDepartmentEList = postE.addDepartmentIds(postId, cmd.getDepartmentIds()); -// if(CollUtil.isNotEmpty(postDepartmentEList)){ -// res = postDepartmentGateway.addList(postDepartmentEList); -// } -// } - } catch (Exception e) { throw new RuntimeException(e); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java index a2992a4..6d2b4d5 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java @@ -1,21 +1,12 @@ package com.zcloud.basic.info.command; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway; import com.zcloud.basic.info.domain.gateway.PostGateway; import com.alibaba.cola.exception.BizException; import com.zcloud.basic.info.domain.model.UserE; -import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; -import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; -import com.zcloud.basic.info.persistence.repository.PostRepository; import com.zcloud.basic.info.persistence.repository.UserRepository; -import com.zcloud.gbscommon.utils.Const; -import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -34,11 +25,7 @@ import java.util.stream.Collectors; @AllArgsConstructor public class PostRemoveExe { private final PostGateway postGateway; - private final PostDepartmentGateway postDepartmentGateway; private final UserRepository userRepository; - private final PostRepository postRepository; -// @Autowired -// private ZcloudRedisUtil zcloudRedisUtil; @Transactional(rollbackFor = Exception.class) public boolean execute(Long id) { @@ -48,33 +35,24 @@ public class PostRemoveExe { userE.checkNull(BeanUtil.copyToList(userDOS, UserE.class)); boolean res = postGateway.deletedPostById(id); - postDepartmentGateway.deletedPostDepartment(id); if (!res) { throw new BizException("删除失败"); } - //删除redis数据 - // zcloudRedisUtil.del(Const.REDIS_POST_PREFIX+id); return true; } @Transactional(rollbackFor = Exception.class) public boolean execute(Long[] ids) { - if (ids == null || ids.length == 0) { - throw new BizException("岗位ID不能为空"); - } + UserE userE = new UserE(); + // 校验是否有人员使用该岗位 List userDOS = userRepository.listByPostIds(ids); - UserE userE = new UserE(); userE.checkNull(BeanUtil.copyToList(userDOS, UserE.class)); boolean res = postGateway.deletedPostByIds(ids); - postDepartmentGateway.deletedPostDepartment(ids); if (!res) { throw new BizException("删除失败"); } - for (Long id : ids) { - // zcloudRedisUtil.del(Const.REDIS_POST_PREFIX+id); - } return true; } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java index a227d73..0a5fe56 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java @@ -1,26 +1,16 @@ package com.zcloud.basic.info.command; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.cola.exception.BizException; -import com.zcloud.basic.info.domain.gateway.PostDepartmentGateway; import com.zcloud.basic.info.domain.gateway.PostGateway; -import com.zcloud.basic.info.domain.model.PostDepartmentE; import com.zcloud.basic.info.domain.model.PostE; import com.zcloud.basic.info.dto.PostUpdateCmd; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.repository.PostRepository; -import com.zcloud.gbscommon.utils.Const; -import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; /** @@ -33,10 +23,7 @@ import java.util.Objects; @AllArgsConstructor public class PostUpdateExe { private final PostGateway postGateway; - private final PostDepartmentGateway postDepartmentGateway; private final PostRepository postRepository; -// @Autowired -// private ZcloudRedisUtil zcloudRedisUtil; @Transactional(rollbackFor = Exception.class) public void execute(PostUpdateCmd postUpdateCmd) { @@ -49,26 +36,9 @@ public class PostUpdateExe { BeanUtils.copyProperties(postUpdateCmd, postE); boolean res = postGateway.update(postE); - // 岗位关联部门 - // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据 -// if(res){ -// if (postUpdateCmd.getSupervisionFlag() == null || postUpdateCmd.getSupervisionFlag() == 0){ -// postDepartmentGateway.deletedPostDepartment(postE.getId()); -// }else if(postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){ -// // 是监管单位 -// postDepartmentGateway.deletedPostDepartment(postE.getId()); -// List postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds()); -// if(CollUtil.isNotEmpty(postDepartmentEList)){ -// res = postDepartmentGateway.addList(postDepartmentEList); -// } -// } -// } - if (!res) { throw new BizException("修改失败"); } - //删除redis数据 - // zcloudRedisUtil.del(Const.REDIS_POST_PREFIX+postDO.getId()); } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java index 5665883..dce0919 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java @@ -1,8 +1,6 @@ package com.zcloud.basic.info.command; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.domain.gateway.UserQualificationInfoGateway; import com.zcloud.basic.info.domain.model.UserQualificationInfoE; import com.zcloud.basic.info.dto.UserQualificationInfoAddCmd; diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java index f74931a..ee77d28 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java @@ -2,7 +2,6 @@ package com.zcloud.basic.info.command; import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.exception.BizException; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.domain.gateway.UserQualificationInfoGateway; import com.zcloud.basic.info.domain.model.UserQualificationInfoE; import com.zcloud.basic.info.dto.UserQualificationInfoUpdateCmd; 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 7199aca..2883ca4 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 @@ -5,19 +5,13 @@ 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; -import com.zcloud.basic.info.dto.PostDepartmentPageQry; import com.zcloud.basic.info.dto.PostListQry; import com.zcloud.basic.info.dto.PostPageQry; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.PostCO; -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; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; @@ -40,11 +34,9 @@ import java.util.stream.Collectors; @AllArgsConstructor public class PostQueryExe { private final PostRepository postRepository; - private final PostDepartmentRepository postDepartmentRepository; private final DepartmentRepository departmentRepository; private final DepartmentCoConvertor departmentCoConvertor; private final PostCoConvertor postCoConvertor; - private final PostDepartmentCoConvertor postDepartmentCoConvertor; /** * 分页 @@ -57,8 +49,7 @@ public class PostQueryExe { PageResponse pageResponse = postRepository.listPage(params); if (pageResponse == null || CollUtil.isEmpty(pageResponse.getData())) { - List postCOList = new ArrayList<>(); - return PageResponse.of(postCOList, 0, 0, 0); + return PageResponse.of(new ArrayList<>(), 0, 0, 0); } Long[] departmentIds = pageResponse.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); @@ -97,18 +88,9 @@ public class PostQueryExe { if (postMRDO == null || CollUtil.isEmpty(postMRDO.getData())) { return new MultiResponse<>(); } -// Long[] postIds = postMRDO.getData().stream().map(PostDO::getId).toArray(Long[]::new); Long[] departmentIds = postMRDO.getData().stream().map(PostDO::getDepartmentId).toArray(Long[]::new); - // 岗位部门集合 -// List postDepartmentDOList = postDepartmentRepository.list(postIds); List departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds)); - // Map<岗位id, List<岗位部门对象>> -// Map> postDepartmentMap = new HashMap<>(); -// 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)) { @@ -121,9 +103,6 @@ public class PostQueryExe { List postCOList = postCoConvertor.converDOsToCOs(postDOList); if (CollUtil.isNotEmpty(postCOList)) { for (PostCO postCO : postCOList) { -// if (CollUtil.isNotEmpty(postDepartmentMap) && CollUtil.isNotEmpty(postDepartmentMap.get(postCO.getId()))) { -// postCO.setDepartmentList(postDepartmentMap.get(postCO.getId())); -// } if (CollUtil.isNotEmpty(departmentMap)) { postCO.setDepartmentName(departmentMap.get(postCO.getDepartmentId())); } @@ -155,16 +134,6 @@ public class PostQueryExe { postCO.getData().setDepartmentName(departmentDO.getName()); } - // 岗位-部门权限关联代码 -// if (co.getSupervisionFlag() == 1) { -// PostDepartmentPageQry qry = new PostDepartmentPageQry(); -// qry.setEqPostId(id); -// Map params = PageQueryHelper.toHashMap(qry); -// List postDepartmentDOS = postDepartmentRepository.list(params); -// List postDepartmentCOS = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOS); -// postCO.getData().setDepartmentList(postDepartmentCOS); -// } - return postCO; } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java index 322aae1..57ff05c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java @@ -5,13 +5,11 @@ import com.zcloud.basic.info.command.convertor.UserQualificationInfoCoConvertor; import com.zcloud.basic.info.dto.UserQualificationInfoPageQry; import com.zcloud.basic.info.dto.clientobject.UserQualificationInfoCO; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; -import com.zcloud.basic.info.persistence.repository.ImgFilesRepository; import com.zcloud.basic.info.persistence.repository.UserQualificationInfoRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.dto.SingleResponse; import lombok.AllArgsConstructor; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -30,7 +28,6 @@ import java.util.Map; public class UserQualificationInfoQueryExe { private final UserQualificationInfoRepository userQualificationInfoRepository; private final UserQualificationInfoCoConvertor userQualificationInfoCoConvertor; - private final ImgFilesRepository imgFilesRepository; /** * 分页 diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java index 4b35c62..baea0de 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java @@ -23,7 +23,7 @@ public class PostRemoveCmd extends Command { @ApiModelProperty(value = "主键", name = "ids", required = true) @NotNull(message = "主键不能为空") - @Size(min = 1, message = "至少需要一个主键") + @Size(min = 1, message = "请选择要删除的项。") private Long[] ids; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java index fb7e91c..ee015ca 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java @@ -26,7 +26,7 @@ public class UserQualificationInfoRemoveCmd extends Command { @ApiModelProperty(value = "主键", name = "ids", required = true) @NotNull(message = "主键不能为空") - @Size(min = 1, message = "至少需要一个主键") + @Size(min = 1, message = "请选择要删除的项。") private Long[] ids; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java index 147c8db..1c8ad5c 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.persistence.repository.impl; import com.alibaba.cola.dto.MultiResponse; +import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; @@ -33,6 +34,13 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i @Override public PageResponse listPage(Map params) { + + // 企业端 + Integer corpFlag = (Integer)params.get("corpFlag"); + if(corpFlag == 2){ + params.put("eqCorpinfoId", AuthContext.getTenantId()); + } + IPage iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); @@ -43,6 +51,13 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i @Override public MultiResponse list(Map params) { + + // 企业端 + Integer corpFlag = (Integer)params.get("corpFlag"); + if(corpFlag == 2){ + params.put("corpinfoId", AuthContext.getTenantId()); + } + Long[] ids = (Long[])params.get("postIds"); Long departmentId = (Long)params.get("departmentId"); Long corpinfoId = (Long)params.get("corpinfoId");