fixed 代码生成功能迭代

fuint-application/src/main/java/com/fuint/common/service/impl/GenCodeServiceImpl.java

@@ -132,9 +132,11 @@ public class GenCodeServiceImpl implements GenCodeService {
     public void generatorCode(String tableName) throws BusinessRuntimeException {
         // 查询表信息
         TGenCode table = tGenCodeMapper.findGenCodeByTableName(tableName);
+        if (table == null) {
+            throw new BusinessRuntimeException("渲染模板失败，该表不存在.");
+        }
 
         VelocityInitializer.initVelocity();
-
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表

fuint-application/src/main/java/com/fuint/common/util/GenUtils.java

@@ -66,7 +66,7 @@ public class GenUtils {
      */
     public static String convertClassName(String tableName) {
         boolean autoRemovePre = false;
-        String tablePrefix = "mt_";
+        String tablePrefix = "mt";
         if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
             String[] searchList = StringUtils.split(tablePrefix, ",");
             tableName = replaceFirst(tableName, searchList);

fuint-application/src/main/java/com/fuint/common/util/VelocityUtils.java

@@ -36,35 +36,25 @@ public class VelocityUtils {
         VelocityContext velocityContext = new VelocityContext();
         velocityContext.put("tableName", genTable.getTableName());
         velocityContext.put("moduleName", genTable.getModuleName());
+        String modelName = CommonUtil.firstLetterToUpperCase(genTable.getTablePrefix()).replaceAll("_", "") + CommonUtil.firstLetterToUpperCase(genTable.getTableName());
+        velocityContext.put("modelName", modelName);
         velocityContext.put("basePackage", getPackagePrefix(genTable.getPackageName()));
         velocityContext.put("packageName", genTable.getPackageName());
         velocityContext.put("pkColumn", genTable.getPkName());
         velocityContext.put("importList", getImportList(genTable));
         velocityContext.put("table", genTable);
+        velocityContext.put("columns", new ArrayList<>());
         setMenuVelocityContext(velocityContext, genTable);
         return velocityContext;
     }
 
     public static void setMenuVelocityContext(VelocityContext context, TGenCode genTable) {
-        String options = null;
+        String options = (genTable.getTableName() == null) ? genTable.getTableName() : null;
         JSONObject paramsObj = JSON.parseObject(options);
         String parentMenuId = getParentMenuId(paramsObj);
         context.put("parentMenuId", parentMenuId);
     }
 
-    public static void setTreeVelocityContext(VelocityContext context, TGenCode genTable) {
-        String options = genTable.getTableName();
-        JSONObject paramsObj = JSON.parseObject(options);
-        String treeCode = getTreecode(paramsObj);
-        String treeParentCode = getTreeParentCode(paramsObj);
-        String treeName = getTreeName(paramsObj);
-
-        context.put("treeCode", treeCode);
-        context.put("treeParentCode", treeParentCode);
-        context.put("treeName", treeName);
-        context.put("expandColumn", getExpandColumn(genTable));
-    }
-
     /**
      * 获取模板信息
      *
@@ -72,8 +62,8 @@ public class VelocityUtils {
      */
     public static List<String> getTemplateList() {
         String useWebType = "vm/vue";
-        List<String> templates = new ArrayList<String>();
-        templates.add("vm/java/domain.java.vm");
+        List<String> templates = new ArrayList<>();
+        templates.add("vm/java/model.java.vm");
         templates.add("vm/java/mapper.java.vm");
         templates.add("vm/java/service.java.vm");
         templates.add("vm/java/serviceImpl.java.vm");
@@ -98,50 +88,33 @@ public class VelocityUtils {
         // 大写类名
         String className = genTable.getTableName();
         // 业务名称
-        String businessName = genTable.getTableName();
+        String businessName = genTable.getModuleName();
+        // 模型名称
+        String modelName = CommonUtil.firstLetterToUpperCase(genTable.getTablePrefix()).replaceAll("_", "") + CommonUtil.firstLetterToUpperCase(genTable.getTableName());
 
         String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
         String vuePath = "vue";
 
-        if (template.contains("domain.java.vm"))
-        {
-            fileName = StringUtil.format("{}/domain/{}.java", javaPath, className);
-        }
-        else if (template.contains("mapper.java.vm"))
-        {
+        if (template.contains("model.java.vm")) {
+            fileName = StringUtil.format("{}/model/{}.java", javaPath, modelName);
+        } else if (template.contains("mapper.java.vm")) {
             fileName = StringUtil.format("{}/mapper/{}Mapper.java", javaPath, className);
-        }
-        else if (template.contains("service.java.vm"))
-        {
+        } else if (template.contains("service.java.vm")) {
             fileName = StringUtil.format("{}/service/I{}Service.java", javaPath, className);
-        }
-        else if (template.contains("serviceImpl.java.vm"))
-        {
+        } else if (template.contains("serviceImpl.java.vm")) {
             fileName = StringUtil.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
-        }
-        else if (template.contains("controller.java.vm"))
-        {
+        } else if (template.contains("controller.java.vm")) {
             fileName = StringUtil.format("{}/controller/{}Controller.java", javaPath, className);
-        }
-        else if (template.contains("mapper.xml.vm"))
-        {
+        } else if (template.contains("mapper.xml.vm")) {
             fileName = StringUtil.format("{}/{}Mapper.xml", mybatisPath, className);
-        }
-        else if (template.contains("sql.vm"))
-        {
+        } else if (template.contains("sql.vm")) {
             fileName = businessName + "Menu.sql";
-        }
-        else if (template.contains("api.js.vm"))
-        {
+        } else if (template.contains("api.js.vm")) {
             fileName = StringUtil.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("index.vue.vm"))
-        {
+        } else if (template.contains("index.vue.vm")) {
             fileName = StringUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("index-tree.vue.vm"))
-        {
+        } else if (template.contains("index-tree.vue.vm")) {
             fileName = StringUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
         }
         return fileName;
@@ -165,7 +138,7 @@ public class VelocityUtils {
      * @return 返回需要导入的包列表
      */
     public static HashSet<String> getImportList(TGenCode genTable) {
-        HashSet<String> importList = new HashSet<String>();
+        HashSet<String> importList = new HashSet<>();
         return importList;
     }
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGenCodeController.java

@@ -53,7 +53,7 @@ public class BackendGenCodeController extends BaseController {
         String token = request.getHeader("Access-Token");
         Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
-        String tableName = request.getParameter("title");
+        String tableName = request.getParameter("tableName");
         String status = request.getParameter("status");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
@@ -187,7 +187,7 @@ public class BackendGenCodeController extends BaseController {
             // empty
         }
 
-        genCodeService.generatorCode("mt_luck");
+        genCodeService.generatorCode("luck");
         return getSuccessResult(true);
     }
 }

fuint-application/src/main/resources/vm/java/domain.java.vm → fuint-application/src/main/resources/vm/java/model.java.vm

@@ -23,7 +23,7 @@ import com.fuint.common.core.domain.TreeEntity;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
-public class ${ClassName} extends ${Entity}
+public class ${modelName} implements Serializable
 {
     private static final long serialVersionUID = 1L;