解决入驻工具报错

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<String, DataSource> 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());
+//            }
+//        });
     }
 }

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<CleanAdvisoryMapper, C
     @Autowired
     private CleanAdvisoryServiceImpl onlycleanAdvisoryServiceImpl;
 
+    /**
+     * 获取当前数据源信息
+     */
+
     @Override
     @DS("ope")
     public IPage<CleanAdvisory> findPage(Page<CleanAdvisory> page, CleanAdvisory cleanAdvisory) {
@@ -91,6 +100,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     }
 
     @DS("#dataSourceCode")
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteOpeSuppliers(String dataSourceCode, CleanAdvisory cleanAdvisory) {
         baseMapper.deleteOpeSuppliersApply(cleanAdvisory);
         baseMapper.deleteSuppliersOrg(cleanAdvisory);
@@ -109,6 +119,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     }
 
     @DS("#dataSourceCode")
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteEmp(String dataSourceCode, CleanAdvisory cleanAdvisory) {
         baseMapper.deleteEmpMedia(cleanAdvisory);
         baseMapper.deleteEmpTags(cleanAdvisory);
@@ -126,6 +137,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     }
 
     @DS("#dataSourceCode")
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteElder(String dataSourceCode, CleanAdvisory cleanAdvisory) {
         baseMapper.deleteElderInfo(cleanAdvisory);
         if (!"ope".equals(dataSourceCode)) {
@@ -133,6 +145,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
         }
     }
 
+
     //清除长者信息
     public void clearBill(CleanAdvisory cleanAdvisory) {
         //预留删除长者表数据
@@ -142,6 +155,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     }
 
     @DS("#dataSourceCode")
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void deleteBill(@RequestParam("dataSourceCode") String dataSourceCode, CleanAdvisory cleanAdvisory) {
         baseMapper.deleteBill(cleanAdvisory);
         baseMapper.updateBaseInfo(cleanAdvisory);