From 82eeb86d6001b39f30fe2a95723b751951ad6bec Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 22 Aug 2020 14:52:37 +0800
Subject: [PATCH] 代码生成添加select必填选项
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
index 6902e62..2830c98 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -23,6 +23,9 @@
/** mybatis空间路径 */
private static final String MYBATIS_PATH = "main/resources/mapper";
+
+ /** 默认上级菜单，系统工具 */
+ private static final String DEFAULT_PARENT_MENU_ID = "3";
/**
* 设置模板变量信息
@@ -55,11 +58,20 @@
velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
velocityContext.put("columns", genTable.getColumns());
velocityContext.put("table", genTable);
+ setMenuVelocityContext(velocityContext, genTable);
if (GenConstants.TPL_TREE.equals(tplCategory))
{
setTreeVelocityContext(velocityContext, genTable);
}
return velocityContext;
+ }
+
+ public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
+ {
+ String options = genTable.getOptions();
+ JSONObject paramsObj = JSONObject.parseObject(options);
+ String parentMenuId = getParentMenuId(paramsObj);
+ context.put("parentMenuId", parentMenuId);
}
public static void setTreeVelocityContext(VelocityContext context, GenTable genTable)
@@ -221,7 +233,21 @@
public static String getPermissionPrefix(String moduleName, String businessName)
{
return StringUtils.format("{}:{}", moduleName, businessName);
+ }
+ /**
+ * 获取上级菜单ID字段
+ *
+ * @param paramsObj 生成其他选项
+ * @return 上级菜单ID字段
+ */
+ public static String getParentMenuId(JSONObject paramsObj)
+ {
+ if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID))
+ {
+ return paramsObj.getString(GenConstants.PARENT_MENU_ID);
+ }
+ return DEFAULT_PARENT_MENU_ID;
}
/**
@@ -236,7 +262,7 @@
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
@@ -251,7 +277,7 @@
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
@@ -266,7 +292,7 @@
{
return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME));
}
- return "";
+ return StringUtils.EMPTY;
}
/**
@@ -295,4 +321,4 @@
}
return num;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3