代码生成器模板调整

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

@@ -245,6 +245,7 @@ public class GenerateServiceImpl implements IGenerateService {
             column.setIsInsert(Integer.parseInt(item.get("isInsert")));
             column.setIsEdit(Integer.parseInt(item.get("isEdit")));
             column.setIsList(Integer.parseInt(item.get("isList")));
+            column.setIsDetail(Integer.parseInt(item.get("isDetail")));
             column.setIsQuery(Integer.parseInt(item.get("isQuery")));
             column.setQueryType(item.get("queryType"));
             column.setHtmlType(item.get("htmlType"));

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

@@ -104,6 +104,11 @@ public class GenUtil {
             column.setIsList(GenConstants.REQUIRE);
         }
 
+        // 需详情的字段
+        if (!GenUtil.isArraysContains(new String[]{"is_delete", "delete_time"}, columnName)) {
+            column.setIsDetail(GenConstants.REQUIRE);
+        }
+
         // 需查询字段
         if (!GenUtil.isArraysContains(SqlConstants.COLUMN_NAME_NOT_QUERY, columnName) && column.getIsPk() == 0) {
             column.setIsQuery(GenConstants.REQUIRE);

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

@@ -2,6 +2,7 @@ package com.hxkj.generator.util;
 
 import com.hxkj.common.utils.StringUtil;
 import com.hxkj.generator.config.GenConfig;
+import com.hxkj.generator.constant.GenConstants;
 import com.hxkj.generator.constant.SqlConstants;
 import com.hxkj.generator.entity.GenTable;
 import com.hxkj.generator.entity.GenTableColumn;
@@ -108,12 +109,14 @@ public class VelocityUtil {
         templates.add("java/voList.java.vm");
         templates.add("java/voDetail.java.vm");
 
-//        if (GenConstants.TPL_CRUD.equals(genTpl)) {
+        if (GenConstants.TPL_CRUD.equals(genTpl)) {
-//            templates.add("vue/index.vue.vm");
+            templates.add("vue/index.vue.vm");
-//        }
+        }
-//        else if (GenConstants.TPL_TREE.equals(genTpl)) {
+
-//            templates.add("vue/index-tree.vue.vm");
+        else if (GenConstants.TPL_TREE.equals(genTpl)) {
-//        }
+            templates.add("vue/index-tree.vue.vm");
+        }
+
         return templates;
     }
 

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

@@ -15,6 +15,7 @@ import ${packageName}.common.mapper.${moduleName}.${EntityName}Mapper;
 import ${packageName}.common.utils.TimeUtil;
 import ${packageName}.common.utils.UrlUtil;
 import com.hxkj.common.config.GlobalConfig;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
@@ -69,16 +70,25 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
     @Override
     public $genTpl list($genParam) {
     #if($table.genTpl.equals("curd"))
-        Integer pageNo   = pageParam.getPageNo();
+        Integer page  = pageParam.getPageNo();
-        Integer pageSize = pageParam.getPageSize();
+        Integer limit = pageParam.getPageSize();
     #end
 
     #if(!$table.subTableName.equals("") && !$table.subTableFk.equals(""))
-        MPJQueryWrapper<${EntityName}> queryWrapper = new MPJQueryWrapper<>();
+        #set($queryWrapper = "mpjQueryWrapper")
-        queryWrapper.innerJoin("?_$table.subTableName f ON f.$table.SubTableFk=t.id".replace("?_", GlobalConfig.tablePrefix));
+        MPJQueryWrapper<${EntityName}> mpjQueryWrapper = new MPJQueryWrapper<>();
-    #else
+        mpjQueryWrapper.innerJoin("?_$table.subTableName f ON f.$table.SubTableFk=t.id".replace("?_", GlobalConfig.tablePrefix));
-        QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>();
+        #if($fields.contains("is_delete"))
+        mpjQueryWrapper.eq("is_delete", 0);
         #end
+        #if($fields.contains("sort"))
+         mpjQueryWrapper.orderByDesc(Arrays.asList("sort", "id"));
+        #else
+        mpjQueryWrapper.orderByDesc("id");
+        #end
+    #else
+        #set($queryWrapper = "queryWrapper")
+        QueryWrapper<${EntityName}> queryWrapper = new QueryWrapper<>();
         #if($fields.contains("is_delete"))
         queryWrapper.eq("is_delete", 0);
         #end
@@ -87,9 +97,10 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #else
         queryWrapper.orderByDesc("id");
         #end
+    #end
 
     #if($isSearch)
-        ${entityName}Mapper.setSearch(mpjQueryWrapper, params, new String[]{
+        ${entityName}Mapper.setSearch($queryWrapper, params, new String[]{
     #foreach ($column in $columns)
     #if($column.isQuery)
         #if($dateFields.contains($column.columnName))
@@ -115,7 +126,7 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #end
     #end
     #end
-        }
+        });
     #end
 
     #if(!$table.subTableName.equals("") && !$table.subTableFk.equals(""))
@@ -126,21 +137,21 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         IPage<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinPage(
                 new Page<>(page, limit),
                 ${EntityName}ListVo.class,
-                mpjQueryWrapper);
+                $queryWrapper);
         #else
         List<${EntityName}ListVo> iPage = ${entityName}Mapper.selectJoinList(
                 ${EntityName}ListVo.class,
-                mpjQueryWrapper);
+                $queryWrapper);
         #end
     #else
         #set($isJoin = false)
         #set($joinCurdList = "${EntityName}")
         #if($table.genTpl.equals("curd"))
         #set($joinCurdName = "iPage.getRecords()")
-        IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), queryWrapper);
+        IPage<${EntityName}> iPage = ${entityName}Mapper.selectPage(new Page<>(page, limit), $queryWrapper);
         #else
         #set($joinCurdName = "array")
