|
|
@@ -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 com.vber.common.core.constant.Constants;
|
|
|
@@ -19,6 +18,7 @@ import com.vber.common.core.utils.file.FileUtils;
|
|
|
import com.vber.common.json.utils.JsonUtils;
|
|
|
import com.vber.common.mybatis.core.page.PageQuery;
|
|
|
import com.vber.common.mybatis.core.page.TableDataInfo;
|
|
|
+import com.vber.common.mybatis.utils.IdGeneratorUtil;
|
|
|
import com.vber.generator.config.GenConfig;
|
|
|
import com.vber.generator.constant.GenConstants;
|
|
|
import com.vber.generator.domain.GenMenu;
|
|
|
@@ -60,11 +60,10 @@ import java.util.zip.ZipOutputStream;
|
|
|
@Service
|
|
|
public class GenTableServiceImpl implements IGenTableService {
|
|
|
|
|
|
- private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"};
|
|
|
+ private static final String[] TABLE_IGNORE = new String[] { "sj_", "act_", "flw_", "gen_" };
|
|
|
private final GenTableMapper baseMapper;
|
|
|
private final GenTableColumnMapper genTableColumnMapper;
|
|
|
private final GenMenuMapper genMenuMapper;
|
|
|
- private final IdentifierGenerator identifierGenerator;
|
|
|
|
|
|
/**
|
|
|
* 获取代码生成地址
|
|
|
@@ -523,7 +522,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
}
|
|
|
|
|
|
private GenMenu buildMenuBtn(Long mId, String btnName, String perms, String icon, String btnClass,
|
|
|
- String btnScript) {
|
|
|
+ String btnScript) {
|
|
|
GenMenu menu = new GenMenu();
|
|
|
menu.setParentId(mId);
|
|
|
menu.setMenuName(btnName);
|
|
|
@@ -643,7 +642,7 @@ public class GenTableServiceImpl implements IGenTableService {
|
|
|
private @NotNull List<String> getTemplates(GenTable table) {
|
|
|
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);
|
|
|
// 设置主键列信息
|