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

Merge branch 'develop' of 10.10.31.70:/ervu-eks into develop

Browse source
This commit is contained in:
kochetkov 2024-12-10 14:21:25 +03:00
commit d6681eef60
2 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ public class RequestService {
}
}
@Transactional
@Transactional(timeout = 300000)
public void processSqlAndAqlRequests(Requests config, List<String> ids) {
logger.debug("Starting transactional processing of requests");
if (config.getSqlRequests() != null) {

52
config/cde-xml/removeFromCallList.xml
View file

@ -3,39 +3,26 @@
<RequestURL>
<![CDATA[
DO
$$
BEGIN
DELETE FROM summoned_list where recruit_id in ${endpointArguments};
DELETE FROM recruit_active_list where recruit_id in ${endpointArguments};
DELETE FROM documents where recruit_id in ${endpointArguments};
DELETE FROM subpoena where recruit_id in ${endpointArguments};
END
$$;
]]>
</RequestURL>
<SqlConnectionParams>
<JdbcHost>10.10.31.118</JdbcHost>
<JdbcPort>5432</JdbcPort>
<JdbcUsername>ervu</JdbcUsername>
<JdbcPassword>ervu</JdbcPassword>
<JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
<JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
<JdbcXaDataSourcePoolSize>50</JdbcXaDataSourcePoolSize>
<JdbcDatabase>summon-list-registry</JdbcDatabase>
</SqlConnectionParams>
</SqlRequest>
$$
DECLARE
t varchar(100);
begin
select pg_sleep(60) into t;
--delete from recruits where 1=2;
update recruits
set system_pgs_status=null, extra_info = jsonb_set(coalesce(extra_info,'{}'::jsonb), '{blocked}',
('{"cur":'|| coalesce('"'||current_recruitment_id::text||'"','null')||
',"trg":'|| coalesce('"'||target_recruitment_id::text||'"','null')||
',"dio":'|| coalesce('"'||department_id_old::text||'"','null')||
',"st":'|| coalesce('"'||system_pgs_status::text||'"','null')||'}')::jsonb
)
where id IN ${endpointArguments};
end
$$;
<SqlRequest>
<RequestURL>
<![CDATA[
update recruits
set current_recruitment_id = jsonb_extract_path_text(extra_info,'blocked','cur')::uuid
,target_recruitment_id = jsonb_extract_path_text(extra_info,'blocked','trg')::uuid
,department_id_old = jsonb_extract_path_text(extra_info,'blocked','dio')::uuid
,system_pgs_status = '1.2'
,conscription = null
,extra_info = extra_info - ('blocked')
where id in ${endpointArguments};
]]>
</RequestURL>
<SqlConnectionParams>
@ -49,4 +36,5 @@
<JdbcDatabase>person_registry</JdbcDatabase>
</SqlConnectionParams>
</SqlRequest>
</Requests>