-        List<${EntityName}> array = ${entityName}Mapper.selectList(queryWrapper);
+        List<${EntityName}> array = ${entityName}Mapper.selectList($queryWrapper);
         #end
     #end
 
@@ -156,20 +167,19 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         #end
         for($joinCurdList item : $joinCurdName) {
         #if(!$isJoin)
-            ${EntityName}ListVo vo = new ${EntityName}Vo();
+            ${EntityName}ListVo vo = new ${EntityName}ListVo();
             BeanUtils.copyProperties(item, vo);
-            #end
             #if($listFields.contains("image"))
-            vo.setImage(UrlUtil.toAbsoluteUrl(item.getImage()))
+            vo.setImage(UrlUtil.toAbsoluteUrl(item.getImage()));
             #end
             #if($listFields.contains("avatar"))
-            vo.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar()))
+            vo.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar()));
             #end
             #if($listFields.contains("logo"))
-            vo.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo()))
+            vo.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo()));
             #end
             #if($listFields.contains("img"))
-            vo.setImg(UrlUtil.toAbsoluteUrl(item.getImg()))
+            vo.setImg(UrlUtil.toAbsoluteUrl(item.getImg()));
             #end
             #if($listFields.contains("create_time"))
             vo.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
@@ -186,8 +196,35 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
             #if($listFields.contains("end_time"))
             vo.setEndTime(TimeUtil.timestampToDate(item.getEndTime()));
             #end
-            #if(!$isJoin)
+            list.add(vo);
-            list.add(vo)
+        #else
+            #if($listFields.contains("image"))
+            item.setImage(UrlUtil.toAbsoluteUrl(item.getImage()));
+            #end
+            #if($listFields.contains("avatar"))
+            item.setAvatar(UrlUtil.toAbsoluteUrl(item.getAvatar()));
+            #end
+            #if($listFields.contains("logo"))
+            item.setLogo(UrlUtil.toAbsoluteUrl(item.getLogo()));
+            #end
+            #if($listFields.contains("img"))
+            item.setImg(UrlUtil.toAbsoluteUrl(item.getImg()));
+            #end
+            #if($listFields.contains("create_time"))
+            item.setCreateTime(TimeUtil.timestampToDate(item.getCreateTime()));
+            #end
+            #if($listFields.contains("update_time"))
+            item.setUpdateTime(TimeUtil.timestampToDate(item.getUpdateTime()));
+            #end
+            #if($listFields.contains("delete_time"))
+            item.setDeleteTime(TimeUtil.timestampToDate(item.getDeleteTime()));
+            #end
+            #if($listFields.contains("start_time"))
+            item.setStartTime(TimeUtil.timestampToDate(item.getStartTime()));
+            #end
+            #if($listFields.contains("end_time"))
+            item.setEndTime(TimeUtil.timestampToDate(item.getEndTime()));
+            #end
         #end
         }
     #end
@@ -219,7 +256,8 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      */
     @Override
     public ${EntityName}DetailVo detail(Integer id) {
-        ${EntityName} model = new QueryWrapper<${EntityName}>()
+        ${EntityName} model = ${entityName}Mapper.selectOne(
+                new QueryWrapper<${EntityName}>()
                     .eq("id", id)
                     #if($allFields.contains("is_delete"))
                     .eq("is_delete", 0)
@@ -236,16 +274,16 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         $detailFields.contains("avatar") || $detailFields.contains("logo") ||
         $detailFields.contains("img"))
         #if($detailFields.contains("image"))
-        vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage()))
+        vo.setImage(UrlUtil.toAbsoluteUrl(model.getImage()));
         #end
         #if($detailFields.contains("avatar"))
-        vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar()))
+        vo.setAvatar(UrlUtil.toAbsoluteUrl(model.getAvatar()));
         #end
         #if($detailFields.contains("logo"))
-        vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo()))
+        vo.setLogo(UrlUtil.toAbsoluteUrl(model.getLogo()));
         #end
         #if($detailFields.contains("img"))
-        vo.setImg(UrlUtil.toAbsoluteUrl(model.getImg()))
+        vo.setImg(UrlUtil.toAbsoluteUrl(model.getImg()));
         #end
         #if($detailFields.contains("create_time"))
         vo.setCreateTime(TimeUtil.timestampToDate(model.getCreateTime()));
@@ -302,8 +340,9 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      */
     @Override
     public void edit(${EntityName}Param ${entityName}Param) {
-        ${EntityName} model = new QueryWrapper<${EntityName}>()
+        ${EntityName} model = ${entityName}Mapper.selectOne(
-                .eq("id", id)
+                new QueryWrapper<${EntityName}>()
+                    .eq("id",  ${entityName}Param.getId())
                     #if($allFields.contains("is_delete"))
                     .eq("is_delete", 0)
                     #end
@@ -336,7 +375,8 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
      */
     @Override
     public void del(Integer id) {
-        ${EntityName} model = new QueryWrapper<${EntityName}>()
+        ${EntityName} model = ${entityName}Mapper.selectOne(
+                new QueryWrapper<${EntityName}>()
                     .eq("id", id)
                     #if($allFields.contains("is_delete"))
                     .eq("is_delete", 0)

server/like-generator/src/main/resources/vue/index-tree.vue.vm

@@ -0,0 +1 @@
+未定的内容