056\057报文检核调整

b710927d · lixinyi · 04fbc029 · b710927d · b710927d · b710927d
Commit b710927d authored Apr 10, 2024 by lixinyi
7 changed files
--- a/editor_vue/src/iso/components/TextInput.vue
+++ b/editor_vue/src/iso/components/TextInput.vue
@@ -202,12 +202,13 @@ export default {

    // 点击选择按钮
    choose() {
+      this.loadData();
      this.allSelectedList = [];
      this.dialogVisible = true;
    }, // 点击选择弹窗的确定按钮
    chooseConfirm() {
      console.log(this.allSelectedList[0].bic);
-      this.dataModel.value = this.allSelectedList[0].bic;
+      this.$set(this.dataModel, "value", this.allSelectedList[0].bic);
      this.dialogVisible = false;
    }, // 加载数据
    loadData(newPageConfig) {

--- a/editor_vue/src/iso/script/Rule/Cbpr/Camt056.js
+++ b/editor_vue/src/iso/script/Rule/Cbpr/Camt056.js
@@ -213,7 +213,7 @@ function CBPR_Case_Identification_FormalRule(obj) {
        "<br/>- The string of 16 characters cannot contain “//”";
    if (isNotEmpty(obj)) {
        let id = obj.id;
-        const position = " Cancellation Identification";
+        const position = " Case Identification";
        if (isNotEmpty(id)) {
            if (id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//') >= 0) {
                message(position, msg);

--- a/swift-service/pom.xml
+++ b/swift-service/pom.xml
@@ -83,6 +83,20 @@
        </dependency>
        <dependency>
            <groupId>com.brilliance</groupId>
+            <artifactId>cips</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/cips-1.0.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.brilliance</groupId>
+            <artifactId>cips-bean</artifactId>
+            <version>1.0.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/cips-bean-1.0.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.brilliance</groupId>
            <artifactId>swiftCore</artifactId>
            <version>2.0</version>
            <scope>system</scope>

--- a/swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
@@ -30,7 +30,7 @@ public class MxTransfer {
            }
        }
        gsonMaps.remove("appHdr");
-        List<String> list = new ArrayList<>(Arrays.asList("cdtTrfTxInf", "txInfAndSts","cxlDtls","txInfAndSts"));
+        List<String> list = new ArrayList<>(Arrays.asList("cdtTrfTxInf", "txInfAndSts","cxlDtls","txInfAndSts","undrlyg","txInf","cxlRsnInf"));
        //最大数量大于1的节点需要读其子节点
        for(String s: list) {
            if (gsonMaps.get(s) != null) {
@@ -97,6 +97,10 @@ public class MxTransfer {
        String swiftGsonStr = new JSONObject(maps).toJSONString();
        logger.debug("swiftGsonStr------>:::" + swiftGsonStr);
        //System.out.println("swiftGsonStr---->:" + swiftGsonStr);
+        //本地测试
+//        AbstractMX abstractMX = AbstractMX.fromJson(swiftGsonStr);
+//        return abstractMX.message();
+        //远程
        try {
            Map<String, Object> map = new HashMap();
            map.put("interface", "mxTranslate");

--- a/swift-service/src/main/java/com/brilliance/mxeditor/controller/MxEditorController.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/controller/MxEditorController.java
@@ -371,10 +371,10 @@ public class MxEditorController {
 //        rs.put("retcode","0000000");
 //        List<Map<String,Object>> ccdlst = new ArrayList<>();
 //        Map<String,Object> tmpmap1 = new HashMap<>();
-//        tmpmap1.put("BIC","1111");
+//        tmpmap1.put("BIC","CHBHHKHHXXX");
 //        tmpmap1.put("NAM1","1111");
 //        Map<String,Object> tmpmap2 = new HashMap<>();
-//        tmpmap2.put("BIC","2222");
+//        tmpmap2.put("BIC","CHBHHKHHXXX");
 //        tmpmap2.put("NAM1","2222");
 //        ccdlst.add(tmpmap1);
 //        ccdlst.add(tmpmap2);

--- 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.80ffbb63.js"></script><script defer="defer" src="js/app.e44d0563.js"></script><link href="css/chunk-vendors.7c88cb4c.css" rel="stylesheet"><link href="css/app.411c12ef.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.80ffbb63.js"></script><script defer="defer" src="js/app.0c774191.js"></script><link href="css/chunk-vendors.7c88cb4c.css" rel="stylesheet"><link href="css/app.481e4eb6.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/camt05600108.properties
+++ b/swift-service/src/main/resources/template/camt05600108.properties
@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
 appHdr.prty=prty
 appHdr.rltd=rltd
 fiToFIPmtCxlReq.assgnmt=assgnmt
-fiToFIPmtCxlReq.undrlyg=undrlyg
+#fiToFIPmtCxlReq.undrlyg=undrlyg
 #fiToFIPmtCxlReq=fiToFIPmtCxlReq
 #fiToFIPmtCxlReq.assgnmt=assgnmt
 #fiToFIPmtCxlReq.undrlyg=undrlyg
@@ -28,17 +28,17 @@ fiToFIPmtCxlReq.undrlyg=undrlyg
 #fiToFIPmtCxlReq.assgnmt.creDtTm=creDtTm
 #fiToFIPmtCxlReq.assgnmt.assgnr.agt=assgnrAgt
 #fiToFIPmtCxlReq.assgnmt.assgne.agt=assgneAgt
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgId=orgnlMsgId
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgNmId=orgnlMsgNmId
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlCreDtTm=orgnlCreDtTm
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlInstrId=orgnlInstrId
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlEndToEndId=orgnlEndToEndId
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlTxId=orgnlTxId
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlUETR=uetr
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlClrSysRef=orgnlClrSysRef
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
-#fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
-#fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf=cxlRsnInf
-#fiToFIPmtCxlReq.undrlyg.txInf._case.cretr=cretr
-#fiToFIPmtCxlReq.undrlyg.txInf._case.id=caseId
-#fiToFIPmtCxlReq.undrlyg.txInf*.orgnlUETR=uetr
\ No newline at end of file
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlGrpInf=orgnlGrpInf
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlInstrId=orgnlInstrId
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlEndToEndId=orgnlEndToEndId
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlTxId=orgnlTxId
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlUETR=orgnlUETR
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlClrSysRef=orgnlClrSysRef
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
+fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
+fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.orgtr=orgtr
+fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.rsn=rsn
+fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.AddtlInf=AddtlInf
+fiToFIPmtCxlReq.undrlyg*.txInf*._case=_case
+#fiToFIPmtCxlReq.undrlyg*.txInf*.case.id=caseId
+fiToFIPmtCxlReq.undrlyg*.txInf*.cxlId=cxlId
\ No newline at end of file