0822swift官网MX2MT更新-3

swiftCore/src/main/java/com/brilliance/swift/mx2mt/AbstractMx2MtCreator.java

@@ -14,6 +14,7 @@ import com.prowidesoftware.swift.io.IConversionService;
 import com.prowidesoftware.swift.io.writer.SwiftWriter;
 import com.prowidesoftware.swift.model.*;
 import com.prowidesoftware.swift.model.field.*;
+import com.prowidesoftware.swift.model.mx.AbstractMX;
 import com.prowidesoftware.swift.model.mx.NamespaceReader;
 import org.apache.commons.lang3.Validate;
 import org.dom4j.*;
@@ -512,6 +513,14 @@ public abstract class AbstractMx2MtCreator implements Mx2MtCreator {
         IConversionService srv = new ConversionService();
         String mtStr = srv.getFIN(swiftMessage);
         SwiftTranslationReport str = context.get(SwiftTranslationReport.class);
+        AbstractMX abstractMX = (AbstractMX)context.get(Mx2MtContextIdentifier.MX_OBJ, true);
+        if (abstractMX != null && abstractMX.getMxId() != null) {
+            str.setMxType(abstractMX.getMxId().getBusinessProcess().name()
+                    + abstractMX.getMxId().getFunctionality()
+                    + abstractMX.getMxId().getVariant()
+                    + abstractMX.getMxId().getVersion());
+        }
+        str.setMtType(getMtType());
         str.setMessage(mtStr);
         String outputFilePath = (String)context.get(Mx2MtContextIdentifier.MX_TO_MT_OUTPUT_FILE_PATH, true);
         if (StringUtil.isNotEmpty(outputFilePath)) {

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field60Generate.java

@@ -49,6 +49,9 @@ public class Field60Generate extends AbstractMx2MtTagsGenerate {
         if (counter != 1) { //没有OPBD 或者 OPBD不止一条数据
             buildSTErrorInfo(84, "Block4/60a", null);
         }
+        if (index == -1) {
+            return;
+        }
         String pageNumber = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.StmtPgntn.PgNb");
         if (StringUtil.isNotEmpty(pageNumber)) {
             int pgNb = Integer.parseInt(pageNumber);

swiftCore/src/main/java/com/brilliance/swift/mx2mt/mt940950/impl/Field62Generate.java

@@ -49,6 +49,9 @@ public class Field62Generate extends AbstractMx2MtTagsGenerate {
         if (counter != 1) { //没有CLBD 或者 CLBD不止一条数据
             buildSTErrorInfo(87, "Block4/62a", null);
         }
+        if (index == -1) {
+            return;
+        }
         String lastPageIndicator = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.StmtPgntn.LastPgInd");
         if (StringUtil.isNotEmpty(lastPageIndicator) && Boolean.TRUE.equals(Boolean.valueOf(lastPageIndicator))) {
             String subTypeCode = getXmlNodeValue(bodyHdrParentElementName, document, "Stmt.Bal("+index+").Tp.SubTp.Cd");

swiftCore/src/main/java/com/brilliance/swift/util/SwiftTransferUtil.java

@@ -766,7 +766,7 @@ public class SwiftTransferUtil {
      * List<SwiftTransferErrorInfo>
      */
     public static SwiftTranslationErrorInfo getSwiftTranslationErrorInfoById(long id) {
-        //if (stErrorInfos == null) {
+        if (stErrorInfos == null) {
             try {
                 stErrorInfos = new ArrayList<>();
                 InputStream resourceAsStream = SwiftTransferUtil.class.getResourceAsStream("/ErrorCodeList.xlsx");
@@ -791,7 +791,7 @@ public class SwiftTransferUtil {
                 stErrorInfos = null; //如果出现异常,stErrorInfos=null,下次仍需初始化
                 throw e;
             }
-       // }
+        }
         SwiftTranslationErrorInfo tmpErrorInfo = null;
         if (stErrorInfos != null && stErrorInfos.size() > 0) {
             for (int i=0; i<stErrorInfos.size(); i++) {

swiftCore/src/main/java/com/brilliance/swift/vo/SwiftTranslationReport.java

@@ -16,6 +16,10 @@ public class SwiftTranslationReport {
 
     private String translationResult;
 
+    private String mxType;
+
+    private String mtType;
+
     public List<SwiftTranslationErrorInfo> getErrorInfos() {
         if (errorInfos == null) {
             errorInfos = new ArrayList<>();
@@ -42,4 +46,20 @@ public class SwiftTranslationReport {
     public void setTranslationResult(String translationResult) {
         this.translationResult = translationResult;
     }
+
+    public String getMxType() {
+        return mxType;
+    }
+
+    public void setMxType(String mxType) {
+        this.mxType = mxType;
+    }
+
+    public String getMtType() {
+        return mtType;
+    }
+
+    public void setMtType(String mtType) {
+        this.mtType = mtType;
+    }
 }