This commit is contained in:
ilyin 2024-09-28 21:20:42 +03:00
parent 309850c070
commit 0a667d0903
6 changed files with 53 additions and 51 deletions

View file

@ -28,7 +28,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -67,7 +67,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>subpoena</JdbcDatabase> <JdbcDatabase>subpoena</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -93,7 +93,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>incidents</JdbcDatabase> <JdbcDatabase>incidents</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -120,7 +120,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>geps_notifications</JdbcDatabase> <JdbcDatabase>geps_notifications</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -159,7 +159,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>journal_dev</JdbcDatabase> <JdbcDatabase>journal_dev</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

View file

@ -20,7 +20,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>summon-list-registry</JdbcDatabase> <JdbcDatabase>summon-list-registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -45,7 +45,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

View file

@ -36,7 +36,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>subpoena</JdbcDatabase> <JdbcDatabase>subpoena</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -65,7 +65,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>decision-document-service</JdbcDatabase> <JdbcDatabase>decision-document-service</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -105,7 +105,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>journal_dev</JdbcDatabase> <JdbcDatabase>journal_dev</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -133,7 +133,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>geps_notifications</JdbcDatabase> <JdbcDatabase>geps_notifications</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -165,7 +165,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>incidents</JdbcDatabase> <JdbcDatabase>incidents</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -208,7 +208,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -237,7 +237,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>appeal-document-service</JdbcDatabase> <JdbcDatabase>appeal-document-service</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

View file

@ -24,7 +24,7 @@
<JdbcPassword>ervu</JdbcPassword> <JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName> <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName> <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize> <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
<JdbcDatabase>person_registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>

View file

@ -149,16 +149,18 @@ public class RequestService {
private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) { private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
String endpointArguments = ids.stream() String endpointArguments;
.map(id -> "'" + id.trim() + "'")
.collect(Collectors.joining(", "));
String requestURL = request.getRequestURL(); String requestURL = request.getRequestURL();
if (requestURL.contains(":=")) { if (requestURL.contains(":=")) {
endpointArguments = "'{" + endpointArguments + "}'"; endpointArguments = "'{" + ids.stream()
.map(String::trim)
.collect(Collectors.joining(", ")) + "}'";
} else { } else {
endpointArguments = "(" + endpointArguments + ")"; endpointArguments = "(" + ids.stream()
.map(s -> "'" + s.trim() + "'")
.collect(Collectors.joining(", ")) + ")";
} }
if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) { if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) {
@ -197,6 +199,7 @@ public class RequestService {
return resultMap; return resultMap;
} }
private boolean executeSqlQuery(Connection connection, String query) throws SQLException { private boolean executeSqlQuery(Connection connection, String query) throws SQLException {
try (PreparedStatement stmt = connection.prepareStatement(query)) { try (PreparedStatement stmt = connection.prepareStatement(query)) {
return stmt.execute(); return stmt.execute();

View file

@ -48,7 +48,6 @@
<componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId> <componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId>
<name>Tab container</name> <name>Tab container</name>
<container>true</container> <container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered> <childrenReordered>false</childrenReordered>
<scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/> <scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/>
<scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d"> <scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d">