From 1fd2a709d850c743a6d1da8b65133fc8e51c92d2 Mon Sep 17 00:00:00 2001
From: fuyongxin <110568259@qq.com>
Date: Wed, 03 Jun 2026 14:59:30 +0800
Subject: [PATCH] 修改ruoyi-改为sgd
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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 6031be1..4498e13 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
@@ -4,6 +4,8 @@
import java.io.File;
import java.io.IOException;
import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -157,7 +159,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importGenTable(List<GenTable> tableList)
+ public void importGenTable(List<GenTable> tableList, String tplWebType)
{
String operName = SecurityUtils.getUsername();
try
@@ -165,6 +167,7 @@
for (GenTable table : tableList)
{
String tableName = table.getTableName();
+ table.setTplWebType(tplWebType);
GenUtils.initTable(table, operName);
int row = genTableMapper.insertGenTable(table);
if (row > 0)
@@ -206,7 +209,7 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+ List<String> templates = VelocityUtils.getTemplateList(table);
for (String template : templates)
{
// 渲染模板
@@ -227,11 +230,7 @@
@Override
public byte[] downloadCode(String tableName)
{
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ZipOutputStream zip = new ZipOutputStream(outputStream);
- generatorCode(tableName, zip);
- IOUtils.closeQuietly(zip);
- return outputStream.toByteArray();
+ return downloadCode(new String[] { tableName });
}
/**
@@ -254,10 +253,10 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+ List<String> templates = VelocityUtils.getTemplateList(table);
for (String template : templates)
{
- if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
+ if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "api.ts.vm", "type.ts.vm", "index.ts.vm", "index.vue.vm", "index-tree.vue.vm", "view.vue.vm"))
{
// 渲染模板
StringWriter sw = new StringWriter();
@@ -342,9 +341,14 @@
{
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
ZipOutputStream zip = new ZipOutputStream(outputStream);
+ Map<String, StringBuffer> typeFiles = new HashMap<>();
for (String tableName : tableNames)
{
- generatorCode(tableName, zip);
+ generatorCode(tableName, zip, typeFiles);
+ }
+ for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())
+ {
+ writeToZip(zip, entry.getKey(), entry.getValue().toString());
}
IOUtils.closeQuietly(zip);
return outputStream.toByteArray();
@@ -353,7 +357,7 @@
/**
* 查询表信息并生成代码
*/
- private void generatorCode(String tableName, ZipOutputStream zip)
+ private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)
{
// 查询表信息
GenTable table = genTableMapper.selectGenTableByName(tableName);
@@ -367,26 +371,53 @@
VelocityContext context = VelocityUtils.prepareContext(table);
// 获取模板列表
- List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
+ List<String> templates = VelocityUtils.getTemplateList(table);
for (String template : templates)
{
// 渲染模板
StringWriter sw = new StringWriter();
Template tpl = Velocity.getTemplate(template, Constants.UTF8);
tpl.merge(context, sw);
- try
+ String fileName = VelocityUtils.getFileName(template, table);
+ // index-bak.ts 模版，追加内容
+ if (fileName.contains("index-bak.ts"))
{
- // 添加到zip
- zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
- IOUtils.write(sw.toString(), zip, Constants.UTF8);
- IOUtils.closeQuietly(sw);
- zip.flush();
- zip.closeEntry();
+ if (!typeFiles.containsKey(fileName))
+ {
+ typeFiles.put(fileName, new StringBuffer(sw.toString()));
+ }
+ else
+ {
+ Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));
+ }
}
- catch (IOException e)
+ else
{
- log.error("渲染模板失败，表名：" + table.getTableName(), e);
+ // 其他文件正常添加
+ writeToZip(zip, fileName, sw.toString());
}
+ }
+ }
+
+ /**
+ * 将字符串内容写入ZIP输出流
+ *
+ * @param zip ZIP输出流
+ * @param fileName ZIP条目名称（即文件名）
+ * @param content 要写入的内容
+ */
+ private void writeToZip(ZipOutputStream zip, String fileName, String content)
+ {
+ try
+ {
+ zip.putNextEntry(new ZipEntry(fileName));
+ IOUtils.write(content, zip, Constants.UTF8);
+ zip.flush();
+ zip.closeEntry();
+ }
+ catch (IOException e)
+ {
+ log.error("写入ZIP文件失败，文件名: " + fileName, e);
}
}
@@ -493,12 +524,14 @@
String treeName = paramsObj.getString(GenConstants.TREE_NAME);
Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
+ boolean isView = paramsObj.getBooleanValue(GenConstants.GEN_VIEW);
genTable.setTreeCode(treeCode);
genTable.setTreeParentCode(treeParentCode);
genTable.setTreeName(treeName);
genTable.setParentMenuId(parentMenuId);
genTable.setParentMenuName(parentMenuName);
+ genTable.setView(isView);
}
}
--
Gitblit v1.9.3