a_bazu
/
cloud-property
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find:()优化展示后台代码

master
Yueng 2024-09-07 21:12:42 +08:00
parent c86d94c18b
commit c438eaee0e
3 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cloud-property-common/src/main/java/com/muyu/common/domain/AssetAuthorization.java
View File

@ -26,21 +26,21 @@ public class AssetAuthorization {
* 中间表主键 * 中间表主键
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
private Integer id; private Long id;
/** /**
* 表ID * 表ID
*/ */
private Integer tableId; private Long tableId;
/** /**
* 部门ID * 部门ID
*/ */
private Integer deptId; private Long deptId;
/** /**
* 数据库ID * 数据库ID
*/ */
private Integer basicId; private Long basicId;
/** /**
* 用户ID * 用户ID
*/ */
private Integer userId; private Long userId;
} }

19
cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
View File

@ -116,10 +116,10 @@ public class DataRunNameServiceImpl implements DataRunNameService {
//数据库名称查询 //数据库名称查询
List<DataName> dataNameList = dataNameService.list().stream() List<DataName> dataNameList = dataNameService.list().stream()
.map(DataName::dataNameBuild).toList(); .map(DataName::dataNameBuild).toList();
HashSet<TableNames> set = new HashSet<>();
//遍历获取数据数据库名称对象 //遍历获取数据数据库名称对象
dataNameList.forEach(dataName -> { dataNameList.forEach(dataName -> {
HashSet<TableNames> set = new HashSet<>();
//判断getId不为空 //判断getId不为空
if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) { if (StringUtils.isNotBlank(String.valueOf(dataName.getId()))) {
@ -141,17 +141,20 @@ public class DataRunNameServiceImpl implements DataRunNameService {
List<AssetAuthorization> idByDeptId = dataRunNameMapper.findTableIdAndBasicIdByDeptId(deptId); List<AssetAuthorization> idByDeptId = dataRunNameMapper.findTableIdAndBasicIdByDeptId(deptId);
//在取数据数据遍历里获取表名称查询方法 //在取数据数据遍历里获取表名称查询方法
tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> { tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> {
if (tableIdAndBasicId.getUserId().equals(userId)){
List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
set.addAll(tableNames);
}
List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
set.addAll(tableNames);
}); });
idByDeptId.forEach(tableIdAndBasicId -> { idByDeptId.forEach(tableIdAndBasicId -> {
List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName); if (tableIdAndBasicId.getDeptId().equals(deptId)){
set.addAll(tableNames); List<TableNames> tableNames = this.dataDeptShow(tableIdAndBasicId, dataName);
set.addAll(tableNames);
}
}); });
} }
dataName.setTableNames((List<TableNames>) set);
}); });
//返回所有数据 //返回所有数据
return dataNameList; return dataNameList;

29
logs/cloud-property/info.log
View File

