From 42008124b68bfd7f2e2003c07bc0bdd5311f95b6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 29 四月 2020 09:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi/src/main/resources/vm/java/controller.java.vm | 300 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 197 insertions(+), 103 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/java/controller.java.vm b/ruoyi/src/main/resources/vm/java/controller.java.vm
index cd6f9be..4e02f97 100644
--- a/ruoyi/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi/src/main/resources/vm/java/controller.java.vm
@@ -1,103 +1,197 @@
-package ${packageName}.controller;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import ${packageName}.domain.${ClassName};
-import ${packageName}.service.I${ClassName}Service;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.page.TableDataInfo;
-
-/**
- * ${functionName}Controller
- *
- * @author ${author}
- * @date ${datetime}
- */
-@RestController
-@RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
- @Autowired
- private I${ClassName}Service ${className}Service;
-
- /**
- * 鏌ヨ${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
- @GetMapping("/list")
- public TableDataInfo list(${ClassName} ${className})
- {
- startPage();
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭${functionName}鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
- @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(${ClassName} ${className})
- {
- List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
- ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.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(${className}Service.select${ClassName}ById(${pkColumn.javaField}));
- }
-
- /**
- * 鏂板${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
- @Log(title = "${functionName}", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.insert${ClassName}(${className}));
- }
-
- /**
- * 淇敼${functionName}
- */
- @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
- @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody ${ClassName} ${className})
- {
- return toAjax(${className}Service.update${ClassName}(${className}));
- }
-
- /**
- * 鍒犻櫎${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(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s));
- }
-}
+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.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.service.I${ClassName}Service;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+#if($table.crud)
+import com.ruoyi.framework.web.page.TableDataInfo;
+#elseif($table.tree)
+#end
+
+/**
+ * ${functionName}Controller
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/${moduleName}/${businessName}" )
+public class ${ClassName}Controller extends BaseController {
+
+ private final I${ClassName}Service i${ClassName}Service;
+
+ /**
+ * 鏌ヨ${functionName}鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
+ @GetMapping("/list")
+#if($table.crud)
+ public TableDataInfo list(${ClassName} ${className})
+ {
+ startPage();
+ LambdaQueryWrapper<${ClassName}> lqw = new LambdaQueryWrapper<${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);
+ return getDataTable(list);
+ }
+#elseif($table.tree)
+ public AjaxResult list(${ClassName} ${className}) {
+ List<${ClassName}> list = i${ClassName}Service.list(lqw);
+ return AjaxResult.success(list);
+ }
+#end
+
+ /**
+ * 瀵煎嚭${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}" );
+ }
+
+ /**
+ * 鑾峰彇${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}));
+ }
+
+ /**
+ * 鏂板${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);
+ }
+
+ /**
+ * 淇敼${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);
+ }
+
+ /**
+ * 鍒犻櫎${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);
+ }
+}
--
Gitblit v1.9.3