From 6c01241b96f66239aff192f22dce99e1275986ed Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 15 二月 2022 11:07:50 +0800
Subject: [PATCH] fix 回滚代码生成部分优化 修复优化导致的问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 3c25b11..f5fbdb2 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
@@ -78,14 +78,14 @@
public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions();
- Map<String, String> paramsObj = JsonUtils.parseMap(options);
+ Map<String, Object> paramsObj = JsonUtils.parseMap(options);
String parentMenuId = getParentMenuId(paramsObj);
context.put("parentMenuId", parentMenuId);
}
public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions();
- Map<String, String> paramsObj = JsonUtils.parseMap(options);
+ Map<String, Object> paramsObj = JsonUtils.parseMap(options);
String treeCode = getTreecode(paramsObj);
String treeParentCode = getTreeParentCode(paramsObj);
String treeName = getTreeName(paramsObj);
@@ -270,9 +270,9 @@
* @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 涓婄骇鑿滃崟ID瀛楁
*/
- public static String getParentMenuId(Map<String, String> paramsObj) {
+ public static String getParentMenuId(Map<String, Object> paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
- && StringUtils.isNotEmpty(paramsObj.get(GenConstants.PARENT_MENU_ID))) {
+ && StringUtils.isNotEmpty(Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID)))) {
return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
}
return DEFAULT_PARENT_MENU_ID;
@@ -284,9 +284,9 @@
* @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠紪鐮�
*/
- public static String getTreecode(Map<String, String> paramsObj) {
+ public static String getTreecode(Map<String, Object> paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) {
- return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_CODE));
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
}
return StringUtils.EMPTY;
}
@@ -297,9 +297,9 @@
* @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戠埗缂栫爜
*/
- public static String getTreeParentCode(Map<String, String> paramsObj) {
+ public static String getTreeParentCode(Map<String, Object> paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
- return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_PARENT_CODE));
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_PARENT_CODE)));
}
return StringUtils.EMPTY;
}
@@ -310,9 +310,9 @@
* @param paramsObj 鐢熸垚鍏朵粬閫夐」
* @return 鏍戝悕绉�
*/
- public static String getTreeName(Map<String, String> paramsObj) {
+ public static String getTreeName(Map<String, Object> paramsObj) {
if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
- return StringUtils.toCamelCase(paramsObj.get(GenConstants.TREE_NAME));
+ return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_NAME)));
}
return StringUtils.EMPTY;
}
@@ -325,8 +325,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()) {
if (column.isList()) {
--
Gitblit v1.9.3