From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 18 一月 2023 11:59:32 +0800
Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 44 ++++----------------------------------------
1 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index 7a80229..0836d19 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -3,12 +3,11 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.Constants;
@@ -58,6 +57,7 @@
private final GenTableMapper baseMapper;
private final GenTableColumnMapper genTableColumnMapper;
+ private final IdentifierGenerator identifierGenerator;
/**
* 鏌ヨ涓氬姟瀛楁鍒楄〃
@@ -205,14 +205,11 @@
Map<String, String> dataMap = new LinkedHashMap<>();
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableById(tableId);
- Snowflake snowflake = IdUtil.getSnowflake();
List<Long> menuIds = new ArrayList<>();
for (int i = 0; i < 6; i++) {
- menuIds.add(snowflake.nextId());
+ menuIds.add(identifierGenerator.nextId(null).longValue());
}
table.setMenuIds(menuIds);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
VelocityInitializer.initVelocity();
@@ -255,8 +252,6 @@
public void generatorCode(String tableName) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
@@ -356,14 +351,11 @@
private void generatorCode(String tableName, ZipOutputStream zip) {
// 鏌ヨ琛ㄤ俊鎭�
GenTable table = baseMapper.selectGenTableByName(tableName);
- Snowflake snowflake = IdUtil.getSnowflake();
List<Long> menuIds = new ArrayList<>();
for (int i = 0; i < 6; i++) {
- menuIds.add(snowflake.nextId());
+ menuIds.add(identifierGenerator.nextId(null).longValue());
}
table.setMenuIds(menuIds);
- // 璁剧疆涓诲瓙琛ㄤ俊鎭�
- setSubTable(table);
// 璁剧疆涓婚敭鍒椾俊鎭�
setPkColumn(table);
@@ -407,12 +399,6 @@
throw new ServiceException("鏍戠埗缂栫爜瀛楁涓嶈兘涓虹┖");
} else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
throw new ServiceException("鏍戝悕绉板瓧娈典笉鑳戒负绌�");
- } else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) {
- if (StringUtils.isEmpty(genTable.getSubTableName())) {
- throw new ServiceException("鍏宠仈瀛愯〃鐨勮〃鍚嶄笉鑳戒负绌�");
- } else if (StringUtils.isEmpty(genTable.getSubTableFkName())) {
- throw new ServiceException("瀛愯〃鍏宠仈鐨勫閿悕涓嶈兘涓虹┖");
- }
}
}
}
@@ -432,29 +418,7 @@
if (ObjectUtil.isNull(table.getPkColumn())) {
table.setPkColumn(table.getColumns().get(0));
}
- if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
- for (GenTableColumn column : table.getSubTable().getColumns()) {
- if (column.isPk()) {
- table.getSubTable().setPkColumn(column);
- break;
- }
- }
- if (ObjectUtil.isNull(table.getSubTable().getPkColumn())) {
- table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0));
- }
- }
- }
- /**
- * 璁剧疆涓诲瓙琛ㄤ俊鎭�
- *
- * @param table 涓氬姟琛ㄤ俊鎭�
- */
- public void setSubTable(GenTable table) {
- String subTableName = table.getSubTableName();
- if (StringUtils.isNotEmpty(subTableName)) {
- table.setSubTable(baseMapper.selectGenTableByName(subTableName));
- }
}
/**
--
Gitblit v1.9.3