From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 119 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 30 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 091a956..69421cc 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -1,15 +1,17 @@
package com.ruoyi.generator.util;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import org.apache.velocity.VelocityContext;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
+import org.apache.velocity.VelocityContext;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
/**
* 妯℃澘澶勭悊宸ュ叿绫�
@@ -43,18 +45,18 @@
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("tplCategory", genTable.getTplCategory());
velocityContext.put("tableName", genTable.getTableName());
- velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "銆愯濉啓鍔熻兘鍚嶇О銆�");
+ velocityContext.put("functionName", StrUtil.isNotEmpty(functionName) ? functionName : "銆愯濉啓鍔熻兘鍚嶇О銆�");
velocityContext.put("ClassName", genTable.getClassName());
- velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+ velocityContext.put("className", StrUtil.lowerFirst(genTable.getClassName()));
velocityContext.put("moduleName", genTable.getModuleName());
- velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+ velocityContext.put("BusinessName", StrUtil.upperFirst(genTable.getBusinessName()));
velocityContext.put("businessName", genTable.getBusinessName());
velocityContext.put("basePackage", getPackagePrefix(packageName));
velocityContext.put("packageName", packageName);
velocityContext.put("author", genTable.getFunctionAuthor());
velocityContext.put("datetime", DateUtils.getDate());
velocityContext.put("pkColumn", genTable.getPkColumn());
- velocityContext.put("importList", getImportList(genTable.getColumns()));
+ velocityContext.put("importList", getImportList(genTable));
velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
velocityContext.put("columns", genTable.getColumns());
velocityContext.put("table", genTable);
@@ -62,6 +64,10 @@
if (GenConstants.TPL_TREE.equals(tplCategory))
{
setTreeVelocityContext(velocityContext, genTable);
+ }
+ if (GenConstants.TPL_SUB.equals(tplCategory))
+ {
+ setSubVelocityContext(velocityContext, genTable);
}
return velocityContext;
}
@@ -96,6 +102,24 @@
}
}
+ public static void setSubVelocityContext(VelocityContext context, GenTable genTable)
+ {
+ GenTable subTable = genTable.getSubTable();
+ String subTableName = genTable.getSubTableName();
+ String subTableFkName = genTable.getSubTableFkName();
+ String subClassName = genTable.getSubTable().getClassName();
+ String subTableFkClassName = StrUtil.toCamelCase(subTableFkName);
+
+ context.put("subTable", subTable);
+ context.put("subTableName", subTableName);
+ context.put("subTableFkName", subTableFkName);
+ context.put("subTableFkClassName", subTableFkClassName);
+ context.put("subTableFkclassName", StrUtil.lowerFirst(subTableFkClassName));
+ context.put("subClassName", subClassName);
+ context.put("subclassName", StrUtil.lowerFirst(subClassName));
+ context.put("subImportList", getImportList(genTable.getSubTable()));
+ }
+
/**
* 鑾峰彇妯℃澘淇℃伅
*
@@ -105,6 +129,10 @@
{
List<String> templates = new ArrayList<String>();
templates.add("vm/java/domain.java.vm");
+ templates.add("vm/java/vo.java.vm");
+ templates.add("vm/java/queryBo.java.vm");
+ templates.add("vm/java/addBo.java.vm");
+ templates.add("vm/java/editBo.java.vm");
templates.add("vm/java/mapper.java.vm");
templates.add("vm/java/service.java.vm");
templates.add("vm/java/serviceImpl.java.vm");
@@ -119,6 +147,11 @@
else if (GenConstants.TPL_TREE.equals(tplCategory))
{
templates.add("vm/vue/index-tree.vue.vm");
+ }
+ else if (GenConstants.TPL_SUB.equals(tplCategory))
+ {
+ templates.add("vm/vue/index.vue.vm");
+ templates.add("vm/java/sub-domain.java.vm");
}
return templates;
}
@@ -139,33 +172,53 @@
// 涓氬姟鍚嶇О
String businessName = genTable.getBusinessName();
- String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+ String javaPath = PROJECT_PATH + "/" + StrUtil.replace(packageName, ".", "/");
String mybatisPath = MYBATIS_PATH + "/" + moduleName;
String vuePath = "vue";
if (template.contains("domain.java.vm"))
{
- fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
+ fileName = StrUtil.format("{}/domain/{}.java", javaPath, className);
+ }
+ if (template.contains("vo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/vo/{}Vo.java", javaPath, className);
+ }
+ if (template.contains("queryBo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/bo/{}QueryBo.java", javaPath, className);
+ }
+ if (template.contains("addBo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/bo/{}AddBo.java", javaPath, className);
+ }
+ if (template.contains("editBo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/bo/{}EditBo.java", javaPath, className);
+ }
+ if (template.contains("sub-domain.java.vm") && StrUtil.equals(GenConstants.TPL_SUB, genTable.getTplCategory()))
+ {
+ fileName = StrUtil.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName());
}
else if (template.contains("mapper.java.vm"))
{
- fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
+ fileName = StrUtil.format("{}/mapper/{}Mapper.java", javaPath, className);
}
else if (template.contains("service.java.vm"))
{
- fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+ fileName = StrUtil.format("{}/service/I{}Service.java", javaPath, className);
}
else if (template.contains("serviceImpl.java.vm"))
{
- fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
+ fileName = StrUtil.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
}
else if (template.contains("controller.java.vm"))
{
- fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
+ fileName = StrUtil.format("{}/controller/{}Controller.java", javaPath, className);
}
else if (template.contains("mapper.xml.vm"))
{
- fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
+ fileName = StrUtil.format("{}/{}Mapper.xml", mybatisPath, className);
}
else if (template.contains("sql.vm"))
{
@@ -173,15 +226,15 @@
}
else if (template.contains("api.js.vm"))
{
- fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
+ fileName = StrUtil.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
}
else if (template.contains("index.vue.vm"))
{
- fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+ fileName = StrUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
}
else if (template.contains("index-tree.vue.vm"))
{
- fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+ fileName = StrUtil.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
}
return fileName;
}
@@ -195,19 +248,25 @@
public static String getPackagePrefix(String packageName)
{
int lastIndex = packageName.lastIndexOf(".");
- String basePackage = StringUtils.substring(packageName, 0, lastIndex);
+ String basePackage = StrUtil.sub(packageName, 0, lastIndex);
return basePackage;
}
/**
* 鏍规嵁鍒楃被鍨嬭幏鍙栧鍏ュ寘
*
- * @param columns 鍒楅泦鍚�
+ * @param genTable 涓氬姟琛ㄥ璞�
* @return 杩斿洖闇�瑕佸鍏ョ殑鍖呭垪琛�
*/
- public static HashSet<String> getImportList(List<GenTableColumn> columns)
+ public static HashSet<String> getImportList(GenTable genTable)
{
+ List<GenTableColumn> columns = genTable.getColumns();
+ GenTable subGenTable = genTable.getSubTable();
HashSet<String> importList = new HashSet<String>();
+ if (Validator.isNotNull(subGenTable))
+ {
+ importList.add("java.util.List");
+ }
for (GenTableColumn column : columns)
{
if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
@@ -232,7 +291,7 @@
*/
public static String getPermissionPrefix(String moduleName, String businessName)
{
- return StringUtils.format("{}:{}", moduleName, businessName);
+ return StrUtil.format("{}:{}", moduleName, businessName);
}
/**
@@ -243,7 +302,7 @@
*/
public static String getParentMenuId(JSONObject paramsObj)
{
- if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
{
return paramsObj.getString(GenConstants.PARENT_MENU_ID);
}
@@ -260,9 +319,9 @@
{
if (paramsObj.containsKey(GenConstants.TREE_CODE))
{
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
+ return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
}
- return StringUtils.EMPTY;
+ return StrUtil.EMPTY;
}
/**
@@ -275,9 +334,9 @@
{
if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
{
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
+ return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
}
- return StringUtils.EMPTY;
+ return StrUtil.EMPTY;
}
/**
@@ -290,9 +349,9 @@
{
if (paramsObj.containsKey(GenConstants.TREE_NAME))
{
- return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
+ return StrUtil.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
}
- return StringUtils.EMPTY;
+ return StrUtil.EMPTY;
}
/**
--
Gitblit v1.9.3