更新cips端到端标识号、交易标识号规则

10a86946 · lixinyi · 4c01feea · 10a86946 · 10a86946 · 10a86946
Commit 10a86946 authored Apr 18, 2024 by lixinyi
7 changed files
--- a/editor_vue/src/iso/components/TextInput.vue
+++ b/editor_vue/src/iso/components/TextInput.vue
@@ -338,7 +338,6 @@ export default {
            this.dataModel.defaultValue = this.generateId(msgid);
            window.sessionStorage.setItem("msgid", msgid);
          });
-          
        }
        console.log("MsgId:"+this.dataModel.value);
      }

--- a/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
@@ -75,7 +75,7 @@ path:"0.1.0",
 name:"付款标识",
 label:"PaymentIdentification",
 tag:"PmtId",
-status:"M",
+status:"O",
 children: [
 {
 path:"0.1.0.0",
@@ -83,10 +83,9 @@ name:"端到端标识号",
 label:"EndToEndIdentification",
 tag:"EndToEndId",
 type:"TextInput",
-status:"M",
+status:"O",
 maxLength:"35",
-//iscips 标识是否属于cips，若属于cips有特定的初始化规则
-iscips:"1",
+unable:true,
 },
 {
 path:"0.1.0.1",
@@ -94,8 +93,9 @@ name:"交易标识号",
 label:"TransactionIdentification",
 tag:"TxId",
 type:"TextInput",
-status:"M",
+status:"O",
 maxLength:"35",
+unable:true,
 },
 ],
 },

--- a/editor_vue/src/iso/script/MsgJson/cips_112_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/cips_112_001_02.js
@@ -75,7 +75,7 @@ path:"0.1.0",
 name:"付款标识",
 label:"PaymentIdentification",
 tag:"PmtId",
-status:"M",
+status:"O",
 children: [
 {
 path:"0.1.0.0",
@@ -92,10 +92,9 @@ name:"端到端标识号",
 label:"EndToEndIdentification",
 tag:"EndToEndId",
 type:"TextInput",
-status:"M",
+status:"O",
 maxLength:"35",
-//iscips 标识是否属于cips，若属于cips有特定的初始化规则
-iscips:"1",
+unable:true,
 },
 {
 path:"0.1.0.2",
@@ -103,8 +102,9 @@ name:"交易标识号",
 label:"TransactionIdentification",
 tag:"TxId",
 type:"TextInput",
-status:"M",
+status:"O",
 maxLength:"35",
+unable:true,
 },
 ],
 },

--- a/swift-service/src/main/java/com/brilliance/mxeditor/CipsTransfer.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/CipsTransfer.java
@@ -77,10 +77,8 @@ public class CipsTransfer {
        }
        if (rescipsEndToEndId.get("EndToEndId") != null)
            gsonMaps.put("cipsEndToEndId",rescipsEndToEndId.get("EndToEndId"));
