1.实现VoCustomerCreditTransfer到MT103转换

2.分包，mt2swiftdto,swiftdto2mt,mx2swiftdto,swiftdto2mx,实现mt与mx之间的转换

swiftCore/src/main/java/com/brilliance/swift/SwiftTransfer.java

+package com.brilliance.swift;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoCreateManager;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtCreatorManager;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.SwiftDto;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+public class SwiftTransfer {
+
+    /**
+     * SWIFTDTO transfer MT
+     * @param file
+     * @param fileOutputPath
+     * @param mtIoType
+     * @return
+     * @throws SwiftException
+     */
+    public static String swiftDto2Mt(File file, String fileOutputPath, String mtIoType) throws SwiftException {
+        try {
+            String gsonStr = FileUtils.readFileToString(file);
+            SwiftDto swiftDto = SwiftDto.fromJson(gsonStr);
+            return new SwiftDto2MtCreatorManager().swiftDto2Mt(swiftDto, fileOutputPath, StringUtil.isEmpty(mtIoType)?"O":mtIoType);
+        } catch (IOException e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
+    }
+
+    public static String swiftDto2Mt(String gsonStr, String fileOutputPath, String mtIoType) throws SwiftException{
+        SwiftDto swiftDto = SwiftDto.fromJson(gsonStr);
+        return new SwiftDto2MtCreatorManager().swiftDto2Mt(swiftDto, fileOutputPath, StringUtil.isEmpty(mtIoType)?"O":mtIoType);
+    }
+
+    /**
+     * MT transfer SWIFTDTO
+     * @param file
+     * @param outPutFilePath
+     * @param extraMap
+     * @return
+     * @throws SwiftException
+     */
+    public SwiftDto mt2SwiftDto(File file, String outPutFilePath, Map<String, Object> extraMap) throws SwiftException {
+        try{
+            String mtStr = FileUtils.readFileToString(file);
+            return new Mt2SwiftDtoCreateManager().convert(mtStr, outPutFilePath, extraMap);
+        } catch (IOException e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
+    }
+
+    public SwiftDto mt2SwiftDto(String mtStr, String outPutFilePath, Map<String, Object> extraMap) throws SwiftException {
+        return new Mt2SwiftDtoCreateManager().convert(mtStr, outPutFilePath, extraMap);
+    }
+
+
+}

swiftCore/src/main/java/com/brilliance/swift/constants/Mx2MtConstants.java

@@ -84,4 +84,8 @@ public class Mx2MtConstants {
     public static final String MAINBODY_PARENT_ELEMENT_NAME = "mainBodyParentElementName";
 
     public static final String MT_TEMPLATE_NAME = "mtTemplateName";
+
+    public static final String MT_21_DEFAULT_VALUE = "NONREF";
+
+    public static final String MX_END_TO_END_ID_DEFAULT_VALUE = "NOTPROVIDED";
 }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/AbstractMt2MxCreator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/AbstractMt2SwiftDtoCreator.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
 import com.brilliance.swift.constants.Mx2MtConstants;
 import com.brilliance.swift.exception.SwiftException;
@@ -9,15 +9,15 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 
 import java.util.Date;
 
-public abstract class AbstractMt2MxCreator implements Mt2MxCreator{
+public abstract class AbstractMt2SwiftDtoCreator implements Mt2SwiftDtoCreator {
 
-    protected Mt2MxContext context;
+    protected Mt2SwiftDtoContext context;
 
-    public Mt2MxContext getContext() {
+    public Mt2SwiftDtoContext getContext() {
         return context;
     }
 
-    public void setContext(Mt2MxContext context) {
+    public void setContext(Mt2SwiftDtoContext context) {
         this.context = context;
     }
 

swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/AbstractMt2SwiftDtoParseFields.java

+package com.brilliance.swift.mt2SwiftDto;
+
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.util.SwiftTransferUtil;
+import com.brilliance.swift.vo.common.ClearingSystemMember;
+import com.brilliance.swift.vo.common.ClearingSystemMemberCode;
+import com.brilliance.swift.vo.common.PartyAccount;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.mt.AbstractMT;
+
+public abstract class AbstractMt2SwiftDtoParseFields implements Mt2SwiftDtoParseFields {
+
+    protected Mt2SwiftDtoContext context;
+
+    public Mt2SwiftDtoContext getContext() {
+        return context;
+    }
+
+    public void setContext(Mt2SwiftDtoContext context) {
+        this.context = context;
+    }
+
+    public ClearingSystemMemberCode getClsSysMemberByDesc(String desc) {
+        ClearingSystemMemberCode code = null;
+        ClearingSystemMemberCode[] values = ClearingSystemMemberCode.values();
+        for (ClearingSystemMemberCode tmpCode : values) {
+            if (tmpCode.desc().equals(desc)) {
+                code = tmpCode;
+                break;
+            }
+        }
+        return code;
+    }
+
+    protected PartyAccount buildPartyAccount(String account) {
+        PartyAccount partyAcct = null;
+        if (StringUtil.isNotEmpty(account)) {
+            partyAcct = new PartyAccount();
+            if (account.length() > 4 && account.startsWith("//")) {
+                if ("CH".equals(account.substring(2, 4))) {
+                    partyAcct.setAcctType("CUID");
+                    partyAcct.setAccount(account.substring(4));
+                } else {
+                    partyAcct.setAccount(account.substring(2));
+                }
+            } else {
+                if (account.length() > 3 && (account.startsWith("/C/") || account.startsWith("/D/"))) {
+                    account = account.substring(3);
+                } else {
+                    account = account.substring(1);
+                }
+                if (SwiftTransferUtil.checkIbanAccount(account)) {
+                    partyAcct.setIbanAcct(account);
+                } else {
+                    partyAcct.setAccount(account);
+                }
+            }
+        }
+        return partyAcct;
+    }
+
+    protected PartyDto buildPartyAccount(PartyDto partyDto, String account) {
+        if (StringUtil.isNotEmpty(account)) {
+            if (account.length() > 4 && account.startsWith("//")) {
+                ClearingSystemMemberCode code = getClsSysMemberByDesc(account.substring(2, 4));
+                if (code != null) {
+                    ClearingSystemMember clrSysMember = new ClearingSystemMember();
+                    clrSysMember.setCode(code.value());
+                    clrSysMember.setId(account.substring(4));
+                    partyDto.setClrSysMmb(clrSysMember);
+                } else {
+                    PartyAccount partyAcct = new PartyAccount();
+                    if ("CH".equals(account.substring(2, 4))) {
+                        partyAcct.setAcctType("CUID");
+                        partyAcct.setAccount(account.substring(4));
+                    } else {
+                        partyAcct.setAccount(account.substring(2));
+                    }
+                    partyDto.setPartyAcct(partyAcct);
+                }
+            } else {
+                if (account.length() > 3 && (account.startsWith("/C/") || account.startsWith("/D/"))) {
+                    account = account.substring(3);
+                } else {
+                    account = account.substring(1);
+                }
+                PartyAccount partyAcct = new PartyAccount();
+                if (SwiftTransferUtil.checkIbanAccount(account)) {
+                    partyAcct.setIbanAcct(account);
+                } else {
+                    partyAcct.setAccount(account);
+                }
+                partyDto.setPartyAcct(partyAcct);
+            }
+        }
+        return partyDto;
+    }
+
+    protected boolean isCov() {
+        AbstractMT abstractMT = context.get(AbstractMT.class);
+        return abstractMT.getSwiftMessage().isCOV();
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/mt2mx/Mt2MxContext.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/Mt2SwiftDtoContext.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
 import com.brilliance.swift.context.ContextImpl;
 
-public class Mt2MxContext extends ContextImpl {
+public class Mt2SwiftDtoContext extends ContextImpl {
 
     private static final long serialVersionUID = 1720388698305926316L;
 }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/Mt2MxContextIdentifier.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/Mt2SwiftDtoContextIdentifier.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
-public class Mt2MxContextIdentifier {
+public class Mt2SwiftDtoContextIdentifier {
 
     public static final String MT_TO_MX_OUTPUT_FILE_PATH = "mt.to.mx.output.filepath";
 

swiftCore/src/main/java/com/brilliance/swift/mt2mx/Mt2MxCreateManager.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/Mt2SwiftDtoCreateManager.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.camt053001.Mt2Mx940950Creator;
-import com.brilliance.swift.mt2mx.camt054001.Mt2Mx900910Creator;
-import com.brilliance.swift.mt2mx.pacs008001.Mt2MxPacs008001Creator;
-import com.brilliance.swift.mt2mx.pacs009001.Mt2MxPacs009001Creator;
-import com.brilliance.swift.mx.SwiftDto2MxCreatorManager;
+import com.brilliance.swift.mt2SwiftDto.camt053001.Mt2Mx940950Creator;
+import com.brilliance.swift.mt2SwiftDto.camt054001.Mt2Mx900910Creator;
+import com.brilliance.swift.mt2SwiftDto.pacs008001.Mt2SwiftDtoPacs008001Creator;
+import com.brilliance.swift.mt2SwiftDto.pacs009001.Mt2SwiftDtoPacs009001Creator;
 import com.brilliance.swift.vo.SwiftDto;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
-import org.apache.commons.io.FileUtils;
 
-import java.io.File;
 import java.util.List;
 import java.util.Map;
 
-public class Mt2MxCreateManager {
+public class Mt2SwiftDtoCreateManager {
 
     public AbstractMT abstractMT = null;
 
@@ -26,40 +23,7 @@ public class Mt2MxCreateManager {
         }
     }
 
-    public SwiftDto mt2SwiftDto(File file, String outPutFilePath, Map<String, Object> extraMap) throws Exception {
-        String mtStr = FileUtils.readFileToString(file);
-        init(mtStr);
-        return convert(outPutFilePath, extraMap);
-    }
-
-    public SwiftDto mt2SwiftDto(File file, String outPutFilePath) throws Exception {
-        String mtStr = FileUtils.readFileToString(file);
-        init(mtStr);
-        return convert(outPutFilePath, null);
-    }
-
-    public SwiftDto mt2SwiftDto(File file) throws Exception {
-        String mtStr = FileUtils.readFileToString(file);
-        init(mtStr);
-        return convert(null, null);
-    }
-
-    public SwiftDto mt2SwiftDto(String mtStr, String outPutFilePath, Map<String, Object> extraMap) throws Exception {
-        init(mtStr);
-        return convert(outPutFilePath, extraMap);
-    }
-
-    public SwiftDto mt2SwiftDto(String mtStr, String outPutFilePath) throws Exception {
-        init(mtStr);
-        return convert(outPutFilePath, null);
-    }
-
-    public SwiftDto mt2SwiftDto(String mtStr) throws Exception {
-        init(mtStr);
-        return convert(null, null);
-    }
-
-    public String mt2mx(File file, String outPutFilePath, Map<String, Object> extraMap) throws Exception {
+    /*public String mt2mx(File file, String outPutFilePath, Map<String, Object> extraMap) throws Exception {
         SwiftDto swiftDto = mt2SwiftDto(file, outPutFilePath, extraMap);
         return new SwiftDto2MxCreatorManager().swiftDto2Mx(swiftDto, outPutFilePath);
     }
@@ -83,32 +47,33 @@ public class Mt2MxCreateManager {
 
     public String mt2mx(String mtStr) throws Exception {
         return mt2mx(mtStr, null, null);
-    }
+    }*/
 
-    public SwiftDto convert(String outPutFilePath, Map<String, Object> extraMap) throws SwiftException {
-        AbstractMt2MxCreator creator = getMt2MxCreator();
-        Mt2MxContext context = new Mt2MxContext();
+    public SwiftDto convert(String mtStr, String outPutFilePath, Map<String, Object> extraMap) throws SwiftException {
+        init(mtStr);
+        AbstractMt2SwiftDtoCreator creator = getMt2MxCreator();
+        Mt2SwiftDtoContext context = new Mt2SwiftDtoContext();
         context.set(AbstractMT.class, abstractMT);
-        context.set(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, outPutFilePath);
+        context.set(Mt2SwiftDtoContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, outPutFilePath);
         context.putAll(extraMap);
         creator.setContext(context);
         creator.preProcess();
-        List<Mt2MxParseFields> parseFields = creator.getParseFieldsList();
+        List<Mt2SwiftDtoParseFields> parseFields = creator.getParseFieldsList();
         for (int i=0; i<parseFields.size(); i++) {
-            AbstractMt2MxParseFields parseField = (AbstractMt2MxParseFields) parseFields.get(i);
+            AbstractMt2SwiftDtoParseFields parseField = (AbstractMt2SwiftDtoParseFields) parseFields.get(i);
             parseField.setContext(context);
             parseField.parseFields();
         }
         creator.postProcess();
-        return (SwiftDto) context.get(Mt2MxContextIdentifier.MT_TO_SWIFTDTO_OBJ);
+        return (SwiftDto) context.get(Mt2SwiftDtoContextIdentifier.MT_TO_SWIFTDTO_OBJ);
     }
 
-    public AbstractMt2MxCreator getMt2MxCreator() throws SwiftException {
+    public AbstractMt2SwiftDtoCreator getMt2MxCreator() throws SwiftException {
         String messageType = abstractMT.getMessageType();
         if ("103".equals(messageType)) {
-            return new Mt2MxPacs008001Creator();
+            return new Mt2SwiftDtoPacs008001Creator();
         } else if ("202".equals(messageType)) {
-            return new Mt2MxPacs009001Creator();
+            return new Mt2SwiftDtoPacs009001Creator();
         } else if("900".equals(messageType)||"910".equals(messageType)){
             return new Mt2Mx900910Creator();
         } else if("940".equals(messageType)||"950".equals(messageType)){

swiftCore/src/main/java/com/brilliance/swift/mt2mx/Mt2MxCreator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/Mt2SwiftDtoCreator.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
 import com.brilliance.swift.exception.SwiftException;
 
 import java.util.List;
 
-public interface Mt2MxCreator {
+public interface Mt2SwiftDtoCreator {
 
     void preProcess() throws SwiftException;
 
-    List<Mt2MxParseFields> getParseFieldsList() throws SwiftException;
+    List<Mt2SwiftDtoParseFields> getParseFieldsList() throws SwiftException;
 
     void postProcess() throws SwiftException;
 }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/Mt2MxParseFields.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/Mt2SwiftDtoParseFields.java

-package com.brilliance.swift.mt2mx;
+package com.brilliance.swift.mt2SwiftDto;
 
 import com.brilliance.swift.exception.SwiftException;
 
-public interface Mt2MxParseFields {
+public interface Mt2SwiftDtoParseFields {
 
     public void parseFields() throws SwiftException;
 }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/Mt2Mx940950Creator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/Mt2Mx940950Creator.java

-package com.brilliance.swift.mt2mx.camt053001;
+package com.brilliance.swift.mt2SwiftDto.camt053001;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxCreator;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
-import com.brilliance.swift.mt2mx.Mt2MxParseFields;
-import com.brilliance.swift.mt2mx.camt053001.impl.*;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoCreator;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoParseFields;
+import com.brilliance.swift.mt2SwiftDto.camt053001.impl.*;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.SwiftDto;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author zh
  * @create 2022-04-24 17:06
  */
-public class Mt2Mx940950Creator extends AbstractMt2MxCreator {
+public class Mt2Mx940950Creator extends AbstractMt2SwiftDtoCreator {
     @Override
     public void preProcess() throws SwiftException {
         try {
@@ -36,8 +36,8 @@ public class Mt2Mx940950Creator extends AbstractMt2MxCreator {
         }
     }
     @Override
-    public List<Mt2MxParseFields> getParseFieldsList() throws SwiftException {
-        List<Mt2MxParseFields> list = new ArrayList<>();
+    public List<Mt2SwiftDtoParseFields> getParseFieldsList() throws SwiftException {
+        List<Mt2SwiftDtoParseFields> list = new ArrayList<>();
         list.add(new Camt053001Parse20Field());
         list.add(new Camt053001Parse21Field());
         list.add(new Camt053001Parse25aField());
@@ -54,9 +54,9 @@ public class Mt2Mx940950Creator extends AbstractMt2MxCreator {
     @Override
     public void postProcess() throws SwiftException {
         try {
-            String outputFilePath = (String)context.get(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
+            String outputFilePath = (String)context.get(Mt2SwiftDtoContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
             BankToCustomerStatement bankToCustomerStatement = context.get(BankToCustomerStatement.class);
-            context.set(Mt2MxContextIdentifier.MT_TO_SWIFTDTO_OBJ, bankToCustomerStatement);
+            context.set(Mt2SwiftDtoContextIdentifier.MT_TO_SWIFTDTO_OBJ, bankToCustomerStatement);
             if (StringUtil.isNotEmpty(outputFilePath)) {
                 bankToCustomerStatement.write(new File(outputFilePath));
             }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse20Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse20Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.prowidesoftware.swift.model.field.Field20;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse20Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse20Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse21Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse21Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 
 /**
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse21Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse21Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
 

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse25aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse25aField.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.prowidesoftware.swift.model.field.Field25;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse25aField extends AbstractMt2MxParseFields {
+public class Camt053001Parse25aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse28CField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse28CField.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.prowidesoftware.swift.model.field.Field28C;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse28CField extends AbstractMt2MxParseFields {
+public class Camt053001Parse28CField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse60aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse60aField.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.BalDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse60aField extends AbstractMt2MxParseFields {
+public class Camt053001Parse60aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse61Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse61Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.NtryDto;
@@ -16,7 +16,7 @@ import java.util.List;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse61Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse61Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse62aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse62aField.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.BalDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse62aField extends AbstractMt2MxParseFields {
+public class Camt053001Parse62aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse64Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse64Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.BalDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT950;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse64Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse64Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse65Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse65Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.brilliance.swift.vo.common.BalDto;
-import com.brilliance.swift.vo.common.BalTypeEnum;
 import com.prowidesoftware.swift.model.field.Field65;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt9xx.MT940;
@@ -16,7 +15,7 @@ import java.util.List;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse65Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse65Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt053001/impl/Camt053001Parse86Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt053001/impl/Camt053001Parse86Field.java

-package com.brilliance.swift.mt2mx.camt053001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt053001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerStatement;
 import com.prowidesoftware.swift.model.field.Field86;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -13,7 +13,7 @@ import java.util.List;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt053001Parse86Field extends AbstractMt2MxParseFields {
+public class Camt053001Parse86Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/Mt2Mx900910Creator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/Mt2Mx900910Creator.java

-package com.brilliance.swift.mt2mx.camt054001;
+package com.brilliance.swift.mt2SwiftDto.camt054001;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxCreator;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
-import com.brilliance.swift.mt2mx.Mt2MxParseFields;
-import com.brilliance.swift.mt2mx.camt054001.impl.*;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoCreator;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoParseFields;
+import com.brilliance.swift.mt2SwiftDto.camt054001.impl.*;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.brilliance.swift.vo.SwiftDto;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author zh
  * @create 2022-04-24 14:50
  */
-public class Mt2Mx900910Creator extends AbstractMt2MxCreator {
+public class Mt2Mx900910Creator extends AbstractMt2SwiftDtoCreator {
 
     @Override
     public void preProcess() throws SwiftException {
@@ -37,8 +37,8 @@ public class Mt2Mx900910Creator extends AbstractMt2MxCreator {
         }
     }
     @Override
-    public List<Mt2MxParseFields> getParseFieldsList() throws SwiftException {
-        List<Mt2MxParseFields> list = new ArrayList<>();
+    public List<Mt2SwiftDtoParseFields> getParseFieldsList() throws SwiftException {
+        List<Mt2SwiftDtoParseFields> list = new ArrayList<>();
         list.add(new Camt054001Parse13DField());
         list.add(new Camt054001Parse20Field());
         list.add(new Camt054001Parse21Field());
@@ -54,9 +54,9 @@ public class Mt2Mx900910Creator extends AbstractMt2MxCreator {
     @Override
     public void postProcess() throws SwiftException {
         try {
-            String outputFilePath = (String)context.get(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
+            String outputFilePath = (String)context.get(Mt2SwiftDtoContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
             BankToCustomerDebitCreditNotification bankToCustomerDebitCreditNotification = context.get(BankToCustomerDebitCreditNotification.class);
-            context.set(Mt2MxContextIdentifier.MT_TO_SWIFTDTO_OBJ, bankToCustomerDebitCreditNotification);
+            context.set(Mt2SwiftDtoContextIdentifier.MT_TO_SWIFTDTO_OBJ, bankToCustomerDebitCreditNotification);
             if (StringUtil.isNotEmpty(outputFilePath)) {
                 bankToCustomerDebitCreditNotification.write(new File(outputFilePath));
             }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse13DField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse13DField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 
 /**
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse13DField extends AbstractMt2MxParseFields {
+public class Camt054001Parse13DField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
 

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse20Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse20Field.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.prowidesoftware.swift.model.field.Field20;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse20Field extends AbstractMt2MxParseFields {
+public class Camt054001Parse20Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse21Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse21Field.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.prowidesoftware.swift.model.field.Field21;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse21Field extends AbstractMt2MxParseFields {
+public class Camt054001Parse21Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse25aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse25aField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.prowidesoftware.swift.model.field.Field25;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse25aField extends AbstractMt2MxParseFields {
+public class Camt054001Parse25aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse32aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse32aField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse32aField extends AbstractMt2MxParseFields {
+public class Camt054001Parse32aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse50aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse50aField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse50aField extends AbstractMt2MxParseFields {
+public class Camt054001Parse50aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse52aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse52aField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT900;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse52aField extends AbstractMt2MxParseFields {
+public class Camt054001Parse52aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse56aField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse56aField.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -14,7 +14,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse56aField extends AbstractMt2MxParseFields {
+public class Camt054001Parse56aField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/camt054001/impl/Camt054001Parse72Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/camt054001/impl/Camt054001Parse72Field.java

-package com.brilliance.swift.mt2mx.camt054001.impl;
+package com.brilliance.swift.mt2SwiftDto.camt054001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.BankToCustomerDebitCreditNotification;
-import com.prowidesoftware.swift.model.field.Field20;
 import com.prowidesoftware.swift.model.field.Field72;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt9xx.MT900;
@@ -13,7 +12,7 @@ import com.prowidesoftware.swift.model.mt9xx.MT910;
  * @author zh
  * @create 2022-04-24 14:59
  */
-public class Camt054001Parse72Field extends AbstractMt2MxParseFields {
+public class Camt054001Parse72Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/Mt2MxPacs008001Creator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/Mt2SwiftDtoPacs008001Creator.java

-package com.brilliance.swift.mt2mx.pacs008001;
+package com.brilliance.swift.mt2SwiftDto.pacs008001;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxCreator;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
-import com.brilliance.swift.mt2mx.Mt2MxParseFields;
-import com.brilliance.swift.mt2mx.pacs008001.impl.*;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoCreator;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoParseFields;
+import com.brilliance.swift.mt2SwiftDto.pacs008001.impl.*;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.SwiftDto;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
@@ -13,7 +13,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Mt2MxPacs008001Creator extends AbstractMt2MxCreator {
+public class Mt2SwiftDtoPacs008001Creator extends AbstractMt2SwiftDtoCreator {
 
 
 
@@ -36,8 +36,8 @@ public class Mt2MxPacs008001Creator extends AbstractMt2MxCreator {
     }
 
     @Override
-    public List<Mt2MxParseFields> getParseFieldsList() throws SwiftException {
-        List<Mt2MxParseFields> list = new ArrayList<>();
+    public List<Mt2SwiftDtoParseFields> getParseFieldsList() throws SwiftException {
+        List<Mt2SwiftDtoParseFields> list = new ArrayList<>();
         list.add(new Pacs00801Parse20Field());
         list.add(new Pacs00801Parse13CField());
         list.add(new Pacs00801Parse23BField());
@@ -64,9 +64,9 @@ public class Mt2MxPacs008001Creator extends AbstractMt2MxCreator {
     @Override
     public void postProcess() throws SwiftException {
         try {
-            String outputFilePath = (String)context.get(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
+            String outputFilePath = (String)context.get(Mt2SwiftDtoContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
             VoCustomerCreditTransfer customerCreditTransfer = context.get(VoCustomerCreditTransfer.class);
-            context.set(Mt2MxContextIdentifier.MT_TO_SWIFTDTO_OBJ, customerCreditTransfer);
+            context.set(Mt2SwiftDtoContextIdentifier.MT_TO_SWIFTDTO_OBJ, customerCreditTransfer);
             if (StringUtil.isNotEmpty(outputFilePath)) {
                 customerCreditTransfer.write(new File(outputFilePath));
             }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse13CField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse13CField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field13C;
@@ -13,7 +13,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.Date;
 import java.util.List;
 
-public class Pacs00801Parse13CField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse13CField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse20Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse20Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field20;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse20Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse20Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse23BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse23BField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field23B;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse23BField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse23BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse23EField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse23EField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field23E;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -9,7 +9,7 @@ import com.prowidesoftware.swift.model.mt1xx.MT103;
 
 import java.util.List;
 
-public class Pacs00801Parse23EField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse23EField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse26TField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse26TField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field26T;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse26TField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse26TField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse32AField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse32AField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
@@ -9,7 +9,7 @@ import com.prowidesoftware.swift.model.field.Field32A;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse32AField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse32AField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse33BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse33BField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
 import com.prowidesoftware.swift.model.field.Field33B;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse33BField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse33BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse36Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse36Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field36;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -10,7 +9,7 @@ import com.prowidesoftware.swift.model.mt1xx.MT103;
 
 import java.math.BigDecimal;
 
-public class Pacs00801Parse36Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse36Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse50Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse50Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.field.Field50K;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse50Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse50Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -21,7 +21,7 @@ public class Pacs00801Parse50Field extends AbstractMt2MxParseFields {
                 Field50A field50A = mt103.getField50A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field50A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field50A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field50A.getLine(1));
                 }
                 partyDto.setPartyBic(field50A.getBIC());
             } else if (mt103.getField50F() != null) {
@@ -30,7 +30,7 @@ public class Pacs00801Parse50Field extends AbstractMt2MxParseFields {
                 Field50K field50K = mt103.getField50K();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field50K.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field50K.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field50K.getLine(1));
                 }
                 partyDto.setPartyName(field50K.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field50K.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse52Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse52Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.field.Field52D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse52Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse52Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -21,14 +21,14 @@ public class Pacs00801Parse52Field extends AbstractMt2MxParseFields {
                 Field52A field52A = mt103.getField52A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52A.getLine(1));
                 }
                 partyDto.setPartyBic(field52A.getBIC());
             } else if (mt103.getField52D() != null) {
                 Field52D field52D = mt103.getField52D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52D.getLine(1));
                 }
                 partyDto.setPartyName(field52D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field52D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse53Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse53Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field53D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse53Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse53Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,19 +22,19 @@ public class Pacs00801Parse53Field extends AbstractMt2MxParseFields {
                 Field53A field53A = mt103.getField53A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field53A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field53A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field53A.getLine(1));
                 }
                 partyDto.setPartyBic(field53A.getBIC());
             } else if (mt103.getField53B() != null) {
                 Field53B field53B = mt103.getField53B();
                 if (StringUtil.isNotEmpty(field53B.getAccount())) {
-                    customerCreditTransfer.setSettleAccount(buildPartyAccount(field53B.getAccount()));
+                    customerCreditTransfer.setSettleAccount(buildPartyAccount(field53B.getLine(1)));
                 }
             } else if (mt103.getField53D() != null) {
                 Field53D field53D = mt103.getField53D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field53D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field53D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field53D.getLine(1));
                 }
                 partyDto.setPartyName(field53D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field53D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse54Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse54Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field54D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse54Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse54Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,7 +22,7 @@ public class Pacs00801Parse54Field extends AbstractMt2MxParseFields {
                 Field54A field54A = mt103.getField54A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field54A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field54A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field54A.getLine(1));
                 }
                 partyDto.setPartyBic(field54A.getBIC());
             } else if (mt103.getField54B() != null) {
@@ -32,7 +32,7 @@ public class Pacs00801Parse54Field extends AbstractMt2MxParseFields {
                 Field54D field54D = mt103.getField54D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field54D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field54D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field54D.getLine(1));
                 }
                 partyDto.setPartyName(field54D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field54D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse55Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse55Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field55D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse55Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse55Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,7 +22,7 @@ public class Pacs00801Parse55Field extends AbstractMt2MxParseFields {
                 Field55A field55A = mt103.getField55A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field55A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field55A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field55A.getLine(1));
                 }
                 partyDto.setPartyBic(field55A.getBIC());
             } else if (mt103.getField55B() != null) {
@@ -32,7 +32,7 @@ public class Pacs00801Parse55Field extends AbstractMt2MxParseFields {
                 Field55D field55D = mt103.getField55D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field55D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field55D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field55D.getLine(1));
                 }
                 partyDto.setPartyName(field55D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field55D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse56Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse56Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field56D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse56Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse56Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,18 +22,18 @@ public class Pacs00801Parse56Field extends AbstractMt2MxParseFields {
                 Field56A field56A = mt103.getField56A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56A.getLine(1));
                 }
                 partyDto.setPartyBic(field56A.getBIC());
             } else if (mt103.getField56C() != null) {
                 Field56C field56C = mt103.getField56C();
                 partyDto = new PartyDto();
-                partyDto.setPartyAcct(buildPartyAccount(field56C.getAccount()));
+                partyDto = buildPartyAccount(partyDto, field56C.getValue());
             } else if (mt103.getField56D() != null) {
                 Field56D field56D = mt103.getField56D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56D.getLine(1));
                 }
                 partyDto.setPartyName(field56D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field56D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse57Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse57Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.field.Field57D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse57Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse57Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -23,7 +23,7 @@ public class Pacs00801Parse57Field extends AbstractMt2MxParseFields {
                 Field57A field57A = mt103.getField57A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57A.getLine(1));
                 }
                 partyDto.setPartyBic(field57A.getBIC());
             } else if (mt103.getField57B() != null) {
@@ -32,12 +32,12 @@ public class Pacs00801Parse57Field extends AbstractMt2MxParseFields {
             } else if (mt103.getField57C() != null) {
                 Field57C field57C = mt103.getField57C();
                 partyDto = new PartyDto();
-                partyDto.setPartyAcct(buildPartyAccount(field57C.getAccount()));
+                partyDto = buildPartyAccount(partyDto, field57C.getValue());
             } else if (mt103.getField57D() != null) {
                 Field57D field57D = mt103.getField57D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57D.getLine(1));
                 }
                 partyDto.setPartyName(field57D.getName());
                 if (StringUtil.isNotEmpty(field57D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse59Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse59Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field59F;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse59Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse59Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,7 +22,7 @@ public class Pacs00801Parse59Field extends AbstractMt2MxParseFields {
                 Field59 field59 = mt103.getField59();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field59.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field59.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field59.getLine(1));
                 }
                 partyDto.setPartyName(field59.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field59.getNameAndAddressLine2())) {
@@ -38,7 +38,7 @@ public class Pacs00801Parse59Field extends AbstractMt2MxParseFields {
                 Field59A field59A = mt103.getField59A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field59A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field59A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field59A.getLine(1));
                 }
                 partyDto.setPartyBic(field59A.getBIC());
             } else if (mt103.getField59F() != null) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse70Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse70Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field70;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -9,7 +9,7 @@ import com.prowidesoftware.swift.model.mt1xx.MT103;
 
 import java.util.List;
 
-public class Pacs00801Parse70Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse70Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse71Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse71Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
 import com.brilliance.swift.vo.common.ChargeForEnum;
@@ -14,7 +13,7 @@ import com.prowidesoftware.swift.model.mt1xx.MT103;
 
 import java.util.List;
 
-public class Pacs00801Parse71Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse71Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse72Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse72Field.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.SwiftTransferUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.field.Field72;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse72Field extends AbstractMt2MxParseFields {
+public class Pacs00801Parse72Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs008001/impl/Pacs00801Parse77BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs008001/impl/Pacs00801Parse77BField.java

-package com.brilliance.swift.mt2mx.pacs008001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs008001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field77B;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt1xx.MT103;
 
-public class Pacs00801Parse77BField extends AbstractMt2MxParseFields {
+public class Pacs00801Parse77BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/Mt2MxPacs009001Creator.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/Mt2SwiftDtoPacs009001Creator.java

-package com.brilliance.swift.mt2mx.pacs009001;
+package com.brilliance.swift.mt2SwiftDto.pacs009001;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxCreator;
-import com.brilliance.swift.mt2mx.Mt2MxContextIdentifier;
-import com.brilliance.swift.mt2mx.Mt2MxParseFields;
-import com.brilliance.swift.mt2mx.pacs009001.impl.*;
-import com.brilliance.swift.mt2mx.pacs009001.impl.cov.*;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoCreator;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoContextIdentifier;
+import com.brilliance.swift.mt2SwiftDto.Mt2SwiftDtoParseFields;
+import com.brilliance.swift.mt2SwiftDto.pacs009001.impl.*;
+import com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov.*;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.SwiftDto;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -14,7 +14,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Mt2MxPacs009001Creator extends AbstractMt2MxCreator {
+public class Mt2SwiftDtoPacs009001Creator extends AbstractMt2SwiftDtoCreator {
 
     @Override
     public void preProcess() throws SwiftException {
@@ -35,8 +35,8 @@ public class Mt2MxPacs009001Creator extends AbstractMt2MxCreator {
     }
 
     @Override
-    public List<Mt2MxParseFields> getParseFieldsList() throws SwiftException {
-        List<Mt2MxParseFields> list = new ArrayList<>();
+    public List<Mt2SwiftDtoParseFields> getParseFieldsList() throws SwiftException {
+        List<Mt2SwiftDtoParseFields> list = new ArrayList<>();
         list.add(new Pacs009001Parse20Field());
         list.add(new Pacs009001Parse21Field());
         list.add(new Pacs009001Parse13CField());
@@ -64,9 +64,9 @@ public class Mt2MxPacs009001Creator extends AbstractMt2MxCreator {
     @Override
     public void postProcess() throws SwiftException {
         try {
-            String outputFilePath = (String)context.get(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
+            String outputFilePath = (String)context.get(Mt2SwiftDtoContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
             VoFinancialInstitutionCreditTransfer financialInstitutionCreditTransfer = context.get(VoFinancialInstitutionCreditTransfer.class);
-            context.set(Mt2MxContextIdentifier.MT_TO_SWIFTDTO_OBJ, financialInstitutionCreditTransfer);
+            context.set(Mt2SwiftDtoContextIdentifier.MT_TO_SWIFTDTO_OBJ, financialInstitutionCreditTransfer);
             if (StringUtil.isNotEmpty(outputFilePath)) {
                 financialInstitutionCreditTransfer.write(new File(outputFilePath));
             }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse13CField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse13CField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field13C;
@@ -14,7 +14,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import java.util.Date;
 import java.util.List;
 
-public class Pacs009001Parse13CField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse13CField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse20Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse20Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field20;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse20Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse20Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse21Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse21Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
+import com.brilliance.swift.constants.Mx2MtConstants;
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field21;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse21Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse21Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
             VoFinancialInstitutionCreditTransfer financialInstitutionCreditTransfer = context.get(VoFinancialInstitutionCreditTransfer.class);
             Field21 field21 = getField21();
             if (field21 != null) {
-                financialInstitutionCreditTransfer.setEndToEndId(field21.getValue());
+                if (Mx2MtConstants.MT_21_DEFAULT_VALUE.equals(field21.getValue())) {
+                    financialInstitutionCreditTransfer.setEndToEndId(Mx2MtConstants.MX_END_TO_END_ID_DEFAULT_VALUE);
+                } else {
+                    financialInstitutionCreditTransfer.setEndToEndId(field21.getValue());
+                }
             }
         } catch (Exception e) {
             throw new SwiftException("ERROR", e.getMessage());

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse32AField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse32AField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.DateUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse32AField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse32AField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse52Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse52Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse52Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse52Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -21,14 +21,14 @@ public class Pacs009001Parse52Field extends AbstractMt2MxParseFields {
                 Field52A field52A = getField52A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52A.getLine(1));
                 }
                 partyDto.setPartyBic(field52A.getBIC());
             } else if (getField52D() != null) {
                 Field52D field52D = getField52D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52D.getLine(1));
                 }
                 partyDto.setPartyName(field52D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field52D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse53Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse53Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse53Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse53Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -20,19 +20,19 @@ public class Pacs009001Parse53Field extends AbstractMt2MxParseFields {
                 Field53A field53A = getField53A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field53A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field53A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field53A.getLine(1));
                 }
                 partyDto.setPartyBic(field53A.getBIC());
             } else if (getField53B() != null) {
                 Field53B field53B = getField53B();
                 if (StringUtil.isNotEmpty(field53B.getAccount())) {
-                    financialInstitutionCreditTransfer.setSettleAccount(buildPartyAccount(field53B.getAccount()));
+                    financialInstitutionCreditTransfer.setSettleAccount(buildPartyAccount(field53B.getLine(1)));
                 }
             } else if (getField53D() != null) {
                 Field53D field53D = getField53D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field53D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field53D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field53D.getLine(1));
                 }
                 partyDto.setPartyName(field53D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field53D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse54Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse54Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse54Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse54Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -20,7 +20,7 @@ public class Pacs009001Parse54Field extends AbstractMt2MxParseFields {
                 Field54A field54A = getField54A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field54A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field54A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field54A.getLine(1));
                 }
                 partyDto.setPartyBic(field54A.getBIC());
             } else if (getField54B() != null) {
@@ -30,7 +30,7 @@ public class Pacs009001Parse54Field extends AbstractMt2MxParseFields {
                 Field54D field54D = getField54D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field54D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field54D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field54D.getLine(1));
                 }
                 partyDto.setPartyName(field54D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field54D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse56Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse56Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse56Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse56Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -21,14 +21,14 @@ public class Pacs009001Parse56Field extends AbstractMt2MxParseFields {
                 Field56A field56A = getField56A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56A.getLine(1));
                 }
                 partyDto.setPartyBic(field56A.getBIC());
             } else if (getField56D() != null) {
                 Field56D field56D = getField56D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56D.getLine(1));
                 }
                 partyDto.setPartyName(field56D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field56D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse57Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse57Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse57Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse57Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -20,7 +20,7 @@ public class Pacs009001Parse57Field extends AbstractMt2MxParseFields {
                 Field57A field57A = getField57A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57A.getLine(1));
                 }
                 partyDto.setPartyBic(field57A.getBIC());
             } else if (getField57B() != null) {
@@ -30,7 +30,7 @@ public class Pacs009001Parse57Field extends AbstractMt2MxParseFields {
                 Field57D field57D = getField57D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57D.getLine(1));
                 }
                 partyDto.setPartyName(field57D.getName());
                 if (StringUtil.isNotEmpty(field57D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse58Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse58Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse58Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse58Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -21,7 +21,7 @@ public class Pacs009001Parse58Field extends AbstractMt2MxParseFields {
                 Field58D field58D = getField58D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field58D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field58D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field58D.getLine(1));
                 }
                 partyDto.setPartyName(field58D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field58D.getNameAndAddressLine2())) {
@@ -37,7 +37,7 @@ public class Pacs009001Parse58Field extends AbstractMt2MxParseFields {
                 Field58A field58A = getField58A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field58A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field58A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field58A.getLine(1));
                 }
                 partyDto.setPartyBic(field58A.getBIC());
             }

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/Pacs009001Parse72Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/Pacs009001Parse72Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.SwiftTransferUtil;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.PartyDto;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse72Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse72Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse33BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse33BField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.brilliance.swift.vo.common.CcyFormatAmount;
@@ -9,7 +9,7 @@ import com.prowidesoftware.swift.model.field.Field33B;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse33BField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse33BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse50Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse50Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field50K;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse50Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse50Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -23,7 +23,7 @@ public class Pacs009001Parse50Field extends AbstractMt2MxParseFields {
                 Field50A field50A = mt202Cov.getField50A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field50A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field50A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field50A.getLine(1));
                 }
                 partyDto.setPartyBic(field50A.getBIC());
             } else if (mt202Cov.getField50F() != null) {
@@ -32,7 +32,7 @@ public class Pacs009001Parse50Field extends AbstractMt2MxParseFields {
                 Field50K field50K = mt202Cov.getField50K();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field50K.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field50K.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field50K.getLine(1));
                 }
                 partyDto.setPartyName(field50K.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field50K.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse52BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse52BField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field52D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse52BField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse52BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -22,14 +22,14 @@ public class Pacs009001Parse52BField extends AbstractMt2MxParseFields {
                 Field52A field52A = getField52A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52A.getLine(1));
                 }
                 partyDto.setPartyBic(field52A.getBIC());
             } else if (getField52D() != null) {
                 Field52D field52D = getField52D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field52D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field52D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field52D.getLine(1));
                 }
                 partyDto.setPartyName(field52D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field52D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse56BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse56BField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.field.Field56D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse56BField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse56BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -23,18 +23,18 @@ public class Pacs009001Parse56BField extends AbstractMt2MxParseFields {
                 Field56A field56A = getField56A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56A.getLine(1));
                 }
                 partyDto.setPartyBic(field56A.getBIC());
             } else if (getField56C() != null) {
                 Field56C field56C = getField56C();
                 partyDto = new PartyDto();
-                partyDto.setPartyAcct(buildPartyAccount(field56C.getAccount()));
+                partyDto = buildPartyAccount(partyDto, field56C.getValue());
             } else if (getField56D() != null) {
                 Field56D field56D = getField56D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field56D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field56D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field56D.getLine(1));
                 }
                 partyDto.setPartyName(field56D.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field56D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse57BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse57BField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -13,7 +13,7 @@ import com.prowidesoftware.swift.model.field.Field57D;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse57BField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse57BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -24,7 +24,7 @@ public class Pacs009001Parse57BField extends AbstractMt2MxParseFields {
                 Field57A field57A = getField57A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57A.getLine(1));
                 }
                 partyDto.setPartyBic(field57A.getBIC());
             } else if (getField57B() != null) {
@@ -33,12 +33,12 @@ public class Pacs009001Parse57BField extends AbstractMt2MxParseFields {
             } else if (getField57C() != null) {
                 Field57C field57C = getField57C();
                 partyDto = new PartyDto();
-                partyDto.setPartyAcct(buildPartyAccount(field57C.getAccount()));
+                partyDto = buildPartyAccount(partyDto, field57C.getValue());
             } else if (getField57D() != null) {
                 Field57D field57D = getField57D();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field57D.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field57D.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field57D.getLine(1));
                 }
                 partyDto.setPartyName(field57D.getName());
                 if (StringUtil.isNotEmpty(field57D.getNameAndAddressLine2())) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse59Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse59Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.StringUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -12,7 +12,7 @@ import com.prowidesoftware.swift.model.field.Field59F;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse59Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse59Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {
@@ -24,7 +24,7 @@ public class Pacs009001Parse59Field extends AbstractMt2MxParseFields {
                 Field59 field59 = mt202COV.getField59();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field59.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field59.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field59.getLine(1));
                 }
                 partyDto.setPartyName(field59.getNameAndAddressLine1());
                 if (StringUtil.isNotEmpty(field59.getNameAndAddressLine2())) {
@@ -40,7 +40,7 @@ public class Pacs009001Parse59Field extends AbstractMt2MxParseFields {
                 Field59A field59A = mt202COV.getField59A();
                 partyDto = new PartyDto();
                 if (StringUtil.isNotEmpty(field59A.getAccount())) {
-                    partyDto.setPartyAcct(buildPartyAccount(field59A.getAccount()));
+                    partyDto = buildPartyAccount(partyDto, field59A.getLine(1));
                 }
                 partyDto.setPartyBic(field59A.getBIC());
             } else if (mt202COV.getField59F() != null) {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse70Field.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse70Field.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
 import com.prowidesoftware.swift.model.field.Field70;
@@ -10,7 +10,7 @@ import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
 import java.util.List;
 
-public class Pacs009001Parse70Field extends AbstractMt2MxParseFields {
+public class Pacs009001Parse70Field extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/pacs009001/impl/cov/Pacs009001Parse72BField.java → swiftCore/src/main/java/com/brilliance/swift/mt2SwiftDto/pacs009001/impl/cov/Pacs009001Parse72BField.java

-package com.brilliance.swift.mt2mx.pacs009001.impl.cov;
+package com.brilliance.swift.mt2SwiftDto.pacs009001.impl.cov;
 
 import com.brilliance.swift.exception.SwiftException;
-import com.brilliance.swift.mt2mx.AbstractMt2MxParseFields;
+import com.brilliance.swift.mt2SwiftDto.AbstractMt2SwiftDtoParseFields;
 import com.brilliance.swift.util.SwiftTransferUtil;
 import com.brilliance.swift.vo.VoCustomerCreditTransfer;
 import com.brilliance.swift.vo.VoFinancialInstitutionCreditTransfer;
@@ -11,7 +11,7 @@ import com.prowidesoftware.swift.model.field.Field72;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
 import com.prowidesoftware.swift.model.mt2xx.MT202COV;
 
-public class Pacs009001Parse72BField extends AbstractMt2MxParseFields {
+public class Pacs009001Parse72BField extends AbstractMt2SwiftDtoParseFields {
     @Override
     public void parseFields() throws SwiftException {
         try {

swiftCore/src/main/java/com/brilliance/swift/mt2mx/AbstractMt2MxParseFields.java

-package com.brilliance.swift.mt2mx;
-
-import com.brilliance.swift.util.StringUtil;
-import com.brilliance.swift.vo.common.PartyAccount;
-import com.prowidesoftware.swift.model.mt.AbstractMT;
-
-public abstract class AbstractMt2MxParseFields implements Mt2MxParseFields{
-
-    protected Mt2MxContext context;
-
-    public Mt2MxContext getContext() {
-        return context;
-    }
-
-    public void setContext(Mt2MxContext context) {
-        this.context = context;
-    }
-
-    protected PartyAccount buildPartyAccount(String account) {
-        if (StringUtil.isNotEmpty(account)) {
-            PartyAccount partyAcct = new PartyAccount();
-            if (account.startsWith("CH")) {
-                partyAcct.setAccount(account.substring(2));
-            } else {
-                partyAcct.setIbanAcct(account);
-            }
-            return partyAcct;
-        }
-        return null;
-    }
-
-    protected boolean isCov() {
-        AbstractMT abstractMT = context.get(AbstractMT.class);
-        return abstractMT.getSwiftMessage().isCOV();
-    }
-}

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt202cov202/impl/cov/FieldB72Generate.java

 package com.brilliance.swift.mx2mt.mt202cov202.impl.cov;
 
+import com.brilliance.swift.constants.Mx2MtConstants;
 import com.brilliance.swift.exception.SwiftException;
 import com.brilliance.swift.mx2mt.AbstractMx2MtFieldsGenerate;
+import com.brilliance.swift.util.StringUtil;
+import org.dom4j.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FieldB72Generate extends AbstractMx2MtFieldsGenerate {
 
     private static final Logger logger = LoggerFactory.getLogger(FieldB72Generate.class);
 
     @Override
     public void fieldsGenerate() throws SwiftException {
-        map.put("filed72B", "");
+        try {
+            List<String> field72List = new ArrayList<>();
+            List<String> field72TmpList = new ArrayList<>();
+            Document document = (Document)map.get(Mx2MtConstants.MX_XML_DOCUMENT);
+            String bicCode = getBicCode(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.UndrlygCstmrCdtTrf.PrvsInstgAgt1.FinInstnId");
+            String name = getXmlNodeValue(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.UndrlygCstmrCdtTrf.PrvsInstgAgt1.FinInstnId.Nm");
+            if (StringUtil.isNotEmpty(bicCode)) {
+                bicCode = Mx2MtConstants.INS + bicCode;
+                field72TmpList.addAll(StringUtil.outStringList(bicCode, 35, "//"));
+            } else if (StringUtil.isNotEmpty(name)) {
+                name = Mx2MtConstants.INS + name;
+                field72TmpList.addAll(StringUtil.outStringList(name, 35, "//"));
+            }
+            String cdtrAgtInstrInf = getXmlNodeValue(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.UndrlygCstmrCdtTrf.InstrForCdtrAgt.InstrInf");
+            if (StringUtil.isNotEmpty(cdtrAgtInstrInf)) {
+                cdtrAgtInstrInf = Mx2MtConstants.ACC + cdtrAgtInstrInf;
+                field72TmpList.addAll(StringUtil.outStringList(cdtrAgtInstrInf, 35, "//"));
+            }
+            String nxtAgtInstrInf = getXmlNodeValue(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.UndrlygCstmrCdtTrf.InstrForNxtAgt.InstrInf");
+            if (StringUtil.isNotEmpty(nxtAgtInstrInf)) {
+                nxtAgtInstrInf = Mx2MtConstants.REC + nxtAgtInstrInf;
+                field72TmpList.addAll(StringUtil.outStringList(nxtAgtInstrInf, 35, "//"));
+            }
+            for (int i=0; i<field72TmpList.size(); i++) {
+                if (i == 6) break;
+                if (i == 0) {
+                    field72List.add(":72:" + field72TmpList.get(i));
+                } else {
+                    field72List.add(field72TmpList.get(i));
+                }
+            }
+            map.put("field72BList", field72List);
+        } catch (Exception e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
     }
 }

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/AbstractSwiftDto2MtCreator.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.util.DateUtil;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.SwiftDto;
+import com.brilliance.swift.vo.common.MessagePriority;
+import com.prowidesoftware.swift.io.ConversionService;
+import com.prowidesoftware.swift.io.IConversionService;
+import com.prowidesoftware.swift.io.writer.SwiftWriter;
+import com.prowidesoftware.swift.model.*;
+import org.apache.commons.lang3.Validate;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public abstract class AbstractSwiftDto2MtCreator implements SwiftDto2MtCreator{
+
+    protected SwiftDto2MtContext context;
+
+    public SwiftDto2MtContext getContext() {
+        return context;
+    }
+
+    public AbstractSwiftDto2MtCreator setContext(SwiftDto2MtContext context) {
+        this.context = context;
+        return this;
+    }
+
+    //TODO
+    protected String getRandomNumber(int length) {
+        String randomNumber = "";
+        Random random = new Random();
+        for (int i=0; i<length; i++) {
+            randomNumber += random.nextInt(9);
+        }
+        return randomNumber;
+    }
+
+    protected String processBicCode(String bicCode) {
+        String processedBicCode = "";
+        if (!StringUtil.isEmpty(bicCode)) {
+            if (bicCode.length() == 8) {
+                processedBicCode = bicCode + Mx2MtConstants.BICSUFFIX;
+            } else if (bicCode.length() == 11) {
+                processedBicCode = bicCode.substring(0, 8) + Mx2MtConstants.BICMIDDLE + bicCode.substring(8);
+            } else {
+                throw new SwiftException("ERROR", "BicCode length is invalid.");
+            }
+        }
+        return processedBicCode;
+    }
+
+    public abstract List<SwiftDto2MtTagGenerate> getGenerateTagList();
+
+    protected abstract String getMtType();
+
+    @Override
+    public void preProcess() throws SwiftException {
+        SwiftMessage swiftMessage = new SwiftMessage();
+        context.set(swiftMessage);
+    }
+
+    @Override
+    public void withBlock1() throws SwiftException {
+        SwiftBlock1 block1 = new SwiftBlock1();
+        SwiftDto swiftDto = (SwiftDto)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ);
+        String mtIoType = (String)context.get(SwiftDto2MtContextIdentifier.MT_IO_TYPE, true);
+        if ("O".equalsIgnoreCase(mtIoType)) {
+            block1.setLogicalTerminal(processBicCode(swiftDto.getReceiverBic()));
+        } else {
+            block1.setLogicalTerminal(processBicCode(swiftDto.getSenderBic()));
+        }
+        block1.setSessionNumber(getRandomNumber(4));
+        block1.setSequenceNumber(getRandomNumber(6));
+        context.get(SwiftMessage.class).setBlock1(block1);
+    }
+
+    @Override
+    public void withBlock2() throws SwiftException {
+        SwiftDto swiftDto = (SwiftDto)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ);
+        String mtIoType = (String)context.get(SwiftDto2MtContextIdentifier.MT_IO_TYPE, true);
+        String messagePriority = MessagePriority.NORM.equals(swiftDto.getMessagePriority()) ? "N" : "U";
+        if ("O".equalsIgnoreCase(mtIoType)) {
+            SwiftBlock2Output block2 = new SwiftBlock2Output();
+            block2.setMessageType(getMtType());
+            block2.setSenderInputTime(DateUtil.format(swiftDto.getCreateDate(), "HHmm"));
+            block2.setMIRDate(DateUtil.format(swiftDto.getCreateDate(), "yyMMdd"));
+            block2.setMIRLogicalTerminal(processBicCode(swiftDto.getSenderBic()));
+            block2.setMIRSessionNumber(getRandomNumber(4));
+            block2.setMIRSequenceNumber(getRandomNumber(6));
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
+            block2.setReceiverOutputDateTime(calendar);
+            block2.setMessagePriority(messagePriority);
+            context.get(SwiftMessage.class).setBlock2(block2);
+        } else {
+            SwiftBlock2Input block2 = new SwiftBlock2Input();
+            block2.setMessageType(getMtType());
+            block2.setReceiverAddress(processBicCode(swiftDto.getReceiverBic()));
+            block2.setMessagePriority(messagePriority);
+            context.get(SwiftMessage.class).setBlock2(block2);
+        }
+    }
+
+    @Override
+    public void withBlock3() throws SwiftException {
+        SwiftDto swiftDto = (SwiftDto)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ);
+        List<Tag> tags = new ArrayList<>();
+        SwiftBlock3 block3 = new SwiftBlock3();
+        tags.add(new Tag("108", new SimpleDateFormat("yyMMddHHmmssSSSS").format(Calendar.getInstance().getTime())));
+        if (StringUtil.isNotEmpty(swiftDto.getUetr())) {
+            tags.add(new Tag("121", swiftDto.getUetr()));
+        }
+        block3.setTags(tags);
+        context.get(SwiftMessage.class).setBlock3(block3);
+    }
+
+    @Override
+    public void withBlock4() throws SwiftException {
+        List<SwiftDto2MtTagGenerate> list = getGenerateTagList();
+        if (list != null) {
+            List<Tag> tags = new ArrayList<>();
+            SwiftBlock4 block4 = new SwiftBlock4(tags);
+            context.get(SwiftMessage.class).setBlock4(block4);
+            for (int i=0; i<list.size(); i++) {
+                AbstractSwiftDto2MtTagGenerate swiftDto2MtTagGenerate = (AbstractSwiftDto2MtTagGenerate)list.get(i);
+                swiftDto2MtTagGenerate.setContext(context).tagGenerate();
+            }
+        }
+    }
+
+    @Override
+    public void withBlock5() throws SwiftException {
+
+    }
+
+    @Override
+    public void postProcess() throws SwiftException {
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        IConversionService srv = new ConversionService();
+        String mtStr = srv.getFIN(swiftMessage);
+        context.set(SwiftDto2MtContextIdentifier.MT_TXT, mtStr);
+        String outputFilePath = (String)context.get(SwiftDto2MtContextIdentifier.MT_OUTPUT_FILE_PATH, true);
+        if (StringUtil.isNotEmpty(outputFilePath)) {
+            write(swiftMessage, new File(outputFilePath));
+        }
+    }
+
+    public void write(SwiftMessage swiftMessage, File file) throws SwiftException {
+        try {
+            Validate.notNull(file, "the file to write cannot be null");
+            Validate.notNull(swiftMessage, "the message to write cannot be null");
+            if(!file.exists()) {
+                file.createNewFile();
+            }
+            FileWriter fw = new FileWriter(file.getAbsoluteFile());
+            SwiftWriter.writeMessage(swiftMessage, fw, true);
+            fw.close();
+        } catch (IOException e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
+    }
+
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/AbstractSwiftDto2MtTagGenerate.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.common.ClearingSystemMember;
+import com.brilliance.swift.vo.common.ClearingSystemMemberCode;
+import com.brilliance.swift.vo.common.PartyAccount;
+import com.brilliance.swift.vo.common.PartyDto;
+
+public abstract class AbstractSwiftDto2MtTagGenerate implements SwiftDto2MtTagGenerate{
+
+    protected SwiftDto2MtContext context;
+
+    public SwiftDto2MtContext getContext() {
+        return context;
+    }
+
+    public AbstractSwiftDto2MtTagGenerate setContext(SwiftDto2MtContext context) {
+        this.context = context;
+        return this;
+    }
+
+    public ClearingSystemMemberCode getClsSysMemberByValue(String value) {
+        ClearingSystemMemberCode code = null;
+        ClearingSystemMemberCode[] values = ClearingSystemMemberCode.values();
+        for (ClearingSystemMemberCode tmpCode : values) {
+            if (tmpCode.value().equals(value)) {
+                code = tmpCode;
+                break;
+            }
+        }
+        return code;
+    }
+
+    protected String getAccount(PartyDto partyDto) {
+        if (partyDto == null) {
+            return null;
+        }
+        String account = "";
+        ClearingSystemMember clrSysMmb = partyDto.getClrSysMmb();
+        if (clrSysMmb != null) {
+            ClearingSystemMemberCode memberCode = getClsSysMemberByValue(clrSysMmb.getCode());
+            if (memberCode != null) {
+                account = "//" + memberCode.desc();
+            } else {
+                account = "//" + clrSysMmb.getCode();
+            }
+            account += clrSysMmb.getId();
+        } else {
+            PartyAccount partyAcct = partyDto.getPartyAcct();
+            if (partyAcct != null) {
+                if ("CUID".equals(partyAcct.getAcctType())) {
+                    account = "//CH" + partyAcct.getAccount();
+                } else {
+                    account = "/" + (StringUtil.isNotEmpty(partyAcct.getIbanAcct()) ? partyAcct.getIbanAcct() : partyAcct.getAccount());
+                }
+            }
+        }
+        if (account.length() > 35) {
+            account = account.substring(0, 35);
+        }
+        return account;
+    }
+
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/SwiftDto2MtContext.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.context.ContextImpl;
+
+public class SwiftDto2MtContext extends ContextImpl {
+    private static final long serialVersionUID = -708755732608258345L;
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/SwiftDto2MtContextIdentifier.java

+package com.brilliance.swift.swiftdto2mt;
+
+public class SwiftDto2MtContextIdentifier {
+
+    public static final String MT_OUTPUT_FILE_PATH = "mt.output.filepath";
+
+    public static final String MT_TXT = "mt.txt";
+
+    public static final String SWIFT_DTO_OBJ = "swift.dto.obj";
+
+    public static final String MT_IO_TYPE = "mt.io.type";
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/SwiftDto2MtCreator.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.exception.SwiftException;
+
+public interface SwiftDto2MtCreator {
+
+    public void preProcess() throws SwiftException;
+
+    public void withBlock1() throws SwiftException;
+
+    public void withBlock2() throws SwiftException;
+
+    public void withBlock3() throws SwiftException;
+
+    public void withBlock4() throws SwiftException;
+
+    public void withBlock5() throws SwiftException;
+
+    public void postProcess() throws SwiftException;
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/SwiftDto2MtCreatorManager.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.mt103.SwiftDto2Mt103Creator;
+import com.brilliance.swift.swiftdto2mt.mt202.SwiftDto2Mt202Creator;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.SwiftDto;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+public class SwiftDto2MtCreatorManager {
+
+    public String swiftDto2Mt(File file, String fileOutputPath, String mtIoType) throws SwiftException {
+        try {
+            String gsonStr = FileUtils.readFileToString(file);
+            SwiftDto swiftDto = SwiftDto.fromJson(gsonStr);
+            return swiftDto2Mt(swiftDto, fileOutputPath, StringUtil.isEmpty(mtIoType)?"O":mtIoType);
+        } catch (IOException e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
+    }
+
+    public String swiftDto2Mt(String gsonStr, String fileOutputPath, String mtIoType) throws SwiftException{
+        SwiftDto swiftDto = SwiftDto.fromJson(gsonStr);
+        return swiftDto2Mt(swiftDto, fileOutputPath, StringUtil.isEmpty(mtIoType)?"O":mtIoType);
+    }
+
+    public String swiftDto2Mt(SwiftDto swiftDto, String fileOutputPath, String mtIoType) throws SwiftException {
+        SwiftDto2MtContext context = new SwiftDto2MtContext();
+        context.set(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, swiftDto);
+        context.set(SwiftDto2MtContextIdentifier.MT_OUTPUT_FILE_PATH, fileOutputPath);
+        context.set(SwiftDto2MtContextIdentifier.MT_IO_TYPE, mtIoType);
+        AbstractSwiftDto2MtCreator creator = getCreator(swiftDto.getMessageType());
+        creator.setContext(context);
+        creator.preProcess();
+        creator.withBlock1();
+        creator.withBlock2();
+        creator.withBlock3();
+        creator.withBlock4();
+        creator.withBlock5();
+        creator.postProcess();
+        String xmlStr = (String)context.get(SwiftDto2MtContextIdentifier.MT_TXT);
+        return xmlStr;
+    }
+
+    public AbstractSwiftDto2MtCreator getCreator(String messageType) {
+        if ("pacs.008.001".equals(messageType)) {
+            return new SwiftDto2Mt103Creator();
+        } else if ("pacs.009.001".equals(messageType)) {
+            return new SwiftDto2Mt202Creator();
+        } else {
+            throw new SwiftException("Invalid message type");
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/SwiftDto2MtTagGenerate.java

+package com.brilliance.swift.swiftdto2mt;
+
+import com.brilliance.swift.exception.SwiftException;
+
+public interface SwiftDto2MtTagGenerate {
+
+    public void tagGenerate() throws SwiftException;
+
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/SwiftDto2Mt103Creator.java

+package com.brilliance.swift.swiftdto2mt.mt103;
+
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtCreator;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.mt103.impl.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SwiftDto2Mt103Creator extends AbstractSwiftDto2MtCreator {
+    @Override
+    public List<SwiftDto2MtTagGenerate> getGenerateTagList() {
+        List<SwiftDto2MtTagGenerate> list = new ArrayList<>();
+        list.add(new Tag20Generate());
+        list.add(new Tag13CGenerate());
+        list.add(new Tag23BGenerate());
+        list.add(new Tag23EGenerate());
+        list.add(new Tag26TGenerate());
+        list.add(new Tag32AGenerate());
+        list.add(new Tag33BGenerate());
+        list.add(new Tag36Generate());
+        list.add(new Tag50Generate());
+        list.add(new Tag51Generate());
+        list.add(new Tag52Generate());
+        list.add(new Tag53Generate());
+        list.add(new Tag54Generate());
+        list.add(new Tag55Generate());
+        list.add(new Tag56Generate());
+        list.add(new Tag57Generate());
+        list.add(new Tag59Generate());
+        list.add(new Tag70Generate());
+        list.add(new Tag71Generate());
+        list.add(new Tag72Generate());
+        list.add(new Tag77BGenerate());
+        return list;
+    }
+
+    @Override
+    protected String getMtType() {
+        return "103";
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag13CGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.DateUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag13CGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "13C";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (customerCreditTransfer.getDebitDate() != null) {
+            String dateStr = DateUtil.format(customerCreditTransfer.getDebitDate(), "HHmm");
+            tags.add(new Tag(name, "/SNDTIME/"+dateStr+"+0800"));
+        }
+        if (customerCreditTransfer.getCreditDate() != null) {
+            String dateStr = DateUtil.format(customerCreditTransfer.getCreditDate(), "HHmm");
+            tags.add(new Tag(name, "/RNCTIME/"+dateStr+"+0800"));
+        }
+        if (customerCreditTransfer.getClsDate() != null) {
+            String dateStr = DateUtil.format(customerCreditTransfer.getClsDate(), "HHmm");
+            tags.add(new Tag(name, "/CLSTIME/"+dateStr+"+0800"));
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag20Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag20Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "20";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (StringUtil.isNotEmpty(customerCreditTransfer.getMessageId())) {
+            tags.add(new Tag(name, customerCreditTransfer.getMessageId()));
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag23BGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag23BGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "23B";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (StringUtil.isNotEmpty(customerCreditTransfer.getBussinessCode())) {
+            String bussinessCode = customerCreditTransfer.getBussinessCode();
+            String value = "SDVA".equals(bussinessCode) ? "CRED" : bussinessCode;
+            tags.add(new Tag(name, value));
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag23EGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag23EGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "23E";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        List<String> instructionCodeList = customerCreditTransfer.getInstructionCodeList();
+        if (instructionCodeList.size() > 0) {
+            for (int i=0; i<instructionCodeList.size(); i++) {
+                tags.add(new Tag(name, instructionCodeList.get(i)));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag26TGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag26TGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "26T";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (StringUtil.isNotEmpty(customerCreditTransfer.getTxnTypeCode())) {
+            tags.add(new Tag(name, customerCreditTransfer.getTxnTypeCode()));
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag32AGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.DateUtil;
+import com.brilliance.swift.util.NumberUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.CcyFormatAmount;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.Date;
+import java.util.List;
+
+public class Tag32AGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "32A";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        CcyFormatAmount settledCcyFormatAmount = customerCreditTransfer.getSettledCcyFormatAmount();
+        Date settledDate = customerCreditTransfer.getSettledDate();
+        if (settledDate != null && settledCcyFormatAmount != null) {
+            String dateStr = DateUtil.format(settledDate, "yyMMdd");
+            String ccy = settledCcyFormatAmount.getCcy();
+            String amt = NumberUtil.formatAmt(settledCcyFormatAmount.getAmt(), ccy);
+            tags.add(new Tag(name, dateStr+ccy+amt));
+        }
+    }
+}
+

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag33BGenerate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.NumberUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.CcyFormatAmount;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag33BGenerate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "33B";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (customerCreditTransfer.getInstructedCcyFormatAmount() != null) {
+            CcyFormatAmount instructedCcyFormatAmount = customerCreditTransfer.getInstructedCcyFormatAmount();
+            String ccy = instructedCcyFormatAmount.getCcy();
+            String amt = NumberUtil.formatAmt(instructedCcyFormatAmount.getAmt(), ccy);
+            tags.add(new Tag(name,ccy+amt));
+        }
+    }
+}
+

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag36Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag36Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "36";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (customerCreditTransfer.getExchangeRate() != null) {
+            String exchangeRateStr = String.valueOf(customerCreditTransfer.getExchangeRate()).replace(".", ",");
+            tags.add(new Tag(name, exchangeRateStr));
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag50Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag50Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "50A";
+
+    private String name_F = "50F";
+
+    private String name_K = "50K";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto debitParty = customerCreditTransfer.getDebitParty();
+        if (debitParty != null) {
+            String account = getAccount(debitParty);
+            String bicCode = debitParty.getPartyBic();
+            String name = debitParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = debitParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_K, value));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag51Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+
+public class Tag51Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag52Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag52Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "52A";
+
+    private String name_D = "52D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto debitAgtParty = customerCreditTransfer.getDebitAgtParty();
+        if (debitAgtParty != null) {
+            String account = getAccount(debitAgtParty);
+            String bicCode = debitAgtParty.getPartyBic();
+            String name = debitAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = debitAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            }
+        }
+    }
+}
\ No newline at end of file

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag53Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyAccount;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag53Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "53A";
+
+    private String name_B = "53B";
+
+    private String name_D = "53D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto instgAgtParty = customerCreditTransfer.getInstgAgtParty();
+        if (instgAgtParty != null) {
+            String account = getAccount(instgAgtParty);
+            String bicCode = instgAgtParty.getPartyBic();
+            String name = instgAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = instgAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            }
+        } else {
+            PartyAccount settleAccount = customerCreditTransfer.getSettleAccount();
+            if (settleAccount != null) {
+                PartyDto partyDto = new PartyDto();
+                partyDto.setPartyAcct(settleAccount);
+                String value = getAccount(partyDto);
+                tags.add(new Tag(name_B, value));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag54Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag54Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "54A";
+
+    private String name_D = "54D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto instdAgtParty = customerCreditTransfer.getInstdAgtParty();
+        if (instdAgtParty != null) {
+            String account = getAccount(instdAgtParty);
+            String bicCode = instdAgtParty.getPartyBic();
+            String name = instdAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = instdAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            }
+        }
+    }
+}
+

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag55Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag55Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "55A";
+
+    private String name_D = "55D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto thridAgtParty = customerCreditTransfer.getThridAgtParty();
+        if (thridAgtParty != null) {
+            String account = getAccount(thridAgtParty);
+            String bicCode = thridAgtParty.getPartyBic();
+            String name = thridAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = thridAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag56Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag56Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "56A";
+
+    private String name_C = "56C";
+
+    private String name_D = "56D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto intrymyAgtParty = customerCreditTransfer.getIntrmyAgtParty();
+        if (intrymyAgtParty != null) {
+            String account = getAccount(intrymyAgtParty);
+            String bicCode = intrymyAgtParty.getPartyBic();
+            String name = intrymyAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = intrymyAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            } else {
+                tags.add(new Tag(name_C, account));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag57Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+
+public class Tag57Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "57A";
+
+    private String name_C = "57C";
+
+    private String name_D = "57D";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto creditAgtParty = customerCreditTransfer.getCreditAgtParty();
+        if (creditAgtParty != null) {
+            String account = getAccount(creditAgtParty);
+            String bicCode = creditAgtParty.getPartyBic();
+            String name = creditAgtParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = creditAgtParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_D, value));
+            } else {
+                tags.add(new Tag(name_C, account));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag59Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.StringUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.PartyDto;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag59Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "59A";
+
+    private String name_none = "59";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        PartyDto creditParty = customerCreditTransfer.getCreditParty();
+        if (creditParty != null) {
+            String account = getAccount(creditParty);
+            String bicCode = creditParty.getPartyBic();
+            String name = creditParty.getPartyName();
+            String value = "";
+            if (StringUtil.isNotEmpty(bicCode)) {
+                value = bicCode;
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + bicCode;
+                }
+                tags.add(new Tag(name_A, value));
+            } else if (StringUtil.isNotEmpty(name)) {
+                if (name.length() > 35) name = name.substring(0, 35);
+                if (StringUtil.isNotEmpty(account)) {
+                    value = account + Mx2MtConstants.NEW_LINE + name;
+                } else {
+                    value = name;
+                }
+                List<String> addressList = creditParty.getAddressList();
+                for (int i=0; i<addressList.size(); i++) {
+                    if (i == 3) break;
+                    String address = addressList.get(i);
+                    if (address.length() > 35) address = address.substring(0, 35);
+                    value += Mx2MtConstants.NEW_LINE + address;
+                }
+                tags.add(new Tag(name_none, value));
+            }
+        }
+    }
+}

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag70Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.constants.Mx2MtConstants;
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+
+import java.util.List;
+
+public class Tag70Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name = "70";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        List<String> remittanceInfoList = customerCreditTransfer.getRemittanceInfoList();
+        if (remittanceInfoList.size() > 0) {
+            String value = "";
+            for (int i=0; i<remittanceInfoList.size(); i++) {
+                if (i==0) {
+                    value += remittanceInfoList.get(i);
+                } else {
+                    value += Mx2MtConstants.NEW_LINE + remittanceInfoList.get(i);
+                }
+            }
+            tags.add(new Tag(name, value));
+        }
+    }
+
+    /*@Override
+    public void fieldsGenerate() throws SwiftException {
+        try {
+            String field70 = "";
+            Document document = (Document)map.get(Mx2MtConstants.MX_XML_DOCUMENT);
+            int ustrdCounts = getXmlNodeCounts(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.RmtInf.Ustrd");
+            if (ustrdCounts > 0) {
+                String ustrd = getXmlNodeValue(Mx2MtConstants.MAINBODY_PARENT_ELEMENT_NAME, document, "CdtTrfTxInf.RmtInf.Ustrd(0)");
+                field70 = StringUtil.getStringByEnter(ustrd, 35, 4);
+            }
+            map.put("field70", field70);
+        } catch (Exception e) {
+            throw new SwiftException("ERROR", e.getMessage());
+        }
+    }*/
+}
\ No newline at end of file

swiftCore/src/main/java/com/brilliance/swift/swiftdto2mt/mt103/impl/Tag71Generate.java

+package com.brilliance.swift.swiftdto2mt.mt103.impl;
+
+import com.brilliance.swift.exception.SwiftException;
+import com.brilliance.swift.swiftdto2mt.AbstractSwiftDto2MtTagGenerate;
+import com.brilliance.swift.swiftdto2mt.SwiftDto2MtContextIdentifier;
+import com.brilliance.swift.util.NumberUtil;
+import com.brilliance.swift.vo.VoCustomerCreditTransfer;
+import com.brilliance.swift.vo.common.CcyFormatAmount;
+import com.prowidesoftware.swift.model.SwiftMessage;
+import com.prowidesoftware.swift.model.Tag;
+import com.prowidesoftware.swift.model.mx.dic.ChargeBearerType1Code;
+
+import java.util.List;
+
+public class Tag71Generate extends AbstractSwiftDto2MtTagGenerate {
+
+    private String name_A = "71A";
+
+    private String name_F = "71F";
+
+    private String name_G = "71G";
+
+    @Override
+    public void tagGenerate() throws SwiftException {
+        VoCustomerCreditTransfer customerCreditTransfer = (VoCustomerCreditTransfer)context.get(SwiftDto2MtContextIdentifier.SWIFT_DTO_OBJ, true);
+        SwiftMessage swiftMessage = context.get(SwiftMessage.class);
+        List<Tag> tags = swiftMessage.getBlock4().getTags();
+        if (customerCreditTransfer.getChargeFor() != null) {
+            String value = "";
+            if (ChargeBearerType1Code.CRED.value().equals(customerCreditTransfer.getChargeFor().value())) {
+                value = "BEN";
+            } else if (ChargeBearerType1Code.DEBT.value().equals(customerCreditTransfer.getChargeFor().value())) {
+                value = "OUR";
+            } else if (ChargeBearerType1Code.SHAR.value().equals(customerCreditTransfer.getChargeFor().value())) {
+                value = "SHA";
+            }
+            tags.add(new Tag(name_A, value));
+            if (customerCreditTransfer.getChargeCcyFormatAmount() != null) {
+                CcyFormatAmount chargeCcyFormatAmount = customerCreditTransfer.getChargeCcyFormatAmount();
+                String ccy = chargeCcyFormatAmount.getCcy();
+                String amt = NumberUtil.formatAmt(chargeCcyFormatAmount.getAmt(), ccy);
+                if ("SHA".equals(value) || "BEN".equals(value)) {
+                    tags.add(new Tag(name_F, ccy+amt));
+                } else if ("OUR".equals(value)) {
+                    tags.add(new Tag(name_G, ccy+amt));
+                }
+            }
+        }
+    }
+}