Procházet zdrojové kódy

新增数据连接修改

chenw před 7 roky
rodič
revize
16e581cfcf

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

@@ -36,16 +36,19 @@ public class DataBasesService {
     private DynamicDataSourceRegister dataSourceRegister;
     private DynamicDataSourceRegister dataSourceRegister;
     @Autowired
     @Autowired
     GetChartsDataUtilService getChartsDataUtilService;
     GetChartsDataUtilService getChartsDataUtilService;
+    @Autowired
+    private ImplementSqlService implementSqlService;
     /*
     /*
    保存数据库连接
    保存数据库连接
     */
     */
-
     public RepEntity inputDatabases(DatabasesInfo databasesInfo){
     public RepEntity inputDatabases(DatabasesInfo databasesInfo){
         if (databasesInfo == null || "".equals(databasesInfo)){
         if (databasesInfo == null || "".equals(databasesInfo)){
             return new RepEntity(RepCode.Null);
             return new RepEntity(RepCode.Null);
         }
         }
         Databases databases = new Databases();
         Databases databases = new Databases();
         BeanUtils.copyProperties(databasesInfo, databases);
         BeanUtils.copyProperties(databasesInfo, databases);
+        //校验此连接是否可用
+        implementSqlService.connectTest(databases);
         String note = databases.getNote();
         String note = databases.getNote();
         if (note == null || "".equals(note)){
         if (note == null || "".equals(note)){
             note = "";
             note = "";
@@ -53,11 +56,9 @@ public class DataBasesService {
         }
         }
         dataConnectorMapper.inputDataBases(databases);
         dataConnectorMapper.inputDataBases(databases);
         int id = databases.getId();
         int id = databases.getId();
-
         databasesInfo.setId(id);
         databasesInfo.setId(id);
         //添加数据源可切换
         //添加数据源可切换
         addDataSource(databasesInfo);
         addDataSource(databasesInfo);
-
         return new RepEntity(RepCode.success,id);
         return new RepEntity(RepCode.success,id);
     }
     }
 
 

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

@@ -135,7 +135,6 @@ public class ImplementSqlService {
         String username = databases.getUserName();
         String username = databases.getUserName();
         Connection con = null;
         Connection con = null;
         try {
         try {
-            DriverManager.setLoginTimeout(8);
             con = DriverManager.getConnection(url, username, password);
             con = DriverManager.getConnection(url, username, password);
             con.close();
             con.close();
         } catch (SQLException se) {
         } catch (SQLException se) {