Skip to content

S
swiftMtMx
Commit 75cc02d6 by miniphoto
Options

103合并类并删除没用的类

parent dc3ef3b0
Showing with 321 additions and 946 deletions
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/Mx2Mt103Creator.java
......@@ -68,29 +68,15 @@ public class Mx2Mt103Creator extends AbstractMx2MtCreator {
fieldsGenerateList.add(new Field33BGenerate());
fieldsGenerateList.add(new Field36Generate());
fieldsGenerateList.add(new Field50AGenerate());
fieldsGenerateList.add(new Field50FGenerate());
fieldsGenerateList.add(new Field50KGenerate());
fieldsGenerateList.add(new Field52AGenerate());
fieldsGenerateList.add(new Field52DGenerate());
fieldsGenerateList.add(new Field53AGenerate());
fieldsGenerateList.add(new Field53BGenerate());
fieldsGenerateList.add(new Field53DGenerate());
fieldsGenerateList.add(new Field54AGenerate());
fieldsGenerateList.add(new Field54DGenerate());
fieldsGenerateList.add(new Field55AGenerate());
fieldsGenerateList.add(new Field55DGenerate());
fieldsGenerateList.add(new Field56AGenerate());
fieldsGenerateList.add(new Field56CGenerate());
fieldsGenerateList.add(new Field56DGenerate());
fieldsGenerateList.add(new Field57AGenerate());
fieldsGenerateList.add(new Field57CGenerate());
fieldsGenerateList.add(new Field57DGenerate());
fieldsGenerateList.add(new Field59Generate());
fieldsGenerateList.add(new Field59AGenerate());
fieldsGenerateList.add(new Field70Generate());
fieldsGenerateList.add(new Field71AGenerate());
fieldsGenerateList.add(new Field71FGenerate());
fieldsGenerateList.add(new Field71GGenerate());
fieldsGenerateList.add(new Field72Generate());
fieldsGenerateList.add(new Field77BGenerate());
fieldsGenerateList.add(new CommonFieldFor103Generate());
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field23EGenerate.java
......@@ -59,7 +59,7 @@ public class Field23EGenerate extends AbstractMx2MtFieldsGenerate {
}
if (cdtTrfTxInf.get(0).getInstrForCdtrAgt().get(0).getInstrInf() != null) {
String field23E = cdtTrfTxInf.get(0).getInstrForCdtrAgt().get(0).getInstrInf();
map.put("field23E",field23E);
field23EList.add(field23E);
}
}
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field50AGenerate.java
......@@ -12,17 +12,24 @@ import org.slf4j.LoggerFactory;
import java.util.List;
/**
* "1，如果<AnyBIC>节点有值，则设置50 option为“A”，且BIC为此节点的值
* 1，如果<AnyBIC>节点有值，则设置50 option为“A”，且BIC为此节点的值
* 2，若节点<IBAN>有值，则在此节点值前面加上“/”后，作为50的账号；
* 3，若节点<Othr><Id>有值，则在此节点值前面加上“//CH”后，作为50的账号；"
* "<CdtTrfTxInf>[1]<Dbtr><Id><OrgId><AnyBIC>
* 3，若节点<Othr><Id>有值，则在此节点值前面加上“//CH”后，作为50的账号；
* <CdtTrfTxInf>[1]<Dbtr><Id><OrgId><AnyBIC>
* <CdtTrfTxInf>[1]<DbtrAcct><Id><IBAN>
* <CdtTrfTxInf>[1]<DbtrAcct><Id><Othr><Id>"
* **/
* <CdtTrfTxInf>[1]<DbtrAcct><Id><Othr><Id>
* 1，待补充？？？
* 2，账号取值规则与50A相同
* 1，若<Dbtr><Nm>有录入，则设置50 option为“K”，且名称取自此节点，而地址需要合并截取？？？
* 2，账号取值规则与50A相同
* <CdtTrfTxInf>[1]<Dbtr><Nm>
* <CdtTrfTxInf>[1]<Dbtr><PstlAdr><AdrLine>
*/
public class Field50AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field50AGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
//TODO 为F条件待补充
logger.info("Field50AGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
......@@ -39,6 +46,20 @@ public class Field50AGenerate extends AbstractMx2MtFieldsGenerate {
&& cdtTrfTxInf.get(0).getDbtr().getId().getOrgId().getBICOrBEI() != null){
map.put("field50Key","A");
map.put("field50A",cdtTrfTxInf.get(0).getDbtr().getId().getOrgId().getBICOrBEI());
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getDbtr() != null
&& cdtTrfTxInf.get(0).getDbtr().getNm() != null){
map.put("field50Key","K");
if (cdtTrfTxInf.get(0).getDbtr() != null
&& cdtTrfTxInf.get(0).getDbtr().getPstlAdr() != null
&& cdtTrfTxInf.get(0).getDbtr().getPstlAdr().getAdrLine() != null){
List<String> adrList = cdtTrfTxInf.get(0).getDbtr().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field50Adr",adStr);
}
}
if (cdtTrfTxInf.get(0).getDbtrAcct() != null
&& cdtTrfTxInf.get(0).getDbtrAcct().getId() != null){
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field50FGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
public class Field50FGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field50FGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field50FGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getDbtr() != null
&& cdtTrfTxInf.get(0).getDbtr().getId() != null
&& cdtTrfTxInf.get(0).getDbtr().getId().getOrgId() != null
&& cdtTrfTxInf.get(0).getDbtr().getId().getOrgId().getBICOrBEI() != null){
map.put("field50Key","F");
//TODO 为F条件待补充
}
if (cdtTrfTxInf.get(0).getDbtrAcct() != null
&& cdtTrfTxInf.get(0).getDbtrAcct().getId() != null){
if (cdtTrfTxInf.get(0).getDbtrAcct().getId().getIBAN() != null){
map.put("field50Account","/" + cdtTrfTxInf.get(0).getDbtrAcct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getDbtrAcct().getId().getOthr().getId() != null){
map.put("field50Account","//CH" + cdtTrfTxInf.get(0).getDbtrAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field50F error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field50KGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
public class Field50KGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field50KGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field50KGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getDbtr() != null
&& cdtTrfTxInf.get(0).getDbtr().getNm() != null){
map.put("field50Key","K");
}
if (cdtTrfTxInf.get(0).getDbtr() != null
&& cdtTrfTxInf.get(0).getDbtr().getPstlAdr() != null
&& cdtTrfTxInf.get(0).getDbtr().getPstlAdr().getAdrLine() != null){
List<String> adrList = cdtTrfTxInf.get(0).getDbtr().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field50Adr",adStr);
if (cdtTrfTxInf.get(0).getDbtrAcct() != null
&& cdtTrfTxInf.get(0).getDbtrAcct().getId() != null){
if (cdtTrfTxInf.get(0).getDbtrAcct().getId().getIBAN() != null){
map.put("field50Account","/" + cdtTrfTxInf.get(0).getDbtrAcct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getDbtrAcct().getId().getOthr().getId() != null){
map.put("field50Account","//CH" + cdtTrfTxInf.get(0).getDbtrAcct().getId().getOthr().getId());
}
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field50K error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field52AGenerate.java
......@@ -19,6 +19,10 @@ import java.util.List;
* <CdtTrfTxInf>[1]<DbtrAgtAcct><Id><IBAN>
* <CdtTrfTxInf>[1]<DbtrAgtAcct><Id><Othr><Id>
* <CdtTrfTxInf>[1]<DbtrAgtAcct><Id><Othr><SchmeNm><Cd>
* * 1，若节点<Nm>有值，则设置52 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * 2，账号取值规则和节点与52A相同
* * <CdtTrfTxInf>[1]<DbtrAgt><FinInstnId><Nm>
* * <CdtTrfTxInf>[1]<DbtrAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field52AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field52AGenerate.class);
......@@ -39,6 +43,17 @@ public class Field52AGenerate extends AbstractMx2MtFieldsGenerate {
&& cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getBIC() != null){
map.put("field52Key","A");
map.put("field52A",cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getBIC());
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getDbtrAgt() != null
&& cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getNm() != null){
map.put("field52Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field52DAdr",adStr);
}
if (cdtTrfTxInf.get(0).getDbtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getDbtrAgtAcct().getId() != null){
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field52DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* 1，若节点<Nm>有值，则设置52 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* 2，账号取值规则和节点与52A相同
* <CdtTrfTxInf>[1]<DbtrAgt><FinInstnId><Nm>
* <CdtTrfTxInf>[1]<DbtrAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field52DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field52DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field52DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getDbtrAgt() != null
&& cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getNm() != null){
map.put("field52Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field52DAdr",adStr);
}
if (cdtTrfTxInf.get(0).getDbtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getDbtrAgtAcct().getId() != null){
if (cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getIBAN() != null){
map.put("field52Account",cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getSchmeNm().getCd() != null){
if (cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getId() != null){
map.put("field52Account","//CH" + cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getId());
}
}else {
if (cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getId() != null){
map.put("field52Account",cdtTrfTxInf.get(0).getDbtrAgtAcct().getId().getOthr().getId());
}
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field52D error");
}
}
}
\ No newline at end of file
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field53AGenerate.java
......@@ -9,6 +9,8 @@ import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* 1，若节点<BICFI>有值，则设置53 option为“A”，同时BIC取此栏位；
* 2，若节点<IBAN>有值，则作为53的账号；
......@@ -17,6 +19,16 @@ import org.slf4j.LoggerFactory;
* <GrpHdr><SttlmInf><InstgRmbrsmntAgtAcct><Id><IBAN>
* <GrpHdr><SttlmInf><InstgRmbrsmntAgtAcct><Id><Othr><Id>
* <GrpHdr><SttlmInf><InstgRmbrsmntAgtAcct><Id><Othr><SchmeNm><Cd>
* * //如果<SttlmAcct><Id><IBAN>或<SttlmAcct><Id><Othr><Id>有值，则设置53 option为“B”：
* * //1）若节点<IBAN>有值，则作为53B的账号；
* * //2）若节点<Othr><Id>有值，则作为53B的账号；
* * //<GrpHdr><SttlmInf><SttlmAcct><Id><IBAN>
* * //<GrpHdr><SttlmInf><SttlmAcct><Id><Othr><Id>
* * //<GrpHdr><SttlmInf><SttlmAcct><Id><Othr><SchmeNm><Cd>
* //1，若节点<Nm>有值，则设置53 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * //2，账号取值规则和节点与53A相同
* * //<GrpHdr><SttlmInf><InstgRmbrsmntAgt><FinInstnId><Nm>
* * //<GrpHdr><SttlmInf><InstgRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field53AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field53AGenerate.class);
......@@ -36,17 +48,54 @@ public class Field53AGenerate extends AbstractMx2MtFieldsGenerate {
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getBIC() != null){
map.put("field53Key","A");
map.put("field53",grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getBIC());
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
}else if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}
}
}else if ((grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN() != null)
|| (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId() != null)){
map.put("field53Key","B");
if (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN());
}else if (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId());
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}else if ((grpHdr.getSttlmInf().getInstdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field53Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field53DAdr",adStr);
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
}else if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field53BGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* //如果<SttlmAcct><Id><IBAN>或<SttlmAcct><Id><Othr><Id>有值，则设置53 option为“B”：
* //1）若节点<IBAN>有值，则作为53B的账号；
* //2）若节点<Othr><Id>有值，则作为53B的账号；
* //<GrpHdr><SttlmInf><SttlmAcct><Id><IBAN>
* //<GrpHdr><SttlmInf><SttlmAcct><Id><Othr><Id>
* //<GrpHdr><SttlmInf><SttlmAcct><Id><Othr><SchmeNm><Cd>
*/
public class Field53BGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field53BGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field53BGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
GroupHeader33 grpHdr = fiToFICstmrCdtTrf.getGrpHdr();
if (grpHdr.getSttlmInf() != null){
if ((grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN() != null)
|| (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId() != null)){
map.put("field53Key","B");
}
if (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getSttlmAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getSttlmAcct() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getSttlmAcct().getId().getOthr().getId());
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field53B error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field53DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<Nm>有值，则设置53 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* //2，账号取值规则和节点与53A相同
* //<GrpHdr><SttlmInf><InstgRmbrsmntAgt><FinInstnId><Nm>
* //<GrpHdr><SttlmInf><InstgRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field53DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field53DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field53DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
GroupHeader33 grpHdr = fiToFICstmrCdtTrf.getGrpHdr();
if (grpHdr.getSttlmInf() != null){
if ((grpHdr.getSttlmInf().getInstdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field53Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field53DAdr",adStr);
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field53D error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field54AGenerate.java
......@@ -9,6 +9,8 @@ import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<BICFI>有值，则设置54 option为“A”，同时BIC取此栏位；
* //2，若节点<IBAN>有值，则作为54的账号；
......@@ -16,6 +18,10 @@ import org.slf4j.LoggerFactory;
* //<GrpHdr><SttlmInf><InstdRmbrsmntAgt><FinInstnId><BICFI>
* //<GrpHdr><SttlmInf><InstdRmbrsmntAgtAcct><Id><IBAN>
* //<GrpHdr><SttlmInf><InstdRmbrsmntAgtAcct><Id><Othr><Id>
* * //1，若节点<Nm>有值，则设置54 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * //2，账号取值规则和节点与54A相同
* * //<GrpHdr><SttlmInf><InstdRmbrsmntAgt><FinInstnId><Nm>
* * //<GrpHdr><SttlmInf><InstdRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field54AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(Field54AGenerate.class);
......@@ -35,13 +41,22 @@ public class Field54AGenerate extends AbstractMx2MtFieldsGenerate {
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getBIC() != null){
map.put("field54Key","A");
map.put("field54",grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getBIC());
}else if ((grpHdr.getSttlmInf().getInstdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field54Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field54DAdr",adStr);
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
}else if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field54DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<Nm>有值，则设置54 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* //2，账号取值规则和节点与54A相同
* //<GrpHdr><SttlmInf><InstdRmbrsmntAgt><FinInstnId><Nm>
* //<GrpHdr><SttlmInf><InstdRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field54DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field54DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field54DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
GroupHeader33 grpHdr = fiToFICstmrCdtTrf.getGrpHdr();
if (grpHdr.getSttlmInf() != null){
if ((grpHdr.getSttlmInf().getInstdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field54Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field54DAdr",adStr);
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field53Account",grpHdr.getSttlmInf().getInstdRmbrsmntAgtAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field54D error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field55AGenerate.java
......@@ -9,6 +9,8 @@ import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<BICFI>有值，则设置55 option为“A”，同时BIC取此栏位
* //2，若节点<IBAN>有值，则作为55的账号；
......@@ -16,6 +18,10 @@ import org.slf4j.LoggerFactory;
* //<GrpHdr><SttlmInf><ThrdRmbrsmntAgt><FinInstnId><BICFI>
* //<GrpHdr><SttlmInf><ThrdRmbrsmntAgtAcct><Id><IBAN>
* //<GrpHdr><SttlmInf><ThrdRmbrsmntAgtAcct><Id><Othr><Id>
* * //1，若节点<Nm>有值，则设置55 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * //2，账号取值规则和节点与55A相同
* * //<GrpHdr><SttlmInf><ThrdRmbrsmntAgt><FinInstnId><Nm>
* * //<GrpHdr><SttlmInf><ThrdRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field55AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field55AGenerate.class);
......@@ -35,13 +41,22 @@ public class Field55AGenerate extends AbstractMx2MtFieldsGenerate {
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId().getBIC() != null){
map.put("field55Key","A");
map.put("field55",grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId().getBIC());
}else if ((grpHdr.getSttlmInf().getThrdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field55Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field55DAdr",adStr);
}
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field55Account",grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr() != null
}else if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field55Account",grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr().getId());
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field55DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<Nm>有值，则设置55 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* //2，账号取值规则和节点与55A相同
* //<GrpHdr><SttlmInf><ThrdRmbrsmntAgt><FinInstnId><Nm>
* //<GrpHdr><SttlmInf><ThrdRmbrsmntAgt><FinInstnId><PstlAdr><AdrLine>[1]，<AdrLine>[2]，<AdrLine>[3]
*/
public class Field55DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field55DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field55DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
GroupHeader33 grpHdr = fiToFICstmrCdtTrf.getGrpHdr();
if (grpHdr.getSttlmInf() != null){
if ((grpHdr.getSttlmInf().getThrdRmbrsmntAgt() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgt().getFinInstnId().getNm() != null)){
map.put("field55Key","D");
List<String> adrList = grpHdr.getSttlmInf().getInstdRmbrsmntAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field55DAdr",adStr);
}
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId() != null){
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getIBAN() != null){
map.put("field55Account",grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getIBAN());
}
if (grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr() != null
&& grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr().getId() != null){
map.put("field55Account",grpHdr.getSttlmInf().getThrdRmbrsmntAgtAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field55D error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field56AGenerate.java
......@@ -19,6 +19,17 @@ import java.util.List;
* //<CdtTrfTxInf>[1]<IntrmyAgt1Acct><Id><IBAN>
* //<CdtTrfTxInf>[1]<IntrmyAgt1Acct><Id><Othr><Id>
* //<CdtTrfTxInf>[1]<IntrmyAgt1Acct><Id><Othr><SchmeNm><Cd>
* //如果<IntrmyAgt1><FinInstnId><BICFI>为空，且<IntrmyAgt1><FinInstnId><Nm>为空，
* * //但节点<IBAN>有值，或者节点<Othr><Id>有值，则设置56option为“C”
* * //若节点<Id><Othr><Id>不为空，则取“//CH”+此节点作为账号，否则取节点<MmbId>作为账号：
* * //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><ClrSysId><Cd>
* * //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><ClrSysId><Prtry>
* * //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><MmbId>
* * //<CdtTrfTxInf>[1]<IntrmyAgt1Acct><Id><Othr><Id>
* * //1，若节点<Nm>有值，则设置56 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * //2，账号取值规则和节点与56A相同
* * //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><Nm>
* * //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><PstlAdr><AdrLine>[1],<AdrLine>[2],<AdrLine>[3]
*/
public class Field56AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field56AGenerate.class);
......@@ -39,15 +50,60 @@ public class Field56AGenerate extends AbstractMx2MtFieldsGenerate {
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getBIC() != null){
map.put("field56Key","A");
map.put("field56A",cdtTrfTxInf.get(0).getDbtrAgt().getFinInstnId().getBIC());
}
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN());
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN());
}else if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId());
}
}
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getBIC() == null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getNm() == null){
if ((cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null)
|| (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null)){
map.put("field56Key","C");
if(cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null) {
map.put("field56Account", "//CH" + cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId());
}else if (cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId().getMmbId() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId().getMmbId());
}
}
}
}
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getNm() != null){
map.put("field56Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null){
map.put("field56DAdr",adStr);
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN());
}else if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId());
}
}
}
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field56CGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //如果<IntrmyAgt1><FinInstnId><BICFI>为空，且<IntrmyAgt1><FinInstnId><Nm>为空，
* //但节点<IBAN>有值，或者节点<Othr><Id>有值，则设置56option为“C”
* //若节点<Id><Othr><Id>不为空，则取“//CH”+此节点作为账号，否则取节点<MmbId>作为账号：
* //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><ClrSysId><Cd>
* //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><ClrSysId><Prtry>
* //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><ClrSysMmbId><MmbId>
* //<CdtTrfTxInf>[1]<IntrmyAgt1Acct><Id><Othr><Id>
*/
public class Field56CGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field56CGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field56CGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getBIC() == null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getNm() == null){
if ((cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null)
|| (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null)){
map.put("field56Key","C");
}
}
}
if(cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null) {
map.put("field56Account", "//CH" + cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId());
}else if (cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId().getMmbId() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getClrSysMmbId().getMmbId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field56C error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field56DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<Nm>有值，则设置56 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* //2，账号取值规则和节点与56A相同
* //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><Nm>
* //<CdtTrfTxInf>[1]<IntrmyAgt1><FinInstnId><PstlAdr><AdrLine>[1],<AdrLine>[2],<AdrLine>[3]
*/
public class Field56DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field56DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field56DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getNm() != null){
map.put("field56Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getIntrmyAgt1().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field56DAdr",adStr);
}
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId() != null){
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId() != null){
map.put("field56Account",cdtTrfTxInf.get(0).getIntrmyAgt1Acct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field56D error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field57AGenerate.java
......@@ -19,6 +19,17 @@ import java.util.List;
* //<CdtTrfTxInf>[1]<CdtrAgtAcct><Id><IBAN>
* //<CdtTrfTxInf>[1]<CdtrAgtAcct><Id><Othr><Id>
* //<CdtTrfTxInf>[1]<CdtrAgtAcct><Id><Othr><SchmeNm><Cd>
* * //如果<CdtrAgt><FinInstnId><BICFI>为空，且<CdtrAgt><FinInstnId><Nm>为空，
* * // 但节点<IBAN>有值，或者节点<Othr><Id>有值，则设置57 option为“C”
* * //若节点<Id><Othr><Id>不为空，则取“//CH”+此节点作为账号，否则取节点<MmbId>作为账号：
* * //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><ClrSysId><Cd>
* * //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><ClrSysId><Prtry>
* * //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><MmbId>
* * //<CdtTrfTxInf>[1]<CdtrAgtAcct><Id><Othr><Id>
* * //1，若节点<Nm>有值，则设置57 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* * //2，账号取值规则和节点与57A相同
* * //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><Nm>
* * //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><PstlAdr><AdrLine>[1],<AdrLine>[2],<AdrLine>[3]
*/
public class Field57AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field57AGenerate.class);
......@@ -39,15 +50,67 @@ public class Field57AGenerate extends AbstractMx2MtFieldsGenerate {
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getBIC() != null){
map.put("field57Key","A");
map.put("field57A",cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getBIC());
}
if (cdtTrfTxInf.get(0).getCdtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN());
if (cdtTrfTxInf.get(0).getCdtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN());
}else if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId());
}
}
}else if ((cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getBIC() == null)
&& (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getNm() == null)){
if ((cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN() != null)
|| (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)){
map.put("field57Key","C");
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId().getMmbId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId().getMmbId());
}
}
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getNm() != null){
map.put("field57Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId());
map.put("field57DAdr",adStr);
if (cdtTrfTxInf.get(0).getCdtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId());
}
}
}
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field57CGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //如果<CdtrAgt><FinInstnId><BICFI>为空，且<CdtrAgt><FinInstnId><Nm>为空，
* // 但节点<IBAN>有值，或者节点<Othr><Id>有值，则设置57 option为“C”
* //若节点<Id><Othr><Id>不为空，则取“//CH”+此节点作为账号，否则取节点<MmbId>作为账号：
* //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><ClrSysId><Cd>
* //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><ClrSysId><Prtry>
* //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><ClrSysMmbId><MmbId>
* //<CdtTrfTxInf>[1]<CdtrAgtAcct><Id><Othr><Id>
*/
public class Field57CGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field57CGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field57CGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if ((cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getBIC() == null)
&& (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getNm() == null)){
if ((cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN() != null)
|| (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)){
map.put("field57Key","C");
}
}
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId().getMmbId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getClrSysMmbId().getMmbId());
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field57C error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field57DGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若节点<Nm>有值，则设置57 option为“D”，且名称取自此节点，而地址需要合并截取？？？
* //2，账号取值规则和节点与57A相同
* //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><Nm>
* //<CdtTrfTxInf>[1]<CdtrAgt><FinInstnId><PstlAdr><AdrLine>[1],<AdrLine>[2],<AdrLine>[3]
*/
public class Field57DGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field57DGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field57DGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtrAgt() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId() != null
&& cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getNm() != null){
map.put("field57Key","D");
List<String> adrList = cdtTrfTxInf.get(0).getCdtrAgt().getFinInstnId().getPstlAdr().getAdrLine();
String adStr = "";
for (int i = 0; i<adrList.size(); i++){
adStr = adStr + adrList.get(i);
}
map.put("field57DAdr",adStr);
}
if (cdtTrfTxInf.get(0).getCdtrAgtAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getIBAN());
}
if (cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId() != null){
map.put("field57Account",cdtTrfTxInf.get(0).getCdtrAgtAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field57D error");
}
}
}
\ No newline at end of file
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field59AGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* 1，若节点<AnyBIC>有值，则设置59 option为“A”，同时BIC取此栏位；
* 2，账号取值规则和节点与59相同
* <CdtTrfTxInf>[1]<Cdtr><Id><OrgId><AnyBIC>
*/
public class Field59AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field59AGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field59AGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtr() != null
&& cdtTrfTxInf.get(0).getCdtr().getId() != null
&& cdtTrfTxInf.get(0).getCdtr().getId().getOrgId() != null
&& cdtTrfTxInf.get(0).getCdtr().getId().getOrgId().getBICOrBEI() != null){
map.put("field59AKey","A");
}
if (cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN() != null){
map.put("field59Account","/" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN());
}
if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)
&&
(cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm().getCd() != null)){
map.put("field59Account","//CH" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}
}
if (cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null){
if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)
&&
(cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm().getCd() == null)){
map.put("field59Account","/" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field59A error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field59Generate.java
......@@ -21,6 +21,9 @@ import java.util.List;
* <CdtTrfTxInf>[1]<CdtrAcct><Id><IBAN>
* <CdtTrfTxInf>[1]<CdtrAcct><Id><Othr><Id>
* <CdtTrfTxInf>[1]<CdtrAcct><Id><Othr><SchmeNm><Cd>"
* * 1，若节点<AnyBIC>有值，则设置59 option为“A”，同时BIC取此栏位；
* * 2，账号取值规则和节点与59相同
* * <CdtTrfTxInf>[1]<Cdtr><Id><OrgId><AnyBIC>
* **/
public class Field59Generate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field59Generate.class);
......@@ -45,30 +48,34 @@ public class Field59Generate extends AbstractMx2MtFieldsGenerate {
adStr = adStr + adrList.get(i);
}
map.put("field59Adr",adStr);
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getCdtr() != null
&& cdtTrfTxInf.get(0).getCdtr().getId() != null
&& cdtTrfTxInf.get(0).getCdtr().getId().getOrgId() != null
&& cdtTrfTxInf.get(0).getCdtr().getId().getOrgId().getBICOrBEI() != null){
map.put("field59AKey","A");
}
if (cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null){
if (cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN() != null){
map.put("field59Account","/" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getIBAN());
}
if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
}else if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)
&&
(cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm().getCd() != null)){
map.put("field59Account","//CH" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}
}
if (cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null){
if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)
&&
(cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm().getCd() == null)){
map.put("field59Account","/" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}else if (cdtTrfTxInf.get(0).getCdtrAcct() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId() != null){
if ((cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId() != null)
&&
(cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm() != null
&& cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getSchmeNm().getCd() == null)){
map.put("field59Account","/" + cdtTrfTxInf.get(0).getCdtrAcct().getId().getOthr().getId());
}
}
}
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field71AGenerate.java
......@@ -16,6 +16,10 @@ import java.util.List;
* 2）如果节点值为 'DEBT'，则71A取值为“OUR”
* 3）如果节点值为'SHAR'，则71A取值为“SHA”
* <CdtTrfTxInf>[1]<ChrgBr>
* * //1，若71A为“BEN”或“SHA”，则此节点取值为71F
* * //CdtTrfTxInf>[1]<ChrgsInf><Amt Ccy="XXX">
* * 1，若71A为“OUR”，则此节点取值为71G；
* * <CdtTrfTxInf>[1]<ChrgsInf><Amt Ccy="XXX">
*/
public class Field71AGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field71AGenerate.class);
......@@ -38,16 +42,30 @@ public class Field71AGenerate extends AbstractMx2MtFieldsGenerate {
if("CRED".equals(field71A_mx))
{
field71A="BEN";
}
else if("DEBT".equals(field71A_mx))
{
}else if("DEBT".equals(field71A_mx)) {
field71A="OUR";
}
else if("SHAR".equals(field71A_mx))
{
}else if("SHAR".equals(field71A_mx)) {
field71A="SHA";
}
map.put("field71A",field71A);
}else if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().size() >0
&& cdtTrfTxInf.get(0).getChrgsInf().get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt() != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy() != null) {
if ("BEN".equals(map.get("field71A")) || "SHA".equals(map.get("field71A"))){
map.put("field71F",cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy());
}
}else if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().size() > 0
&& cdtTrfTxInf.get(0).getChrgsInf().get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt() != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy() != null) {
if ("OUR".equals(map.get("field71A"))){
map.put("field71G",cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy());
}
}
}
}
} catch(Exception e) {
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field71FGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* //1，若71A为“BEN”或“SHA”，则此节点取值为71F
* //CdtTrfTxInf>[1]<ChrgsInf><Amt Ccy="XXX">
*/
public class Field71FGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field71FGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field71FGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().size() >0
&& cdtTrfTxInf.get(0).getChrgsInf().get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt() != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy() != null) {
if ("BEN".equals(map.get("field71A")) || "SHA".equals(map.get("field71A"))){
map.put("field71F",cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field71F error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field71GGenerate.java deleted 100644 → 0
package com.prowidesoftware.brilliance.mx2mt.mt103.impl;
import com.prowidesoftware.brilliance.constants.Mx2MtConstants;
import com.prowidesoftware.brilliance.exception.SwiftException;
import com.prowidesoftware.brilliance.mx2mt.AbstractMx2MtFieldsGenerate;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.CreditTransferTransactionInformation11;
import com.prowidesoftware.swift.model.mx.dic.FIToFICustomerCreditTransferV02;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List;
/**
* 1，若71A为“OUR”，则此节点取值为71G；
* <CdtTrfTxInf>[1]<ChrgsInf><Amt Ccy="XXX">
*/
public class Field71GGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(com.prowidesoftware.brilliance.mx2mt.mt103.impl.Field71GGenerate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("Field71GGenerate start.");
try {
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = obj.getFIToFICstmrCdtTrf();
List<CreditTransferTransactionInformation11> cdtTrfTxInf = fiToFICstmrCdtTrf.getCdtTrfTxInf();
if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().size() > 0
&& cdtTrfTxInf.get(0).getChrgsInf().get(0) != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt() != null
&& cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy() != null) {
if ("OUR".equals(map.get("field71A"))){
map.put("field71G",cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy());
}
}
}
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 Field71G error");
}
}
}
src/main/resources/template/swift_mt_103.vm
......@@ -7,7 +7,7 @@
:13C:$field13C
#end
#end
#if(!$null.isNull($vm.field23B) && $vm.field23B.length()>0)
#if(!$null.isNull($vm.field23B) && $vm.field23B.length() > 0)
:23B:$vm.field23B
#end
#if(!$null.isNull($vm.field23EList) && $vm.field23EList.size()!=0)
......@@ -15,19 +15,16 @@
:23E:$field23E
#end
#end
#if(!$null.isNull($vm.field23E) && $vm.field23E.length()>0)
:23E:$vm.field23E
#end
#if(!$null.isNull($vm.field26T) && $vm.field26T.length()>0)
#if(!$null.isNull($vm.field26T) && $vm.field26T.length() > 0)
:26T:$vm.field26T
#end
#if(!$null.isNull($vm.field32A) && $vm.field32A.length()>0)
#if(!$null.isNull($vm.field32A) && $vm.field32A.length() > 0)
:32A:$vm.field32A
#end
#if(!$null.isNull($vm.field33B))
#if(!$null.isNull($vm.field33B) && $vm.field33B.length() > 0)
:33B:$vm.field33B
#end
#if(!$null.isNull($vm.field36) && $vm.field36.length()>0)
#if(!$null.isNull($vm.field36) && $vm.field36.length() > 0)
:36:$vm.field36
#end
#if($vm.field50Key=='A')
......@@ -154,19 +151,16 @@ $vm.field57DAdr
#if($vm.field71G)
:71G:$vm.field71G
#end
#if(!$null.isNull($vm.field72Adr1) && $vm.field72Adr1.length()>0)
#if(!$null.isNull($vm.field72Adr1) && $vm.field72Adr1.length() > 0)
:72:$vm.field72Adr1
#end
#if(!$null.isNull($vm.field72Adr2) && $vm.field72Adr2.length()>0)
#elseif(!$null.isNull($vm.field72Adr2) && $vm.field72Adr2.length() > 0)
:72:$vm.field72Adr2
#end
#if(!$null.isNull($vm.field72Adr3) && $vm.field72Adr3.length()>0)
#elseif(!$null.isNull($vm.field72Adr3) && $vm.field72Adr3.length() > 0)
:72:$vm.field72Adr3
#end
#if(!$null.isNull($vm.field72Adr4) && $vm.field72Adr4.length()>0)
#elseif(!$null.isNull($vm.field72Adr4) && $vm.field72Adr4.length() > 0)
:72:$vm.field72Adr4
#end
#if(!$null.isNull($vm.field77B) && $vm.field77B.length()>0)
#if(($vm.field77B) && $vm.field77B.length() > 0)
:77B:$vm.field77B
#end
-}{5:{MAC:6342F3D2}{CHK:C412E5AF7797}{DLM:}}
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