Skip to content

S
swiftMtMx
Commit a141ab2f by zhanghou
Options

完成camt029001和camt056001报文要素平铺展示

parent 06f3cf6c
Showing with 134 additions and 60 deletions
swiftCore/src/main/java/com/brilliance/swift/mx2element/Mx2ElementCreatorManager.java
......@@ -4,6 +4,7 @@ import com.brilliance.swift.exception.SwiftException;
import com.brilliance.swift.mx2element.camt029001.Mx2ElementCamt029001Creator;
import com.brilliance.swift.mx2element.camt053001.Mx2ElementCamt053001Creator;
import com.brilliance.swift.mx2element.camt054001.Mx2ElementCamt054001Creator;
import com.brilliance.swift.mx2element.camt056001.Mx2ElementCamt056001Creator;
import com.brilliance.swift.mx2element.pacs008001.Mx2ElementPacs008001Creator;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
......@@ -40,6 +41,8 @@ public class Mx2ElementCreatorManager {
return new Mx2ElementCamt053001Creator();
}else if("camt.029.001".equals(messageType)){
return new Mx2ElementCamt029001Creator();
}else if("camt.056.001".equals(messageType)){
return new Mx2ElementCamt056001Creator();
}
else {
throw new SwiftException("Invalid message type");
......
swiftCore/src/main/java/com/brilliance/swift/mx2element/camt029001/Mx2ElementCamt029001Creator.java
......@@ -23,6 +23,14 @@ import java.util.Map;
public class Mx2ElementCamt029001Creator extends AbstractMx2ElementCreator {
@Override
public Map<String, Object> buildElement() {
return super.buildElement();
}
/*
//cretrPty=rsltnOfInvstgtn.cxlDtls.txInfAndSts.rslvdCase.cretr.pty[prefix:cretr,type:party]
//cretrAgt=rsltnOfInvstgtn.cxlDtls.txInfAndSts.rslvdCase.cretr.agt[prefix:cretr,type:agent]
@Override
public Map<String, Object> buildElement() {
//AbstractMX abstractMX = AbstractMX.parse(xmlStr);
String messageType = abstractMX.getMxId().getBusinessProcess().name()
+ abstractMX.getMxId().getFunctionality()
......@@ -181,5 +189,5 @@ public class Mx2ElementCamt029001Creator extends AbstractMx2ElementCreator {
}
}
return value;
}
}*/
}
swiftCore/src/main/java/com/brilliance/swift/mx2element/camt053001/Mx2ElementCamt053001Creator.java
......@@ -98,7 +98,6 @@ public class Mx2ElementCamt053001Creator extends AbstractMx2ElementCreator {
String p = paths[i];
if(p.indexOf("#")>0){
String key = p.split("#")[0];
System.out.println(tmpMaps);
JSONArray array = (JSONArray) tmpMaps.get(key);
String fileName = "/template/"+p.split("#")[1]+".properties";
InputStream resourceAsStream = AbstractMx2ElementCreator.class.getResourceAsStream(fileName);
......
swiftCore/src/main/java/com/brilliance/swift/mx2element/camt056001/Mx2ElementCamt056001Creator.java 0 → 100644
package com.brilliance.swift.mx2element.camt056001;
import com.brilliance.swift.exception.SwiftException;
import com.brilliance.swift.mx2element.AbstractMx2ElementCreator;
import com.brilliance.swift.util.StringUtil;
import com.brilliance.swift.util.XmlUtil;
import com.brilliance.swift.vo.common.CdtDbtCode;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class Mx2ElementCamt056001Creator extends AbstractMx2ElementCreator {
@Override
public Map<String, Object> buildElement() {
return super.buildElement();
}
}
swiftCore/src/main/resources/swiftXml/MxCamt02900108_196.xml
......@@ -56,7 +56,7 @@ Change Log
<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.029.001.09">
<RsltnOfInvstgtn>
<Assgnmt>
<Id>ASSNID-001</Id>
<Id>ASSNID-001</Id>
<Assgnr>
<Agt>
<FinInstnId>
......@@ -74,13 +74,29 @@ Change Log
<CreDtTm>2021-02-17T16:15:00+01:00</CreDtTm>
</Assgnmt>
<Sts>
<Conf>CNCL</Conf>
<Conf>CNCL</Conf>
<RjctdMod>
<Cd>UM01</Cd>
</RjctdMod>
<DplctOf>
<Id>CS001</Id>
<Cretr>
<Agt>
<FinInstnId>
<BICFI>RBOSGB2L</BICFI>
<Nm>zs</Nm>
<LEI>cd</LEI>
</FinInstnId>
</Agt>
</Cretr>
</DplctOf>
<AssgnmtCxlConf>true</AssgnmtCxlConf>
</Sts>
<CxlDtls>
<TxInfAndSts>
<CxlStsId>CNCL-ID00111111111111111</CxlStsId>
<CxlStsId>CNCL-ID001</CxlStsId>
<RslvdCase>
<Id>CSE-0011111111111111111111111</Id>
<Id>CSE-001</Id>
<Cretr>
<Agt>
<FinInstnId>
......@@ -110,7 +126,9 @@ Change Log
</Orgtr>
<Rsn>
<Cd>AGNT</Cd>
</Rsn>
</Rsn>
<AddtlInf>HELLO,WORLD.HELLO,WORLD.HELLO,WORLD.HELLO</AddtlInf>
<AddtlInf>NICE TO MEET YOU</AddtlInf>
</CxlStsRsnInf>
</TxInfAndSts>
</CxlDtls>
......
swiftCore/src/main/resources/swiftXml/MxCamt05600108_192.xml
......@@ -56,18 +56,20 @@ Change Log
<Undrlyg>
<TxInf>
<Case>
<Id>CSE-00111111111111111111111111</Id>
<Cretr>
<Agt>
<FinInstnId>
<BICFI>RBOSGB2L</BICFI>
</FinInstnId>
</Agt>
</Cretr>
<Id>CSE-0011</Id>
<Cretr>
<Agt>
<FinInstnId>
<BICFI>RBOSGB2L</BICFI>
<Nm>zs</Nm>
<LEI>cd</LEI>
</FinInstnId>
</Agt>
</Cretr>
</Case>
<OrgnlGrpInf>
<OrgnlMsgId>pacs8bizmsgidr01</OrgnlMsgId>
<OrgnlMsgNmId>11pacs.008.001.08</OrgnlMsgNmId>
<OrgnlMsgNmId>pacs.008.001.08</OrgnlMsgNmId>
<OrgnlCreDtTm>2021-02-17T08:30:00+01:00</OrgnlCreDtTm>
</OrgnlGrpInf>
<OrgnlInstrId>pacs8bizmsgidr01</OrgnlInstrId>
......
swiftCore/src/main/resources/template/agent.properties deleted 100644 → 0
clrSysId=finInstnId.clrSysMmbId.mmbId
clrSysIdType=finInstnId.clrSysMmbId.clrSysId.cd
clrSysIdTypePrtry=finInstnId.clrSysMmbId.clrSysId.prtry
\ No newline at end of file
swiftCore/src/main/resources/template/camt053001.properties
#61?????????list??,#entry?#?????????????(???)
#entry.propertie????????????????????????????????61?#?????
#??????????xml??????
#60,62,64???????bal?????????????????????????????????????????????????
#OPBD?60?CLBD?62?CLAV?64
#tp.cdOrPrtry.cd??????????????????OPBD????????
#APPLICATION HEADER
frBic=appHdr.fr.fiId.finInstnId.bicfi?appHdr.fr.orgId.id.orgId.anyBIC
toBic=appHdr.to.fiId.finInstnId.bicfi?appHdr.to.orgId.id.orgId.anyBIC
......
swiftCore/src/main/resources/template/camt056001.properties
#case???????????????????
#APPLICATION HEADER
frBic=appHdr.fr.fiId.finInstnId.bicfi?appHdr.fr.orgId.id.orgId.anyBIC
toBic=appHdr.to.fiId.finInstnId.bicfi?appHdr.to.orgId.id.orgId.anyBIC
bizMsgIdr=fiToFIPmtCxlReq.undrlyg.txInf.case.id?appHdr.bizMsgIdr
bizMsgIdr=fiToFIPmtCxlReq.undrlyg.txInf._case.id?appHdr.bizMsgIdr?fiToFIPmtCxlReq.assgnmt.id
msgDefIdr=appHdr.msgDefIdr
bizSvc=appHdr.bizSvc
creDt=fiToFIPmtCxlReq.assgnmt.creDtTm?appHdr.creDt
priority=appHdr.prty
uetr=fiToFIPmtCxlReq.undrlyg.txInf.orgnlUETR
#BODY
#11S
orgnlMsgNmId=fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgNmId
......@@ -15,10 +17,63 @@ orgnlInstrId=fiToFIPmtCxlReq.undrlyg.txInf.orgnlInstrId
#32
orgnlIntrBkSttlmAmt=fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmAmt.value&bigdecimal
orgnlIntrBkSttlmCcy=fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmAmt.ccy
#76
orgnlIntrBkSttlmDt=fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmDt
#79
rsnCd=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.rsn.cd
rsnPrtry=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.rsn.prtry
addtlInf=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.addtlInf
#other
cretrPty=fiToFIPmtCxlReq.undrlyg.txInf.case.cretr.pty[prefix:cretr,type:party]
cretrAgt=fiToFIPmtCxlReq.undrlyg.txInf.case.cretr.agt[prefix:cretr,type:agent]
\ No newline at end of file
#Other
orgnlMsgId=fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgId
orgnlEndToEndId=fiToFIPmtCxlReq.undrlyg.txInf.orgnlEndToEndId
assgnrBic=fiToFIPmtCxlReq.assgnmt.assgnr.pty.id.orgId.anyBIC?fiToFIPmtCxlReq.assgnmt.assgnr.agt.finInstnId.bicfi
assgneBic=fiToFIPmtCxlReq.assgnmt.assgne.pty.id.orgId.anyBIC?fiToFIPmtCxlReq.assgnmt.assgne.agt.finInstnId.bicfi
caseCretrNm=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.nm?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.nm
caseCretrOrgAnyBIC=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.id.orgId.anyBIC?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.bicfi
caseCretrOrgLei=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.id.orgId.lei?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.lei
caseCretrOrgOthrId=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.id.orgId.othr.id?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.othr.id
caseCretrOrgOthrIdType=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.id.orgId.othr.schmeNm.cd?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.othr.schmeNm.cd
caseCretrOrgOthrIdTypePrtry=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.id.orgId.othr.schmeNm.prtry?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.othr.schmeNm.prtry
caseCretrPstlAdrType=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.adrTp.cd?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.adrTp.cd
caseCretrPstlAdrCtry=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.ctry?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.ctry
caseCretrPstlAdrDept=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.dept?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.dept
caseCretrPstlAdrSubDept=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.subDept?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.subDept
caseCretrPstlAdrStrtNm=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.strtNm?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.strtNm
caseCretrPstlAdrBldgNb=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.bldgNb?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.bldgNb
caseCretrPstlAdrBldgNm=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.bldgNm?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.bldgNm
caseCretrPstlAdrFlr=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.flr?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.flr
caseCretrPstlAdrRoom=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.room?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.room
caseCretrPstlAdrTwnNm=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.twnNm?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.twnNm
caseCretrPstlAdrPstBx=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.pstBx?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.pstBx
caseCretrPstlAdrPstCd=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.pstCd?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.pstCd
caseCretrAdrLines=fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.pty.pstlAdr.adrLine?fiToFIPmtCxlReq.undrlyg.txInf._case.cretr.agt.finInstnId.pstlAdr.adrLine
orgtrNm=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.nm
orgtrOrgAnyBIC=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.orgId.anyBIC
orgtrOrgLei=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.orgId.lei
orgtrOrgOthrId=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.orgId.othr.id
orgtrOrgOthrIdType=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.orgId.othr.schmeNm.cd
orgtrOrgOthrIdTypePrtry=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.orgId.othr.schmeNm.prtry
orgtrPrvtBirthDt=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.dtAndPlcOfBirth.birthDt
orgtrPrvtPrvcOfBirth=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.dtAndPlcOfBirth.prvcOfBirth
orgtrPrvtCityOfBirth=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.dtAndPlcOfBirth.cityOfBirth
orgtrPrvtCtryOfBirth=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.dtAndPlcOfBirth.cityOfBirth
orgtrPrvtId=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.othr.id
orgtrPrvtIdType=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.othr.schmeNm.cd
orgtrPrvtIdTypePrtry=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.id.prvtId.othr.schmeNm.prtry
orgtrCtryOfRes=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.ctryOfRes
orgtrPstlAdrType=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.adrTp.cd
orgtrPstlAdrCtry=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.ctry
orgtrPstlAdrDept=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.dept
orgtrPstlAdrSubDept=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.subDept
orgtrPstlAdrStrtNm=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.strtNm
orgtrPstlAdrBldgNb=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.bldgNb
orgtrPstlAdrBldgNm=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.bldgNm
orgtrPstlAdrFlr=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.flr
orgtrPstlAdrRoom=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.room
orgtrPstlAdrTwnNm=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.twnNm
orgtrPstlAdrPstBx=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.pstBx
orgtrPstlAdrPstCd=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.pstCd
orgtrAdrLines=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.pstlAdr.adrLine
orgtrPhneNb=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.ctctDtls.phneNb
orgtrMobNb=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.ctctDtls.mobNb
orgtrFaxNb=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.ctctDtls.faxNb
orgtrEmailAdr=fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf.orgtr.ctctDtls.emailAdr
swiftCore/src/main/resources/template/party.properties deleted 100644 → 0
prvtBirthDt=id.prvtId.dtAndPlcOfBirth.birthDt
prvtPrvcOfBirth=id.prvtId.dtAndPlcOfBirth.prvcOfBirth
prvtCityOfBirth=id.prvtId.dtAndPlcOfBirth.cityOfBirth
prvtCtryOfBirth=id.prvtId.dtAndPlcOfBirth.ctryOfBirth
prvtId=id.prvtId.othr.id
prvtIdType=id.prvtId.othr.schmeNm.cd
prvtIdTypePrtry=id.prvtId.othr.schmeNm.prtry
ctryOfRes=ctryOfRes
phneNb=ctctDtls.phneNb
mobNb=ctctDtls.mobNb
faxNb=ctctDtls.faxNb
emailAdr=ctctDtls.emailAdr
\ No newline at end of file
swiftCore/src/main/resources/template/partyAndAgent.properties deleted 100644 → 0
nm=nm?finInstnId.nm
orgAnyBIC=id.orgId.anyBIC?finInstnId.bicfi
orgLei=id.orgId.lei?finInstnId.lei
orgOthrId=id.orgId.othr.id?finInstnId.othr.id
orgOthrIdType=id.orgId.othr.schmeNm.cd?finInstnId.othr.schmeNm.cd
orgOthrIdTypePrtry=id.orgId.othr.schmeNm.prtry?finInstnId.othr.schmeNm.prtry
pstlAdrType=pstlAdr.adrTp.cd?finInstnId.
pstlAdrCtry=pstlAdr.ctry?finInstnId.pstlAdr.ctry
pstlAdrDept=pstlAdr.dept?finInstnId.pstlAdr.dept
pstlAdrSubDept=pstlAdr.subDept?finInstnId.pstlAdr.subDept
pstlAdrStrtNm=pstlAdr.strtNm?finInstnId.pstlAdr.strtNm
pstlAdrBldgNb=pstlAdr.bldgNb?finInstnId.pstlAdr.bldgNb
pstlAdrBldgNm=pstlAdr.bldgNm?finInstnId.pstlAdr.bldgNm
pstlAdrFlr=pstlAdr.flr?finInstnId.pstlAdr.flr
pstlAdrRoom=pstlAdr.room?finInstnId.pstlAdr.room
pstlAdrTwnNm=pstlAdr.twnNm?finInstnId.pstlAdr.twnNm
pstlAdrPstBx=pstlAdr.pstBx?finInstnId.pstlAdr.pstBx
pstlAdrPstCd=pstlAdr.pstCd?finInstnId.pstlAdr.pstCd
adrLines=pstlAdr.adrLine?finInstnId.pstlAdr.adrLine
\ No newline at end of file
swiftCore/src/test/java/com/brilliance/mx2element/camt029001/Test196.java
......@@ -10,9 +10,9 @@ public class Test196 {
public static void main(String[] args) throws IOException {
File file = new File(System.getProperty("user.dir")+"\\swiftCore\\src\\main\\resources\\swiftXml\\MxCamt02900108_196.xml");
//File file = new File("d:/test/MxPacs00800108.xml");
String xmlStr = FileUtils.readFileToString(file);
String jsonStr = SwiftTransfer.mx2Element(xmlStr);
System.out.println(jsonStr);
// SwiftTransfer.validateMx(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