From 29f287cf6e4869d7bbc283991458e09a03b59c52 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 21 一月 2026 14:29:55 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-generator/src/main/resources/vm/java/controller.java.vm |   87 ++++++++++++++++++++++++-------------------
 1 files changed, 49 insertions(+), 38 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 7381569..da06dbd 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,34 +34,49 @@
  * @author ${author}
  * @date ${datetime}
  */
-@Api("${functionName}")
+@Api(description = "${functionName}")
 @RestController
 @RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     @Autowired
     private I${ClassName}Service ${className}Service;
 
-    /**
-     * 鏌ヨ${functionName}鍒楄〃
-     */
-    @ApiOperation("鏌ヨ${functionName}鍒楄〃")
-    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
-    @GetMapping("/list")
-#if($table.crud || $table.sub)
-    public TableDataInfo list(${ClassName} ${className})
-    {
-        startPage();
-        List<${ClassName}> list = ${className}Service.queryList(${className});
-        return getDataTable(list);
+##/**
+## * 鏌ヨ${functionName}鍒楄〃
+## */
+##@ApiOperation("鏌ヨ${functionName}鍒楄〃")
+##// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+##@PostMapping("/list")
+##    #if($table.crud || $table.sub)
+##    public TableDataInfo list(@RequestBody ${ClassName} ${className}) {
+##        startPage();
+##        List<${ClassName}> list = ${className}Service.queryList(${className});
+##        return getDataTable(list);
+##    }
+##    #elseif($table.tree)
+##        public AjaxResult list(${ClassName} ${className}) {
+##            List<${ClassName}> list = ${className}Service.queryList(${className});
+##            return AjaxResult.success(list);
+##        }
+##    #end
+
+/**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
+@ApiOperation("鏌ヨ${functionName}鍒楄〃")
+// @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+@PostMapping("/list")
+    #if($table.crud || $table.sub)
+    public Map<String, Object> list(@RequestBody ${ClassName} ${className}) {
+        Page<${ClassName}> list = ${className}Service.queryList(${className});
+        return getDataTable(list.getRecords(), (int) list.getTotal());
     }
-#elseif($table.tree)
-    public AjaxResult list(${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.queryList(${className});
-        return AjaxResult.success(list);
-    }
-#end
+    #elseif($table.tree)
+        public AjaxResult list(${ClassName} ${className}) {
+            List<${ClassName}> list = ${className}Service.queryList(${className});
+            return AjaxResult.success(list);
+        }
+    #end
 
     /**
      * 瀵煎嚭${functionName}鍒楄〃
@@ -69,10 +85,9 @@
     // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(${ClassName} ${className})
-    {
-        List<${ClassName}> list = ${className}Service.queryList(${className});
-        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+    public AjaxResult export(${ClassName} ${className}) {
+        List<${ClassName}> list = ${className}Service.exportQueryList(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
         return util.exportExcel(list, "${functionName}鏁版嵁");
     }
 
@@ -81,9 +96,8 @@
      */
     @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
     // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
-    @GetMapping(value = "/{${pkColumn.javaField}}")
-    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    @GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
+    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return AjaxResult.success(${className}Service.getById(${pkColumn.javaField}));
     }
 
@@ -93,10 +107,9 @@
     @ApiOperation("鏂板${functionName}")
     // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit
-    public AjaxResult add(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult add(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.save(${className}));
     }
 
@@ -106,10 +119,9 @@
     @ApiOperation("淇敼${functionName}")
     // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/edit")
     @RepeatSubmit
-    public AjaxResult edit(@RequestBody ${ClassName} ${className})
-    {
+    public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
         return toAjax(${className}Service.updateById(${className}));
     }
 
@@ -119,9 +131,8 @@
     @ApiOperation("鍒犻櫎${functionName}")
     // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{${pkColumn.javaField}s}")
-    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
-    {
+    @GetMapping("/remove/{${pkColumn.javaField}s}")
+    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
         return toAjax(${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s)));
     }
 }

--
Gitblit v1.9.3