From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/java/controller.java.vm | 166 +++++++++++++++----------------------------------------
1 files changed, 45 insertions(+), 121 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 26b7473..670813c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -1,11 +1,8 @@
package ${packageName}.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
import java.util.List;
import java.util.Arrays;
-import com.ruoyi.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,13 +18,18 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import ${packageName}.domain.${ClassName};
+import ${packageName}.vo.${ClassName}Vo;
+import ${packageName}.bo.${ClassName}QueryBo;
+import ${packageName}.bo.${ClassName}AddBo;
+import ${packageName}.bo.${ClassName}EditBo;
import ${packageName}.service.I${ClassName}Service;
import com.ruoyi.common.utils.poi.ExcelUtil;
-#if($table.crud)
+#if($table.crud || $table.sub)
import com.ruoyi.common.core.page.TableDataInfo;
#elseif($table.tree)
#end
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
/**
* ${functionName}Controller
@@ -35,9 +37,10 @@
* @author ${author}
* @date ${datetime}
*/
+@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;
@@ -45,101 +48,18 @@
/**
* 鏌ヨ${functionName}鍒楄〃
*/
+ @ApiOperation("鏌ヨ${functionName}鍒楄〃")
@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
@GetMapping("/list")
-#if($table.crud)
- public TableDataInfo list(${ClassName} ${className})
- {
+#if($table.crud || $table.sub)
+ public TableDataInfo<${ClassName}Vo> list(${ClassName}QueryBo bo) {
startPage();
- LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
-#foreach($column in $columns)
-#set($queryType=$column.queryType)
-#set($javaField=$column.javaField)
-#set($javaType=$column.javaType)
-#set($columnName=$column.columnName)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#if($column.query)
-#if($column.queryType == "EQ")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.eq(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "NE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.ne(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "GT")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.gt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "GTE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.ge(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "LT")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.lt(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "LTE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.le(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "LIKE")
-#if($javaType == 'String')
- if (StringUtils.isNotBlank(${className}.get$AttrName())){
- lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#else
- if (${className}.get$AttrName() != null){
- lqw.like(${ClassName}::get$AttrName ,${className}.get$AttrName());
- }
-#end
-#elseif($queryType == "BETWEEN")
-#end
-#end
-#end
- List<${ClassName}> list = i${ClassName}Service.list(lqw);
+ List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
return getDataTable(list);
}
#elseif($table.tree)
- public AjaxResult list(${ClassName} ${className}) {
- LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(${className});
- List<${ClassName}> list = i${ClassName}Service.list(lqw);
+ public AjaxResult<${ClassName}Vo> list(${ClassName}QueryBo bo) {
+ List<${ClassName}Vo> list = i${ClassName}Service.queryList(bo);
return AjaxResult.success(list);
}
#end
@@ -147,52 +67,56 @@
/**
* 瀵煎嚭${functionName}鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')" )
- @Log(title = "${functionName}" , businessType = BusinessType.EXPORT)
- @GetMapping("/export" )
- public AjaxResult export(${ClassName} ${className}) {
- LambdaQueryWrapper<${ClassName}> lqw = new LambdaQueryWrapper<${ClassName}>(${className});
- List<${ClassName}> list = i${ClassName}Service.list(lqw);
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}. class);
- return util.exportExcel(list, "${businessName}" );
+ @ApiOperation("瀵煎嚭${functionName}鍒楄〃")
+ @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}鏁版嵁" );
}
/**
* 鑾峰彇${functionName}璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')" )
- @GetMapping(value = "/{${pkColumn.javaField}}" )
- public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}" ) ${pkColumn.javaType} ${pkColumn.javaField}) {
- return AjaxResult.success(i${ClassName}Service.getById(${pkColumn.javaField}));
+ @ApiOperation("鑾峰彇${functionName}璇︾粏淇℃伅")
+ @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}));
}
/**
* 鏂板${functionName}
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')" )
- @Log(title = "${functionName}" , businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ${ClassName} ${className}) {
- return toAjax(i${ClassName}Service.save(${className}) ? 1 : 0);
+ @ApiOperation("鏂板${functionName}")
+ @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);
}
/**
* 淇敼${functionName}
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')" )
- @Log(title = "${functionName}" , businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ${ClassName} ${className}) {
- return toAjax(i${ClassName}Service.updateById(${className}) ? 1 : 0);
+ @ApiOperation("淇敼${functionName}")
+ @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);
}
/**
* 鍒犻櫎${functionName}
*/
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')" )
+ @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) {
- return toAjax(i${ClassName}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s)) ? 1 : 0);
+ @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