From d5b1b3da7f60577cdc97aa20277a45dd2538b22a Mon Sep 17 00:00:00 2001
From: Alawn <alawn.cn@gmail.com>
Date: Wed, 23 Jun 2021 15:01:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=81=94=E7=B3=BB=E4=BA=BA=E7=B1=BB=E5=9E=8B=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=80=8E=E5=8A=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bui/etc/BUI_PUB_CTL.XML              |  4 +-
 bui/etc/cap/OBUICAP1/2040801_CTL.XML | 15 ++++---
 bui/etc/cap/OBUICAP2/4905104_CTL.XML | 60 ++++++++++++++++++++++++++++
 bui/etc/cap/OBUICAP2_CTL.XML         |  2 +
 bui/etc/cap/SCAHRO1_ATR.XML          | 12 +++---
 5 files changed, 80 insertions(+), 13 deletions(-)
 create mode 100644 bui/etc/cap/OBUICAP2/4905104_CTL.XML

diff --git a/bui/etc/BUI_PUB_CTL.XML b/bui/etc/BUI_PUB_CTL.XML
index 2e0e1ef..5398f11 100644
--- a/bui/etc/BUI_PUB_CTL.XML
+++ b/bui/etc/BUI_PUB_CTL.XML
@@ -85,7 +85,7 @@
             <Set>token=$TOKEN</Set>
             <Set>funcId=$FUNC_ID</Set>
             <Set>TXN_CD=$TXN_CD</Set>
-            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040869,2040862,2040860,4908103,204076)">
+            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040869,2040862,2040860,4908103,204076,4905104)">
                <!--第三方鉴权-->
                <Exec func="PUB:CallThirdComm" error="IGNORE">
                   <Arg name="HTxnCd" value="TokenVerify" />
@@ -149,7 +149,7 @@
                <Exec func="PUB:RollbackWork" error="IGNORE" />
             </Else>
             <!--FLG_LOG值为0：代表此交易不用写入操作日志 ;其他情况则写入操作日志中 --> 
-            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040862,2040860,4908103,204076)">             
+            <If condition="IS_NOEQUAL_STRING($TXN_CD,4807106,4807002,0030006,0030004,0030005,2040866,2040841,2040881,2040876,2040867,2040862,2040860,4908103,204076,4905104)">             
                <!--操作员流水 --> 
                <Set>MSG_TYP=$GWA.MSG_TYP</Set>               
                <Set>MSG_CD=$GWA.MSG_CD</Set>               
diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
index 91263eb..88e07d3 100644
--- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML
+++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML
@@ -18,10 +18,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_S">   <!--查询成功状态-->
@@ -41,10 +42,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_F">   <!-- 查询失败状态 -->
@@ -64,10 +66,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
       <DynSentence name="QRY_CAPTXNJNL_U">   <!-- 查询预计状态 -->
@@ -87,10 +90,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
 
 
@@ -111,10 +115,11 @@
             AND ('%s' IS NULL OR J.ORD_TYP = '%s')
             AND ('%s' IS NULL OR J.CAP_ORD_NO = '%s')
             AND ('%s' IS NULL OR J.TXN_CNL = '%s')
+            AND ('%s' IS NULL OR J.CORG_DSK_NO = '%s')            
             AND (J.ORD_DT &gt;='%s' OR '%s' IS NULL)
             AND (J.ORD_DT &lt;='%s' OR '%s' IS NULL) order by J.TXN_TM desc
          </Sentence>
-         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
+         <Fields>MERC_ID|MERC_ID|MERC_ORD_NO|MERC_ORD_NO|DSK_NAM|DSK_NAM|JRN_NO|JRN_NO|CRD_NO|CRD_NO|CORG_NO|CORG_NO|TXN_MOD|TXN_MOD|ORD_TYP|ORD_TYP|CAP_ORD_NO|CAP_ORD_NO|TXN_CNL|TXN_CNL|CORG_DSK_NO|CORG_DSK_NO|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
       </DynSentence>
       <FlowCtrl>
 
