xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 回滚代码生成部分优化 修复优化导致的问题

Browse Source
2.X
疯狂的狮子li 3 years ago
parent 5be893f980
commit b9a3eba0b5
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File

33
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.ruoyi.gen.util; package com.ruoyi.gen.util;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.core.constant.GenConstants; import com.ruoyi.common.core.constant.GenConstants;
import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.DateUtils;
@ -76,14 +77,14 @@ public class VelocityUtils {
public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) { public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions(); String options = genTable.getOptions();
Map<String, String> paramsObj = JsonUtils.parseMap(options); Map<String, Object> paramsObj = JsonUtils.parseMap(options);
String parentMenuId = getParentMenuId(paramsObj); String parentMenuId = getParentMenuId(paramsObj);
context.put("parentMenuId", parentMenuId); context.put("parentMenuId", parentMenuId);
} }
public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) { public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
String options = genTable.getOptions(); String options = genTable.getOptions();
Map<String, String> paramsObj = JsonUtils.parseMap(options); Map<String, Object> paramsObj = JsonUtils.parseMap(options);
String treeCode = getTreecode(paramsObj); String treeCode = getTreecode(paramsObj);
String treeParentCode = getTreeParentCode(paramsObj); String treeParentCode = getTreeParentCode(paramsObj);
String treeName = getTreeName(paramsObj); String treeName = getTreeName(paramsObj);
@ -267,10 +268,10 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项 * @param paramsObj 生成其他选项
* @return 上级菜单ID字段 * @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) 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 paramsObj.get(GenConstants.PARENT_MENU_ID); return Convert.toStr(paramsObj.get(GenConstants.PARENT_MENU_ID));
} }
return DEFAULT_PARENT_MENU_ID; return DEFAULT_PARENT_MENU_ID;
} }
@ -281,9 +282,9 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项 * @param paramsObj 生成其他选项
* @return 树编码 * @return 树编码
*/ */
public static String getTreecode(Map<String, String> paramsObj) { public static String getTreecode(Map<String, Object> paramsObj) {
if (paramsObj.containsKey(GenConstants.TREE_CODE)) { 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; return StringUtils.EMPTY;
} }
@ -294,9 +295,9 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项 * @param paramsObj 生成其他选项
* @return 树父编码 * @return 树父编码
*/ */
public static String getTreeParentCode(Map<String, String> paramsObj) { public static String getTreeParentCode(Map<String, Object> paramsObj) {
if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) { 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; return StringUtils.EMPTY;
} }
@ -307,9 +308,9 @@ public class VelocityUtils {
* @param paramsObj 生成其他选项 * @param paramsObj 生成其他选项
* @return 树名称 * @return 树名称
*/ */
public static String getTreeName(Map<String, String> paramsObj) { public static String getTreeName(Map<String, Object> paramsObj) {
if (paramsObj.containsKey(GenConstants.TREE_NAME)) { 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; return StringUtils.EMPTY;
} }
@ -322,8 +323,8 @@ public class VelocityUtils {
*/ */
public static int getExpandColumn(GenTable genTable) { public static int getExpandColumn(GenTable genTable) {
String options = genTable.getOptions(); String options = genTable.getOptions();
Map<String, String> paramsObj = JsonUtils.parseMap(options); Map<String, Object> paramsObj = JsonUtils.parseMap(options);
String treeName = paramsObj.get(GenConstants.TREE_NAME); String treeName = Convert.toStr(paramsObj.get(GenConstants.TREE_NAME));
int num = 0; int num = 0;
for (GenTableColumn column : genTable.getColumns()) { for (GenTableColumn column : genTable.getColumns()) {
if (column.isList()) { if (column.isList()) {

Write Preview
Loading…
Cancel
Save