数据源切换BUG修复

bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSourceContextHolder.java

@@ -10,25 +10,25 @@ import java.util.Set;
 public class DynamicDataSourceContextHolder {
 
     //存放当前线程使用的数据源类型信息
-    private static final ThreadLocal<String> contextHolder = new ThreadLocal<String>();
+    private static final ThreadLocal<Object> contextHolder = new ThreadLocal<Object>();
     //存放数据源id
-    private static Set<String> dataSourceIds = new HashSet<String>();
+    private static Set<Object> dataSourceIds = new HashSet<Object>();
 
-    public static Set<String> getDataSourceIds() {
+    public static Set<Object> getDataSourceIds() {
         return dataSourceIds;
     }
 
-    public static void setDataSourceIds(Set<String> dataSourceIds) {
+    public static void setDataSourceIds(Set<Object> dataSourceIds) {
         DynamicDataSourceContextHolder.dataSourceIds = dataSourceIds;
     }
 
     //设置数据源
-    public static void setDataSourceType(String dataSourceType) {
+    public static void setDataSourceType(Object dataSourceType) {
         contextHolder.set(dataSourceType);
     }
 
     //获取数据源
-    public static String getDataSourceType() {
+    public static Object getDataSourceType() {
         return contextHolder.get();
     }
 
@@ -38,7 +38,7 @@ public class DynamicDataSourceContextHolder {
     }
 
     //判断当前数据源是否存在
-    public static boolean isContainsDataSource(String dataSourceId) {
+    public static boolean isContainsDataSource(Object dataSourceId) {
         return dataSourceIds.contains(dataSourceId);
     }
 }

bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSourceRegister.java

@@ -31,7 +31,7 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
     //默认数据源
     private DataSource defaultDataSource;
     //用户自定义数据源
-    private Map<String, DataSource> slaveDataSources = new HashMap<>();
+    private Map<Object, DataSource> slaveDataSources = new HashMap<>();
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DynamicDataSourceRegister.class);
 
@@ -45,11 +45,11 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
         this.defaultDataSource = defaultDataSource;
     }
 
-    public Map<String, DataSource> getSlaveDataSources() {
+    public Map<Object, DataSource> getSlaveDataSources() {
         return slaveDataSources;
     }
 
-    public void setSlaveDataSources(Map<String, DataSource> slaveDataSources) {
+    public void setSlaveDataSources(Map<Object, DataSource> slaveDataSources) {
         this.slaveDataSources = slaveDataSources;
     }
 
@@ -105,7 +105,7 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
                 dsMap.put("username", rs.getString("user_name"));
                 dsMap.put("password", rs.getString("pass_word"));
                 DataSource ds = buildDataSource(dsMap);
-                slaveDataSources.put(rs.getString("id"), ds);
+                slaveDataSources.put(rs.getInt("id"), ds);
             }
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
@@ -127,13 +127,13 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
     public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry beanDefinitionRegistry) {
         //添加默认数据源
         targetDataSources.put("dataSource", this.defaultDataSource);
-        Set<String> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
+        Set<Object> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
         dataSourceIds.add(String.valueOf(dataSourceIds));
         DynamicDataSourceContextHolder.setDataSourceIds(dataSourceIds);
         //添加其他数据源
         targetDataSources.putAll(slaveDataSources);
-        Set<String> dataSourceIdSet = DynamicDataSourceContextHolder.getDataSourceIds();
-        for (String key : slaveDataSources.keySet()) {
+        Set<Object> dataSourceIdSet = DynamicDataSourceContextHolder.getDataSourceIds();
+        for (Object key : slaveDataSources.keySet()) {
             dataSourceIdSet.add(key);
         }
         DynamicDataSourceContextHolder.setDataSourceIds(dataSourceIdSet);

bi-server/src/main/java/com/usoftchina/bi/server/aspect/DynamicDattaSourceAspect.java

@@ -52,11 +52,11 @@ public class DynamicDattaSourceAspect {
         }
         int baseId = toSql.getId();
 
-        if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-            logger.info("数据源 -> {} 不存在,使用默认的数据源 -> {}",String.valueOf(baseId), joinPoint.getSignature());
+        if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
+            logger.info("数据源 -> {} 不存在,使用默认的数据源 -> {}",baseId, joinPoint.getSignature());
         } else {
-            logger.info("使用数据源：{}", String.valueOf(baseId));
-            DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+            logger.info("使用数据源：{}", baseId);
+            DynamicDataSourceContextHolder.setDataSourceType(baseId);
         }
     }
 

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/GetChartsDataUtilService.java

@@ -81,10 +81,10 @@ public class GetChartsDataUtilService {
         }
         List<Map<String, Object>> values = new ArrayList<>();
         try {
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
             values = chartsConfigMapper.getChartsData(sql, showDataChartInfo.getTestPage().enablePaging());
             PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(values);

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowHistogramService.java

@@ -62,10 +62,10 @@ public class ShowHistogramService {
         int baseId = getChartsDataUtilService.getBaseId(id);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
 
             String xColumn = histogramConfigInfo.getxAxis().getColumnRename();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowIndividualService.java

@@ -59,10 +59,10 @@ public class ShowIndividualService {
         int baseId = getChartsDataUtilService.getBaseId(id);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
 
             //取筛选列表

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowLineService.java

@@ -63,10 +63,10 @@ public class ShowLineService {
         int baseId = getChartsDataUtilService.getBaseId(id);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
 
         String xColumn = lineConfigInfo.getxAxis().getColumnRename();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPieService.java

@@ -55,10 +55,10 @@ public class ShowPieService {
 
         int baseId = getChartsDataUtilService.getBaseId(id);
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
 
         String xColumn = pieConfigInfo.getLegendData().getColumnRename();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPopulationService.java

@@ -54,10 +54,10 @@ public class ShowPopulationService {
         int baseId = getChartsDataUtilService.getBaseId(id);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
             List<String> groupByList = populationInfo.getGroupByList();  //分组
 

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowScatterService.java

@@ -59,10 +59,10 @@ public class ShowScatterService {
         int baseId = getChartsDataUtilService.getBaseId(id);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
 
         String xColumn = scatterConfigInfo.getxAxis().getColumnRename();

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/ColumnScreenService.java

@@ -41,15 +41,15 @@ public class ColumnScreenService {
         List<Object> data = new ArrayList<>();
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        logger.info("切换数据库: {}", String.valueOf(baseId));
+        logger.info("切换数据库: {}", baseId);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                logger.info("数据源:{} 不存在,使用默认的数据源", String.valueOf(baseId));
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
+                logger.info("数据源:{} 不存在,使用默认的数据源", baseId);
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                logger.info("使用数据源：{}", String.valueOf(baseId));
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                logger.info("使用数据源：{}", baseId);
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
             data =  showChartsMapper.getScreenData(columnScreenInfo.getColumnName(), tableName, columnScreenInfo.getKeyword(), columnScreenInfo.getCount());
         }catch (Exception e){
@@ -80,15 +80,15 @@ public class ColumnScreenService {
         List<Object> data = new ArrayList<>();
 
         int baseId =  getChartsDataUtilService.getBaseIdByConnect(connectId);
-        logger.info("切换数据库={}", String.valueOf(baseId));
+        logger.info("切换数据库={}", baseId);
 
         try{
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                logger.info("数据源: {}不存在,使用默认的数据源", String.valueOf(baseId));
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
+                logger.info("数据源: {}不存在,使用默认的数据源", baseId);
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                logger.info("使用数据源：{}", String.valueOf(baseId));
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                logger.info("使用数据源：{}", baseId);
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
             data =  showChartsMapper.getScreenData(columnScreenInfo.getColumnName(), tableName, columnScreenInfo.getKeyword(), columnScreenInfo.getCount());
         }catch (Exception e){

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataBasesService.java

@@ -239,7 +239,7 @@ public class DataBasesService {
             datasource.setTargetDataSources(target);
             datasource.afterPropertiesSet();
 
-            Set<String> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
+            Set<Object> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
 
             dataSourceIds.add(String.valueOf(databasesInfo.getId()));
 

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataConnectorService.java

@@ -381,11 +381,11 @@ public class DataConnectorService {
         String sqls = chartsUtilService.columnNameUtil(id, dataId, sql, true, 0, createId);
 
         try {
-            if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
+            if (!DynamicDataSourceContextHolder.isContainsDataSource(baseId)) {
                 logger.info("数据源:{} 不存在, 使用默认的数据源", baseId);
             } else {
                 logger.info("使用数据源：", baseId);
-                DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
+                DynamicDataSourceContextHolder.setDataSourceType(baseId);
             }
             List<Map<String, Object>> val = new ArrayList<>();
             if (id == createId) {

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/ImplementSqlService.java

@@ -1,6 +1,7 @@
 package com.usoftchina.bi.server.service.dataSource;
 
 import com.usoftchina.bi.core.exception.MyException;
+import com.usoftchina.bi.core.jdbc.DynamicDataSourceContextHolder;
 import com.usoftchina.bi.server.dao.dataSource.DataColumnMapper;
 import com.usoftchina.bi.server.dao.dataSource.DataConnectorMapper;
 import com.usoftchina.bi.server.model.bo.ToSql;

bi-server/src/test/java/com/usoftchina/bi/test/server/TestDataSource.java

@@ -72,7 +72,7 @@ public class TestDataSource{
         datasource.setTargetDataSources(target);
         datasource.afterPropertiesSet();
 
-        Set<String> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
+        Set<Object> dataSourceIds = DynamicDataSourceContextHolder.getDataSourceIds();
         dataSourceIds.add("UAS_TEST");
         DynamicDataSourceContextHolder.setDataSourceIds(dataSourceIds);