更新cips111报文标识号规则

4c01feea · lixinyi · 6d1d2d5a · 4c01feea · 4c01feea · 4c01feea
Commit 4c01feea authored Apr 17, 2024 by lixinyi
9 changed files
--- a/editor_vue/babel.config.js
+++ b/editor_vue/babel.config.js
@@ -19,5 +19,4 @@ module.exports = {
        "@babel/plugin-proposal-object-rest-spread",
        "@babel/plugin-transform-runtime",
    ],
-    sourceType: 'unambiguous'
 };
--- a/editor_vue/src/iso/Service/post.js
+++ b/editor_vue/src/iso/Service/post.js
@@ -84,6 +84,13 @@ export default{
            data:data
        })
    },
+    getMsgId(data){
+        return new link({
+            url:`/cips/getMsgId`,
+            method:"post",
+            data:data
+        })
+    },


    sendCipsMes(data){

--- a/editor_vue/src/iso/components/TextInput.vue
+++ b/editor_vue/src/iso/components/TextInput.vue
@@ -256,12 +256,12 @@ 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 ("CHBHHKHHXXX"===this.dataModel.headBic) {
+    //   this.$set(this.dataModel, "value", "CHBHHKHHXXX");
+    // }
+    // if ("HKICHKHHXXX"===this.dataModel.headBic) {
+    //   this.$set(this.dataModel, "value", "HKICHKHHXXX");
+    // }
    var smhinr = this.$route.query.smhinr;
    if (smhinr != undefined && smhinr != null) {
      // if (
@@ -331,9 +331,14 @@ export default {
        if (msgid != null || msgid != undefined) {
          this.dataModel.defaultValue = this.generateId(msgid);
        } else {
-          msgid = this.$moment(new Date()).format("YYYYMMDDHHmm")+this.generateRandomString(6);//cips报文标识号
-          this.dataModel.defaultValue = this.generateId(msgid);
-          window.sessionStorage.setItem("msgid", msgid);
+          send.getMsgId().then((res) => {
+            var data = res.data;
+            console.log(res);
+            msgid = data;
+            this.dataModel.defaultValue = this.generateId(msgid);
+            window.sessionStorage.setItem("msgid", msgid);
+          });
+          
        }
        console.log("MsgId:"+this.dataModel.value);
      }

--- a/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
@@ -828,7 +828,7 @@ name:"标识",
 label:"Identification",
 tag:"Id",
 type:"Choice",
-status:"M",
+status:"O",
 children: [
 {
 path:"0.1.20.2.0",

--- a/swift-service/.gitignore
+++ b/swift-service/.gitignore
@@ -28,6 +28,6 @@ target/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
-
+/node_modules/
 ### VS Code ###
 .vscode/
--- a/swift-service/src/main/java/com/brilliance/mxeditor/controller/CipsEditorController.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/controller/CipsEditorController.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.brilliance.cips.utils.MsgUtil;
 import com.brilliance.mxeditor.MxTransfer;
+import com.brilliance.mxeditor.bo.Account;
 import com.brilliance.mxeditor.config.EditorEnvConfig;
 import com.brilliance.mxeditor.exception.SwiftException;
 import com.brilliance.mxeditor.interf.CommonSend;
@@ -26,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@@ -315,5 +313,26 @@ public class CipsEditorController {
        }else
            return null;
    }
+
+
+    @RequestMapping(value = "/getMsgId", method = RequestMethod.POST)
+    @ResponseBody
+    public String getMsgId() {
+        Map<String, Object> map = new HashMap();
+        map.put("interface", "bdTaskFive");
+        map.put("transaction", "getMsgId");
+        Map rs = (Map) CommonSend.send(map);
+        //本地测试数据
+//        Map<String,Object> rs = new HashMap<>();
+//        rs.put("retcode","0000000");
+//        rs.put("data","1111");
+
+        String retcod = (String) rs.get("retcode");
+        if (retcod != null && retcod.endsWith("0000000")) {
+          String msgId = (String) rs.get("data");
+            return msgId;
+        }else
+            return null;
+    }
 }

--- a/swift-service/src/main/resources/innerService.properties
+++ b/swift-service/src/main/resources/innerService.properties
 #ip=127.0.0.1
 #port=10091
-#ip=10.37.91.132
-#port=9998
+ip=10.37.91.132
+port=9998

-ip=10.37.98.201
-port=9998
\ No newline at end of file
+#ip=10.37.98.201
+#port=9998
\ No newline at end of file
--- 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.e1d592f1.js"></script><script defer="defer" src="js/app.06c3df70.js"></script><script defer="defer" src="js/main.91e00e4c.js"></script><link href="css/chunk-vendors.b3e1a118.css" rel="stylesheet"><link href="css/app.1503674a.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.e1d592f1.js"></script><script defer="defer" src="js/app.72e61fbc.js"></script><script defer="defer" src="js/main.91e00e4c.js"></script><link href="css/chunk-vendors.7c88cb4c.css" rel="stylesheet"><link href="css/app.046fcd07.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
--- a/swift-service/src/main/resources/template/camt05200108.properties
+++ b/swift-service/src/main/resources/template/camt05200108.properties
@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
 appHdr.prty=prty
 appHdr.rltd=rltd
 bkToCstmrAcctRpt.grpHdr=grpHdr
-bkToCstmrAcctRpt.rpt=rpt
+#bkToCstmrAcctRpt.rpt=rpt
 #appHdr.fr.fiId.finInstnId.bicfi=senderBic
 #appHdr.fr.fiId.finInstnId.nm=senderNm
 #appHdr.to.fiId.finInstnId.bicfi=receiverBic
@@ -22,11 +22,11 @@ bkToCstmrAcctRpt.rpt=rpt
 #appHdr.creDt=creDt@ISODATETIME
 #bkToCstmrAcctRpt.grpHdr.msgId=msgId
 #bkToCstmrAcctRpt.grpHdr.creDtTm=creDtTm
-#bkToCstmrAcctRpt.rpt.creDtTm=rptCreDtTm
-#bkToCstmrAcctRpt.rpt.id=id
-#bkToCstmrAcctRpt.rpt.lglSeqNb=lglSeqNb
-#bkToCstmrAcctRpt.rpt.rptPgntn=rptPgntn
-#bkToCstmrAcctRpt.rpt.acct=acct
-#bkToCstmrAcctRpt.rpt.ntry=ntry
-#bkToCstmrAcctRpt.rpt.txsSummry.ttlCdtNtries=ttlCdtNtries
-#bkToCstmrAcctRpt.rpt.txsSummry.ttlDbtNtries=ttlDbtNtries
\ No newline at end of file
+bkToCstmrAcctRpt.rpt*.creDtTm=rptCreDtTm
+bkToCstmrAcctRpt.rpt*.id=id
+bkToCstmrAcctRpt.rpt*.lglSeqNb=lglSeqNb
+bkToCstmrAcctRpt.rpt*.rptPgntn=rptPgntn
+bkToCstmrAcctRpt.rpt*.acct=acct
+bkToCstmrAcctRpt.rpt*.ntry=ntry
+bkToCstmrAcctRpt.rpt*.txsSummry.ttlCdtNtries=ttlCdtNtries
+bkToCstmrAcctRpt.rpt*.txsSummry.ttlDbtNtries=ttlDbtNtries
\ No newline at end of file