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

save

Browse source
This commit is contained in:
ilyin 2024-09-27 20:19:58 +03:00
parent 363fa8f35c
commit fd0ebc7ba5
4 changed files with 291 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config-data-executor/config-examples/block.xml
View file

@ -6,9 +6,9 @@
$$ $$
begin begin
update recruits update recruits
set current_recruitment_id = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' set current_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8'
,target_recruitment_id = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' ,target_recruitment_id = '812228fe-42d3-4094-9508-2d1ca2739de8'
,department_id_old = 'ИДЕНТИФИКАТОР ТЕСТОВОГО ВК' ,department_id_old = '812228fe-42d3-4094-9508-2d1ca2739de8'
,system_pgs_status = '13' ,system_pgs_status = '13'
,extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}', ,extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}',
('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')|| ('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')||
@ -29,7 +29,7 @@
<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>15</JdbcXaDataSourcePoolSize>
<JdbcDatabase>summon-list-registry</JdbcDatabase> <JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams> </SqlConnectionParams>
</SqlRequest> </SqlRequest>
@ -131,7 +131,7 @@
DO DO
$$ $$
DECLARE DECLARE
recruitIds uuid[] := '{${endpointArguments}}'; recruitIds uuid[] := ${endpointArguments};
importIds uuid[] := ARRAY(SELECT import_id importIds uuid[] := ARRAY(SELECT import_id
FROM import_results FROM import_results
WHERE recruit_id = ANY (recruitIds)); WHERE recruit_id = ANY (recruitIds));

2
config-data-executor/config-examples/removeFromSystem.xml
View file

@ -77,7 +77,7 @@
DO DO
$$ $$
DECLARE DECLARE
recruitIds uuid[] := '{${endpointArguments}}'; recruitIds uuid[] := ${endpointArguments};
importIds uuid[] := ARRAY(SELECT import_id importIds uuid[] := ARRAY(SELECT import_id
FROM import_results FROM import_results
WHERE recruit_id = ANY (recruitIds)); WHERE recruit_id = ANY (recruitIds));

6
config-data-executor/src/main/java/org/micord/service/RequestService.java
View file

@ -150,12 +150,14 @@ 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 = ids.stream()
.map(id -> "'" + id.trim() + "'") .map(String::trim)
.collect(Collectors.joining(", ")); .collect(Collectors.joining(", "));
String requestURL = request.getRequestURL(); String requestURL = request.getRequestURL();
if (!requestURL.contains("uuid[]")) { if (requestURL.contains(":=")) {
endpointArguments = "'{" + endpointArguments + "}'";
} else {
endpointArguments = "(" + endpointArguments + ")"; endpointArguments = "(" + endpointArguments + ")";
} }

299
resources/src/main/resources/business-model/main.page
View file

