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

Merge remote-tracking branch 'origin/main' into main 

# Conflicts:
#	web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
main
SondonYong 2025-11-06 16:11:52 +08:00
parent 9093b3f3a7 396c045704
commit f83f8cb323
22 changed files with 304 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java
View File

@ -11,6 +11,7 @@ import com.zcloud.basic.info.api.CorpInfoServiceI;
import com.zcloud.basic.info.dto.*;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@ -109,5 +110,11 @@ public class CorpInfoController {
return SingleResponse.buildSuccess();
}
@ApiOperation("企业用户中台-首页分页列表")
@PostMapping("/corpUserMiddlePage")
public PageResponse<CorpUserMiddleCO> corpUserMiddlePage(@Validated @RequestBody CorpUserMiddleQry qry) {
return corpInfoService.corpUserMiddlePage(qry);
}
}

10
web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoRemoveExe.java
View File

@ -2,7 +2,10 @@ package com.zcloud.basic.info.command;
import com.alibaba.cola.exception.BizException;
import com.zcloud.basic.info.domain.gateway.CorpInfoGateway;
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;
@ -17,6 +20,8 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class CorpInfoRemoveExe {
private final CorpInfoGateway corpInfoGateway;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) {
@ -24,6 +29,8 @@ public class CorpInfoRemoveExe {
if (!res) {
throw new BizException("删除失败");
}
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_CORP_PREFIX+id);
return true;
}
@ -33,6 +40,9 @@ public class CorpInfoRemoveExe {
if (!res) {
throw new BizException("删除失败");
}
for (Long id : ids) {
zcloudRedisUtil.del(Const.REDIS_CORP_PREFIX+id);
}
return true;
}
}

9
web-app/src/main/java/com/zcloud/basic/info/command/CorpInfoUpdateExe.java
View File

@ -10,9 +10,12 @@ import com.zcloud.basic.info.dto.CorpInfoUpdateCmd;
import com.zcloud.basic.info.dto.CorpInfoUpdateUseFlagCmd;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.gbscommon.utils.Const;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
@ -31,6 +34,8 @@ public class CorpInfoUpdateExe {
private final CorpInfoRepository corpInfoRepository;
@DubboReference
private TenantFacade tenantFacade;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public void execute(CorpInfoUpdateCmd corpInfoUpdateCmd) {
@ -40,6 +45,8 @@ public class CorpInfoUpdateExe {
if (!res) {
throw new BizException("修改失败");
}
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_CORP_PREFIX+corpInfoUpdateCmd.getId());
}
public void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd) {
@ -49,6 +56,8 @@ public class CorpInfoUpdateExe {
BeanUtils.copyProperties(corpInfoUpdateCmd, corpInfoE);
corpInfoGateway.changeCompanyName(corpInfoE);
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_CORP_PREFIX+corpInfoUpdateCmd.getId());
// OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd();
// otaUpdateCmd.setAccount(corpInfoE.getCorpName());

39
web-app/src/main/java/com/zcloud/basic/info/command/DepartmentRemoveExe.java
View File

@ -3,20 +3,27 @@ package com.zcloud.basic.info.command;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.exception.BizException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
import com.zcloud.basic.info.dto.clientobject.DepartmentCO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.gbscommon.utils.Const;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@ -30,33 +37,57 @@ import java.util.Map;
public class DepartmentRemoveExe {
private final DepartmentGateway departmentGateway;
private final DepartmentRepository departmentRepository;
private final UserRepository userRepository;
@DubboReference
private DeptFacade deptFacade;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) {
DepartmentDO departmentDO = departmentRepository.getById(id);
if(departmentDO == null){
throw new BizException("部门信息不存在");
}
// departmentGateway
Map<String, Object> parmas =new HashMap<>();
parmas.put("eqParentId", id);
PageResponse<DepartmentDO> pageResponse = departmentRepository.listPage(parmas);
if(CollUtil.isNotEmpty(pageResponse.getData())){
Long departmentCount = departmentRepository.countByParams(parmas);
if(departmentCount>0){
throw new BizException("请先删除下级部门");
}
Boolean b = userRepository.checkUserDepartment(id);
if(b){
throw new BizException("部门有相应人员，请解除相关部门信息后删除");
}
boolean res = departmentGateway.deletedDepartmentById(id);
if (!res) {
throw new BizException("删除失败");
}
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_DEPT_PREFIX+id);
return true;
}
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long[] ids) {
if (ids == null || ids.length == 0) {
return true;
}
Boolean b = userRepository.checkUserDepartment(ids);
if(b){
throw new BizException("部门有相应人员，请解除相关部门信息后删除");
}
boolean res = departmentGateway.deletedDepartmentByIds(ids);
if (!res) {
throw new BizException("删除失败");
}
// 批量删除 Redis 缓存 - 循环处理每个ID
for (Long id : ids) {
zcloudRedisUtil.del(Const.REDIS_DEPT_PREFIX + id);
}
return true;
}
}

