From 868942e202aeb967b8ce47b38cc2433a636a128d Mon Sep 17 00:00:00 2001
From: phanes <5411232+phanes@user.noreply.gitee.com>
Date: 星期日, 16 一月 2022 17:46:24 +0800
Subject: [PATCH] update 格式化代码结构 统一编码格式

---
 ruoyi-generator/src/main/resources/vm/java/controller.java.vm |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index ae6f818..be09599 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -7,13 +7,13 @@
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -39,7 +39,7 @@
  */
 @Validated
 @Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
 public class ${ClassName}Controller extends BaseController {
@@ -50,11 +50,11 @@
      * 鏌ヨ${functionName}鍒楄〃
      */
     @ApiOperation("鏌ヨ${functionName}鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+    @SaCheckPermission("${permissionPrefix}:list")
     @GetMapping("/list")
 #if($table.crud || $table.sub)
-    public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
-        return i${ClassName}Service.queryPageList(bo);
+    public TableDataInfo<${ClassName}Vo> list(@Validated(QueryGroup.class) ${ClassName}Bo bo, PageQuery pageQuery) {
+        return i${ClassName}Service.queryPageList(bo, pageQuery);
     }
 #elseif($table.tree)
     public AjaxResult<List<${ClassName}Vo>> list(@Validated(QueryGroup.class) ${ClassName}Bo bo) {
@@ -67,9 +67,9 @@
      * 瀵煎嚭${functionName}鍒楄〃
      */
     @ApiOperation("瀵煎嚭${functionName}鍒楄〃")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+    @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
+    @PostMapping("/export")
     public void export(@Validated ${ClassName}Bo bo, HttpServletResponse response) {
         List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
         ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
@@ -79,7 +79,7 @@
      * 鑾峰彇${functionName}璇︾粏淇℃伅
      */
     @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+    @SaCheckPermission("${permissionPrefix}:query")
     @GetMapping("/{${pkColumn.javaField}}")
     public AjaxResult<${ClassName}Vo> getInfo(@ApiParam("涓婚敭")
                                                   @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@@ -91,7 +91,7 @@
      * 鏂板${functionName}
      */
     @ApiOperation("鏂板${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+    @SaCheckPermission("${permissionPrefix}:add")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -103,7 +103,7 @@
      * 淇敼${functionName}
      */
     @ApiOperation("淇敼${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+    @SaCheckPermission("${permissionPrefix}:edit")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -115,8 +115,8 @@
      * 鍒犻櫎${functionName}
      */
     @ApiOperation("鍒犻櫎${functionName}")
-    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
-    @Log(title = "${functionName}" , businessType = BusinessType.DELETE)
+    @SaCheckPermission("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @DeleteMapping("/{${pkColumn.javaField}s}")
     public AjaxResult<Void> remove(@ApiParam("涓婚敭涓�")
                                        @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")

--
Gitblit v1.9.3