diff --git a/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/directory.json b/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/directory.json new file mode 100644 index 0000000..11113c5 --- /dev/null +++ b/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/directory.json @@ -0,0 +1,7 @@ +{ + "description":"", + "directory":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi", + "filePath":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi/", + "name":"AdminUserApi", + "type":3 +} \ No newline at end of file diff --git a/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/getByUserCode.rapi b/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/getByUserCode.rapi new file mode 100644 index 0000000..09bd0e9 --- /dev/null +++ b/.fastRequest/collections/Root/biz-module-system-api/AdminUserApi/getByUserCode.rapi @@ -0,0 +1,37 @@ +{ + "activeGroup":"Default", + "apiParamGroup":{}, + "childList":[], + "description":"", + "directory":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi", + "domain":"http://localhost:8080", + "enableEnv":"local", + "enableProject":"biz-module-system-api", + "filePath":"/.fastRequest/collections/ROOT/biz-module-system-api/AdminUserApi~getByUserCode.rapi", + "headerList":[], + "id":"api_cn.ey.biz.module.system.api.user.AdminUserApi.getByUserCode", + "name":"通过用户用户编号 查询用户", + "paramGroup":{ + "bodyKeyValueListJson":"", + "className":"cn.ey.biz.module.system.api.user.AdminUserApi", + "jsonDocument":"", + "method":"getByUserCode", + "methodDescription":"通过用户用户编号 查询用户", + "methodType":"GET", + "multipartKeyValueListJson":"[]", + "originUrl":"/rpc-api/system/user/get-by-user-code", + "pathParamsKeyValueListJson":"[]", + "postScript":"", + "postType":"json", + "preScript":"", + "returnDocument":"{\"code\":\"No comment,Type =Number\",\"data\":{\"id\":\"用户ID\",\"userCode\":\"用户编码\",\"gpn\":\"用户编码-GPN\",\"displayName\":\"名字全称\",\"buesinessUnit\":\"buesinessUnit\",\"mgmtUnit\":\"mgmtUnit\",\"operatingUnit\":\"operatingUnit\",\"subMgmtUnit\":\"subMgmtUnit\",\"rankCode\":\"等级\",\"baseLocation\":\" base 地\",\"region\":\"区域\",\"country\":\"国家\",\"serviceLine\":\"serviceLine\",\"subServiceLine\":\"subServiceLine\",\"legalEntity\":\"所属公司主体\"},\"msg\":\"No comment,Type =String\",\"success\":\"No comment,Type =Boolean\"}", + "tempId":"", + "url":"/rpc-api/system/user/get-by-user-code", + "urlEncodedKeyValueListJson":"[]", + "urlEncodedKeyValueListText":"", + "urlParamsKeyValueListJson":"[{\"comment\":\"用户编号\",\"customFlag\":2,\"enabled\":true,\"key\":\"userCode\",\"type\":\"String\",\"value\":\"1\"}]", + "urlParamsKeyValueListText":"userCode=1" + }, + "tempId":"api_cn.ey.biz.module.system.api.user.AdminUserApi.getByUserCode", + "type":2 +} \ No newline at end of file diff --git a/.fastRequest/collections/Root/biz-module-system-api/directory.json b/.fastRequest/collections/Root/biz-module-system-api/directory.json new file mode 100644 index 0000000..ebab3dd --- /dev/null +++ b/.fastRequest/collections/Root/biz-module-system-api/directory.json @@ -0,0 +1,7 @@ +{ + "description":"", + "directory":"/.fastRequest/collections/ROOT\\biz-module-system-api", + "filePath":"/.fastRequest/collections/ROOT\\biz-module-system-api/", + "name":"biz-module-system-api", + "type":4 +} \ No newline at end of file diff --git a/.fastRequest/config/fastRequestCurrentProjectConfig.json b/.fastRequest/config/fastRequestCurrentProjectConfig.json index de84066..96b52e9 100644 --- a/.fastRequest/config/fastRequestCurrentProjectConfig.json +++ b/.fastRequest/config/fastRequestCurrentProjectConfig.json @@ -5,13 +5,9 @@ { "env":"local", "url":"http://localhost:48081/admin-api" - }, - { - "env":"g", - "url":"http://localhost:48080/admin-api" } ], - "name":"biz-module-system-srv" + "name":"system" }, { "hostGroup":[ @@ -24,15 +20,14 @@ } ], "envList":[ - "local", - "g" + "local" ], "headerList":[], "maxDescriptionLength":-1, "postScript":"", "preScript":"", "projectList":[ - "biz-module-system-srv", + "system", "biz-module-system-api" ], "syncModel":{ diff --git a/biz-module-system-api/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApi.java b/biz-module-system-api/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApi.java index c5e4b70..4312136 100644 --- a/biz-module-system-api/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApi.java +++ b/biz-module-system-api/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApi.java @@ -85,4 +85,8 @@ public interface PermissionApi { @ApiImplicitParam(name = "code", value = "角色code", example = "2", required = true, dataTypeClass = String.class) R> getUsersByRoleCode(@RequestParam("code") String code); + + @GetMapping(PREFIX + "/is-user-admin") + @ApiOperation("判断是否有权限,任一一个即可") + R isUserAdmin(@RequestParam("userId") Long userId); } diff --git a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApiImpl.java b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApiImpl.java index 7c7d07a..c1012ce 100644 --- a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApiImpl.java +++ b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/api/permission/PermissionApiImpl.java @@ -91,4 +91,9 @@ public class PermissionApiImpl implements PermissionApi { return success(permissionService.getUsersByRoleCode(code)); } + @Override + public R isUserAdmin(Long userId) { + return success(permissionService.isUserAdmin(userId)); + } + } diff --git a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionService.java b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionService.java index 038b1be..9251ea4 100644 --- a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionService.java +++ b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionService.java @@ -184,4 +184,12 @@ public interface PermissionService { * @return 用户信息集合 */ List getUsersByRoleCodes(List roleCodes); + + /** + * 是否是管理员 + * + * @param userId 用户id + * @return + */ + Boolean isUserAdmin(Long userId); } \ No newline at end of file diff --git a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionServiceImpl.java b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionServiceImpl.java index 6693e04..b468090 100644 --- a/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionServiceImpl.java +++ b/biz-module-system-srv/src/main/java/cn/ey/biz/module/system/service/permission/PermissionServiceImpl.java @@ -842,6 +842,18 @@ public class PermissionServiceImpl implements PermissionService { return new ArrayList<>(); } + /** + * 是否是管理员 + * + * @param userId 用户id + * @return + */ + @Override + public Boolean isUserAdmin(Long userId) { + Set cacheRoleIds = userRoleCache.get(userId); + return roleService.hasAnySuperAdmin(cacheRoleIds); + } + public List getCodeBlockListDataRespDTO(Set ids){ List codeBlockDOList=codeBlockMapper.selectList(new LambdaQueryWrapper() .in(CodeBlockDO::getCodeBlockCode,ids)); diff --git a/pom.xml b/pom.xml index 202fc46..7fd971b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ - 1.0.0 + 1.0.44