代码生成器模板调整

server/like-generator/src/main/java/com/hxkj/generator/util/VelocityUtil.java

@@ -1,9 +1,7 @@
 package com.hxkj.generator.util;
 
 import com.hxkj.common.utils.StringUtil;
-import com.hxkj.common.utils.UrlUtil;
 import com.hxkj.generator.config.GenConfig;
-import com.hxkj.generator.constant.GenConstants;
 import com.hxkj.generator.entity.GenTable;
 import com.hxkj.generator.entity.GenTableColumn;
 import org.apache.velocity.VelocityContext;
@@ -14,10 +12,7 @@ import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public class VelocityUtil {
 
@@ -67,9 +62,6 @@ public class VelocityUtil {
         velocityContext.put("columns", columns);
         velocityContext.put("fields", fields);
         velocityContext.put("isSearch", isSearch);
-        velocityContext.put("isEqually", VelocityUtil.getIsEqually(columns));
-        System.out.println(fields);
-
         return velocityContext;
     }
 
@@ -88,27 +80,6 @@ public class VelocityUtil {
         return genPath + File.separator;
     }
 
-    /**
-     * 判断需列表字段和查询字段是否一致
-     *
-     * @author fzr
-     * @param columns 字段列表
-     * @return Boolean
-     */
-    public static Boolean getIsEqually(List<GenTableColumn> columns) {
-        StringBuilder listStr  = new StringBuilder();
-        StringBuilder queryStr = new StringBuilder();
-        for (GenTableColumn col : columns) {
-            if (col.getIsList() == 1) {
-                listStr.append(",").append(col.getColumnName());
-            }
-            if (col.getIsQuery() == 1) {
-                queryStr.append(",").append(col.getColumnName());
-            }
-        }
-        return listStr.toString().equals(queryStr.toString());
-    }
-
     /**
      * 获取模板列表
      *
@@ -123,12 +94,9 @@ public class VelocityUtil {
         templates.add("java/service.java.vm");
         templates.add("java/serviceImpl.java.vm");
         templates.add("java/validate.java.vm");
-        if (VelocityUtil.getIsEqually(columns)) {
-            templates.add("java/vo.java.vm");
-        } else {
         templates.add("java/voList.java.vm");
         templates.add("java/voDetail.java.vm");
-        }
+
 //        if (GenConstants.TPL_CRUD.equals(genTpl)) {
 //            templates.add("vue/index.vue.vm");
 //        }

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

@@ -4,12 +4,8 @@ import ${packageName}.admin.config.aop.Log;
 import ${packageName}.admin.service.${moduleName}.I${EntityName}Service;
 import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
-#if($isEqually)
-import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo;
-#else
 import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
 import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
-#end
 import ${packageName}.common.core.AjaxResult;
 import ${packageName}.common.core.PageResult;
 import ${packageName}.common.validator.annotation.IDMust;
@@ -42,11 +38,7 @@ public class ${EntityName}Controller {
     @GetMapping("/list")
     public Object list(@Validated PageParam pageParam,
                        @RequestParam Map<String, String> params) {
-        #if($isEqually)
-        PageResult<${EntityName}Vo> list = i${EntityName}Service.list(pageParam, params);
-        #else
         PageResult<${EntityName}ListVo> list = i${EntityName}Service.list(pageParam, params);
-        #end
         return AjaxResult.success(list);
     }
 
@@ -61,11 +53,7 @@ public class ${EntityName}Controller {
      */
     @GetMapping("/detail")
     public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) {
-        #if($isEqually)
-        ${EntityName}Vo detail = i${EntityName}Service.detail(id);
-        #else
         ${EntityName}DetailVo detail = i${EntityName}Service.detail(id);
-        #end
         return AjaxResult.success(detail);
     }
 

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

@@ -2,14 +2,8 @@ package ${packageName}.admin.service.${moduleName};
 
 import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.validate.${moduleName}.${EntityName}Param;
-#if($table.genTpl=="curd")
-#if($isEqually)
-import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo;
-#else
 import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
 import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
-#end
-#end
 import ${packageName}.common.core.PageResult;
 
 import java.util.Map;
