From cfdeada3fdb415ea451fb3fb76b96a2e7977752c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 11:21:09 +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 | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 5b4bff8..b2125e0 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
@@ -132,9 +132,7 @@
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/bo.java.vm");
templates.add("vm/java/mapper.java.vm");
templates.add("vm/java/service.java.vm");
templates.add("vm/java/serviceImpl.java.vm");
@@ -184,20 +182,12 @@
}
if (template.contains("vo.java.vm"))
{
- fileName = StrUtil.format("{}/vo/{}Vo.java", javaPath, className);
+ fileName = StrUtil.format("{}/domain/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("bo.java.vm"))
+ {
+ fileName = StrUtil.format("{}/domain/bo/{}Bo.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());
@@ -304,7 +294,8 @@
*/
public static String getParentMenuId(Map<String, Object> paramsObj)
{
- if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+ && StrUtil.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID)))
{
return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
}
@@ -319,7 +310,7 @@
*/
public static String getTreecode(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_CODE))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
}
@@ -334,7 +325,7 @@
*/
public static String getTreeParentCode(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
}
@@ -349,7 +340,7 @@
*/
public static String getTreeName(Map<String, Object> paramsObj)
{
- if (paramsObj.containsKey(GenConstants.TREE_NAME))
+ if (Validator.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME))
{
return StrUtil.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
}
@@ -365,8 +356,8 @@
public static int getExpandColumn(GenTable genTable)
{
String options = genTable.getOptions();
- Map<String, String> paramsObj = JsonUtils.parseMap(options);
- String treeName = paramsObj.get(GenConstants.TREE_NAME);
+ Map<String, Object> paramsObj = JsonUtils.parseMap(options);
+ String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
int num = 0;
for (GenTableColumn column : genTable.getColumns())
{
--
Gitblit v1.9.3