调整代码生成器

server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java

@@ -208,6 +208,7 @@ public class GenerateServiceImpl implements IGenerateService {
                 }
             }
         } catch (Exception e) {
+            e.printStackTrace();
             throw new OperateException("导入失败：" + e.getMessage());
         }
     }

server/like-generator/src/main/java/com/mdd/generator/util/GenUtil.java

@@ -66,7 +66,6 @@ public class GenUtil {
 
         // 日期字段
         else if (GenUtil.isArraysContains(SqlConstants.COLUMN_TYPE_TIME, columnType)) {
-
             column.setJavaType(JavaConstants.TYPE_DATE);
             column.setHtmlType(HtmlConstants.HTML_DATETIME);
         }
@@ -242,14 +241,10 @@ public class GenUtil {
      * @return 截取后的列类型
      */
     public static String getColumnLength(String columnType) {
-        if (columnType.equals("")) {
-            return "0";
-        }
         if (StringUtil.indexOf(columnType, "(") > 0) {
             return StringUtil.substringBetween(columnType, "(", ")");
-        }
-        else {
-            return "";
+        } else {
+            return "0";
         }
     }
 

server/like-generator/src/main/resources/java/controller.java.vm

@@ -59,8 +59,8 @@ public class ${EntityName}Controller {
     }
     #else
     @GetMapping("/list")
-    public AjaxResult<JSONArray> list(@RequestParam Map<String, String> params) {
-        JSONArray list = i${EntityName}Service.list(params);
+    public AjaxResult<JSONArray> list(@Validated ${EntityName}SearchValidate searchValidate) {
+        JSONArray list = i${EntityName}Service.list(searchValidate);
         return AjaxResult.success(list);
     }
     #end

server/like-generator/src/main/resources/java/service.java.vm

@@ -3,13 +3,19 @@ package ${packageName}.admin.service;
 #if(!$table.genTpl.equals("crud"))
 import com.alibaba.fastjson2.JSONArray;
 #end
+#if($table.genTpl.equals("crud"))
 import ${packageName}.admin.validate.commons.PageValidate;
+#end
 import ${packageName}.admin.validate.${EntityName}CreateValidate;
 import ${packageName}.admin.validate.${EntityName}UpdateValidate;
 import ${packageName}.admin.validate.${EntityName}SearchValidate;
+#if($table.genTpl.equals("crud"))
 import ${packageName}.admin.vo.${EntityName}ListedVo;
+#end
 import ${packageName}.admin.vo.${EntityName}DetailVo;
+#if($table.genTpl.equals("crud"))
 import ${packageName}.common.core.PageResult;
+#end
 
 #set($isAuthor = !$authorName.equals(""))
 /**
@@ -39,10 +45,10 @@ public interface I${EntityName}Service {
      #if(!$authorName.equals(""))
      * @author ${authorName}
      #end
-     * @param params 搜索参数
+     * @param searchValidate 搜索参数
      * @return JSONArray
     */
-    JSONArray list(Map<String, String> params);
+    JSONArray list(${EntityName}SearchValidate searchValidate);
  #end
 
     /**

server/like-generator/src/main/resources/java/serviceImpl.java.vm

@@ -1,26 +1,29 @@
 package ${packageName}.admin.service.impl;
 
 #if(!$table.genTpl.equals("crud"))
-import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONArray;
 #end
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+#if($table.genTpl.equals("crud"))
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.query.MPJQueryWrapper;
-import ${packageName}.admin.service.I${EntityName}Service;
 import ${packageName}.admin.validate.commons.PageValidate;
+#end
+import ${packageName}.admin.service.I${EntityName}Service;
 import ${packageName}.admin.validate.${EntityName}CreateValidate;
 import ${packageName}.admin.validate.${EntityName}UpdateValidate;
 import ${packageName}.admin.validate.${EntityName}SearchValidate;
 import ${packageName}.admin.vo.${EntityName}ListedVo;
 import ${packageName}.admin.vo.${EntityName}DetailVo;
+#if($table.genTpl.equals("crud"))
 import ${packageName}.common.core.PageResult;
+#end
 import ${packageName}.common.entity.${EntityName};
 import ${packageName}.common.mapper.${EntityName}Mapper;
 import ${packageName}.common.utils.ArrayUtil;
 import ${packageName}.common.utils.TimeUtil;
 import ${packageName}.common.utils.UrlUtil;
-import ${packageName}.common.config.GlobalConfig;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
@@ -51,7 +54,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #set($genTpl = "JSONArray")
         #if($isSearch)
             #set($isSearchParam = true)
-            #set($genParam = "Map<String, String> params")
+            #set($genParam = "${EntityName}SearchValidate searchValidate")
         #else
             #set($isSearchParam = false)
             #set($genParam = "")

server/like-generator/src/main/resources/java/validateSearch.java.vm

@@ -23,7 +23,12 @@ public class ${EntityName}SearchValidate implements Serializable {
 
 #foreach ($column in $columns)
 #if($column.isQuery==1)
+    #if ($column.columnName.equals("create_time") || $column.columnName.equals("update_time") || $column.columnName.equals("delete_time"))
+    private String ${column.javaField}Start;
+    private String ${column.javaField}End;
+    #else
     private ${column.javaType} ${column.javaField};
+    #end
 
 #end
 #end