From db184afd0c5bf3359b44eb0251fa5b07386eb3ff Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期三, 06 十一月 2024 09:48:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java index c0a75be..08d9c28 100644 --- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java +++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/app/AppController.java @@ -6,9 +6,11 @@ import com.iailab.framework.common.pojo.PageResult; import com.iailab.framework.common.util.object.BeanUtils; import com.iailab.framework.excel.core.util.ExcelUtils; +import com.iailab.module.system.api.app.dto.AppMenuRespDTO; import com.iailab.module.system.controller.admin.app.vo.AppPageReqVO; import com.iailab.module.system.controller.admin.app.vo.AppRespVO; import com.iailab.module.system.controller.admin.app.vo.AppSaveReqVO; +import com.iailab.module.system.controller.admin.auth.vo.AuthPermissionInfoRespVO; import com.iailab.module.system.dal.dataobject.app.AppDO; import com.iailab.module.system.service.app.AppService; import io.swagger.v3.oas.annotations.Operation; @@ -71,11 +73,28 @@ @GetMapping("/page") @Operation(summary = "获得分页") @PreAuthorize("@ss.hasPermission('system:app:query')") - public CommonResult<PageResult<AppRespVO>> getTenantPage(@Valid AppPageReqVO pageVO) { + public CommonResult<PageResult<AppRespVO>> getAppPage(@Valid AppPageReqVO pageVO) { PageResult<AppDO> pageResult = appService.getPage(pageVO); return success(BeanUtils.toBean(pageResult, AppRespVO.class)); } + @GetMapping("/getAppList") + @Operation(summary = "获得应用列表") + @PreAuthorize("@ss.hasPermission('system:app-menu:query')") + public CommonResult<List<AppRespVO>> getAppList() { + List<AppDO> appDOS = appService.getList(); + return success(BeanUtils.toBean(appDOS, AppRespVO.class)); + } + + @GetMapping("/getAppMenu") + @Operation(summary = "获得应用菜单列表") + @PreAuthorize("@ss.hasPermission('system:app-menu:query')") + @Parameter(name = "id", description = "ID", required = true, example = "1024") + public CommonResult<List<AppRespVO>> getAppMenu(@RequestParam("id") Long id) { + List<AuthPermissionInfoRespVO.MenuVO> appDOS = appService.getAppMenu(id); + return success(BeanUtils.toBean(appDOS, AppRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出租户 Excel") @PreAuthorize("@ss.hasPermission('system:tenant:export')") -- Gitblit v1.9.3