@ -40,3 +40,32 @@
20:53:01.529 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-ec66ecf1-f28e-43bc-aa86-625f1bc53bf8-21.12.0.8_8848] [add-listener] ok, tenant=ec66ecf1-f28e-43bc-aa86-625f1bc53bf8, dataId=cloud-property-dev.yml, group=DEFAULT_GROUP, cnt=1 20:53:01.529 [main] INFO c.a.n.c.c.i.CacheData - [addListener,236] - [fixed-ec66ecf1-f28e-43bc-aa86-625f1bc53bf8-21.12.0.8_8848] [add-listener] ok, tenant=ec66ecf1-f28e-43bc-aa86-625f1bc53bf8, dataId=cloud-property-dev.yml, group=DEFAULT_GROUP, cnt=1
20:53:01.530 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-property-dev.yml, group=DEFAULT_GROUP 20:53:01.530 [main] INFO c.a.c.n.r.NacosContextRefresher - [registerNacosListener,131] - [Nacos Config] Listening config: dataId=cloud-property-dev.yml, group=DEFAULT_GROUP
20:53:02.222 [RMI TCP Connection(8)-192.168.97.139] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet' 20:53:02.222 [RMI TCP Connection(8)-192.168.97.139] INFO o.a.c.c.C.[.[.[/] - [log,173] - Initializing Spring DispatcherServlet 'dispatcherServlet'
21:09:57.584 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,95] - De-registering from Nacos Server now...
21:09:57.586 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [deregisterService,272] - [DEREGISTER-SERVICE] ec66ecf1-f28e-43bc-aa86-625f1bc53bf8 deregistering service cloud-property with instance: Instance{instanceId='null', ip='192.168.97.139', port=9701, weight=1.0, healthy=true, enabled=true, ephemeral=true, clusterName='DEFAULT', serviceName='null', metadata={}}
21:09:57.662 [SpringApplicationShutdownHook] INFO c.a.c.n.r.NacosServiceRegistry - [deregister,115] - De-registration finished.
21:09:57.666 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,254] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown begin
21:09:57.667 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,180] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown begin
21:09:57.667 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,182] - com.alibaba.nacos.client.naming.backups.FailoverReactor do shutdown stop
21:09:57.667 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,256] - com.alibaba.nacos.client.naming.cache.ServiceInfoHolder do shutdown stop
21:09:57.668 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,204] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown begin
21:09:57.668 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,147] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown begin
21:09:57.669 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,149] - com.alibaba.nacos.client.naming.core.ServiceInfoUpdateService do shutdown stop
21:09:57.670 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,218] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown begin
21:09:57.672 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,223] - com.alibaba.nacos.client.naming.core.ServerListManager do shutdown stop
21:09:57.672 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,468] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown begin
21:09:57.672 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,470] - com.alibaba.nacos.client.naming.remote.http.NamingHttpClientProxy do shutdown stop
21:09:57.672 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,487] - Shutdown naming grpc client proxy for uuid->6bafe304-33a7-4658-ba99-77d5ea25a827
21:09:57.673 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,331] - Shutdown grpc redo service executor java.util.concurrent.ScheduledThreadPoolExecutor@151882b7[Running, pool size = 1, active threads = 0, queued tasks = 1, completed tasks = 338]
21:09:57.674 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [shutdown,425] - Shutdown rpc client, set status to shutdown
21:09:57.674 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [shutdown,427] - Shutdown client event executor java.util.concurrent.ScheduledThreadPoolExecutor@dc9395f[Running, pool size = 2, active threads = 2, queued tasks = 0, completed tasks = 0]
21:09:57.674 [SpringApplicationShutdownHook] INFO c.a.n.c.r.client - [closeConnection,584] - Close current connection 1725713579543_21.12.0.11_62950
21:09:57.689 [SpringApplicationShutdownHook] INFO c.a.n.c.r.c.g.GrpcClient - [shutdown,187] - Shutdown grpc executor java.util.concurrent.ThreadPoolExecutor@38d7c88c[Running, pool size = 3, active threads = 0, queued tasks = 0, completed tasks = 204]
21:09:57.689 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutDownAndRemove,497] - shutdown and remove naming rpc client for uuid ->6bafe304-33a7-4658-ba99-77d5ea25a827
21:09:57.690 [SpringApplicationShutdownHook] INFO c.a.n.c.a.r.i.CredentialWatcher - [stop,107] - [null] CredentialWatcher is stopped
21:09:57.692 [SpringApplicationShutdownHook] INFO c.a.n.c.a.r.i.CredentialService - [free,91] - [null] CredentialService is freed
21:09:57.692 [SpringApplicationShutdownHook] INFO c.a.n.client.naming - [shutdown,211] - com.alibaba.nacos.client.naming.remote.NamingClientProxyDelegate do shutdown stop
21:09:57.698 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,215] - dynamic-datasource start closing ....
21:09:57.709 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2204] - {dataSource-1} closing ...
21:09:57.753 [SpringApplicationShutdownHook] INFO c.a.d.p.DruidDataSource - [close,2277] - {dataSource-1} closed
21:09:57.754 [SpringApplicationShutdownHook] INFO c.b.d.d.d.DefaultDataSourceDestroyer - [destroy,98] - dynamic-datasource close the datasource named [master] success,
21:09:57.754 [SpringApplicationShutdownHook] INFO c.b.d.d.DynamicRoutingDataSource - [destroy,219] - dynamic-datasource all closed success,bye