9
web-app/src/main/java/com/zcloud/basic/info/command/DepartmentUpdateExe.java
View File

@ -9,10 +9,13 @@ import com.zcloud.basic.info.domain.model.FacadeDepartmentE;
import com.zcloud.basic.info.dto.DepartmentUpdateCmd;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.gbscommon.utils.Const;
import com.zcloud.gbscommon.utils.ZcloudRedisUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@ -33,6 +36,8 @@ public class DepartmentUpdateExe {
private final DepartmentRepository departmentRepository;
@DubboReference
private DeptFacade deptFacade;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public void execute(DepartmentUpdateCmd departmentUpdateCmd) {
@ -51,6 +56,10 @@ public class DepartmentUpdateExe {
FacadeUpdateDeptCmd deptCmd = new FacadeUpdateDeptCmd();
BeanUtils.copyProperties(deptE, deptCmd);
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_DEPT_PREFIX+departmentDO.getCorpinfoId()+":"+departmentUpdateCmd.getId());
// deptFacade.updateDept(deptCmd);
if(!departmentDO.getName().equals(departmentE.getName())){
//TODO 名字不一样，发送mq

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

@ -1,16 +1,25 @@
package com.zcloud.basic.info.command;
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.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;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
@ -25,6 +34,9 @@ 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) {
@ -42,16 +54,16 @@ public class PostRemoveExe {
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不能为空");
}
// 这段代码后续放到user的方法中, 校验是否有人员使用该岗位
// QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
// queryWrapper.in("post_id", ids);
@ -66,6 +78,10 @@ public class PostRemoveExe {
if (!res) {
throw new BizException("删除失败");
}
for (Long id : ids) {
zcloudRedisUtil.del(Const.REDIS_POST_PREFIX+id);
}
return true;
}
}

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

@ -8,8 +8,13 @@ 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;
@ -28,7 +33,9 @@ import java.util.List;
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) {
@ -45,6 +52,11 @@ public class PostUpdateExe {
.toArray(Long[]::new));
}
PostDO postDO = postRepository.getById(postUpdateCmd.getId());
if (postDO == null) {
throw new BizException("岗位不存在");
}
PostE postE = new PostE();
BeanUtils.copyProperties(postUpdateCmd, postE);
boolean res = postGateway.update(postE);
@ -83,6 +95,9 @@ public class PostUpdateExe {
if (!res) {
throw new BizException("修改失败");
}
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_POST_PREFIX+postDO.getId());
}
}

9
web-app/src/main/java/com/zcloud/basic/info/command/UserRemoveExe.java
View File

@ -2,7 +2,10 @@ package com.zcloud.basic.info.command;
import com.alibaba.cola.exception.BizException;
import com.zcloud.basic.info.domain.gateway.UserGateway;
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;
@ -18,6 +21,8 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class UserRemoveExe {
private final UserGateway userGateway;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) {
@ -25,6 +30,7 @@ public class UserRemoveExe {
if(!res){
throw new BizException("删除失败");
}
zcloudRedisUtil.del(Const.REDIS_USER_PREFIX+id);
return true;
}
@ -34,6 +40,9 @@ public class UserRemoveExe {
if(!res){
throw new BizException("删除失败");
}
for (Long id : ids) {
zcloudRedisUtil.del(Const.REDIS_USER_PREFIX+id);
}
return true;
}
}

7
web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java
View File

