From 088cec8adf9688d914fd219ef88094bdbc6fa27f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 06 Mar 2025 11:09:34 +0800
Subject: [PATCH] 菜单管理新增路由名称
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
index 861c68c..6031be1 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -129,9 +129,9 @@
int row = genTableMapper.updateGenTable(genTable);
if (row > 0)
{
- for (GenTableColumn cenTableColumn : genTable.getColumns())
+ for (GenTableColumn genTableColumn : genTable.getColumns())
{
- genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+ genTableColumnMapper.updateGenTableColumn(genTableColumn);
}
}
}
@@ -206,7 +206,7 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
for (String template : templates)
{
// 渲染模板
@@ -254,7 +254,7 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
for (String template : templates)
{
if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
@@ -367,7 +367,7 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+ List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
for (String template : templates)
{
// 渲染模板
@@ -414,16 +414,16 @@
{
throw new ServiceException("树名称字段不能为空");
}
- else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+ }
+ else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+ {
+ if (StringUtils.isEmpty(genTable.getSubTableName()))
{
- if (StringUtils.isEmpty(genTable.getSubTableName()))
- {
- throw new ServiceException("关联子表的表名不能为空");
- }
- else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
- {
- throw new ServiceException("子表关联的外键名不能为空");
- }
+ throw new ServiceException("关联子表的表名不能为空");
+ }
+ else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
+ {
+ throw new ServiceException("子表关联的外键名不能为空");
}
}
}
@@ -491,7 +491,7 @@
String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
String treeName = paramsObj.getString(GenConstants.TREE_NAME);
- String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+ Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
genTable.setTreeCode(treeCode);
--
Gitblit v1.9.3