diff --git a/pom.xml b/pom.xml
index 7c6d4df0..33d3f940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,8 @@
3.2.1
+
+ 8.7.2-20240722
7.0.1
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index 3450e7cf..adb95a07 100644
--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@@ -64,6 +64,37 @@
ruoyi-common-security
+
+ org.anyline
+ anyline-environment-spring-data-jdbc
+ ${anyline.version}
+
+
+
+ org.anyline
+ anyline-data-jdbc-mysql
+ ${anyline.version}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java
index e973e324..4b4fd16c 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties(prefix = "gen")
public class GenConfig {
+
/**
* 作者
*/
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java
index a7c61eb4..c7daa07d 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java
@@ -56,7 +56,7 @@ public class GenController extends BaseController {
GenTable table = genTableService.selectGenTableById(tableId);
List tables = genTableService.selectGenTableAll();
List list = genTableService.selectGenTableColumnListByTableId(tableId);
- Map map = new HashMap<>();
+ Map map = new HashMap<>(3);
map.put("info", table);
map.put("rows", list);
map.put("tables", tables);
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java
index 52ad6f16..80ef2040 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java
@@ -16,7 +16,6 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
*
* @author Lion Li
*/
-
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("gen_table_column")
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java
index 501f0c2b..eee041a2 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java
@@ -1,13 +1,9 @@
package org.dromara.gen.mapper;
-import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.gen.domain.GenTableColumn;
-import java.util.List;
-
/**
* 业务字段 数据层
*
@@ -15,14 +11,5 @@ import java.util.List;
*/
@InterceptorIgnore(dataPermission = "true", tenantLine = "true")
public interface GenTableColumnMapper extends BaseMapperPlus {
- /**
- * 根据表名称查询列信息
- *
- * @param tableName 表名称
- * @param dataName 数据源名称
- * @return 列信息
- */
- @DS("#dataName")
- List selectDbTableColumnsByName(@Param("tableName") String tableName, String dataName);
}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java
index 2567c89f..5911ab20 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java
@@ -2,8 +2,6 @@ package org.dromara.gen.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.gen.domain.GenTable;
@@ -17,22 +15,6 @@ import java.util.List;
@InterceptorIgnore(dataPermission = "true", tenantLine = "true")
public interface GenTableMapper extends BaseMapperPlus {
- /**
- * 查询据库列表
- *
- * @param genTable 查询条件
- * @return 数据库表集合
- */
- Page selectPageDbTableList(@Param("page") Page page, @Param("genTable") GenTable genTable);
-
- /**
- * 查询据库列表
- *
- * @param tableNames 表名称组
- * @return 数据库表集合
- */
- List selectDbTableListByNames(String[] tableNames);
-
/**
* 查询所有表信息
*
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
index 078a2484..716abd64 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java
@@ -3,16 +3,21 @@ package org.dromara.gen.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.anyline.metadata.Column;
+import org.anyline.metadata.Table;
+import org.anyline.proxy.ServiceProxy;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -59,6 +64,8 @@ public class GenTableServiceImpl implements IGenTableService {
private final GenTableColumnMapper genTableColumnMapper;
private final IdentifierGenerator identifierGenerator;
+ private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"};
+
/**
* 查询业务字段列表
*
@@ -95,7 +102,7 @@ public class GenTableServiceImpl implements IGenTableService {
Map params = genTable.getParams();
QueryWrapper wrapper = Wrappers.query();
wrapper
- .eq(StringUtils.isNotEmpty(genTable.getDataName()),"data_name", genTable.getDataName())
+ .eq(StringUtils.isNotEmpty(genTable.getDataName()), "data_name", genTable.getDataName())
.like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName()))
.like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
.between(params.get("beginTime") != null && params.get("endTime") != null,
@@ -103,11 +110,57 @@ public class GenTableServiceImpl implements IGenTableService {
return wrapper;
}
+ /**
+ * 查询数据库列表
+ *
+ * @param genTable 包含查询条件的GenTable对象
+ * @param pageQuery 包含分页信息的PageQuery对象
+ * @return 包含分页结果的TableDataInfo对象
+ */
@DS("#genTable.dataName")
@Override
public TableDataInfo selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
- genTable.getParams().put("genTableNames",baseMapper.selectTableNameList(genTable.getDataName()));
- Page page = baseMapper.selectPageDbTableList(pageQuery.build(), genTable);
+ // 获取查询条件
+ String tableName = genTable.getTableName();
+ String tableComment = genTable.getTableComment();
+ // 获取分页参数
+ Integer pageNum = pageQuery.getPageNum();
+ Integer pageSize = pageQuery.getPageSize();
+
+ LinkedHashMap> tablesMap = ServiceProxy.metadata().tables();
+ if (CollUtil.isEmpty(tablesMap)) {
+ return TableDataInfo.build();
+ }
+ // 过滤并转换表格数据
+ List tables = tablesMap.values().stream()
+ .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> {
+ boolean nameMatches = true;
+ boolean commentMatches = true;
+ // 进行表名称的模糊查询
+ if (StringUtils.isNotBlank(tableName)) {
+ nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName);
+ }
+ // 进行表描述的模糊查询
+ if (StringUtils.isNotBlank(tableComment)) {
+ commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment);
+ }
+ // 同时匹配名称和描述
+ return nameMatches && commentMatches;
+ })
+ .map(x -> {
+ GenTable gen = new GenTable();
+ gen.setTableName(x.getName());
+ gen.setTableComment(x.getComment());
+ gen.setCreateTime(x.getCreateTime());
+ gen.setUpdateTime(x.getUpdateTime());
+ return gen;
+ }).toList();
+
+ // 创建分页对象，并设置总记录数
+ IPage page = new Page<>(pageNum, pageSize, tables.size());
+ // 使用CollUtil进行分页，并设置分页记录
+ page.setRecords(CollUtil.page(pageNum - 1, pageSize, tables));
return TableDataInfo.build(page);
}
@@ -121,7 +174,29 @@ public class GenTableServiceImpl implements IGenTableService {
@DS("#dataName")
@Override
public List selectDbTableListByNames(String[] tableNames, String dataName) {
- return baseMapper.selectDbTableListByNames(tableNames);
+ Set tableNameSet = new HashSet<>(List.of(tableNames));
+ LinkedHashMap> tablesMap = ServiceProxy.metadata().tables();
+
+ if (CollUtil.isEmpty(tablesMap)) {
+ return new ArrayList<>();
+ }
+
+ List> tableList = tablesMap.values().stream()
+ .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> tableNameSet.contains(x.getName())).toList();
+
+ if (ArrayUtil.isEmpty(tableList)) {
+ return new ArrayList<>();
+ }
+ return tableList.stream().map(x -> {
+ GenTable gen = new GenTable();
+ gen.setDataName(dataName);
+ gen.setTableName(x.getName());
+ gen.setTableComment(x.getComment());
+ gen.setCreateTime(x.getCreateTime());
+ gen.setUpdateTime(x.getUpdateTime());
+ return gen;
+ }).toList();
}
/**
@@ -183,7 +258,7 @@ public class GenTableServiceImpl implements IGenTableService {
int row = baseMapper.insert(table);
if (row > 0) {
// 保存列信息
- List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName, dataName);
+ List genTableColumns = selectDbTableColumnsByName(tableName, dataName);
List saveColumns = new ArrayList<>();
for (GenTableColumn column : genTableColumns) {
GenUtils.initColumnField(column, table);
@@ -199,6 +274,35 @@ public class GenTableServiceImpl implements IGenTableService {
}
}
+ /**
+ * 根据表名称查询列信息
+ *
+ * @param tableName 表名称
+ * @param dataName 数据源名称
+ * @return 列信息
+ */
+ @DS("#dataName")
+ private List selectDbTableColumnsByName(String tableName, String dataName) {
+ Table table = ServiceProxy.metadata().table(tableName);
+ if (Objects.isNull(table)) {
+ return new ArrayList<>();
+ }
+ LinkedHashMap columns = table.getColumns();
+ List tableColumns = new ArrayList<>();
+ columns.forEach((columnName, column) -> {
+ GenTableColumn tableColumn = new GenTableColumn();
+ tableColumn.setIsPk(String.valueOf(column.isPrimaryKey()));
+ tableColumn.setColumnName(column.getName());
+ tableColumn.setColumnComment(column.getComment());
+ tableColumn.setColumnType(column.getTypeName().toLowerCase());
+ tableColumn.setSort(column.getPosition());
+ tableColumn.setIsRequired(column.isNullable() == 0 ? "1" : "0");
+ tableColumn.setIsIncrement(column.isAutoIncrement() == -1 ? "0" : "1");
+ tableColumns.add(tableColumn);
+ });
+ return tableColumns;
+ }
+
/**
* 预览代码
*
@@ -294,7 +398,7 @@ public class GenTableServiceImpl implements IGenTableService {
List tableColumns = table.getColumns();
Map tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName);
- List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(table.getTableName(), table.getDataName());
+ List dbTableColumns = selectDbTableColumnsByName(table.getTableName(), table.getDataName());
if (CollUtil.isEmpty(dbTableColumns)) {
throw new ServiceException("同步数据失败，原表结构不存在");
}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
index 8fedeb00..f48af47f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -7,72 +7,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
index 858ad30e..b234e5db 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -14,167 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
-
-
-
-
-