From 553c29ab8a46c9a07e3657fdd36a81a6bfde1afe Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 23 九月 2021 19:13:58 +0800 Subject: [PATCH] update 整合 satoken 权限、鉴权一体化框架 --- ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 64 ++++++++++++++------------------ 1 files changed, 28 insertions(+), 36 deletions(-) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index 548b4b5..8d0a640 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -1,32 +1,26 @@ package com.ruoyi.generator.controller; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.convert.Convert; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.service.IGenTableColumnService; import com.ruoyi.generator.service.IGenTableService; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 浠g爜鐢熸垚 鎿嶄綔澶勭悊 @@ -46,46 +40,44 @@ /** * 鏌ヨ浠g爜鐢熸垚鍒楄〃 */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @SaCheckPermission("tool:gen:list") @GetMapping("/list") public TableDataInfo genList(GenTable genTable) { - startPage(); - List<GenTable> list = genTableService.selectGenTableList(genTable); - return getDataTable(list); + return genTableService.selectPageGenTableList(genTable); } /** * 淇敼浠g爜鐢熸垚涓氬姟 */ - @PreAuthorize("@ss.hasPermi('tool:gen:query')") + @SaCheckPermission("tool:gen:query") @GetMapping(value = "/{talbleId}") public AjaxResult getInfo(@PathVariable Long talbleId) { GenTable table = genTableService.selectGenTableById(talbleId); + List<GenTable> tables = genTableService.selectGenTableAll(); List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId); Map<String, Object> map = new HashMap<String, Object>(); map.put("info", table); map.put("rows", list); + map.put("tables", tables); return AjaxResult.success(map); } /** * 鏌ヨ鏁版嵁搴撳垪琛� */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @SaCheckPermission("tool:gen:list") @GetMapping("/db/list") public TableDataInfo dataList(GenTable genTable) { - startPage(); - List<GenTable> list = genTableService.selectDbTableList(genTable); - return getDataTable(list); + return genTableService.selectPageDbTableList(genTable); } /** * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛� */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @SaCheckPermission("tool:gen:list") @GetMapping(value = "/column/{talbleId}") public TableDataInfo columnList(Long tableId) { @@ -99,7 +91,7 @@ /** * 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛� */ - @PreAuthorize("@ss.hasPermi('tool:gen:list')") + @SaCheckPermission("tool:gen:import") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.IMPORT) @PostMapping("/importTable") public AjaxResult importTableSave(String tables) @@ -114,7 +106,7 @@ /** * 淇敼淇濆瓨浠g爜鐢熸垚涓氬姟 */ - @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @SaCheckPermission("tool:gen:edit") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult editSave(@Validated @RequestBody GenTable genTable) @@ -127,7 +119,7 @@ /** * 鍒犻櫎浠g爜鐢熸垚 */ - @PreAuthorize("@ss.hasPermi('tool:gen:remove')") + @SaCheckPermission("tool:gen:remove") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") public AjaxResult remove(@PathVariable Long[] tableIds) @@ -139,7 +131,7 @@ /** * 棰勮浠g爜 */ - @PreAuthorize("@ss.hasPermi('tool:gen:preview')") + @SaCheckPermission("tool:gen:preview") @GetMapping("/preview/{tableId}") public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException { @@ -150,7 +142,7 @@ /** * 鐢熸垚浠g爜锛堜笅杞芥柟寮忥級 */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @SaCheckPermission("tool:gen:code") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/download/{tableName}") public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException @@ -162,7 +154,7 @@ /** * 鐢熸垚浠g爜锛堣嚜瀹氫箟璺緞锛� */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @SaCheckPermission("tool:gen:code") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/genCode/{tableName}") public AjaxResult genCode(@PathVariable("tableName") String tableName) @@ -174,7 +166,7 @@ /** * 鍚屾鏁版嵁搴� */ - @PreAuthorize("@ss.hasPermi('tool:gen:edit')") + @SaCheckPermission("tool:gen:edit") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.UPDATE) @GetMapping("/synchDb/{tableName}") public AjaxResult synchDb(@PathVariable("tableName") String tableName) @@ -186,7 +178,7 @@ /** * 鎵归噺鐢熸垚浠g爜 */ - @PreAuthorize("@ss.hasPermi('tool:gen:code')") + @SaCheckPermission("tool:gen:code") @Log(title = "浠g爜鐢熸垚", businessType = BusinessType.GENCODE) @GetMapping("/batchGenCode") public void batchGenCode(HttpServletResponse response, String tables) throws IOException -- Gitblit v1.9.3