From 81b50b9b3c3e6ec071ee46431e003470fcac6852 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 五月 2021 23:52:36 +0800
Subject: [PATCH] update 代码生成器修改为MP分页(未完成)
---
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 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 46f5617..412a82f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -40,7 +40,7 @@
@Api(value = "${functionName}鎺у埗鍣�", tags = {"${functionName}绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
-@RequestMapping("/${moduleName}/${businessName}" )
+@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController {
private final I${ClassName}Service i${ClassName}Service;
@@ -53,9 +53,7 @@
@GetMapping("/list")
#if($table.crud || $table.sub)
public TableDataInfo<${ClassName}Vo> list(${ClassName}QueryBo bo) {
- startPage();
- List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
- return getDataTable(list);
+ return i${ClassName}Service.queryPageList(bo);
}
#elseif($table.tree)
public AjaxResult<${ClassName}Vo> list(${ClassName}QueryBo bo) {
@@ -68,21 +66,21 @@
* 瀵煎嚭${functionName}鍒楄〃
*/
@ApiOperation("瀵煎嚭${functionName}鍒楄〃")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')" )
- @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
- @GetMapping("/export" )
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+ @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
public AjaxResult<${ClassName}Vo> export(${ClassName}QueryBo bo) {
List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
ExcelUtil<${ClassName}Vo> util = new ExcelUtil<${ClassName}Vo>(${ClassName}Vo.class);
- return util.exportExcel(list, "${businessName}" );
+ return util.exportExcel(list, "${functionName}");
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')" )
- @GetMapping(value = "/{${pkColumn.javaField}}" )
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+ @GetMapping("/{${pkColumn.javaField}}")
public AjaxResult<${ClassName}Vo> getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField}) {
return AjaxResult.success(i${ClassName}Service.queryById(${pkColumn.javaField}));
}
@@ -91,9 +89,9 @@
* 鏂板${functionName}
*/
@ApiOperation("鏂板${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')" )
- @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
- @PostMapping
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
+ @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+ @PostMapping()
public AjaxResult<Void> add(@RequestBody ${ClassName}AddBo bo) {
return toAjax(i${ClassName}Service.insertByAddBo(bo) ? 1 : 0);
}
@@ -102,9 +100,9 @@
* 淇敼${functionName}
*/
@ApiOperation("淇敼${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')" )
- @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
- @PutMapping
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
+ @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+ @PutMapping()
public AjaxResult<Void> edit(@RequestBody ${ClassName}EditBo bo) {
return toAjax(i${ClassName}Service.updateByEditBo(bo) ? 1 : 0);
}
@@ -113,10 +111,10 @@
* 鍒犻櫎${functionName}
*/
@ApiOperation("鍒犻櫎${functionName}")
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')" )
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
@Log(title = "${functionName}" , businessType = BusinessType.DELETE)
- @DeleteMapping("/{${pkColumn.javaField}s}" )
- public AjaxResult<Void> remove(@PathVariable ${pkColumn.javaType} ${pkColumn.javaField}s) {
+ @DeleteMapping("/{${pkColumn.javaField}s}")
+ public AjaxResult<Void> remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
return toAjax(i${ClassName}Service.deleteWithValidByIds(Arrays.asList(${pkColumn.javaField}s), true) ? 1 : 0);
}
}
--
Gitblit v1.9.3