@ -4,8 +4,11 @@ import com.alibaba.cola.exception.BizException;
import com.zcloud.basic.info.domain.gateway.UserGateway;
import com.zcloud.basic.info.domain.model.UserE;
import com.zcloud.basic.info.dto.UserUpdateCmd;
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;
@ -21,6 +24,8 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class UserUpdateExe {
private final UserGateway userGateway;
@Autowired
private ZcloudRedisUtil zcloudRedisUtil;
@Transactional(rollbackFor = Exception.class)
public void execute(UserUpdateCmd userUpdateCmd) {
@ -30,6 +35,8 @@ public class UserUpdateExe {
if (!res) {
throw new BizException("修改失败");
}
//删除redis数据
zcloudRedisUtil.del(Const.REDIS_USER_PREFIX+userUpdateCmd.getId());
}
}

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

@ -4,6 +4,7 @@ import com.zcloud.basic.info.domain.model.CorpDepartmentE;
import com.zcloud.basic.info.domain.model.DepartmentE;
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 com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.gbscommon.zcloudcorp.response.ZcloudCorpInfoCO;
@ -33,5 +34,7 @@ public interface CorpInfoCoConvertor {
List<CorpDepartmentCO> converCorpInfoToCorpDepartCOs(List<CorpDepartmentE> corpInfoList);
List<ZcloudCorpInfoCO> converCOsToDubboCOs(List<CorpInfoCO> data);
List<CorpUserMiddleCO> converDOsToMiddleCOs(List<CorpInfoDO> data);
}

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

@ -9,12 +9,16 @@ import com.zcloud.basic.info.domain.model.CorpInfoE;
import com.zcloud.basic.info.domain.model.DepartmentE;
import com.zcloud.basic.info.dto.CorpDepartmentQry;
import com.zcloud.basic.info.dto.CorpInfoPageQry;
import com.zcloud.basic.info.dto.CorpUserMiddleQry;
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 com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.basic.info.persistence.repository.PostRepository;
import com.zcloud.basic.info.persistence.repository.UserRepository;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
@ -39,6 +43,8 @@ public class CorpInfoQueryExe {
private final CorpInfoRepository corpInfoRepository;
private final CorpInfoCoConvertor corpInfoCoConvertor;
private final DepartmentRepository departmentRepository;
private final PostRepository postRepository;
private final UserRepository userRepository;
/**
@ -85,5 +91,20 @@ public class CorpInfoQueryExe {
return PageResponse.of(corpDepartmentCOList, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public PageResponse<CorpUserMiddleCO> corpUserMiddlePage(CorpUserMiddleQry qry) {
Map<String, Object> parmas = PageQueryHelper.toHashMap(qry);
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(parmas);
List<CorpUserMiddleCO> examCenterCOS = corpInfoCoConvertor.converDOsToMiddleCOs(pageResponse.getData());
examCenterCOS.forEach(info->{
info.setDepartMentCount(departmentRepository.getCountByCorpInfoId(info.getId()));
info.setPostCount(postRepository.getCountByCorpInfoId(info.getId()));
info.setUserCount(userRepository.getCountByCorpInfoId(info.getId()));
// info.setMiddleUserCount(departmentRepository.getCountByCorpInfoId(info.getId()));
});
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
}

8
web-app/src/main/java/com/zcloud/basic/info/service/CorpInfoServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoCO;
import com.zcloud.basic.info.domain.enums.UserTypeEnum;
import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO;
import com.zcloud.gbscommon.utils.Tools;
import org.apache.shiro.crypto.hash.SimpleHash;
import lombok.AllArgsConstructor;
@ -98,5 +99,12 @@ public class CorpInfoServiceImpl implements CorpInfoServiceI {
public void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd) {
corpInfoUpdateExe.changeEnableFlag(corpInfoUpdateUseFlagCmd);
}
@Override
public PageResponse<CorpUserMiddleCO> corpUserMiddlePage(CorpUserMiddleQry qry) {
return corpInfoQueryExe.corpUserMiddlePage(qry);
}
}

3
web-client/src/main/java/com/zcloud/basic/info/api/CorpInfoServiceI.java
View File

@ -5,6 +5,7 @@ import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.basic.info.dto.*;
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.List;
@ -34,5 +35,7 @@ public interface CorpInfoServiceI {
void changeCompanyName(CorpInfoUpdateCmd corpInfoUpdateCmd);
void changeEnableFlag(CorpInfoUpdateUseFlagCmd corpInfoUpdateUseFlagCmd);
PageResponse<CorpUserMiddleCO> corpUserMiddlePage(CorpUserMiddleQry qry);
}

38
web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java Normal file
View File

@ -0,0 +1,38 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-30 10:10:48
*/
@Data
public class CorpUserMiddleQry extends PageQuery {
/**
* 查询条件操作前缀,支持以下几种数据库查询操作：
* - `like`: 模糊匹配查询，对应SQL的LIKE操作符
* - `eq`: 等值查询，对应SQL的=操作符
* - `gt`: 大于比较查询
* - `lt`: 小于比较查询
* - `ge`: 大于等于比较查询
* - `le`: 小于等于比较查询
* - `ne`: 不等比较查询，对应SQL的!=操作符
*/
/**
* 名称模糊查询
*/
@ApiModelProperty(value = "分公司名称", name = "likeCorpName")
private String likeCorpName;
@ApiModelProperty(value = "企业类型，0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位", name = "eqType")
private String eqType;
}

39
web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpUserMiddleCO.java Normal file
View File

@ -0,0 +1,39 @@
package com.zcloud.basic.info.dto.clientobject;
import com.alibaba.cola.dto.ClientObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-30 10:10:48
*/
@Data
public class CorpUserMiddleCO extends ClientObject {
//主键
@ApiModelProperty(value = "企业主键")
private Long id;
@ApiModelProperty(value = "企业名称")
private String corpName;
//企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)")
private Integer type;
@ApiModelProperty(value = "部门数")
private Long departMentCount;
@ApiModelProperty(value = "岗位数")
private Long postCount;
@ApiModelProperty(value = "用户数")
private Long userCount;
@ApiModelProperty(value = "中台用户数")
private Long middleUserCount;
}

5
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java
View File

@ -20,5 +20,10 @@ public interface DepartmentRepository extends BaseRepository<DepartmentDO> {
List<DepartmentDO> listTree(Map<String, Object> parmas);
List<DepartmentDO> listByParams(Map<String, Object> departParmas);
Long countByParams(Map<String, Object> parmas);
Long getCountByCorpInfoId(Long id);
}

2
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/PostRepository.java
View File

@ -21,5 +21,7 @@ public interface PostRepository extends BaseRepository<PostDO> {
MultiResponse<PostDO> list(Map<String, Object> params);
SingleResponse<PostDO> getInfoById(Long id);
Long getCountByCorpInfoId(Long id);
}

5
web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java
View File

@ -18,5 +18,10 @@ public interface UserRepository extends BaseRepository<UserDO> {
List<UserDO> listAll(Map<String,Object> params);
Long getCountByCorpInfoId(Long id);
Boolean checkUserDepartment(Long id);
Boolean checkUserDepartment(Long[] ids);
}

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

@ -1,5 +1,6 @@
package com.zcloud.basic.info.persistence.repository.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -35,7 +36,10 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl<CorpInfoMapper, C
IPage<CorpInfoDO> iPage = new Query<CorpInfoDO>().getPage(params);
QueryWrapper<CorpInfoDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params);
queryWrapper.in("type", CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType")));
List<Integer> enterpriseType = CorpTypeEnum.getCodesByEnterpriseType((Integer) params.get("enterpriseType"));
if(CollUtil.isNotEmpty(enterpriseType)){
queryWrapper.in("type",enterpriseType );
}
IPage<CorpInfoDO> result = corpInfoMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());
}

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

