Merge pull request 'dev' (#30) from dev into sit

Reviewed-on: #30
This commit was merged in pull request #30.
This commit is contained in:
wang_lei1
2021-07-19 01:51:17 +00:00
9 changed files with 31 additions and 42 deletions
Binary file not shown.
+2 -1
View File
@@ -48,7 +48,7 @@
<Sentence>
SELECT CORG_NO FROM CAPTXNJNL
WHERE DSK_NAM=? AND ORD_DT=? AND TXN_MOD=? AND DSK_NAM_STS='0' AND TXN_STS='U' AND CORG_DSK_NO = '0'
group by CORG_NO
group by CORG_NO having length(trim(CORG_NO)) > 0
</Sentence>
<Fields>DSK_NAM|ORD_DT|TXN_MOD</Fields>
</DynSentence>
@@ -294,6 +294,7 @@
<Exec func="PUB:RollbackWork"/>
<Return/>
</ElseIf>
<Delete>RTR_FLAG</Delete>
<Set>CAPTXNJNL.CYC_CD=CNY</Set>
<Set>CAPTXNJNL.CITY=$CAPTXNJNL.BANK_CITY</Set>
<Set>CAPTXNJNL.BANK_NAM=$CAPTXNJNL.BANK_NAME</Set>
+3 -11
View File
@@ -10,21 +10,13 @@
select listagg(dsk) WITHIN GROUP(ORDER BY dsk) dsk from
(select '['||DSK_NAM||','||CORG_DSK_NO||','||BAT_STS||','||CORG_NO||']' dsk from CAPBATINF
where BAT_STS &lt;&gt; '4' and BAT_STS &lt;&gt; '2' and
TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,' ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
TO_CHAR(TO_DATE(decode(SND_DT||SND_TM,' ',null,SND_DT||SND_TM), 'yyyymmddHH24MISS')+'%s'/24/60/60, 'yyyymmddHH24MISS')
between TO_CHAR(sysdate - %s/24/60/60,'yyyymmddHH24MISS') and TO_CHAR(sysdate,'yyyymmddHH24MISS'))
</Sentence>
<Fields>MINUTE</Fields>
<Fields>TIME_OUT|TIME_BEFER|</Fields>
</DynSentence>
<FlowCtrl>
<!--获取TOKEN-->
<Exec func="PUB:PARAM_GRP_GET" error="IGNORE">
<Arg name="ParamNam" value="CAPPARAMTER"/>
<Arg name="KeyNam" value="DSK_TIMEOUT_CORG"/>
<Arg name="GrpNam" value="CLOUD_SHIELD"/>
</Exec>
<Set>MINUTE=$CLOUD_SHIELD.P_VALUES</Set>
<!--查询支付地账户-->
<Exec func="PUB:ReadRecord" error="IGNORE">
<Arg name="SqlCmd" value="QryTimeout"/>
+3 -11
View File
@@ -9,20 +9,12 @@
<Sentence>
select listagg(DSK) WITHIN GROUP(ORDER BY DSK) DSK from
(select '['||DSK_NO||','||DSK_STS||']' DSK from CAPDSKINF where dsk_sts &lt;&gt; '4' and
TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,' ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60, 'yyyymmddHH24MISS') &lt;= TO_CHAR(sysdate,'yyyymmddHH24MISS'))
TO_CHAR(TO_DATE(decode(RCV_DT||RCV_TM,' ',null,RCV_DT||RCV_TM), 'yyyymmddHH24MISS')+'%s'/24/60/60, 'yyyymmddHH24MISS')
between TO_CHAR(sysdate - %s/24/60/60,'yyyymmddHH24MISS') and TO_CHAR(sysdate,'yyyymmddHH24MISS'))
</Sentence>
<Fields>MINUTE</Fields>
<Fields>TIME_OUT|TIME_BEFER|</Fields>
</DynSentence>
<FlowCtrl>
<!--获取TOKEN-->
<Exec func="PUB:PARAM_GRP_GET" error="IGNORE">
<Arg name="ParamNam" value="CAPPARAMTER"/>
<Arg name="KeyNam" value="DSK_TIMEOUT"/>
<Arg name="GrpNam" value="CLOUD_SHIELD"/>
</Exec>
<Set>MINUTE=$CLOUD_SHIELD.P_VALUES</Set>
<!--查询支付地账户-->
<Exec func="PUB:ReadRecord" error="IGNORE">
<Arg name="SqlCmd" value="QryTimeout"/>
+9 -7
View File
@@ -6,7 +6,8 @@
</Attributes>
<DynSentence name="QryBatLst">
<Sentence>
select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
select dsk_nam from CAPDSKINF where DSK_NAM in
(select dsk_nam from (select A.dsk_nam,B.rank from CAPDSKINF A,CAPCUSINF B
where A.dsk_nam in (select dsk_nam from
(select dsk_nam,sum(unfinished_num) unfinished_num,sum(finish_num) finish_num
from (select dsk_nam,(case when BAT_STS not in ('4','2') then 1 else 0 end)
@@ -16,7 +17,8 @@
where c.unfinished_num = 0 and c.finish_num &gt; 0)
AND A.Customer_Id = B.Customer_Id
order by rank )
where ROWNUM &lt;= '5'
where ROWNUM &lt;= '1')
FOR UPDATE skip locked
</Sentence>
<Fields>DT_BEFER|</Fields>
</DynSentence>
@@ -70,7 +72,7 @@
<Function name="_before">
<Process>
<!-- 应用加锁,防止并发 -->
<Set>LockKey=BAT_GET_DISK_RESULT</Set>
<!--Set>LockKey=BAT_GET_DISK_RESULT</Set>
<Exec func="PUB:Lock">
<Arg name="RecKey" value="$LockKey" error="IGNORE"/>
<Arg name="TimOut" value="1800"/>
@@ -81,17 +83,17 @@
<Set>Rsp_Msg=加锁失败</Set>
<Exit/>
</If>
<Set>IS_LOCKED=TRUE</Set>
<Set>IS_LOCKED=TRUE</Set-->
</Process>
</Function>
<Function name="_after">
<Process>
<If condition="IS_EQUAL_STRING($IS_LOCKED,TRUE)">
<!--If condition="IS_EQUAL_STRING($IS_LOCKED,TRUE)"-->
<!--解锁-->
<Exec func="PUB:UnLock">
<!--Exec func="PUB:UnLock">
<Arg name="RecKey" value="$LockKey"/>
</Exec>
</If>
</If-->
</Process>
</Function>
+7 -2
View File
@@ -454,7 +454,7 @@
<Set>tran_date=$TXN_DT</Set>
<Set>tran_time=STRCAT($TXN_TM,000)</Set>
<Set>f_seq_no=$CORG_DSK_NO</Set>
<Set>zip_flag=0</Set>
<Set>language=zh_CN</Set>
<Set>settle_mode=2</Set>
<Set>busi_type=$CORG_BUS_TYP</Set> <!--待定 是按照大批还是小批进行合并记账 -->
@@ -462,7 +462,12 @@
<Set>instr_count=$BatCnt</Set> <!--总笔数 -->
<Set>summary_total=$summary_total</Set> <!-- 合并记账使用 具体取值 待定 -->
<Set>batch_sum_flag=$batch_sum_flag</Set> <!--批量合并记账使用-->
<If condition="INTCMP($BAT_ORN_CNT,2,$PARA.ZIP_CNT)">
<Set>zip_flag=0</Set>
</If>
<Else>
<Set>zip_flag=1</Set>
</Else>
<Exec func="PUB:QueryInGroup" error="IGNORE">
<Arg name="SqlCmd" value="$QryExport"/>
<Arg name="RecordName" value="REC"/>
+6 -6
View File
@@ -21,20 +21,20 @@
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
</CycleItem>
<!--心跳招行-->
<CycleItem istxn='0' objsvr="OFRTCAP1" txncod='HEARTBEAT_CMB' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="120" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<CycleItem istxn='0' objsvr="OFRTCAP1" txncod='HEARTBEAT_CMB' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="3600" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
</CycleItem>
<!--心跳工行-->
<CycleItem istxn='0' objsvr="OFRTCAP1" txncod='HEARTBEAT_ICBC' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="120" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<CycleItem istxn='0' objsvr="OFRTCAP1" txncod='HEARTBEAT_ICBC' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="3600" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
</CycleItem>
<!--接入批次长时间未处理完成查询-->
<CycleItem istxn='0' objsvr="OFRTCAP2" txncod='BAT_DSK_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="600" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
<CycleItem istxn='0' objsvr="OFRTCAP2" txncod='BAT_DSK_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="30" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA><TIME_OUT>3600</TIME_OUT><TIME_BEFER>30</TIME_BEFER></ROOT></Data>
</CycleItem>
<!--接出批次长时间未处理完成查询-->
<CycleItem istxn='0' objsvr="OFRTCAP2" txncod='BAT_DSK_CORG_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="300" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA></ROOT></Data>
<CycleItem istxn='0' objsvr="OFRTCAP2" txncod='BAT_DSK_CORG_TIMEOUT' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="30" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
<Data><ROOT><GWA><SYS_CNL>SYS</SYS_CNL></GWA><TIME_OUT>1800</TIME_OUT><TIME_BEFER>30</TIME_BEFER></ROOT></Data>
</CycleItem>
<CycleItem istxn='0' objsvr="OFRTCAP1" txncod='BAT_SEND_TIMER' txndatatype='text/etf' txndat='' funcname='' funcpath = '' interval="65" sndflag ='0' tmout="30" minute='*' hour='*' monthday='*' weekday='*' monthweek='*' month='*' trace='1'>
+1
View File
@@ -762,6 +762,7 @@ create table CMMTRPTREG
RPT_FIL VARCHAR2(60) not null,
RPT_FIL_NM VARCHAR2(120),
TM_SMP VARCHAR2(26),
RPT_FIL_URL VARCHAR2(512) DEFAULT ' ',
constraint CMMTRPTREG_PK
primary key (RPT_DAT, RPT_TYP, RPT_FIL)
)
-4
View File
@@ -101,10 +101,6 @@ values ('FIL_ZIP_PWD', '1234567', '文件加压解压密码', '0', ' ', ' ');
insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
values ('FIL_TOKEN', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0ZXN0IiwiaWF0IjoxNjE0MzI5NzU2LCJleHAiOjE2MTY5MjE3NTZ9.oH9Vvy-9HMF_5Ud11Wh47lP1F3s8ZudVLpgSzMomUmnhf-l-Hch4RZUQZzHBXQUBB4A2vWhFj9KfIB_K5Eb3rQ', '文件上传/下载TOKEN', '0', '20210226170159', ' ');
insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
values ('DSK_TIMEOUT', '60', '接入批次长时间未处理,以分为单位', '0', ' ', ' ');
insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
values ('DSK_TIMEOUT_CORG', '60', '接出批次长时间未处理,以分为单位', '0', ' ', ' ');
insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
values ('FIL_TOKEN_NAME', 'murong', '用户名', '0', ' ', ' ');
insert into CAPPARAMTER (P_KEY, P_VALUES, P_DESC, STS, TM_SMP, RMK)
values ('FIL_TOKEN_PWD', '173f6bcd4621d3736ade75332627b1y7', '密码', '0', ' ', ' ');