-        //新增MesgRefID
-
-        if("cips.112.001.02".equals(gsonMaps.get("MesgType"))) {
-            List<String> list = new ArrayList<>(Arrays.asList("GrpHdr"));
+        //新增MesgRefID,端到端标识号和交易标识号由报文标识号赋值
+        List<String> list = new ArrayList<>(Arrays.asList("GrpHdr"));
            Map res = gsonMaps;
            for(String s: list) {
                if (res.get(s) != null)
@@ -88,16 +86,16 @@ public class CipsTransfer {
            }
            if (res.get("MsgId") != null)
                gsonMaps.put("MesgRefID", res.get("MsgId"));
-        }else if ("cips.111.001.02".equals(gsonMaps.get("MesgType"))){
-            List<String> list = new ArrayList<>(Arrays.asList("CdtTrfTxInf","PmtId"));
-            Map res = gsonMaps;
-            for(String s: list) {
-                if (res.get(s) != null)
-                    res = (Map) res.get(s);
+            Map cdtTrfTxInf = (Map) gsonMaps.get("CdtTrfTxInf");
+            if(cdtTrfTxInf.get("PmtId") == null) {
+                Map<String,Object> pmtIdmap = new HashMap<>();
+                cdtTrfTxInf.put("PmtId",pmtIdmap);
            }
-            if (res.get("EndToEndId") != null)
-                gsonMaps.put("MesgRefID", res.get("EndToEndId"));
-        }
+        Map pmtId = (Map) cdtTrfTxInf.get("PmtId");
+            if (pmtId.get("EndToEndId") == null)
+                pmtId.put("EndToEndId", res.get("MsgId"));
+            if (pmtId.get("TxId") == null)
+                pmtId.put("TxId",res.get("MsgId"));
        //新增MesgID、cipsMsgId、OrigSenderSID、OrigReceiverSID
        gsonMaps.put("MesgID",gsonMaps.get("MesgRefID"));
        gsonMaps.put("cipsMsgId",gsonMaps.get("MesgRefID"));

--- a/swift-service/src/main/resources/innerService.properties
+++ b/swift-service/src/main/resources/innerService.properties
 #ip=127.0.0.1
 #port=10091
-ip=10.37.91.132
-port=9998
+#ip=10.37.91.132
+#port=9998

-#ip=10.37.98.201
-#port=9998
\ No newline at end of file
+ip=10.37.98.201
+port=9998
\ No newline at end of file
--- a/swift-service/src/main/resources/static/index.html
+++ b/swift-service/src/main/resources/static/index.html
-<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.e1d592f1.js"></script><script defer="defer" src="js/app.72e61fbc.js"></script><script defer="defer" src="js/main.91e00e4c.js"></script><link href="css/chunk-vendors.7c88cb4c.css" rel="stylesheet"><link href="css/app.046fcd07.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
+<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.e1d592f1.js"></script><script defer="defer" src="js/app.473f4ed2.js"></script><script defer="defer" src="js/main.91e00e4c.js"></script><link href="css/chunk-vendors.7c88cb4c.css" rel="stylesheet"><link href="css/app.fa9fab79.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
--- a/swift-service/src/main/resources/template/pacs00400109.properties
+++ b/swift-service/src/main/resources/template/pacs00400109.properties
@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
 appHdr.prty=prty
 appHdr.rltd=rltd
 pmtRtr.grpHdr=grpHdr
-pmtRtr.txInf=txInf
+#pmtRtr.txInf=txInf
 #appHdr.fr.fiId.finInstnId.bicfi=senderBic
 #appHdr.fr.fiId.finInstnId.nm=senderNm
 #appHdr.to.fiId.finInstnId.bicfi=receiverBic
@@ -25,40 +25,40 @@ pmtRtr.txInf=txInf
 #pmtRtr.grpHdr.nbOfTxs=nbOfTxs
 #pmtRtr.grpHdr.sttlmInf.sttlmMtd=sttlmMtd
 #pmtRtr.grpHdr.sttlmInf.sttlmAcct=sttlmAcct
-#pmtRtr.txInf.rtrId=rtrId
-#pmtRtr.txInf.orgnlGrpInf=orgnlGrpInf
-#pmtRtr.txInf.orgnlInstrId=orgnlInstrId
-#pmtRtr.txInf.orgnlEndToEndId=orgnlEndToEndId
-#pmtRtr.txInf.orgnlTxId=orgnlTxId
-#pmtRtr.txInf.orgnlUETR=orgnlUETR
-#pmtRtr.txInf.orgnlClrSysRef=orgnlClrSysRef
-#pmtRtr.txInf.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
-#pmtRtr.txInf.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
-#pmtRtr.txInf.rtrdIntrBkSttlmAmt=rtrdIntrBkSttlmAmt
-#pmtRtr.txInf.intrBkSttlmDt=intrBkSttlmDt
-#pmtRtr.txInf.sttlmPrty=sttlmPrty
-#pmtRtr.txInf.sttlmTmIndctn=sttlmTmIndctn
-#pmtRtr.txInf.rtrdInstdAmt=rtrdInstdAmt
-#pmtRtr.txInf.exchgRate=exchgRate
-#pmtRtr.txInf.chrgBr=chrgBr
-#pmtRtr.txInf.chrgsInf=chrgsInf
-#pmtRtr.txInf.clrSysRef=clrSysRef
-#pmtRtr.txInf.instgAgt.finInstnId.bicfi=senderBic
-#pmtRtr.txInf.instdAgt.finInstnId.bicfi=receiverBic
-#pmtRtr.txInf.rtrRsnInf.rgtr=rgtr
-#pmtRtr.txInf.rtrRsnInf.rsn.cd=rsnCd
-#pmtRtr.txInf.rtrRsnInf.addtlInf=addtlInf
-#pmtRtr.txInf.orgnlTxRef.pmtTpInf.svcLvl=svcLvl
-#pmtRtr.txInf.rtrChain.ultmtDbtr=ultmtDbtr
-#pmtRtr.txInf.rtrChain.dbtr=dbtr
-#pmtRtr.txInf.rtrChain.initgPty=initgPty
-#pmtRtr.txInf.rtrChain.dbtrAgt=dbtrAgt
-#pmtRtr.txInf.rtrChain.prvsInstgAgt1=prvsInstgAgt1
-#pmtRtr.txInf.rtrChain.prvsInstgAgt2=prvsInstgAgt2
-#pmtRtr.txInf.rtrChain.prvsInstgAgt3=prvsInstgAgt3
-#pmtRtr.txInf.rtrChain.intrmyAgt1=intrmyAgt1
-#pmtRtr.txInf.rtrChain.intrmyAgt2=intrmyAgt2
-#pmtRtr.txInf.rtrChain.intrmyAgt3=intrmyAgt3
-#pmtRtr.txInf.rtrChain.cdtrAgt=cdtrAgt
-#pmtRtr.txInf.rtrChain.cdtr=cdtr
-#pmtRtr.txInf.rtrChain.ultmtCdtr=ultmtCdtr
\ No newline at end of file
+#pmtRtr.txInf*.rtrId=rtrId
+#pmtRtr.txInf*.orgnlGrpInf=orgnlGrpInf
+#pmtRtr.txInf*.orgnlInstrId=orgnlInstrId
+#pmtRtr.txInf*.orgnlEndToEndId=orgnlEndToEndId
+#pmtRtr.txInf*.orgnlTxId=orgnlTxId
+#pmtRtr.txInf*.orgnlUETR=orgnlUETR
+#pmtRtr.txInf*.orgnlClrSysRef=orgnlClrSysRef
+#pmtRtr.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
+#pmtRtr.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
+#pmtRtr.txInf*.rtrdIntrBkSttlmAmt=rtrdIntrBkSttlmAmt
+#pmtRtr.txInf*.intrBkSttlmDt=intrBkSttlmDt
+#pmtRtr.txInf*.sttlmPrty=sttlmPrty
+#pmtRtr.txInf*.sttlmTmIndctn=sttlmTmIndctn
+#pmtRtr.txInf*.rtrdInstdAmt=rtrdInstdAmt
+#pmtRtr.txInf*.exchgRate=exchgRate
+#pmtRtr.txInf*.chrgBr=chrgBr
+#pmtRtr.txInf*.chrgsInf=chrgsInf
+#pmtRtr.txInf*.clrSysRef=clrSysRef
+#pmtRtr.txInf*.instgAgt.finInstnId.bicfi=senderBic
+#pmtRtr.txInf*.instdAgt.finInstnId.bicfi=receiverBic
+#pmtRtr.txInf*.rtrRsnInf.rgtr=rgtr
+#pmtRtr.txInf*.rtrRsnInf.rsn.cd=rsnCd
+#pmtRtr.txInf*.rtrRsnInf.addtlInf=addtlInf
+#pmtRtr.txInf*.orgnlTxRef.pmtTpInf.svcLvl=svcLvl
+#pmtRtr.txInf*.rtrChain.ultmtDbtr=ultmtDbtr
+#pmtRtr.txInf*.rtrChain.dbtr=dbtr
+#pmtRtr.txInf*.rtrChain.initgPty=initgPty
+#pmtRtr.txInf*.rtrChain.dbtrAgt=dbtrAgt
+#pmtRtr.txInf*.rtrChain.prvsInstgAgt1=prvsInstgAgt1
+#pmtRtr.txInf*.rtrChain.prvsInstgAgt2=prvsInstgAgt2
+#pmtRtr.txInf*.rtrChain.prvsInstgAgt3=prvsInstgAgt3
+#pmtRtr.txInf*.rtrChain.intrmyAgt1=intrmyAgt1
+#pmtRtr.txInf*.rtrChain.intrmyAgt2=intrmyAgt2
+#pmtRtr.txInf*.rtrChain.intrmyAgt3=intrmyAgt3
+#pmtRtr.txInf*.rtrChain.cdtrAgt=cdtrAgt
+#pmtRtr.txInf*.rtrChain.cdtr=cdtr
+#pmtRtr.txInf*.rtrChain.ultmtCdtr=ultmtCdtr
\ No newline at end of file