chenw 7 лет назад
Родитель
Сommit
91992ca0bf

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

@@ -38,48 +38,24 @@ public class GetChartsDataUtilService {
     通过图表ID获取数据库连接ID
     通过图表ID获取数据库连接ID
      */
      */
     public int getBaseId(int id){
     public int getBaseId(int id){
-
         //取数据源ID
         //取数据源ID
         String dataConfig = chartsConfigMapper.getBaseConifg(id);
         String dataConfig = chartsConfigMapper.getBaseConifg(id);
-
-        //取数据连接名的数据库名
-        Databases databases = new Databases();
-        try {
-            databases = objectMapper.readValue(dataConfig, Databases.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        int baseId = databases.getId();
-
-        return baseId;
+        return new Integer(dataConfig);
     }
     }
 
 
     /*
     /*
     通过数据源ID获取数据库连接ID
     通过数据源ID获取数据库连接ID
      */
      */
     public int getBaseIdByConnect(int id){
     public int getBaseIdByConnect(int id){
-
         //取数据源ID
         //取数据源ID
         String dataConfig = dataConnectorMapper.getDbConfig(id);
         String dataConfig = dataConnectorMapper.getDbConfig(id);
-
-        //取数据连接名的数据库名
-        Databases databases = new Databases();
-        try {
-            databases = objectMapper.readValue(dataConfig, Databases.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        int baseId = databases.getId();
-
-        return baseId;
+        return new Integer(dataConfig);
     }
     }
 
 
     //取数据源Id
     //取数据源Id
     public int getConnectId(int id){
     public int getConnectId(int id){
-
         //取数据源ID
         //取数据源ID
         int ConnectId = chartsConfigMapper.getBaseId(id);
         int ConnectId = chartsConfigMapper.getBaseId(id);
-
         return ConnectId;
         return ConnectId;
     }
     }