|
|
@@ -8,7 +8,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
|
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 lombok.RequiredArgsConstructor;
|
|
|
@@ -28,6 +27,7 @@ import org.dromara.common.core.utils.file.FileUtils;
|
|
|
import org.dromara.common.json.utils.JsonUtils;
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
+import org.dromara.common.mybatis.utils.IdGeneratorUtil;
|
|
|
import org.dromara.generator.constant.GenConstants;
|
|
|
import org.dromara.generator.domain.GenTable;
|
|
|
import org.dromara.generator.domain.GenTableColumn;
|
|
|
@@ -60,7 +60,6 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
|
|
|
private final GenTableMapper baseMapper;
|
|
|
private final GenTableColumnMapper genTableColumnMapper;
|
|
|
- private final IdentifierGenerator identifierGenerator;
|
|
|
|
|
|
private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"};
|
|
|
|
|
|
@@ -322,7 +321,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
GenTable table = baseMapper.selectGenTableById(tableId);
|
|
|
List<Long> menuIds = new ArrayList<>();
|
|
|
for (int i = 0; i < 6; i++) {
|
|
|
- menuIds.add(identifierGenerator.nextId(null).longValue());
|
|
|
+ menuIds.add(IdGeneratorUtil.nextLongId());
|
|
|
}
|
|
|
table.setMenuIds(menuIds);
|
|
|
// 设置主键列信息
|
|
|
@@ -468,7 +467,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
GenTable table = baseMapper.selectGenTableById(tableId);
|
|
|
List<Long> menuIds = new ArrayList<>();
|
|
|
for (int i = 0; i < 6; i++) {
|
|
|
- menuIds.add(identifierGenerator.nextId(null).longValue());
|
|
|
+ menuIds.add(IdGeneratorUtil.nextLongId());
|
|
|
}
|
|
|
table.setMenuIds(menuIds);
|
|
|
// 设置主键列信息
|