zcloud_gbs
/
zcloud_gbs_basic_info_gwj
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed:修复bug

main
SondonYong 2025-11-20 17:45:13 +08:00
parent 8d28568da3
commit 5bbce9f03d
12 changed files with 20 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web-adapter/src/main/java/com/zcloud/basic/info/web/PostController.java
View File

@ -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<PostCO> 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<PostCO> page(@Validated @RequestBody PostPageQry qry) {
if(qry.getCorpFlag() == 2){
qry.setEqCorpinfoId(AuthContext.getTenantId());
}
return postService.listPage(qry);
}
@ApiOperation("所有数据")
@PostMapping("/listAll")
public MultiResponse<PostCO> 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();
}
}

10
web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java
View File

@ -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<UserQualificationInfoCO> 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();
}

13
web-app/src/main/java/com/zcloud/basic/info/command/PostAddExe.java
View File

@ -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<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postId, cmd.getDepartmentIds());
// if(CollUtil.isNotEmpty(postDepartmentEList)){
// res = postDepartmentGateway.addList(postDepartmentEList);
// }
// }
} catch (Exception e) {
throw new RuntimeException(e);
}

26
web-app/src/main/java/com/zcloud/basic/info/command/PostRemoveExe.java
View File

@ -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<UserDO> 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;
}

30
web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
View File

@ -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<PostDepartmentE> 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());
}
}

2
web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java
View File

@ -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;

1
web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java
View File

@ -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;

33
web-app/src/main/java/com/zcloud/basic/info/command/query/PostQueryExe.java
View File

@ -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<PostDO> pageResponse = postRepository.listPage(params);
if (pageResponse == null || CollUtil.isEmpty(pageResponse.getData())) {
List<PostCO> 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<PostDepartmentDO> postDepartmentDOList = postDepartmentRepository.list(postIds);
List<DepartmentDO> departmentDOList = departmentRepository.listByIds(Arrays.asList(departmentIds));
// Map<岗位id, List<岗位部门对象>>
// Map<Long, List<PostDepartmentCO>> postDepartmentMap = new HashMap<>();
// if (CollUtil.isNotEmpty(postDepartmentDOList)) {
// List<PostDepartmentCO> postDepartmentCOList = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOList);
// postDepartmentMap = postDepartmentCOList.stream().collect(Collectors.groupingBy(PostDepartmentCO::getPostId));
// }
// Map<部门id, 部门名称>
Map<Long, String> departmentMap = new HashMap<>();
if (CollUtil.isNotEmpty(departmentDOList)) {
@ -121,9 +103,6 @@ public class PostQueryExe {
List<PostCO> 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<String, Object> params = PageQueryHelper.toHashMap(qry);
// List<PostDepartmentDO> postDepartmentDOS = postDepartmentRepository.list(params);
// List<PostDepartmentCO> postDepartmentCOS = postDepartmentCoConvertor.converDOsToCOs(postDepartmentDOS);
// postCO.getData().setDepartmentList(postDepartmentCOS);
// }
return postCO;
}

3
web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java
View File

@ -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;
/**
* 分页

2
web-client/src/main/java/com/zcloud/basic/info/dto/PostRemoveCmd.java
View File

@ -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;
}

2
web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java
View File

@ -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;
}

15
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/PostRepositoryImpl.java
View File

@ -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<PostMapper, PostDO> i
@Override
public PageResponse<PostDO> listPage(Map<String, Object> params) {
// 企业端
Integer corpFlag = (Integer)params.get("corpFlag");
if(corpFlag == 2){
params.put("eqCorpinfoId", AuthContext.getTenantId());
}
IPage<PostDO> iPage = new Query<PostDO>().getPage(params);
QueryWrapper<PostDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
@ -43,6 +51,13 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
@Override
public MultiResponse<PostDO> list(Map<String, Object> 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");