@ -62,5 +62,21 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl<DepartmentMappe
List<DepartmentDO> departmentDOList = departmentMapper.selectList(queryWrapper);
return departmentDOList;
}
@Override
public Long countByParams(Map<String, Object> parmas) {
IPage<DepartmentDO> iPage = new Query<DepartmentDO>().getPage(parmas);
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas);
queryWrapper.orderByDesc("create_time");
return departmentMapper.selectCount(queryWrapper);
}
@Override
public Long getCountByCorpInfoId(Long id) {
QueryWrapper<DepartmentDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("corpinfo_id", id);
return departmentMapper.selectCount(queryWrapper);
}
}

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

@ -2,6 +2,7 @@ package com.zcloud.basic.info.persistence.repository.impl;
import com.alibaba.cola.dto.MultiResponse;
import com.jjb.saas.framework.repository.common.PageHelper;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.dataobject.PostDO;
import com.zcloud.basic.info.persistence.mapper.PostMapper;
import com.zcloud.basic.info.persistence.repository.PostRepository;
@ -63,5 +64,12 @@ public class PostRepositoryImpl extends BaseRepositoryImpl<PostMapper, PostDO> i
public SingleResponse<PostDO> getInfoById(Long id) {
return SingleResponse.of(postMapper.selectById(id));
}
@Override
public Long getCountByCorpInfoId(Long id) {
QueryWrapper<PostDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("corpinfo_id", id);
return postMapper.selectCount(queryWrapper);
}
}

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

@ -1,11 +1,13 @@
package com.zcloud.basic.info.persistence.repository.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.repository.common.PageHelper;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO;
import com.zcloud.basic.info.persistence.dataobject.UserDO;
import com.zcloud.basic.info.persistence.mapper.UserMapper;
@ -43,5 +45,34 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
public List<UserDO> listAll(Map<String, Object> params) {
return userMapper.selectListAll(params);
}
@Override
public Long getCountByCorpInfoId(Long id) {
QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("corpinfo_id", id);
return userMapper.selectCount(queryWrapper);
}
@Override
public Boolean checkUserDepartment(Long id) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("department_id", id);
Long userCount = userMapper.selectCount(queryWrapper);
if(userCount>0){
return true;
}
return false;
}
@Override
public Boolean checkUserDepartment(Long[] ids) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.in("department_id", ids);
Long userCount = userMapper.selectCount(queryWrapper);
if(userCount>0){
return true;
}
return false;
}
}