diff --git a/bui/etc/cap/OBUICAP2/4905104_CTL.XML b/bui/etc/cap/OBUICAP2/4905104_CTL.XML
new file mode 100644
index 0000000..534c840
--- /dev/null
+++ b/bui/etc/cap/OBUICAP2/4905104_CTL.XML
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<Root>
+   <Transaction code="4905104" log_switch="1" desc="查询事务预警规则设置">
+      <DynSentence name="QRY_CAPEVTRLR">
+         <Sentence>
+            SELECT *
+            FROM
+            CAPEVTRLR
+            WHERE
+            (EVT_TYP=? or ? is null)
+         </Sentence>
+         <Fields>EVT_TYP|EVT_TYP|</Fields>
+      </DynSentence>
+      <DynSentence name="QRY_CAPEVTRLR_COUNT">
+         <Sentence>
+            SELECT COUNT(*) TOT_REC_NUM
+            FROM
+            CAPEVTRLR
+            WHERE
+            (EVT_TYP=? or ? is null)
+         </Sentence>
+         <Fields>EVT_TYP|EVT_TYP|</Fields>
+      </DynSentence>
+      <FlowCtrl>
+         <Exec func="PUB:DumpETF"/>
+         <Set>FLAG=$FLAG</Set>
+         <Set>EVT_TYP=$EVT_TYP</Set>
+         <If condition="IS_EQUAL_INT($FLAG,0)">
+            <Exec func="PUB:QueryInGroup" >
+               <Arg name="SqlCmd" value="QRY_CAPEVTRLR" />
+               <Arg name="RecordName" value="CAPEVTRLR" />
+               <Arg name="limit" value="50" />
+            </Exec >
+
+            <If condition="~RetCod=2">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="CMM00000"/>
+                  <Arg name="MsgDat" value="无查询结果"/>
+               </Exec>
+               <Return/>
+            </If>
+            <ElseIf condition="~RetCod=0">
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="BUI00000"/>
+                  <Arg name="MsgDat" value="查询成功"/>
+               </Exec>
+            </ElseIf>
+            <Else>
+               <Exec func="PUB:GWASetMsg">
+                  <Arg name="MsgCd" value="BUI26006"/>
+                  <Arg name="MsgDat" value="查询数据库出错"/>
+               </Exec>
+               <Return/>
+            </Else>
+         </If>
+
+         <Exec func="PUB:DumpETF"/>
+      </FlowCtrl>
+   </Transaction>
+</Root>
diff --git a/bui/etc/cap/OBUICAP2_CTL.XML b/bui/etc/cap/OBUICAP2_CTL.XML
index 6b27846..f3de4c2 100644
--- a/bui/etc/cap/OBUICAP2_CTL.XML
+++ b/bui/etc/cap/OBUICAP2_CTL.XML
@@ -81,6 +81,8 @@
     <Include file="etc/cap/OBUICAP2/4905102_CTL.XML" />
     <!--查询 -->
     <Include file="etc/cap/OBUICAP2/4905103_CTL.XML" />
+    <!--组查询 -->
+    <Include file="etc/cap/OBUICAP2/4905104_CTL.XML" />
     <!--合作机构信息-->
     <!--查询 -->
     <Include file="etc/cap/OBUICAP2/4906103_CTL.XML" />
diff --git a/bui/etc/cap/SCAHRO1_ATR.XML b/bui/etc/cap/SCAHRO1_ATR.XML
index ed50dd4..622bb64 100644
--- a/bui/etc/cap/SCAHRO1_ATR.XML
+++ b/bui/etc/cap/SCAHRO1_ATR.XML
@@ -3,12 +3,12 @@
 <Server name="SCAHRO1" type="SCA" trace="DEBUG">
 
    <Declare name="connector" class="com.murong.ctg.protocol.http.client.hro.HroHttpConnector">
-      <Param name="url"    value="http://172.17.30.23:8085/rhro-service-1.0/verifyToken" />
-      <Param name="method" value="GET" />
-      <Param name="key" value="7nEBaDBay2vNKXnWBQqSRZX8wEK3iVOP" />
-      <Param name="tmOut"  value="3" />
-      <Param name="charSet"  value="UTF-8" />
-      <Param name="contentType"  value="application/x-www-form-urlencoded" />
+      <Param name="url"    value="${_URL}" />
+      <Param name="method" value="${_METHOD}" />
+      <Param name="key" value="${_KEY}" />
+      <Param name="tmOut"  value="${_TM_OUT}" />
+      <Param name="charSet"  value="${_CHAR_SET}" />
+      <Param name="contentType"  value="${_CONTENT_TYPE}" />
    </Declare>
 
 
-- 
2.54.0