Skip to content

S
swiftISOEditor
Commit 10a86946 by lixinyi
Options

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

parent 4c01feea
Showing with 67 additions and 69 deletions
editor_vue/src/iso/components/TextInput.vue
...@@ -338,7 +338,6 @@ export default { ...@@ -338,7 +338,6 @@ export default {
this.dataModel.defaultValue = this.generateId(msgid); this.dataModel.defaultValue = this.generateId(msgid);
window.sessionStorage.setItem("msgid", msgid); window.sessionStorage.setItem("msgid", msgid);
}); });
} }
console.log("MsgId:"+this.dataModel.value); console.log("MsgId:"+this.dataModel.value);
} }
......
editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
...@@ -75,7 +75,7 @@ path:"0.1.0", ...@@ -75,7 +75,7 @@ path:"0.1.0",
name:"付款标识", name:"付款标识",
label:"PaymentIdentification", label:"PaymentIdentification",
tag:"PmtId", tag:"PmtId",
status:"M", status:"O",
children: [ children: [
{ {
path:"0.1.0.0", path:"0.1.0.0",
...@@ -83,10 +83,9 @@ name:"端到端标识号", ...@@ -83,10 +83,9 @@ name:"端到端标识号",
label:"EndToEndIdentification", label:"EndToEndIdentification",
tag:"EndToEndId", tag:"EndToEndId",
type:"TextInput", type:"TextInput",
status:"M", status:"O",
maxLength:"35", maxLength:"35",
//iscips 标识是否属于cips，若属于cips有特定的初始化规则 unable:true,
iscips:"1",
}, },
{ {
path:"0.1.0.1", path:"0.1.0.1",
...@@ -94,8 +93,9 @@ name:"交易标识号", ...@@ -94,8 +93,9 @@ name:"交易标识号",
label:"TransactionIdentification", label:"TransactionIdentification",
tag:"TxId", tag:"TxId",
type:"TextInput", type:"TextInput",
status:"M", status:"O",
maxLength:"35", maxLength:"35",
unable:true,
}, },
], ],
}, },
......
editor_vue/src/iso/script/MsgJson/cips_112_001_02.js
...@@ -75,7 +75,7 @@ path:"0.1.0", ...@@ -75,7 +75,7 @@ path:"0.1.0",
name:"付款标识", name:"付款标识",
label:"PaymentIdentification", label:"PaymentIdentification",
tag:"PmtId", tag:"PmtId",
status:"M", status:"O",
children: [ children: [
{ {
path:"0.1.0.0", path:"0.1.0.0",
...@@ -92,10 +92,9 @@ name:"端到端标识号", ...@@ -92,10 +92,9 @@ name:"端到端标识号",
label:"EndToEndIdentification", label:"EndToEndIdentification",
tag:"EndToEndId", tag:"EndToEndId",
type:"TextInput", type:"TextInput",
status:"M", status:"O",
maxLength:"35", maxLength:"35",
//iscips 标识是否属于cips，若属于cips有特定的初始化规则 unable:true,
iscips:"1",
}, },
{ {
path:"0.1.0.2", path:"0.1.0.2",
...@@ -103,8 +102,9 @@ name:"交易标识号", ...@@ -103,8 +102,9 @@ name:"交易标识号",
label:"TransactionIdentification", label:"TransactionIdentification",
tag:"TxId", tag:"TxId",
type:"TextInput", type:"TextInput",
status:"M", status:"O",
maxLength:"35", maxLength:"35",
unable:true,
}, },
], ],
}, },
......
swift-service/src/main/java/com/brilliance/mxeditor/CipsTransfer.java
...@@ -77,9 +77,7 @@ public class CipsTransfer { ...@@ -77,9 +77,7 @@ public class CipsTransfer {
} }
if (rescipsEndToEndId.get("EndToEndId") != null) if (rescipsEndToEndId.get("EndToEndId") != null)
gsonMaps.put("cipsEndToEndId",rescipsEndToEndId.get("EndToEndId")); gsonMaps.put("cipsEndToEndId",rescipsEndToEndId.get("EndToEndId"));
//新增MesgRefID //新增MesgRefID,端到端标识号和交易标识号由报文标识号赋值
if("cips.112.001.02".equals(gsonMaps.get("MesgType"))) {
List<String> list = new ArrayList<>(Arrays.asList("GrpHdr")); List<String> list = new ArrayList<>(Arrays.asList("GrpHdr"));
Map res = gsonMaps; Map res = gsonMaps;
for(String s: list) { for(String s: list) {
...@@ -88,16 +86,16 @@ public class CipsTransfer { ...@@ -88,16 +86,16 @@ public class CipsTransfer {
} }
if (res.get("MsgId") != null) if (res.get("MsgId") != null)
gsonMaps.put("MesgRefID", res.get("MsgId")); gsonMaps.put("MesgRefID", res.get("MsgId"));
}else if ("cips.111.001.02".equals(gsonMaps.get("MesgType"))){ Map cdtTrfTxInf = (Map) gsonMaps.get("CdtTrfTxInf");
List<String> list = new ArrayList<>(Arrays.asList("CdtTrfTxInf","PmtId")); if(cdtTrfTxInf.get("PmtId") == null) {
Map res = gsonMaps; Map<String,Object> pmtIdmap = new HashMap<>();
for(String s: list) { cdtTrfTxInf.put("PmtId",pmtIdmap);
if (res.get(s) != null) }
res = (Map) res.get(s); Map pmtId = (Map) cdtTrfTxInf.get("PmtId");
} if (pmtId.get("EndToEndId") == null)
if (res.get("EndToEndId") != null) pmtId.put("EndToEndId", res.get("MsgId"));
gsonMaps.put("MesgRefID", res.get("EndToEndId")); if (pmtId.get("TxId") == null)
} pmtId.put("TxId",res.get("MsgId"));
//新增MesgID、cipsMsgId、OrigSenderSID、OrigReceiverSID //新增MesgID、cipsMsgId、OrigSenderSID、OrigReceiverSID
gsonMaps.put("MesgID",gsonMaps.get("MesgRefID")); gsonMaps.put("MesgID",gsonMaps.get("MesgRefID"));
gsonMaps.put("cipsMsgId",gsonMaps.get("MesgRefID")); gsonMaps.put("cipsMsgId",gsonMaps.get("MesgRefID"));
......
swift-service/src/main/resources/innerService.properties
#ip=127.0.0.1 #ip=127.0.0.1
#port=10091 #port=10091
ip=10.37.91.132 #ip=10.37.91.132
port=9998
#ip=10.37.98.201
#port=9998 #port=9998
ip=10.37.98.201
port=9998
\ No newline at end of file
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> <!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 \ No newline at end of file
swift-service/src/main/resources/template/pacs00400109.properties
...@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct ...@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
appHdr.prty=prty appHdr.prty=prty
appHdr.rltd=rltd appHdr.rltd=rltd
pmtRtr.grpHdr=grpHdr pmtRtr.grpHdr=grpHdr
pmtRtr.txInf=txInf #pmtRtr.txInf=txInf
#appHdr.fr.fiId.finInstnId.bicfi=senderBic #appHdr.fr.fiId.finInstnId.bicfi=senderBic
#appHdr.fr.fiId.finInstnId.nm=senderNm #appHdr.fr.fiId.finInstnId.nm=senderNm
#appHdr.to.fiId.finInstnId.bicfi=receiverBic #appHdr.to.fiId.finInstnId.bicfi=receiverBic
...@@ -25,40 +25,40 @@ pmtRtr.txInf=txInf ...@@ -25,40 +25,40 @@ pmtRtr.txInf=txInf
#pmtRtr.grpHdr.nbOfTxs=nbOfTxs #pmtRtr.grpHdr.nbOfTxs=nbOfTxs
#pmtRtr.grpHdr.sttlmInf.sttlmMtd=sttlmMtd #pmtRtr.grpHdr.sttlmInf.sttlmMtd=sttlmMtd
#pmtRtr.grpHdr.sttlmInf.sttlmAcct=sttlmAcct #pmtRtr.grpHdr.sttlmInf.sttlmAcct=sttlmAcct
#pmtRtr.txInf.rtrId=rtrId #pmtRtr.txInf*.rtrId=rtrId
#pmtRtr.txInf.orgnlGrpInf=orgnlGrpInf #pmtRtr.txInf*.orgnlGrpInf=orgnlGrpInf
#pmtRtr.txInf.orgnlInstrId=orgnlInstrId #pmtRtr.txInf*.orgnlInstrId=orgnlInstrId
#pmtRtr.txInf.orgnlEndToEndId=orgnlEndToEndId #pmtRtr.txInf*.orgnlEndToEndId=orgnlEndToEndId
#pmtRtr.txInf.orgnlTxId=orgnlTxId #pmtRtr.txInf*.orgnlTxId=orgnlTxId
#pmtRtr.txInf.orgnlUETR=orgnlUETR #pmtRtr.txInf*.orgnlUETR=orgnlUETR
#pmtRtr.txInf.orgnlClrSysRef=orgnlClrSysRef #pmtRtr.txInf*.orgnlClrSysRef=orgnlClrSysRef
#pmtRtr.txInf.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt #pmtRtr.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
#pmtRtr.txInf.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt #pmtRtr.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
#pmtRtr.txInf.rtrdIntrBkSttlmAmt=rtrdIntrBkSttlmAmt #pmtRtr.txInf*.rtrdIntrBkSttlmAmt=rtrdIntrBkSttlmAmt
#pmtRtr.txInf.intrBkSttlmDt=intrBkSttlmDt #pmtRtr.txInf*.intrBkSttlmDt=intrBkSttlmDt
#pmtRtr.txInf.sttlmPrty=sttlmPrty #pmtRtr.txInf*.sttlmPrty=sttlmPrty
#pmtRtr.txInf.sttlmTmIndctn=sttlmTmIndctn #pmtRtr.txInf*.sttlmTmIndctn=sttlmTmIndctn
#pmtRtr.txInf.rtrdInstdAmt=rtrdInstdAmt #pmtRtr.txInf*.rtrdInstdAmt=rtrdInstdAmt
#pmtRtr.txInf.exchgRate=exchgRate #pmtRtr.txInf*.exchgRate=exchgRate
#pmtRtr.txInf.chrgBr=chrgBr #pmtRtr.txInf*.chrgBr=chrgBr
#pmtRtr.txInf.chrgsInf=chrgsInf #pmtRtr.txInf*.chrgsInf=chrgsInf
#pmtRtr.txInf.clrSysRef=clrSysRef #pmtRtr.txInf*.clrSysRef=clrSysRef
#pmtRtr.txInf.instgAgt.finInstnId.bicfi=senderBic #pmtRtr.txInf*.instgAgt.finInstnId.bicfi=senderBic
#pmtRtr.txInf.instdAgt.finInstnId.bicfi=receiverBic #pmtRtr.txInf*.instdAgt.finInstnId.bicfi=receiverBic
#pmtRtr.txInf.rtrRsnInf.rgtr=rgtr #pmtRtr.txInf*.rtrRsnInf.rgtr=rgtr
#pmtRtr.txInf.rtrRsnInf.rsn.cd=rsnCd #pmtRtr.txInf*.rtrRsnInf.rsn.cd=rsnCd
#pmtRtr.txInf.rtrRsnInf.addtlInf=addtlInf #pmtRtr.txInf*.rtrRsnInf.addtlInf=addtlInf
#pmtRtr.txInf.orgnlTxRef.pmtTpInf.svcLvl=svcLvl #pmtRtr.txInf*.orgnlTxRef.pmtTpInf.svcLvl=svcLvl
#pmtRtr.txInf.rtrChain.ultmtDbtr=ultmtDbtr #pmtRtr.txInf*.rtrChain.ultmtDbtr=ultmtDbtr
#pmtRtr.txInf.rtrChain.dbtr=dbtr #pmtRtr.txInf*.rtrChain.dbtr=dbtr
#pmtRtr.txInf.rtrChain.initgPty=initgPty #pmtRtr.txInf*.rtrChain.initgPty=initgPty
#pmtRtr.txInf.rtrChain.dbtrAgt=dbtrAgt #pmtRtr.txInf*.rtrChain.dbtrAgt=dbtrAgt
#pmtRtr.txInf.rtrChain.prvsInstgAgt1=prvsInstgAgt1 #pmtRtr.txInf*.rtrChain.prvsInstgAgt1=prvsInstgAgt1
#pmtRtr.txInf.rtrChain.prvsInstgAgt2=prvsInstgAgt2 #pmtRtr.txInf*.rtrChain.prvsInstgAgt2=prvsInstgAgt2
#pmtRtr.txInf.rtrChain.prvsInstgAgt3=prvsInstgAgt3 #pmtRtr.txInf*.rtrChain.prvsInstgAgt3=prvsInstgAgt3
#pmtRtr.txInf.rtrChain.intrmyAgt1=intrmyAgt1 #pmtRtr.txInf*.rtrChain.intrmyAgt1=intrmyAgt1
#pmtRtr.txInf.rtrChain.intrmyAgt2=intrmyAgt2 #pmtRtr.txInf*.rtrChain.intrmyAgt2=intrmyAgt2
#pmtRtr.txInf.rtrChain.intrmyAgt3=intrmyAgt3 #pmtRtr.txInf*.rtrChain.intrmyAgt3=intrmyAgt3
#pmtRtr.txInf.rtrChain.cdtrAgt=cdtrAgt #pmtRtr.txInf*.rtrChain.cdtrAgt=cdtrAgt
#pmtRtr.txInf.rtrChain.cdtr=cdtr #pmtRtr.txInf*.rtrChain.cdtr=cdtr
#pmtRtr.txInf.rtrChain.ultmtCdtr=ultmtCdtr #pmtRtr.txInf*.rtrChain.ultmtCdtr=ultmtCdtr
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment