From 70f39cb1eecbb742dab0eb517a48a6bab8d0a576 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 29 十二月 2022 15:42:31 +0800
Subject: [PATCH] update 优化 代码生成与框架主体使用相同的主键生成器 全局统一避免问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..085589f 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,10 +205,9 @@
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);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
@@ -356,10 +355,9 @@
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);
// 璁剧疆涓诲瓙琛ㄤ俊鎭�
--
Gitblit v1.9.3