@ -219,10 +219,6 @@
<entry> <entry>
<key>executeSqlButtonService</key> <key>executeSqlButtonService</key>
<value> <value>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
<complex> <complex>
<entry> <entry>
<key>jndiName</key> <key>jndiName</key>
@ -237,6 +233,10 @@
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
@ -672,10 +672,6 @@
<entry> <entry>
<key>executeSqlButtonService</key> <key>executeSqlButtonService</key>
<value> <value>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
<complex> <complex>
<entry> <entry>
<key>jndiName</key> <key>jndiName</key>
@ -690,6 +686,10 @@
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
@ -1125,10 +1125,6 @@
<entry> <entry>
<key>executeSqlButtonService</key> <key>executeSqlButtonService</key>
<value> <value>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
<complex> <complex>
<entry> <entry>
<key>jndiName</key> <key>jndiName</key>
@ -1143,6 +1139,10 @@
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
@ -1540,6 +1540,269 @@
</properties> </properties>
</scripts> </scripts>
</children> </children>
<children id="01dd02ec-9ea9-4828-864e-e943d30c3de2">
<prototypeId>57c7cd21-1556-4dbd-b9da-33520486a1db</prototypeId>
<componentRootId>01dd02ec-9ea9-4828-864e-e943d30c3de2</componentRootId>
<name>SQL Получить ИД ЕРВУ граждан unlock</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="9403e589-958e-434b-8851-95ab1d93c60f">
<properties>
<entry>
<key>caption</key>
<value>
<simple>"Получить ИД ЕРВУ граждан"</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="e20ed17a-dae5-4d4b-ad9f-763a66627bf5">
<properties>
<entry>
<key>queryParams</key>
<value>
<item id="2c335f90-9cb2-4628-84ad-25aec188c84c" removed="false">
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getValue"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
</properties>
</scripts>
<scripts id="c4fb9d3b-97d1-4384-a567-e9e387054a21">
<properties>
<entry>
<key>executeSqlButtonService</key>
<value>
<complex>
<entry>
<key>jndiName</key>
<value>
<simple>"java:/webbpm/personRegistryDS"</simple>
</value>
</entry>
<entry>
<key>sql</key>
<value>
<simple>"select \u0027{\u0027||string_agg(\u0027\"\u0027||id::text||\u0027\"\u0027,\u0027,\u0027)||\u0027}\u0027\nfrom recruits\nwhere system_id_ern \u003d any(string_to_array(trim(trailing \u0027,\u0027 from replace(replace(replace (?, \u0027\\n\u0027, E\u0027\\n\u0027),chr(13),\u0027\u0027),chr(10),\u0027,\u0027)),\u0027,\u0027))"</simple>
</value>
</entry>
</complex>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="fc0a9292-6c2a-4d35-92be-bff120abb130">
<prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
<componentRootId>fc0a9292-6c2a-4d35-92be-bff120abb130</componentRootId>
<name>AC_get_id</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
<properties>
<entry>
<key>eventRefs</key>
<value>
<item id="e80c3e9e-95f1-47f7-86be-67b50d4f6dae" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01dd02ec-9ea9-4828-864e-e943d30c3de2","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>propertyName</key>
<value>
<simple>"clickEvent"</simple>
</value>
</entry>
</complex>
</value>
</item>
</value>
</entry>
<entry>
<key>ifCondition</key>
<value>
<complex>
<entry>
<key>logicalOperation</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>thenActions</key>
<value>
<item id="8b7cef9f-a1b2-4351-b4ac-d53a48c5bf7a" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"setValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<complex>
<entry>
<key>objectValue</key>
<value>
<complex>
<entry>
<key>argument</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"01dd02ec-9ea9-4828-864e-e943d30c3de2","packageName":"component.button","className":"ExecuteSqlButton","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"getResult"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</entry>
</complex>
</value>
</item>
<item id="1d4318f0-58d9-419e-a123-af05c5e67039" removed="true"/>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="f38593fe-f55f-4fa9-b438-59ab39b03035">
<prototypeId>69af9ec9-d640-499a-bf05-cda6ce64a81f</prototypeId>
<componentRootId>f38593fe-f55f-4fa9-b438-59ab39b03035</componentRootId>
<name>ИД ЕРВУ разлокируемых граждан_unlock</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
<properties>
<entry>
<key>cssClasses</key>
<value>
<item id="8f95a21b-37af-45a7-a16e-e3d3a10b0e34" removed="false">
<value>
<simple>"width-full"</simple>
</value>
</item>
</value>
</entry>
<entry>
<key>errorTooltipStyle</key>
<value>
<complex>
<entry>
<key>height</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
<expanded>false</expanded>
</value>
</entry>
<entry>
<key>label</key>
<value>
<simple>"ИД ЕРВУ разлокируемых граждан"</simple>
</value>
</entry>
<entry>
<key>style</key>
<value>
<complex>
<entry>
<key>height</key>
<value>
<simple>"200px"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="9bfea9aa-6af4-4d1d-8238-b6c4cd3af9b5"/>
<scripts id="5354f590-7a64-4764-93a7-3c329f176f3c"/>
<scripts id="84fc6134-ac89-4b20-9334-556dd2648a99"/>
<scripts id="22428620-8f37-4f73-bace-47bc22c13617">
<enabled>false</enabled>
</scripts>
<scripts id="f4991b76-96a9-4743-9ce5-6959f1bae7d6">
<classRef type="TS">
<className>SaveValueToVariable</className>
<packageName>modules.bpmn.script</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>variable</key>
<value>
<simple>"lock_ids_string"</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="a18f6614-fec4-4567-926d-984d38ac4db4"> <children id="a18f6614-fec4-4567-926d-984d38ac4db4">
<prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId> <prototypeId>133ca212-09a6-413a-ac66-e2f6ce188f1f</prototypeId>
<componentRootId>a18f6614-fec4-4567-926d-984d38ac4db4</componentRootId> <componentRootId>a18f6614-fec4-4567-926d-984d38ac4db4</componentRootId>
@ -1590,7 +1853,7 @@
<entry> <entry>
<key>behavior</key> <key>behavior</key>
<value> <value>
<simple>{"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","packageName":"component.field","className":"TextArea","type":"TS"}</simple> <simple>{"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value> </value>
</entry> </entry>
<entry> <entry>
@ -1614,10 +1877,6 @@
<entry> <entry>
<key>executeSqlButtonService</key> <key>executeSqlButtonService</key>
<value> <value>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
<complex> <complex>
<entry> <entry>
<key>jndiName</key> <key>jndiName</key>
@ -1632,6 +1891,10 @@
</value> </value>
</entry> </entry>
</complex> </complex>
<implRef type="JAVA">
<className>ReadOnlySqlButtonServiceImpl</className>
<packageName>ru.micord.ervu_secret.component.service</packageName>
</implRef>
</value> </value>
</entry> </entry>
</properties> </properties>
@ -1684,7 +1947,7 @@
<entry> <entry>
<key>ervuIdField</key> <key>ervuIdField</key>
<value> <value>
<simple>{"objectId":"8c85fe31-bdb8-495e-8c4c-7addc9d7ba71","packageName":"component.field","className":"TextArea","type":"TS"}</simple> <simple>{"objectId":"f38593fe-f55f-4fa9-b438-59ab39b03035","packageName":"component.field","className":"TextArea","type":"TS"}</simple>
</value> </value>
</entry> </entry>
<entry> <entry>