报文标识号修改

7fda7cb5 · lixinyi · 0136765a · 7fda7cb5 · 7fda7cb5 · 7fda7cb5
Commit 7fda7cb5 authored Jul 17, 2024 by lixinyi
16 changed files
--- a/editor_vue/src/iso/components/TextInput.vue
+++ b/editor_vue/src/iso/components/TextInput.vue
@@ -256,12 +256,21 @@ export default {
    if("bicfi" === this.dataModel.tag){
      this.loadData();
    }
-    // if ("CHBHHKHHXXX"===this.dataModel.headBic) {
-    //   this.$set(this.dataModel, "value", "CHBHHKHHXXX");
-    // }
-    // if ("HKICHKHHXXX"===this.dataModel.headBic) {
-    //   this.$set(this.dataModel, "value", "HKICHKHHXXX");
-    // }
+    if ("1"===this.dataModel.bicid) {
+      var bicid = window.sessionStorage.getItem("bicid");
+          if (bicid != null || bicid != undefined) {
+            this.dataModel.defaultValue = this.generateId(bicid);
+          } else {
+            send.getBankId().then((res) => {
+              var data = res.data;
+              console.log(res);
+              bicid = data;
+              this.dataModel.defaultValue = this.generateId(bicid);
+              window.sessionStorage.setItem("bicid", bicid);
+            });
+          }
+          console.log("bicid:"+this.dataModel.value);
+    }
    var smhinr = this.$route.query.smhinr;
    if (smhinr != undefined && smhinr != null) {
      // if (
@@ -285,10 +294,15 @@ export default {
          if (id != null || id != undefined) {
            this.dataModel.defaultValue = this.generateId(id);
          } else {
-            id = this.generateRandomString(16);//适应后端改为16
+            send.getMsgId().then((res) => {
+              var data = res.data;
+              console.log(res);
+              id = data;
              this.dataModel.defaultValue = this.generateId(id);
              window.sessionStorage.setItem("id", id);
+            });
          }
+          console.log("id:"+this.dataModel.value);
        }
      } else if ("uetr" === this.dataModel.tag) {
        this.active = true;

--- a/editor_vue/src/iso/script/MsgJson/Camt_029_001_09.js
+++ b/editor_vue/src/iso/script/MsgJson/Camt_029_001_09.js
@@ -195,7 +195,6 @@ export default [
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
            status: "O",
            maxLength: "16",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
          },
          {
            path: "3.0.4",
@@ -205,7 +204,6 @@ export default [
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
            status: "O",
            maxLength: "35",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
          },
          {
            path: "3.0.5",

--- a/editor_vue/src/iso/script/MsgJson/Camt_052_001_08.js
+++ b/editor_vue/src/iso/script/MsgJson/Camt_052_001_08.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -100,8 +99,9 @@ export default [
        label: "Identification",
        tag: "id",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
+        unable: true,
      },
      {
        path: "2.1",
@@ -2552,7 +2552,6 @@ export default [
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "O",
                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
                      },
                      {
                        path: "2.14.17.1.0.4",
@@ -2562,7 +2561,6 @@ export default [
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "O",
                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
                      },
                      {
                        path: "2.14.17.1.0.5",

--- a/editor_vue/src/iso/script/MsgJson/Camt_053_001_08.js
+++ b/editor_vue/src/iso/script/MsgJson/Camt_053_001_08.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -100,8 +99,9 @@ export default [
        label: "Identification",
        tag: "id",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
+        unable: true,
      },
      {
        path: "2.1",
@@ -2553,7 +2553,6 @@ export default [
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "O",
                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
                      },
                      {
                        path: "2.14.17.1.0.4",
@@ -2563,7 +2562,6 @@ export default [
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "O",
                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
                      },
                      {
                        path: "2.14.17.1.0.5",

--- a/editor_vue/src/iso/script/MsgJson/Camt_054_001_08.js
+++ b/editor_vue/src/iso/script/MsgJson/Camt_054_001_08.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -101,8 +100,9 @@ export default [
        label: "Identification",
        tag: "id",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
+        unable: true,
      },
      {
        path: "2.1",
@@ -2535,8 +2535,7 @@ export default [
                        tag: "instrId",
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "M",
-                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+                        maxLength: "35"
                      },
                      {
                        path: "2.13.17.1.0.4",
@@ -2545,8 +2544,7 @@ export default [
                        tag: "endToEndId",
                        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
                        status: "O",
-                        maxLength: "35",
-                        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+                        maxLength: "35"
                      },
                      {
                        path: "2.13.17.1.0.5",

--- a/editor_vue/src/iso/script/MsgJson/Camt_057_001_06.js
+++ b/editor_vue/src/iso/script/MsgJson/Camt_057_001_06.js
@@ -19,10 +19,9 @@ export default [
      label: "Message Identification",
      tag: "msgId",
      type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-      status: "M",
+      status: "O",
      maxLength: "35",
-      //consistence 表示是否需要与Business Message Identifier保持一致
-      consistence: "1",
+      unable: true,
    },
    {
      path: "1.1",

--- a/editor_vue/src/iso/script/MsgJson/Head_001_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/Head_001_001_02.js
@@ -36,7 +36,7 @@ export default[
                type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}",
                status: "M",
                maxLength: "11",
-                headBic: "CHBHHKHHXXX",
+                bicid: "1",
              },
              {
                path: "1.0.0.1",

--- a/editor_vue/src/iso/script/MsgJson/Head_010_001_03.js
+++ b/editor_vue/src/iso/script/MsgJson/Head_010_001_03.js
@@ -36,7 +36,7 @@ export default[
                type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}",
                status: "M",
                maxLength: "11",
-                headBic: "CHBHHKHHXXX",
+                bicid: "1",
              },
              {
                path: "1.0.0.1",

--- a/editor_vue/src/iso/script/MsgJson/Pacs_002_001_10.js
+++ b/editor_vue/src/iso/script/MsgJson/Pacs_002_001_10.js
@@ -19,10 +19,9 @@ export default [
      label: "Message Identification",
      tag: "msgId",
      type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-      status: "M",
+      status: "O",
      maxLength: "35",
-      //consistence 表示是否需要与Business Message Identifier保持一致
-      consistence: "1",
+      unable: true,
    },
    {
      path: "1.1",
@@ -83,7 +82,6 @@ export default [
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
        status: "O",
        maxLength: "16",
-        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
      },
      {
        path: "2.2",
@@ -93,7 +91,6 @@ export default [
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
        status: "M",
        maxLength: "35",
-        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
      },
      {
        path: "2.3",

--- a/editor_vue/src/iso/script/MsgJson/Pacs_004_001_09.js
+++ b/editor_vue/src/iso/script/MsgJson/Pacs_004_001_09.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -85,7 +84,6 @@ export default [
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
        status: "O",
        maxLength: "35",
-        consistence: "1",
      },
      {
        path: "2.1",
@@ -130,7 +128,6 @@ export default [
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
        status: "O",
        maxLength: "35",
-        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
      },
      {
        path: "2.3",
@@ -139,8 +136,7 @@ export default [
        tag: "orgnlEndToEndId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
        status: "M",
-        maxLength: "35",
-        consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+        maxLength: "35"
      },
      {
        path: "2.4",

--- a/editor_vue/src/iso/script/MsgJson/Pacs_008_001_08.js
+++ b/editor_vue/src/iso/script/MsgJson/Pacs_008_001_08.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -138,9 +137,9 @@ export default [
            label: "Instruction Identification",
            tag: "instrId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
-            status: "M",
+            status: "O",
            maxLength: "16",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.1",
@@ -148,9 +147,9 @@ export default [
            label: "End To End Identification",
            tag: "endToEndId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-            status: "M",
+            status: "O",
            maxLength: "35",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.2",

--- a/editor_vue/src/iso/script/MsgJson/Pacs_009_001_08.js
+++ b/editor_vue/src/iso/script/MsgJson/Pacs_009_001_08.js
@@ -19,10 +19,9 @@ export default [
      label: "Message Identification",
      tag: "msgId",
      type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-      status: "M",
+      status: "O",
      maxLength: "35",
-      //consistence 表示是否需要与Business Message Identifier保持一致
-      consistence: "1",
+      unable: true,
    },
    {
      path: "1.1",
@@ -87,9 +86,9 @@ export default [
            label: "Instruction Identification",
            tag: "instrId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,16}",
-            status: "M",
+            status: "O",
            maxLength: "16",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.1",
@@ -97,9 +96,9 @@ export default [
            label: "End To End Identification",
            tag: "endToEndId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-            status: "M",
+            status: "O",
            maxLength: "35",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.2",

--- a/editor_vue/src/iso/script/MsgJson/Pacs_009_001_08_COV.js
+++ b/editor_vue/src/iso/script/MsgJson/Pacs_009_001_08_COV.js
@@ -20,10 +20,9 @@ export default [
        label: "Message Identification",
        tag: "msgId",
        type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-        status: "M",
+        status: "O",
        maxLength: "35",
-        //consistence 表示是否需要与Business Message Identifier保持一致
-        consistence: "1",
+        unable: true,
      },
      {
        path: "1.1",
@@ -90,9 +89,9 @@ export default [
            label: "Instruction Identification",
            tag: "instrId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
-            status: "M",
+            status: "O",
            maxLength: "16",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.1",
@@ -100,9 +99,9 @@ export default [
            label: "End To End Identification",
            tag: "endToEndId",
            type: "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]{1,35}",
-            status: "M",
+            status: "O",
            maxLength: "35",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+            unable: true,
          },
          {
            path: "2.0.2",

--- a/editor_vue/src/iso/script/MsgJson/pacs_009_001_08_ADV.js
+++ b/editor_vue/src/iso/script/MsgJson/pacs_009_001_08_ADV.js
@@ -18,10 +18,10 @@ export default [
    name : "Message Identification",
    label : "Message Identification",
    tag : "msgId",
-    status : "M",
+    status : "O",
    type : "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
    maxLength : "35",
-    consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+    unable: true,
  }, {
    path : "1.1",
    name : "Creation Date Time",
@@ -445,7 +445,6 @@ export default [
            status : "M",
            type : "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
            maxLength : "28",
-            consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
          } ]
        }, {
          path : "1.3.3.0.2",
@@ -759,19 +758,19 @@ export default [
      name : "Instruction Identification",
      label : "Instruction Identification",
      tag : "instrId",
-      status : "M",
+      status : "O",
      type : "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
      maxLength : "16",
-      consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+      unable: true,
    }, {
      path : "2.0.1",
      name : "End To End Identification",
      label : "End To End Identification",
      tag : "endToEndId",
-      status : "M",
+      status : "O",
      type : "TextInput#[0-9a-zA-Z/\\-\\?:\\(\\)\\.,'\\+ ]+",
      maxLength : "35",
-      consistence: "1",//consistence 表示是否需要与Business Message Identifier保持一致
+      unable: true,
    }, {
      path : "2.0.2",
      name : "Transaction Identification",

--- a/swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
@@ -53,6 +53,37 @@ public class MxTransfer {
            bizMsgIdr = "MX" + System.nanoTime();
            gsonMaps.put("bizMsgIdr",bizMsgIdr);
        }
+        bizMsgIdr =  gsonMaps.get("bizMsgIdr").toString();
+        String msgDefIdr = (String) gsonMaps.get("msgDefIdr");
+        JSONObject grpHdr = (JSONObject)gsonMaps.get("grpHdr");
+        grpHdr.put("msgId",bizMsgIdr);
+        switch (msgDefIdr.substring(0,8)){
+            case "pacs.008":
+                JSONObject pmtId008 = (JSONObject)gsonMaps.get("pmtId");
+                pmtId008.put("instrId",bizMsgIdr);
+                pmtId008.put("endToEndId",bizMsgIdr);
+                break;
+            case "pacs.009":
+                JSONObject pmtId009 = (JSONObject)gsonMaps.get("pmtId");
+                pmtId009.put("instrId",bizMsgIdr);
+                pmtId009.put("endToEndId",bizMsgIdr);
+                break;
+            case "pacs.052":
+                JSONObject rpt = (JSONObject)gsonMaps.get("rpt");
+                rpt.put("id",bizMsgIdr);
+                break;
+            case "pacs.053":
+                JSONObject stmt = (JSONObject)gsonMaps.get("stmt");
+                stmt.put("id",bizMsgIdr);
+                break;
+            case "pacs.054":
+                JSONObject ntfctn = (JSONObject)gsonMaps.get("ntfctn");
+                ntfctn.put("id",bizMsgIdr);
+                break;
+            case "pacs.057":
+                break;
+
+        }
        if ("rtgs".equals(tp)) {
            resourceAsStream = MessageUtil.class.getResourceAsStream("/template/" + identifier + "_rtgs.properties");
            resourceAsStream2 = MessageUtil.class.getResourceAsStream("/template/head00100102_rtgs.properties");

--- a/swift-service/src/main/resources/static/index.html
+++ b/swift-service/src/main/resources/static/index.html
-<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.d321839e.js"></script><script defer="defer" src="js/app.13a25863.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.b375b6da.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
+<!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><link rel="icon" href="favicon.ico"/><title>ISO手工拟报</title><script defer="defer" src="js/chunk-vendors.dbe64cdc.js"></script><script defer="defer" src="js/app.bb694e97.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.19b6ae5c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but swiftiso-editor doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file