@@ -20,7 +14,7 @@ import java.util.Map;
 public interface I${EntityName}Service {
 
  #if($table.genTpl=="curd")
-    /**
+    /**、
      * ${functionName}列表
      *
      #if(!$authorName.equals(""))
@@ -30,11 +24,7 @@ public interface I${EntityName}Service {
      * @param params 搜索参数
      * @return PageResult<${EntityName}Vo}>
      */
-    #if($isEqually)
-    PageResult<${EntityName}Vo> list(PageParam pageParam, Map<String, String> params);
-    #else
     PageResult<${EntityName}ListVo> list(PageParam pageParam, Map<String, String> params);
-    #end
 #elseif($table.genTpl=="tree")
     /**
      * ${functionName}列表
@@ -57,11 +47,7 @@ public interface I${EntityName}Service {
      * @param id 主键ID
      * @return ${EntityName}
      */
-    #if($isEqually)
-    ${EntityName}Vo detail(Integer id);
-    #else
     ${EntityName}DetailVo detail(Integer id);
-    #end
 
     /**
      * ${functionName}新增

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

@@ -7,12 +7,8 @@ import com.github.yulichang.query.MPJQueryWrapper;
 import ${packageName}.admin.service.${moduleName}.IArticleService;
 import ${packageName}.admin.validate.common.PageParam;
 import ${packageName}.admin.validate.${moduleName}.ArticleParam;
-#if($isEqually)
-import ${packageName}.admin.vo.${moduleName}.${EntityName}Vo;
-#else
 import ${packageName}.admin.vo.${moduleName}.${EntityName}ListVo;
 import ${packageName}.admin.vo.${moduleName}.${EntityName}DetailVo;
-#end
 import ${packageName}.common.core.PageResult;
 import ${packageName}.common.entity.${moduleName}.Article;
 import ${packageName}.common.mapper.${moduleName}.ArticleMapper;
@@ -46,7 +42,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      * @return PageResult<${EntityName}Vo>
      */
     @Override
-    public#if($isEqually) PageResult<${EntityName}Vo>#else PageResult<${EntityName}ListVo>#end list(PageParam pageParam, Map<String, String> params) {
+    public PageResult<${EntityName}ListVo> list(PageParam pageParam, Map<String, String> params) {
         Integer page  = pageParam.getPageNo();
         Integer limit = pageParam.getPageSize();
 
@@ -94,25 +90,13 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         });
         #end
 
-        #if($isEqually)
-        IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper);
-        #else
         IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper);
-        #end
 
         #if($fields.contains("create_time") || $fields.contains("update_time"))
-        #if($isEqually)
-        List<${EntityName}Vo> list = new ArrayList<>();
-        for (${EntityName}Vo item : iPage.getRecords()) {
-        #else
         List<${EntityName}ListVo> list = new ArrayList<>();
+        #end
         for (${EntityName}ListVo item : iPage.getRecords()) {
-        #end
-            #if($isEqually)
-            ${EntityName}Vo vo = new ${EntityName}Vo();
-            #else
             ${EntityName}ListVo vo = new ${EntityName}ListVo();
-            #end
             BeanUtils.copyProperties(item, vo);
             #if($fields.contains("image"))
             vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
@@ -195,17 +179,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         List<${EntityName}> arrayData = ${entityName}Mapper.selectList(queryWrapper);
 
         #if($fields.contains("create_time") || $fields.contains("update_time"))
-        #if($isEqually)
-        List<${EntityName}Vo> list = new ArrayList<>();
-        #else
         List<${EntityName}ListVo> list = new ArrayList<>();
-        #end
         for (${EntityName} item : arrayData) {
-            #if($isEqually)
-            ${EntityName}Vo vo = new ${EntityName}Vo();
-            #else
             ${EntityName}ListVo vo = new ${EntityName}ListVo();
-            #end
             BeanUtils.copyProperties(item, vo);
             #if($fields.contains("image"))
             vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()))
@@ -294,21 +270,12 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         });
         #end
 
-        #if($isEqually)
-        IPage<${EntityName}Vo> iPage = ${entityName}Mapper.selectJoinPage(
-                new Page<>(page, limit),
-                ${EntityName}Vo.class,
-                mpjQueryWrapper);
-
-        for (${EntityName}Vo vo : iPage.getRecords()) {
-        #else
         IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage(
                 new Page<>(page, limit),
                 ${EntityName}ListVo.class,
                 mpjQueryWrapper);
 
         for (${EntityName}ListVo vo : iPage.getRecords()) {
-        #end
             #if($fields.contains("image"))
             vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
             #end
@@ -372,15 +339,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         });
         #end
 
-        #if($isEqually)
-        List<${EntityName}> arrayData = ${entityName}Mapper.selectJoinList(
-                ${EntityName}Vo.class,
-                mpjQueryWrapper);
-        #else
         List<${EntityNameList}> arrayData = ${entityName}Mapper.selectJoinList(
             ${EntityName}ListVo.class,
             mpjQueryWrapper);
-        #end
 
    #if($fields.contains("create_time") || $fields.contains("update_time"))
         for (${EntityName} item : arrayData) {
@@ -440,12 +401,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
 
         Assert.notNull(model, "${functionName}不存在}");
 
-        #if($isEqually)
-        ArticleVo vo = new ArticleVo();
-        #else
         ArticleDetailVo vo = new ArticleDetailVo();
-        #end
-
         #if($field.contains("image"))
         vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage()));
         #end

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

@@ -13,13 +13,11 @@ public class ${EntityName}DetailVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isQuery==1)
     #if($column.javaField.equals("createTime") || $column.javaField.equals("updateTime") || $column.javaField.equals("deleteTime"))
     private String ${column.javaField};
     #else
     private ${column.javaType} ${column.javaField};
     #end
 #end
-#end
 
 }