micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add date in additionalRequest

Browse source
This commit is contained in:
Eduard Tihomiorv 2025-10-09 12:43:54 +03:00
parent 200a8a0e4a
commit bd0baf664b
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
config-data-executor/src/main/java/org/micord/service/DownloadService.java
View file

@ -468,12 +468,13 @@ public class DownloadService {
Boolean emptyDatesAllowed = validationResults.get(ValidationService.IS_EMPTY_DATES_ALLOWED); Boolean emptyDatesAllowed = validationResults.get(ValidationService.IS_EMPTY_DATES_ALLOWED);
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
String endpointArguments; String endpointArguments = "";
String requestURL = request.getRequestURL(); String requestURL = request.getRequestURL();
if (!emptyDatesAllowed) { if (!emptyDatesAllowed) {
requestURL = prepareRequestURL(request, startDate, endDate); requestURL = prepareRequestURL(request.getRequestURL(), startDate, endDate);
requestURL = requestURL.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase());
} }
if (emptyIdsAllowed != null && emptyIdsAllowed) { if (emptyIdsAllowed != null && emptyIdsAllowed) {
@ -501,6 +502,8 @@ public class DownloadService {
try (Connection connection = DatabaseConnection.getConnection( try (Connection connection = DatabaseConnection.getConnection(
argument.getRequestArgumentConnectionParams())) { argument.getRequestArgumentConnectionParams())) {
String query = argument.getRequestArgumentURL(); String query = argument.getRequestArgumentURL();
query = prepareRequestURL(query, startDate, endDate);
query = query.replace("${endpointArguments}", endpointArguments);
int subOffset = 0; int subOffset = 0;
List<String> aggregatedIds = new ArrayList<>(); List<String> aggregatedIds = new ArrayList<>();
while (true) { while (true) {
@ -549,17 +552,15 @@ public class DownloadService {
return resultMap; return resultMap;
} }
private String prepareRequestURL(SQLDownloadRequest request, LocalDate startDate, private String prepareRequestURL(String requestURL, LocalDate startDate,
LocalDate endDate) { LocalDate endDate) {
String requestURL = request.getRequestURL();
if (startDate != null) { if (startDate != null) {
requestURL = requestURL.replace("${startDate}", startDate.toString()); requestURL = requestURL.replace("${startDate}", startDate.toString());
} }
if (endDate != null) { if (endDate != null) {
requestURL = requestURL.replace("${endDate}", endDate.toString()); requestURL = requestURL.replace("${endDate}", endDate.toString());
} }
return requestURL.replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase()); return requestURL;
} }
private List<String[]> executeSqlQuery(Connection connection, String query) throws SQLException { private List<String[]> executeSqlQuery(Connection connection, String query) throws SQLException {