diff --git a/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/file/vo/file/FileRespVO.java b/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/file/vo/file/FileRespVO.java index 77d3d443..8431c7c2 100644 --- a/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/file/vo/file/FileRespVO.java +++ b/zt-module-infra/zt-module-infra-server/src/main/java/com/zt/plat/module/infra/controller/admin/file/vo/file/FileRespVO.java @@ -9,6 +9,7 @@ import com.zt.plat.module.infra.service.file.FileConfigService; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.experimental.Accessors; +import lombok.extern.slf4j.Slf4j; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; @@ -18,6 +19,7 @@ import java.util.Date; /** * @author chenbowen */ +@Slf4j @Schema(description = "管理后台 - 文件 Response VO,不返回 content 字段,太大") @Data @Accessors(chain = true) @@ -87,6 +89,7 @@ public class FileRespVO { if (presignedUrl == null || presignedUrl.isEmpty()) { return null; } + log.info("presignedUrl:{}", presignedUrl); String base64PresignedUrl = Base64.getEncoder().encodeToString(presignedUrl.getBytes(StandardCharsets.UTF_8)); String timestamp = String.valueOf(System.currentTimeMillis()); String loginUserNickname = SecurityFrameworkUtils.getLoginUserNickname(); diff --git a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/permission/PermissionApi.java b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/permission/PermissionApi.java index b30f62f6..87d23136 100644 --- a/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/permission/PermissionApi.java +++ b/zt-module-system/zt-module-system-api/src/main/java/com/zt/plat/module/system/api/permission/PermissionApi.java @@ -56,4 +56,9 @@ public interface PermissionApi extends PermissionCommonApi { @Parameter(name = "userId", description = "用户编号", example = "1", required = true) CommonResult getUserDataPermissionLevel(@RequestParam("userId") Long userId); + @GetMapping(PREFIX + "/get") + @Operation(summary = "通过用户 ID 查询用户是否为超级管理员") + @Parameter(name = "id", description = "用户编号", example = "1", required = true) + CommonResult isSuperAdmin(@RequestParam("id") Long id); + } \ No newline at end of file diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/permission/PermissionApiImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/permission/PermissionApiImpl.java index c3899330..26c8db0e 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/permission/PermissionApiImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/permission/PermissionApiImpl.java @@ -6,6 +6,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.system.api.permission.dto.*; import com.zt.plat.module.system.controller.admin.permission.vo.permission.PermissionAssignRoleDataScopeReqVO; import com.zt.plat.module.system.controller.admin.permission.vo.permission.PermissionAssignUserRoleReqVO; +import com.zt.plat.module.system.dal.dataobject.user.AdminUserDO; import com.zt.plat.module.system.enums.permission.DataScopeEnum; import com.zt.plat.module.system.service.permission.PermissionService; import org.springframework.context.annotation.Primary; @@ -90,4 +91,9 @@ public class PermissionApiImpl implements PermissionApi { public CommonResult getDeptDataPermissionWithRoleCodes(Long userId, String roleCodes) { return success(permissionService.getDeptDataPermissionWithRoleCodes(userId, roleCodes)); } + + @Override + public CommonResult isSuperAdmin(Long id) { + return success(permissionService.isSuperAdmin(id)); + } } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionService.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionService.java index 6d570ca7..5e1d37d7 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionService.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionService.java @@ -189,4 +189,12 @@ public interface PermissionService { */ Set getByRoleIdAndMenuIds(Set roleIds, Set ids); + /** + * 根据用户ID判断用户是否是超级管理员 + * + * @param userId + * @return + */ + Boolean isSuperAdmin(Long userId); + } diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java index 96820ed6..389f3795 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/permission/PermissionServiceImpl.java @@ -559,5 +559,11 @@ public class PermissionServiceImpl implements PermissionService { return result; } + @Override + public Boolean isSuperAdmin(Long userId) { + Set userRoleIds = getUserRoleIdListByUserId(userId); + return roleService.hasAnySuperAdmin(userRoleIds); + } + }