From 82144aed780466daa17b22900f0db66af46b3b13 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Mon, 8 Dec 2025 08:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/web/CorpInfoController.java | 4 + .../basic/info/web/DepartmentController.java | 2 + .../zcloud/basic/info/web/PostController.java | 2 + .../zcloud/basic/info/web/UserController.java | 3 +- .../info/command/query/CorpInfoQueryExe.java | 25 ++---- .../basic/info/dto/CorpDepartmentQry.java | 2 +- .../basic/info/dto/CorpInfoPageQry.java | 1 + .../basic/info/dto/CorpUserMiddleQry.java | 2 +- .../basic/info/dto/DepartmentPageQry.java | 1 + .../zcloud/basic/info/dto/PostPageQry.java | 2 + .../zcloud/basic/info/dto/UserPageQry.java | 2 + .../basic/info/domain/enums/MenuEnum.java | 85 +++++++++++++++++++ .../persistence/mapper/CorpInfoMapper.java | 13 ++- .../persistence/mapper/DepartmentMapper.java | 10 +++ .../info/persistence/mapper/PostMapper.java | 11 ++- .../info/persistence/mapper/UserMapper.java | 3 +- .../impl/CorpInfoRepositoryImpl.java | 15 +++- .../impl/DepartmentRepositoryImpl.java | 8 +- .../repository/impl/PostRepositoryImpl.java | 8 +- .../repository/impl/UserRepositoryImpl.java | 52 ++++-------- .../main/resources/mapper/CorpInfoMapper.xml | 6 ++ .../resources/mapper/DepartmentMapper.xml | 6 +- .../src/main/resources/mapper/PostMapper.xml | 6 +- 23 files changed, 205 insertions(+), 64 deletions(-) create mode 100644 web-domain/src/main/java/com/zcloud/basic/info/domain/enums/MenuEnum.java diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java index 360400c7..26c9a35c 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/CorpInfoController.java @@ -13,6 +13,7 @@ import com.zcloud.basic.info.dto.clientobject.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -49,6 +50,7 @@ public class CorpInfoController { @ApiOperation("分页") @PostMapping("/list") + @PreAuthorize("@pms.hasAnyPermission('zgszhgl','zgsqyxxgl','gszhxxgl','qyd-xgf-zhgl')") public PageResponse page(@Validated @RequestBody CorpInfoPageQry qry) { return corpInfoService.listPage(qry); } @@ -87,6 +89,7 @@ public class CorpInfoController { @ApiOperation("监管端-分子公司部门管理首页") @PostMapping("/corpDepartlist") + @PreAuthorize("@pms.hasAnyPermission('zgsbmgl')") public PageResponse corpDepartlist(@Validated @RequestBody CorpDepartmentQry qry) { return corpInfoService.corpDepartlist(qry); } @@ -113,6 +116,7 @@ public class CorpInfoController { @ApiOperation("企业用户中台-首页分页列表") @PostMapping("/corpUserMiddlePage") + @PreAuthorize("@pms.hasAnyPermission('qyyhzt','zgsyhgl','ryxxgl','qyd-xgf-yhgl')") public PageResponse corpUserMiddlePage(@Validated @RequestBody CorpUserMiddleQry qry) { return corpInfoService.corpUserMiddlePage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 2d65a404..14537724 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -48,6 +49,7 @@ public class DepartmentController { @ApiOperation("查询部门分页") @PostMapping("/list") + @PreAuthorize("@pms.hasAnyPermission('jgzzjg','zzjgqyd','bmglxgf','zzjg')") public PageResponse page(@Validated @RequestBody DepartmentPageQry qry) { return departmentService.listPage(qry); } 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 1d7fe0a5..8e164635 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 @@ -11,6 +11,7 @@ import com.alibaba.cola.dto.SingleResponse; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -43,6 +44,7 @@ public class PostController { @ApiOperation("分页") @PostMapping("/list") + @PreAuthorize("@pms.hasAnyPermission('gwgl','gwglqyd')") public PageResponse page(@Validated @RequestBody PostPageQry qry) { return postService.listPage(qry); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index 188abf9c..c5245e02 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -66,7 +66,7 @@ public class UserController { @ApiOperation("分页") @PostMapping("/list") - @PreAuthorize("@pms.hasAnyPermission('zhgl2','zgsyhgl','ryxxgl')") + @PreAuthorize("@pms.hasAnyPermission('zhgl2','yhglqyd','qydqyyhzt')") public PageResponse page(@RequestBody UserPageQry qry) { return userService.listPage(qry); } @@ -145,6 +145,7 @@ public class UserController { @ApiOperation("相关方用户列表分页") @PostMapping("/listXgf") + @PreAuthorize("@pms.hasAnyPermission('yhglxgf')") public PageResponse listXgf(@RequestBody UserPageQry qry) { return userService.listXgf(qry); } 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 c933ca5e..c663da6e 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 @@ -1,40 +1,33 @@ package com.zcloud.basic.info.command.query; import cn.hutool.core.collection.CollUtil; -import cn.hutool.json.JSONUtil; import com.alibaba.cola.dto.PageResponse; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; -import com.jjb.saas.security.starter.api.SecurityClientApi; import com.jjb.saas.security.starter.api.co.DecryptCmd; -import com.jjb.saas.security.starter.serialize.dto.MaskDTO; -import com.jjb.saas.security.starter.util.DesenstizationClientUtil; -import com.jjb.saas.system.client.tenant.request.TenantAddCmd; import com.zcloud.basic.info.command.convertor.CorpInfoCoConvertor; import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; import com.zcloud.basic.info.domain.enums.UserTypeEnum; import com.zcloud.basic.info.domain.model.CorpDepartmentE; -import com.zcloud.basic.info.domain.model.CorpInfoE; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.domain.model.UserE; 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.CorpInfoEncryCO; import com.zcloud.basic.info.dto.clientobject.CorpUserMiddleCO; -import com.zcloud.basic.info.persistence.dataobject.*; +import com.zcloud.basic.info.persistence.dataobject.CorpFormDO; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; +import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.repository.*; import com.zcloud.gbscommon.utils.PageQueryHelper; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import org.apache.commons.lang.StringUtils; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; -import javax.validation.constraints.NotNull; import java.util.*; import java.util.stream.Collectors; @@ -56,8 +49,8 @@ public class CorpInfoQueryExe { private final UserQualificationInfoRepository userQualificationInfoRepository; private final CorpFormRepository corpFormRepository; private final CorpInfoCoConvertor corpFormCoConvertor; - private final SecurityClientApi securityClientApi; - private final DesenstizationClientUtil desenstizationClientUtil; +// private final SecurityClientApi securityClientApi; +// private final DesenstizationClientUtil desenstizationClientUtil; /** @@ -122,9 +115,9 @@ public class CorpInfoQueryExe { decryptCmd.setExtValues(userCheckPassWordCmd.getExtValues()); decryptCmd.setFieldKey(userCheckPassWordCmd.getFieldKey()); decryptCmd.setMaskDTO(userCheckPassWordCmd.getMaskInfo()); - this.securityClientApi.decrypt(userCheckPassWordCmd.getMaskInfo().getValue(), token); - DecryptCmd decryptCmdResult = desenstizationClientUtil.decryptOne(decryptCmd); - return decryptCmdResult; +// this.securityClientApi.decrypt(userCheckPassWordCmd.getMaskInfo().getValue(), token); +// DecryptCmd decryptCmdResult = desenstizationClientUtil.decryptOne(decryptCmd); + return null; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java index fe58effe..b9ad0155 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java @@ -40,6 +40,6 @@ public class CorpDepartmentQry extends PageQuery { @ApiModelProperty(value = "企业类型1：监管 2：企业 3：相关方", name = "enterpriseType", required = true) private Integer enterpriseType; - + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java index 24b1d82b..c0ff8a94 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoPageQry.java @@ -125,6 +125,7 @@ public class CorpInfoPageQry extends PageQuery { @ApiModelProperty(value = "所属街道编码", name = "street", required = true) private String eqStreet; + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java index 5fa5f8fb..2abbb017 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpUserMiddleQry.java @@ -59,6 +59,6 @@ public class CorpUserMiddleQry extends PageQuery { @ApiModelProperty(value = "所属村居委会编码", name = "village", required = true) private String eqVillage; - + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java index 9bc33d8d..364b0f26 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentPageQry.java @@ -41,6 +41,7 @@ public class DepartmentPageQry extends PageQuery { @ApiModelProperty(value = "部门级别编码", name = "eqLevel") private String eqLevel; + private String menuPath; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java index 4c3bf5a3..62c2fbac 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/PostPageQry.java @@ -42,5 +42,7 @@ public class PostPageQry extends PageQuery { // 岗位名称 private String likePostName; + private String menuPath; + } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index 972c470b..e7214032 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -39,6 +39,8 @@ public class UserPageQry extends PageQuery { @ApiModelProperty(value = "身份证号") private String likeUserIdCard; + private String menuPath; + } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/MenuEnum.java new file mode 100644 index 00000000..49cd84cd --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/enums/MenuEnum.java @@ -0,0 +1,85 @@ +package com.zcloud.basic.info.domain.enums; + +import lombok.Getter; + +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @author zhangyue + * @date 2025/12/6 13:48 + */ +@Getter +public enum MenuEnum { + QYYHZT("/basicInfo/container/supervision/enterpriseMiddleground/list", "qyyhzt"), + ZZJG("/basicInfo/container/supervision/supervision/department", "zzjg"), + GWGL("/basicInfo/container/supervision/supervision/post", "gwgl"), + ZHGL2("/basicInfo/container/supervision/supervision/user/list", "zhgl2"), + ZGSZHGL("/basicInfo/container/supervision/branchCompany/accountManage/list", "zgszhgl"), + ZGSQYXXGL("/basicInfo/container/supervision/branchCompany/enterpriseInfo/list", "zgsqyxxgl"), + ZGSBMGL("/basicInfo/container/supervision/branchCompany/departmentManage/list", "zgsbmgl"), + ZGSYHGL("/basicInfo/container/supervision/branchCompany/subsidiaryUser/list", "zgsyhgl"), + GSZHXXGL("/basicInfo/container/supervision/stakeholderUnit/accountManage/list", "gszhxxgl"), + RYXXGL("/basicInfo/container/supervision/stakeholderUnit/user/list", "ryxxgl"), + TSZYZSGL("/basicInfo/container/supervision/stakeholderUnit/specialPersonnel/list", "tszyzsgl"), + AQRYZSGLGFD("/basicInfo/container/supervision/stakeholderUnit/securityPersonnel/list", "aqryzsglgfd"), + GFDQYXX("/basicInfo/container/supervision/supervision/corpInfo/info", "gfdqyxx"), + QYXX("/basicInfo/container/enterprise/corpInfo/info", "qyxx"), + ZZJGQYD("/basicInfo/container/enterprise/organizationStructure", "zzjgqyd"), + GWGLQYD("/basicInfo/container/enterprise/post", "gwglqyd"), + YHGLQYD("/basicInfo/container/enterprise/user/list", "yhglqyd"), + QYDQYYHZT("/basicInfo/container/enterprise/enterpriseMiddleground/list", "qydqyyhzt"), + QYDXGFZHGL("/basicInfo/container/enterprise/stakeholderUnit/accountManage/list", "qyd-xgf-zhgl"), + QHDXGFYHGL("/basicInfo/container/enterprise/stakeholderUnit/user/list", "qyd-xgf-yhgl"), + QYXXGL("/basicInfo/container/stakeholder/corpInfo", "qyxxgl"), + BMGLXGF("/basicInfo/container/stakeholder/department", "bmglxgf"), + YHGLXGF("/basicInfo/container/stakeholder/user/list", "yhglxgf"), + TZZYZSGL("/Container/Stakeholder/SpecialOperationPersonnel", "tzzyzsgl"), + AQRYZSGL("/Container/Stakeholder/SecurityPersonnelInfo", "aqryzsgl"); + + private final String path; + private final String menuKey; + + private static final Map PATH_MAP = + Arrays.stream(values()) + .collect(Collectors.toMap(MenuEnum::getPath, Function.identity())); + + MenuEnum(String path, String menuKey) { + this.path = path; + this.menuKey = menuKey; + } + + public String getPath() { + return path; + } + + public String getMenuKey() { + return menuKey; + } + + // 通过name获取枚举 + public static MenuEnum getByPath(String path) { + return PATH_MAP.get(path); + } + + // 通过path获取age + public static String getMenuKeyByPath(String path) { + MenuEnum entry = PATH_MAP.get(path); + return entry != null ? entry.getMenuKey() : null; + } + +// 使用示例 + public static void main(String[] args) { + // 获取整个枚举 + MenuEnum entry = MenuEnum.getByPath("张三"); + if (entry != null) { + System.out.println("MenuKey: " + entry.getMenuKey()); // 输出: MenuKey: 25 + } + + // 直接获取值 + String age = MenuEnum.getMenuKeyByPath("李四"); + System.out.println("李四的年龄: " + age); // 输出: 李四的年龄: 30 + } +} diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java index 59430577..6991d371 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/CorpInfoMapper.java @@ -1,11 +1,14 @@ package com.zcloud.basic.info.persistence.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.datascope.annotation.DataScope; import com.jjb.saas.framework.datascope.annotation.DataScopes; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; +import com.zcloud.basic.info.persistence.dataobject.UserDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -16,8 +19,16 @@ import java.util.Map; * @Date 2025-10-29 16:02:16 */ @Mapper +@DataScopes({ + @DataScope(method = "selectUserPage", menuPerms = ""), + @DataScope(method = "corpUserMiddlePage", menuPerms = ""), +}) public interface CorpInfoMapper extends BaseMapper { - IPage corpUserMiddlePage(IPage iPage, Map params); + IPage corpUserMiddlePage(IPage iPage, Map params, String menuPerms); + + IPage selectUserPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); + + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java index 76dde667..2dd78259 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java @@ -1,8 +1,14 @@ package com.zcloud.basic.info.persistence.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,8 +19,12 @@ import java.util.List; * @Date 2025-10-29 16:03:20 */ @Mapper +@DataScopes({ + @DataScope(method = "selectDeptPage", menuPerms = ""), +}) public interface DepartmentMapper extends BaseMapper { List listAllTree(); + IPage selectDeptPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java index 95608687..826ff5b1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/PostMapper.java @@ -1,8 +1,14 @@ package com.zcloud.basic.info.persistence.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.datascope.annotation.DataScope; +import com.jjb.saas.framework.datascope.annotation.DataScopes; +import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * web-infrastructure @@ -12,7 +18,10 @@ import org.apache.ibatis.annotations.Mapper; * @Date 2025-10-31 17:24:04 */ @Mapper +@DataScopes({ + @DataScope(method = "selectPostPage", menuPerms = ""), +}) public interface PostMapper extends BaseMapper { - + IPage selectPostPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java index 88b71da4..8abf61bd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java @@ -22,6 +22,7 @@ import java.util.Map; @Mapper @DataScopes({ @DataScope(method = "selectUserPage", menuPerms = ""), + @DataScope(method = "listXgf", menuPerms = ""), }) public interface UserMapper extends BaseMapper { List selectListAll(@Param("params") Map params); @@ -34,6 +35,6 @@ public interface UserMapper extends BaseMapper { Integer countUser(@Param("params") Map params); - IPage listXgf(IPage iPage, Map params); + IPage listXgf(IPage iPage, Map params, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java index d250c99c..284ba343 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/CorpInfoRepositoryImpl.java @@ -23,6 +23,7 @@ import com.jjb.saas.system.client.unit.request.OpeUnitUpdateCmd; import com.jjb.saas.system.client.user.facade.UserFacade; import com.jjb.saas.system.client.user.request.UserUpdateCmd; import com.zcloud.basic.info.domain.enums.CorpTypeEnum; +import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.mapper.CorpInfoMapper; import com.zcloud.basic.info.persistence.repository.CorpInfoRepository; @@ -32,6 +33,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.time.LocalDate; import java.util.Arrays; @@ -71,7 +73,12 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl result = corpInfoMapper.selectPage(iPage, queryWrapper); + String menuPerms = ""; + if (!ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + queryWrapper.eq("delete_enum", "FALSE"); + IPage result = corpInfoMapper.selectUserPage(iPage, queryWrapper, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } @@ -183,7 +190,11 @@ public class CorpInfoRepositoryImpl extends BaseRepositoryImpl result = corpInfoMapper.corpUserMiddlePage(iPage,params); + String menuPerms = ""; + if (!ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = corpInfoMapper.corpUserMiddlePage(iPage,params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 356417d7..19cc67c4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -12,6 +12,7 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.system.client.dept.facade.DeptFacade; import com.jjb.saas.system.client.dept.request.DeptUpdateCmd; +import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.domain.model.DepartmentE; import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; @@ -46,7 +47,12 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, parmas); queryWrapper.orderByAsc("dep_order").orderByDesc("create_time"); - IPage result = departmentMapper.selectPage(iPage, queryWrapper); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(parmas.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(parmas.get("menuPath").toString()); + } + queryWrapper.eq("delete_enum", "FALSE"); + IPage result = departmentMapper.selectDeptPage(iPage, queryWrapper, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } 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 ffce40a5..11e50bda 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 @@ -4,6 +4,7 @@ import com.alibaba.cola.dto.MultiResponse; import com.jjb.saas.framework.auth.model.SSOUser; import com.jjb.saas.framework.auth.utils.AuthContext; import com.jjb.saas.framework.repository.common.PageHelper; +import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.persistence.dataobject.DepartmentDO; import com.zcloud.basic.info.persistence.dataobject.PostDO; import com.zcloud.basic.info.persistence.mapper.PostMapper; @@ -50,7 +51,12 @@ public class PostRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); queryWrapper.orderByDesc("create_time"); - IPage result = postMapper.selectPage(iPage, queryWrapper); + String menuPerms = ""; + if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + queryWrapper.eq("delete_enum", "FALSE"); + IPage result = postMapper.selectPostPage(iPage, queryWrapper,menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 68db2782..f8c242f6 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -16,35 +16,30 @@ import com.jjb.saas.framework.event.producer.RemoteEventPublisher; import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.message.client.message.facede.MessageFacade; -import com.jjb.saas.message.client.message.request.MessageSendCmd; -import com.jjb.saas.message.client.message.request.MessageTargetCmd; import com.jjb.saas.message.client.todotask.facade.BusTodoTaskFacade; -import com.jjb.saas.message.client.todotask.request.HandelTaskAddCmd; -import com.jjb.saas.message.client.todotask.request.TodoTaskAddCmd; -import com.jjb.saas.system.client.menu.facade.MenuFacade; -import com.jjb.saas.system.client.menu.response.MenuCO; import com.jjb.saas.system.client.role.facade.RoleFacade; import com.jjb.saas.system.client.role.response.RoleCO; import com.jjb.saas.system.client.user.facade.UserFacade; -import com.jjb.saas.system.client.user.request.*; +import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; +import com.jjb.saas.system.client.user.request.UserAddCmd; +import com.jjb.saas.system.client.user.request.UserUpdateCmd; +import com.jjb.saas.system.client.user.request.UserUpdatePasswordCmd; +import com.zcloud.basic.info.domain.enums.MenuEnum; import com.zcloud.basic.info.domain.model.UserE; import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO; import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.mapper.UserMapper; import com.zcloud.basic.info.persistence.repository.UserRepository; -import com.zcloud.gbscommon.event.consttag.EventTagConst; -import com.zcloud.gbscommon.event.user.ZcUserResignation; -import com.zcloud.gbscommon.utils.*; -import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; -import com.zcloud.gbscommon.zcloudimgfiles.request.ZcloudImgFilesQryCmd; -import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.UuidUtil; +import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import lombok.RequiredArgsConstructor; 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.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -76,19 +71,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i private AccountFacade accountFacade; @Autowired private RemoteEventPublisher remoteEventPublisher; - @DubboReference - private MenuFacade menuFacade; - public static String appKey; - -// @Value("${sdk.server.app-key}") -// public void setAppKey(String appKeyProperties) { -// appKey = appKeyProperties; -// } @Override public PageResponse listPage(Map params) { - MultiResponse s = menuFacade.listMenuByAppKey(appKey); - MultiResponse s1 = menuFacade.listMenuByAppKeyAll(appKey); // ZcloudImgFilesQryCmd zcloudImgFilesQryCmd = new ZcloudImgFilesQryCmd(); @@ -119,17 +104,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i queryWrapper.apply("u.id != u.corpinfo_id"); queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); String menuPerms = ""; - if(params.get("allFlag").toString().equals("1")){ - menuPerms = "zhgl2"; - } - if(params.get("allFlag").toString().equals("2")){ - menuPerms = "zgsyhgl"; - } - if(params.get("allFlag").toString().equals("3")){ - menuPerms = "ryxxgl"; - } - if(params.get("allFlag").toString().equals("4")){ - menuPerms = "yhglqyd"; + if (!ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); } IPage result = userMapper.selectUserPage(iPage, queryWrapper, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); @@ -491,7 +467,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @Override public PageResponse listXgf(Map params) { IPage iPage = new Query().getPage(params); - IPage result = userMapper.listXgf(iPage, params); + String menuPerms = ""; + if (!ObjectUtils.isEmpty(params.get("menuPath"))){ + menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString()); + } + IPage result = userMapper.listXgf(iPage, params, menuPerms); return PageHelper.pageToResponse(result, result.getRecords()); } diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index 411cdf2d..49eb639c 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -42,5 +42,11 @@ c.corp_order ASC, c.create_time DESC + + diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml index 441305f6..e75ad3e8 100644 --- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml @@ -7,6 +7,10 @@ - + diff --git a/web-infrastructure/src/main/resources/mapper/PostMapper.xml b/web-infrastructure/src/main/resources/mapper/PostMapper.xml index 570445d8..8055d0fd 100644 --- a/web-infrastructure/src/main/resources/mapper/PostMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/PostMapper.xml @@ -3,6 +3,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +