修复mt转mx时MxType、MtType以及转换结果为空的缺陷

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

@@ -9,6 +9,8 @@ import com.brilliance.swift.util.SwiftTransferUtil;
 import com.brilliance.swift.vo.SwiftTranslationErrorInfo;
 import com.brilliance.swift.vo.SwiftTranslationReport;
 import com.brilliance.swift.vo.common.MessagePriority;
+import com.brilliance.swift.vo.common.TranslationResultCode;
+import com.prowidesoftware.swift.model.MxId;
 import com.prowidesoftware.swift.model.SwiftBlock5;
 import com.prowidesoftware.swift.model.SwiftBlock5Field;
 import com.prowidesoftware.swift.model.mt.AbstractMT;
@@ -88,6 +90,19 @@ public abstract class AbstractMt2MxCreator implements Mt2MxCreator{
         }
     }
 
+    public void setMxType(AbstractMX abstractMX,SwiftTranslationReport str){
+       if(abstractMX==null){
+           return;
+       }
+        MxId mxId=abstractMX.getMxId();
+        if (mxId != null) {
+            str.setMxType(mxId.getBusinessProcess().name()
+                    + mxId.getFunctionality()
+                    + mxId.getVariant()
+                    + mxId.getVersion());
+        }
+    }
+
     @Override
     public void postProcess() {
         String swiftGsonStr = new JSONObject(jsonMaps).toJSONString();
@@ -95,6 +110,11 @@ public abstract class AbstractMt2MxCreator implements Mt2MxCreator{
         String xml = abstractMX.message();
         SwiftTranslationReport str = context.get(SwiftTranslationReport.class);
         str.setMessage(xml);
+        //设置报文MX类型  modified by gechengyang 20230828
+        str.setTranslationResult(TranslationResultCode.TROK.value());
+        MxId mxId=abstractMX.getMxId();
+        setMxType(abstractMX,str);
+       // str.setMxType(((BusinessAppHdrV02) abstractMX.getAppHdr()).getMsgDefIdr());
         try {
             String outputFilePath = (String)context.get(Mt2MxContextIdentifier.MT_TO_MX_OUTPUT_FILE_PATH, true);
             if (StringUtil.isNotEmpty(outputFilePath)) {
@@ -107,6 +127,8 @@ public abstract class AbstractMt2MxCreator implements Mt2MxCreator{
                 stream.close();
             }
         } catch (IOException e) {
+            str.setTranslationResult(TranslationResultCode.TRNK.value());
+            str.setMessage(e.getMessage());
             throw new SwiftException(e.getMessage());
         }
     }

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

@@ -50,6 +50,9 @@ public class Mt2MxCreatorManager {
         }
         creator.postProcess();
         SwiftTranslationReport str = context.get(SwiftTranslationReport.class);
+        if(abstractMT!=null){
+            str.setMtType(abstractMT.getMessageType());
+        }
         return str;
     }