diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java index 9349b99..6ef38a2 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java @@ -1,5 +1,6 @@ package org.jeecg.modules.data.loader; +import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.creator.DataSourceProperty; import com.baomidou.dynamic.datasource.creator.druid.DruidDataSourceCreator; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.sql.DataSource; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j @@ -116,5 +118,19 @@ public class DataSourceLoader { ds.getDataSources().keySet().stream() .filter(name -> !name.equals("master")) .collect(Collectors.toList())); + +// Map dataSourceMap = ds.getDataSources(); +// +// dataSourceMap.forEach((name, dsObj) -> { +// if (dsObj instanceof DruidDataSource) { +// DruidDataSource druidDs = (DruidDataSource) dsObj; +// log.info("数据源 [{}]: URL={}, 连接池状态: 活跃连接={}, 空闲连接={}, 最大连接={}", +// name, +// druidDs.getUrl(), +// druidDs.getActiveCount(), +// druidDs.getPoolingCount(), +// druidDs.getMaxActive()); +// } +// }); } } diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java index 3d3cdbf..67d4a44 100644 --- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java +++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java @@ -1,6 +1,9 @@ package com.nu.modules.cleanadvisory.service.impl; +import com.alibaba.druid.pool.DruidDataSource; +import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,10 +15,12 @@ import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; +import javax.sql.DataSource; @Service @Slf4j @@ -24,6 +29,10 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl findPage(Page page, CleanAdvisory cleanAdvisory) { @@ -91,6 +100,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl