接口调整

@@ -184,7 +184,7 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
         List<Object> resultList = new ArrayList<>();
         try {
             HikariConfig config = new HikariConfig();
-            config.setJdbcUrl(replaceParam(tkDbConnectDTO.getUrl(), tkDbConnectDTO.getParamMap()));
+            config.setJdbcUrl(tkDbConnectDTO.getUrl());
             config.setUsername(tkDbConnectDTO.getUserName());
             config.setPassword(tkDbConnectDTO.getPassword());
             if (DbConnectTypeEnum.MySql.equals(tkDbConnectDTO.getType())) {
@@ -216,7 +216,7 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
 
             dataSource = new HikariDataSource(config);
             connection = dataSource.getConnection();
-            statement = connection.prepareStatement(tkDbConnectDTO.getSql());
+            statement = connection.prepareStatement(replaceParam(tkDbConnectDTO.getSql(), tkDbConnectDTO.getParamMap()));
             resultSet = statement.executeQuery();
             ResultSetMetaData metaData = resultSet.getMetaData();
             List<String> columnNames = new ArrayList<>();
@@ -257,9 +257,9 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
         return resultList;
     }
 
-    private String replaceParam(String url, Map<String, Object> paramMap) {
+    private String replaceParam(String sql, Map<String, Object> paramMap) {
         if (MapUtils.isEmpty(paramMap)) {
-            return url;
+            return sql;
         }
 
         for (Map.Entry<String, Object> objectEntry : paramMap.entrySet()) {
@@ -269,10 +269,10 @@ public class BaseDbConnectServiceImpl implements BaseDbConnectService {
                 continue;
             }
 
-            url = url.replaceAll("${" + key + "}", String.valueOf(value));
+            sql = sql.replaceAll("\\$\\{" + key + "\\}", String.valueOf(value));
         }
 
-        return url;
+        return sql;
     }
 
     private Object getTypedValue(ResultSet rs, int index, int sqlType) throws SQLException {

@@ -119,6 +119,7 @@ public class TkDbConnectServiceImpl extends AbstractBaseService<TkDbConnectMappe
         }
 
         dbDto.setSql(tkDbConnectDTO.getSql());
+        dbDto.setParamMap(tkDbConnectDTO.getParamMap());
         return connectServiceFactory.getService("baseConnect").connect(dbDto);
     }
 }

@@ -41,6 +41,7 @@ public class TkDbDataSetServiceImpl extends AbstractBaseService<TkDbDataSetMappe
             baseMapper.update(entity, filter);
         }
 
+        entity.copyToDTO(dto);
         return dto;
     }
 
@@ -66,6 +67,7 @@ public class TkDbDataSetServiceImpl extends AbstractBaseService<TkDbDataSetMappe
         dto = get(dto.getId());
         TkDbConnectDTO dbConnectDTO = dto.getTkDbConnectDTO();
         dbConnectDTO.setParamMap(paramMap);
+        dbConnectDTO.setSql(dto.getSql());
         return connectServiceFactory.getService("baseConnect").connect(dbConnectDTO);
     }