优化代码生成

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,9 +1,8 @@
 package ${packageName}.controller;
 
-import java.util.Arrays;
 import java.util.List;
+import java.util.Arrays;
 import javax.servlet.http.HttpServletResponse;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,17 +51,13 @@ public class ${ClassName}Controller extends BaseController
     public TableDataInfo list(${ClassName} ${className})
     {
         startPage();
-#if($table.sub)
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-#else
-        List<${ClassName}> list = ${className}Service.list(new QueryWrapper<${ClassName}>(${className}));
-#end
         return getDataTable(list);
     }
 #elseif($table.tree)
     public AjaxResult list(${ClassName} ${className})
     {
-        List<${ClassName}> list = ${className}Service.list(new QueryWrapper<${ClassName}>(${className}));
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return success(list);
     }
 #end
@@ -76,11 +71,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, ${ClassName} ${className})
     {
-#if($table.sub)
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
-#else
-        List<${ClassName}> list = ${className}Service.list(new QueryWrapper<${ClassName}>(${className}));
-#end
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         util.exportExcel(response, list, "${functionName}数据");
     }

ruoyi-generator/src/main/resources/vm/java/service.java.vm

@@ -11,14 +11,6 @@ import ${packageName}.domain.${ClassName};
  * @date ${datetime}
  */
 public interface I${ClassName}Service extends IService<${ClassName}> {
-#if($table.sub)
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -28,6 +20,15 @@ public interface I${ClassName}Service extends IService<${ClassName}> {
      */
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
 
+#if($table.sub)
+    /**
+     * 查询${functionName}
+     *
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+
     /**
      * 新增${functionName}
      *

ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -1,14 +1,16 @@
 package ${packageName}.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.utils.StringUtils;
+import java.util.List;
+import java.util.Map;
 #if($table.sub)
 import java.util.Arrays;
-import java.util.List;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import ${packageName}.domain.${subClassName};
 import ${packageName}.mapper.${subClassName}Mapper;
 #end
@@ -24,26 +26,13 @@ import ${packageName}.service.I${ClassName}Service;
  */
 @Service
 public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service {
-#if($table.sub)
+
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
+#if($table.sub)
     @Autowired
     private ${subClassName}Mapper ${subclassName}Mapper;
-
-    /**
-     * 查询${functionName}
-     *
-     * @param ${pkColumn.javaField} ${functionName}主键
-     * @return ${functionName}
-     */
-    @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
-    {
-        ${ClassName} ${className} = ${className}Mapper.selectById(${pkColumn.javaField});
-        List<${subClassName}> ${subclassName}List = ${className}Mapper.select${subClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
-        ${className}.set${subClassName}List(${subclassName}List);
-        return ${className};
-    }
+#end
 
     /**
      * 查询${functionName}列表
@@ -54,16 +43,34 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Override
     public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
     {
-        List<${ClassName}> ${className}List = ${className}Mapper.selectList(new QueryWrapper<${ClassName}>(${className}));
+        List<${ClassName}> ${className}List = ${className}Mapper.selectList(buildQueryWrapper(${className}));
+#if($table.sub)
         if (StringUtils.isNotNull(${className}List)) {
             for (${ClassName} temp : ${className}List) {
                 List<${subClassName}> ${subclassName}List = ${className}Mapper.select${subClassName}By${pkColumn.capJavaField}(temp.get${pkColumn.capJavaField}());
                 temp.set${subClassName}List(${subclassName}List);
             }
         }
+#end
         return ${className}List;
     }
 
+#if($table.sub)
+    /**
+     * 查询${functionName}
+     *
+     * @param ${pkColumn.javaField} ${functionName}主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    {
+        ${ClassName} ${className} = ${className}Mapper.selectById(${pkColumn.javaField});
+        List<${subClassName}> ${subclassName}List = ${className}Mapper.select${subClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        ${className}.set${subClassName}List(${subclassName}List);
+        return ${className};
+    }
+
     /**
      * 新增${functionName}
      *
@@ -130,7 +137,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      *
      * @param ${className} ${functionName}对象
      */
-    public void insert${subClassName}(${ClassName} ${className})
+    private void insert${subClassName}(${ClassName} ${className})
     {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
         ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
@@ -142,4 +149,32 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
         }
     }
 #end
+
+    private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName} query) {
+        Map<String, Object> params = query.getParams();
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
+#foreach($column in $columns)
+    #if($column.query)
+        #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)})
+        #set($mpMethod=$column.queryType.toLowerCase())
+        #if($queryType != 'BETWEEN')
+            #if($javaType == 'String')
+                #set($condition='StringUtils.isNotBlank(query.get'+$AttrName+'())')
+            #else
+                #set($condition='query.get'+$AttrName+'() != null')
+            #end
+        lqw.$mpMethod($condition, ${ClassName}::get$AttrName, query.get$AttrName());
+        #else
+        lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
+                ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));
+        #end
+    #end
+#end
+        return lqw;
+    }
+
 }

ruoyi-ui/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://localhost:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ruoyi-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 若依管理系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://localhost:8080'