diff --git a/cloud-property-common/src/main/java/com/muyu/common/domain/DataName.java b/cloud-property-common/src/main/java/com/muyu/common/domain/DataName.java index 7d0d932..c868e89 100644 --- a/cloud-property-common/src/main/java/com/muyu/common/domain/DataName.java +++ b/cloud-property-common/src/main/java/com/muyu/common/domain/DataName.java @@ -41,12 +41,6 @@ public class DataName { @TableField(exist = false) private List tableNames; - /** - * 数据库表字段 - */ - @TableField(exist = false) - private List tableFie; - public DataName(Integer id, String name) { this.id = id; this.name = name; diff --git a/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java b/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java index 39d7f56..f353e50 100644 --- a/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java +++ b/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java @@ -1,6 +1,7 @@ package com.muyu.common.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -45,6 +46,12 @@ public class TableNames { */ private Integer dataId; + /** + * 数据库表字段 + */ + @TableField(exist = false) + private List tableFie; + public TableNames(String name, Integer dataId) { this.name = name; this.dataId = dataId; diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java index 0a5b7d9..8f4560c 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java @@ -113,7 +113,8 @@ public class DataRunNameServiceImpl implements DataRunNameService { if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) { List tableNames = tableRunNameService.list(new LambdaQueryWrapper() - .eq(TableNames::getDataId, dataName.getId())).stream() + .eq(TableNames::getDataId, dataName.getId())) + .stream() .map(TableNames::tableNamesBuild).toList(); namesArrayList.addAll(tableNames); @@ -126,9 +127,10 @@ public class DataRunNameServiceImpl implements DataRunNameService { fieArrayList.addAll(list1); } + tableName.setTableFie(fieArrayList); }); } - dataName.setTableFie(fieArrayList); + dataName.setTableNames(namesArrayList); }); return list; diff --git a/logs/cloud-property/info.log b/logs/cloud-property/info.log index 4105ce8..dbe769a 100644 --- a/logs/cloud-property/info.log +++ b/logs/cloud-property/info.log @@ -1786,3 +1786,16 @@ 18:47:25.295 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed 18:47:25.296 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success, 18:47:25.296 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye +19:05:52.728 [main] INFO c.m.s.IntegrationApplication - [logStartupProfileInfo,660] - The following 1 profile is active: "dev" +19:05:54.725 [main] INFO o.a.c.c.StandardService - [log,173] - Starting service [Tomcat] +19:05:54.725 [main] INFO o.a.c.c.StandardEngine - [log,173] - Starting Servlet engine: [Apache Tomcat/10.1.24] +19:05:54.785 [main] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring embedded WebApplicationContext +19:05:56.216 [main] INFO c.a.d.p.DruidDataSource - [init,1002] - {dataSource-1,master} inited +19:05:56.218 [main] INFO c.b.d.d.DynamicRoutingDataSource - [addDataSource,158] - dynamic-datasource - add a datasource named [master] success +19:05:56.218 [main] INFO c.b.d.d.DynamicRoutingDataSource - [afterPropertiesSet,241] - dynamic-datasource initial loaded [1] datasource,primary datasource named [master] +19:05:57.190 [main] INFO c.a.c.s.SentinelWebMvcConfigurer - [addInterceptors,52] - [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**]. +19:05:57.992 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing .... +19:05:58.003 [main] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ... +19:05:58.017 [main] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed +19:05:58.020 [main] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success, +19:05:58.021 [main] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye