Skip to content

S
swiftMtMx
Commit 35524c5f by miniphoto
Options

103合并类并删除没用的类修改模板

parent e0f63b17
Showing with 13 additions and 154 deletions
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/Mx2Mt103Creator.java
......@@ -57,8 +57,6 @@ public class Mx2Mt103Creator extends AbstractMx2MtCreator {
@Override
public List<Mx2MtFieldsGenerate> getFieldsGenerateList() {
List<Mx2MtFieldsGenerate> fieldsGenerateList = new ArrayList<>();
fieldsGenerateList.add(new ReceiverBicFieldGenerate());
fieldsGenerateList.add(new SenderBicFieldGenerate());
fieldsGenerateList.add(new Field13CGenerate());
fieldsGenerateList.add(new Field20Generate());
fieldsGenerateList.add(new Field23BGenerate());
......@@ -79,7 +77,6 @@ public class Mx2Mt103Creator extends AbstractMx2MtCreator {
fieldsGenerateList.add(new Field71AGenerate());
fieldsGenerateList.add(new Field72Generate());
fieldsGenerateList.add(new Field77BGenerate());
fieldsGenerateList.add(new CommonFieldFor103Generate());
return fieldsGenerateList;
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/CommonFieldFor103Generate.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.brilliance.util.DateUtil;
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;
public class CommonFieldFor103Generate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(CommonFieldFor103Generate.class);
@Override
public void fieldsGenerate() throws SwiftException {
logger.info("CommonFieldFor103Generate start.");
try {
MxPacs00800102 mxPacs00800102 = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (mxPacs00800102 == null || mxPacs00800102.getFIToFICstmrCdtTrf() == null) {
return;
}
FIToFICustomerCreditTransferV02 fiToFICstmrCdtTrf = mxPacs00800102.getFIToFICstmrCdtTrf();
GroupHeader33 grpHdr = fiToFICstmrCdtTrf.getGrpHdr();
String createDateStr = DateUtil.format(grpHdr.getCreDtTm(), "YYMMdd");
String createTimeStr = DateUtil.format(grpHdr.getCreDtTm(), "HHmm");
map.put("createDate", createDateStr);
map.put("createTime", createTimeStr);
String outDateStr = DateUtil.formatNow( "YYMMdd");
String outTimeStr = DateUtil.formatNow("HHmm");
map.put("outDate", outDateStr);
map.put("outTime", outTimeStr);
} catch(Exception e) {
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 CommonField error");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/Field71AGenerate.java
......@@ -3,12 +3,15 @@ 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.brilliance.util.NumberUtil;
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.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -54,7 +57,10 @@ public class Field71AGenerate extends AbstractMx2MtFieldsGenerate {
&& 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());
String ccy = cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy();
BigDecimal amt = cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getValue();
String amtStr = NumberUtil.formatAmt(amt, ccy);
map.put("field71F",ccy+amtStr);
}
}else if (cdtTrfTxInf != null && cdtTrfTxInf.size() > 0){
if (cdtTrfTxInf.get(0) != null
......@@ -63,7 +69,10 @@ public class Field71AGenerate extends AbstractMx2MtFieldsGenerate {
&& 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());
String ccy = cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getCcy();
BigDecimal amt = cdtTrfTxInf.get(0).getChrgsInf().get(0).getAmt().getValue();
String amtStr = NumberUtil.formatAmt(amt, ccy);
map.put("field71G",ccy+amtStr);
}
}
}
......
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/ReceiverBicFieldGenerate.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.brilliance.util.StringUtil;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ReceiverBicFieldGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(ReceiverBicFieldGenerate.class);
/**
* <GrpHdr><InstgAgt><FinInstnId><BICFI>
*/
@Override
public void fieldsGenerate() {
logger.info("ReceiverBicFieldGenerate start.");
try{
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
GroupHeader33 grpHdr = obj.getFIToFICstmrCdtTrf().getGrpHdr();
if (grpHdr != null) {
if (grpHdr.getInstgAgt() != null
&& grpHdr.getInstgAgt().getFinInstnId() != null
&& grpHdr.getInstgAgt().getFinInstnId().getBIC() != null){
String receiverBic = grpHdr.getInstgAgt().getFinInstnId().getBIC();
logger.info("Receiver Bic : " + receiverBic);
if (!StringUtil.isEmpty(receiverBic)) {
String mtReceiverBic = "";
if (receiverBic.length() == 8) {
mtReceiverBic = receiverBic + Mx2MtConstants.BICSUFFIX;
} else if (receiverBic.length() == 11) {
mtReceiverBic = receiverBic.substring(0, 8) + Mx2MtConstants.BICMIDDLE + receiverBic.substring(8);
} else {
throw new SwiftException("ERROR", "ReceiverBic length is invalid.");
}
map.put("ReceiverBic", mtReceiverBic);
}
}
}
}catch(Exception e){
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 ReceiverBic error.");
}
}
}
src/main/java/com/prowidesoftware/brilliance/mx2mt/mt103/impl/SenderBicFieldGenerate.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.brilliance.util.StringUtil;
import com.prowidesoftware.swift.model.mx.MxPacs00800102;
import com.prowidesoftware.swift.model.mx.dic.GroupHeader33;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SenderBicFieldGenerate extends AbstractMx2MtFieldsGenerate {
private static final Logger logger = LoggerFactory.getLogger(ReceiverBicFieldGenerate.class);
/**
* <GrpHdr><InstgAgt><FinInstnId><BICFI>
*/
@Override
public void fieldsGenerate() {
logger.info("SenderBicFieldGenerate start.");
try{
MxPacs00800102 obj = (MxPacs00800102)map.get(Mx2MtConstants.MX_OBJECT);
if (obj == null || obj.getFIToFICstmrCdtTrf() == null) {
return;
}
GroupHeader33 grpHdr = obj.getFIToFICstmrCdtTrf().getGrpHdr();
if (grpHdr != null) {
if (grpHdr.getInstgAgt() != null
&& grpHdr.getInstgAgt().getFinInstnId() != null
&& grpHdr.getInstgAgt().getFinInstnId().getBIC() != null){
String senderBic = grpHdr.getInstgAgt().getFinInstnId().getBIC();
logger.info("Sender Bic : " + senderBic);
if (!StringUtil.isEmpty(senderBic)) {
String mtsenderBic = "";
if (senderBic.length() == 8) {
mtsenderBic = senderBic + Mx2MtConstants.BICSUFFIX;
} else if (senderBic.length() == 11) {
mtsenderBic = senderBic.substring(0, 8) + Mx2MtConstants.BICMIDDLE + senderBic.substring(8);
} else {
throw new SwiftException("ERROR", "senderBic length is invalid.");
}
map.put("SenderBic", mtsenderBic);
}
}
}
}catch(Exception e){
logger.error(e.getMessage());
throw new SwiftException("ERROR", "Convert MT103 SenderBic error.");
}
}
}
src/main/resources/template/swift_mt_103.vm
{1:F01${vm.ReceiverBic}5769414896}{2:O103${vm.createTime}${vm.createDate}${vm.SenderBic}0002000001${vm.outDate}${vm.outTime}N{3:{108:178908658RSC1}{111:001}{121:9bc16ba2-76e0-4651-b225-3bae8552f17a}}{4:
{1:$vm.head1}{2:$vm.head2}#if(!$null.isNull($vm.head3) && $vm.head3.length()>0){3:$vm.head3}#end{4:
#if(!$null.isNull($vm.field20))
:20:$vm.field20
#end
......@@ -163,4 +163,4 @@ $vm.field57DAdr
#if(($vm.field77B) && $vm.field77B.length() > 0)
:77B:$vm.field77B
#end
-}{5:{MAC:6342F3D2}{CHK:C412E5AF7797}{DLM:}}
-}#if(!$null.isNull($vm.head5) && $vm.head5.length()>0){5:$vm.head5}#end
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