009、054、002、029报文检核调整

editor_vue/src/iso/Service/service.js

@@ -2,8 +2,8 @@
 import axios from 'axios'
 
 const service = axios.create({
-  baseURL: '/swift-editor-1.0.0/swift',    //代理
-  // baseURL: '/swift-editor/swift',    //本地用这个
+  // baseURL: '/swift-editor-1.0.0/swift',    //代理
+  baseURL: '/swift-editor/swift',    //本地用这个
   timeout: 50000 // request timeout
 })
 

editor_vue/src/iso/components/TextInput.vue

@@ -12,6 +12,10 @@
     >
     </el-input>
     <span v-if="showSpan" class="add-btn" @click="generate">+</span>
+    <!-- 搜索账户和地址 -->
+    <span v-if="ifaccount" class="search-btn" @click="getbic">
+      搜索
+    </span>
   </div>
 </template>
 
@@ -25,6 +29,7 @@ export default {
       active: false,
       showSpan: false,
       bizMsgIdr: "",
+      ifaccount: false,
     };
   },
   methods: {
@@ -87,6 +92,38 @@ export default {
         }
       );
     },
+    // 获取弹框表格数据
+    async getbic() {
+    //   let params = "";
+    //   if("bicfi" === this.dataModel.tag){
+    //     params ={
+    //       biccod: this.dataModel.value,
+    //       bicnam: "",
+    //     };
+    //   }else if("bicfi" === this.dataModel.tag){
+    //     params = {
+    //       biccod: "",
+    //       bicnam: this.dataModel.value,
+    //     };
+    //   }
+    //   let res = await Api.post('/getBic', params);
+    //   if (res.respCode == SUCCESS) {
+    //     //etyDialog为弹窗
+    //     this.root.$refs['etyDialog'].show = true;
+    //     this.root.promptData.data = res.data.ptaInfos;
+    //     this.root.promptData.type = type;
+    //   }
+    // },
+    // // 选中弹框表格的行数据
+    // async selectGridEtyPromptData(row) {
+    //   let params = {
+    //     ...row,
+    //   };
+    //   let res = await Api.post('/service/ptspta/fetch', params);
+    //   if (res.respCode == SUCCESS) {
+    //     this.$set(this.model.bcdgrp, row.role.toLowerCase(), res.data);
+    //   }
+    },
   },
   mounted() {
     if ("CHBHHKHHXXX"===this.dataModel.headBic) {
@@ -142,7 +179,7 @@ export default {
         if (id != null || id != undefined) {
           this.dataModel.defaultValue = this.generateId(id);
         } else {
-          id = this.generateRandomString(21);
+          id = this.generateRandomString(16);//适应后端改为16
           this.dataModel.defaultValue = this.generateId(id);
           window.sessionStorage.setItem("id", id);
         }
@@ -169,6 +206,9 @@ export default {
         this.active = false;
       }
     }
+    if("bicfi" === this.dataModel.tag){
+      this.ifaccount = true;
+    }
     
     this.disabled = this.dataModel.unable || this.dataModel.disabled;
   },
@@ -211,4 +251,17 @@ export default {
   border-radius: 50%;
   cursor: pointer;
 }
+
+.search-btn {
+  display: inline-block;
+  width: 40px;
+  height: 30px;
+  line-height: 30px;
+  text-align: center;
+  background-color: #409EFF;
+  color: #fff;
+  border-radius: 10%;
+  cursor: pointer;
+}
+
 </style>
\ No newline at end of file

editor_vue/src/iso/script/Rule/Cbpr/Camt056.js

@@ -213,6 +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";
         if (isNotEmpty(id)) {
             if (id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//') >= 0) {
                 message(position, msg);

swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java

@@ -30,12 +30,16 @@ public class MxTransfer {
             }
         }
         gsonMaps.remove("appHdr");
-        if (gsonMaps.get("cdtTrfTxInf") != null) {
-            JSONObject jsonObject = (JSONObject) gsonMaps.get("cdtTrfTxInf");
+        List<String> list = new ArrayList<>(Arrays.asList("cdtTrfTxInf", "txInfAndSts","cxlDtls","txInfAndSts"));
+        //最大数量大于1的节点需要读其子节点
+        for(String s: list) {
+            if (gsonMaps.get(s) != null) {
+                JSONObject jsonObject = (JSONObject) gsonMaps.get(s);
                 for (String key : jsonObject.keySet()) {
                     gsonMaps.put(key, jsonObject.get(key));
                 }
-//            gsonMaps.remove("cdtTrfTxInf");
+//            gsonMaps.remove(s);
+            }
         }
         String identifier = (String) gsonMaps.get("identifier");
         String bizSvc = (String) gsonMaps.get("bizSvc");

swift-service/src/main/java/com/brilliance/mxeditor/controller/MxEditorController.java

@@ -9,6 +9,7 @@ import com.brilliance.mxeditor.interf.CommonSend;
 import com.brilliance.mxeditor.util.StringUtil;
 import com.brilliance.mxeditor.config.EditorEnvConfig;
 import com.brilliance.mxeditor.util.SwiftTransferUtil;
+import com.brilliance.mxeditor.vo.AccountVo;
 import com.brilliance.mxeditor.vo.SwiftVo;
 import com.brilliance.swift.SwiftTransfer;
 import com.brilliance.swift.constants.Mx2MtConstants;
@@ -352,5 +353,22 @@ public class MxEditorController {
         }
         return null;
     }
+
+    @RequestMapping(value = "/getBic", method = RequestMethod.POST)
+    @ResponseBody
+    public String getBic(@RequestBody AccountVo account) {
+        logger.info("---->查询信息为:" + account.toString());
+        Map<String, Object> map = new HashMap();
+        map.put("interface", "bdTaskFive");
+        map.put("transaction", "getbic");
+        map.put("biccod", account.getBiccod());
+        map.put("bicnam", account.getBicnam());
+        Map rs = (Map) CommonSend.send(map);
+        String retcod = (String) rs.get("retcode");
+        if (retcod != null && retcod.endsWith("0000000")) {
+            return (String) rs.get("data");
+        }else
+            return null;
+    }
 }
 

swift-service/src/main/java/com/brilliance/mxeditor/vo/AccountVo.java

+package com.brilliance.mxeditor.vo;
+
+/**
+ * @author zh
+ * @create 2022-07-29 16:00
+ */
+public class AccountVo {
+    private String biccod;
+
+    private String bicnam;
+
+    public String getBiccod() {
+        return biccod;
+    }
+
+    public void setBiccod(String biccod) {
+        this.biccod = biccod;
+    }
+
+    public String getBicnam() {
+        return bicnam;
+    }
+
+    public void setBicnam(String bicnam) {
+        this.bicnam = bicnam;
+    }
+
+    @Override
+    public String toString() {
+        return "AccountVo{" +
+                "biccod='" + biccod + '\'' +
+                ", bicnam='" + bicnam + '\'' +
+                '}';
+    }
+}

swift-service/src/main/resources/template/camt02900109.properties

@@ -12,7 +12,7 @@ appHdr.prty=prty
 appHdr.rltd=rltd
 rsltnOfInvstgtn.assgnmt=assgnmt
 rsltnOfInvstgtn.sts=sts
-rsltnOfInvstgtn.cxlDtls=cxlDtls
+#rsltnOfInvstgtn.cxlDtls=cxlDtls
 #appHdr.fr.fiId.finInstnId.bicfi=senderBic
 #appHdr.fr.fiId.finInstnId.nm=senderNm
 #appHdr.to.fiId.finInstnId.bicfi=receiverBic
@@ -26,16 +26,12 @@ rsltnOfInvstgtn.cxlDtls=cxlDtls
 #rsltnOfInvstgtn.assgnmt.assgnr.agt=assgnrAgt
 #rsltnOfInvstgtn.assgnmt.assgne.agt=assgneAgt
 #rsltnOfInvstgtn.sts.conf=conf
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.cxlStsId=cxlStsId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.rslvdCase=rslvdCase
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlGrpInf.orgnlMsgId=orgnlMsgId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlGrpInf.orgnlMsgNmId=orgnlMsgNmId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlGrpInf.orgnlCreDtTm=orgnlCreDtTm@ISODATETIME
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlInstrId=orgnlInstrId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlEndToEndId=orgnlEndToEndId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlTxId=orgnlTxId
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlClrSysRef=orgnlClrSysRef
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.orgnlUETR=uetr
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.cxlStsId=cxlStsId
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.rslvdCase=rslvdCase
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlGrpInf=orgnlGrpInf
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlInstrId=orgnlInstrId
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlEndToEndId=orgnlEndToEndId
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlTxId=orgnlTxId
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlClrSysRef=orgnlClrSysRef
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.orgnlUETR=orgnlUETR
+rsltnOfInvstgtn.cxlDtls*.txInfAndSts*.cxlStsRsnInf=cxlStsRsnInf
\ No newline at end of file
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.cxlStsRsnInf.orgtr=orgtr
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.cxlStsRsnInf.rsn.cd=rsnCd
-#rsltnOfInvstgtn.cxlDtls.txInfAndSts.cxlStsRsnInf.addtlInf=addtlInf
\ No newline at end of file

swift-service/src/main/resources/template/pacs00200110.properties

@@ -11,29 +11,15 @@ appHdr.pssblDplct=pssblDplct
 appHdr.prty=prty
 appHdr.rltd=rltd
 fiToFIPmtStsRpt.grpHdr=grpHdr
-fiToFIPmtStsRpt.txInfAndSts=txInfAndSts
-#appHdr.fr.fiId.finInstnId.bicfi=senderBic
-#appHdr.fr.fiId.finInstnId.nm=senderNm
-#appHdr.to.fiId.finInstnId.bicfi=receiverBic
-#appHdr.to.fiId.finInstnId.nm=receiverNm
-#appHdr.bizMsgIdr=bizMsgIdr
-#appHdr.msgDefIdr=msgDefIdr
-#appHdr.bizSvc=bizSvc
-#appHdr.creDt=creDt
-#appHdr.prty=prty
-#fiToFIPmtStsRpt.grpHdr.msgId=msgId
-#fiToFIPmtStsRpt.grpHdr.creDtTm=creDtTm
-#fiToFIPmtStsRpt.txInfAndSts.orgnlGrpInf.orgnlMsgId=orgnlMsgId
-#fiToFIPmtStsRpt.txInfAndSts.orgnlGrpInf.orgnlMsgNmId=orgnlMsgNmId
-#fiToFIPmtStsRpt.txInfAndSts.orgnlGrpInf.orgnlCreDtTm=orgnlCreDtTm
-#fiToFIPmtStsRpt.txInfAndSts.orgnlInstrId=orgnlInstrId
-#fiToFIPmtStsRpt.txInfAndSts.orgnlEndToEndId=orgnlEndToEndId
-#fiToFIPmtStsRpt.txInfAndSts.orgnlTxId=orgnlTxId
-#fiToFIPmtStsRpt.txInfAndSts.orgnlUETR=orgnlUETR
-#fiToFIPmtStsRpt.txInfAndSts.txSts=txSts
-#fiToFIPmtStsRpt.txInfAndSts.stsRsnInf*.orgtr=orgtr
-#fiToFIPmtStsRpt.txInfAndSts.stsRsnInf*.rsn=rsn
-#fiToFIPmtStsRpt.txInfAndSts.stsRsnInf*.addtlInf=addtlInf
-#fiToFIPmtStsRpt.txInfAndSts.fctvIntrBkSttlmDt=fctvIntrBkSttlmDt
-#fiToFIPmtStsRpt.txInfAndSts.instgAgt.finInstnId.bicfi=senderBic
-#fiToFIPmtStsRpt.txInfAndSts.instdAgt.finInstnId.bicfi=receiverBic
+fiToFIPmtStsRpt.txInfAndSts*.orgnlGrpInf=orgnlGrpInf
+fiToFIPmtStsRpt.txInfAndSts*.orgnlInstrId=orgnlInstrId
+fiToFIPmtStsRpt.txInfAndSts*.orgnlEndToEndId=orgnlEndToEndId
+fiToFIPmtStsRpt.txInfAndSts*.orgnlTxId=orgnlTxId
+fiToFIPmtStsRpt.txInfAndSts*.orgnlUETR=orgnlUETR
+fiToFIPmtStsRpt.txInfAndSts*.txSts=txSts
+fiToFIPmtStsRpt.txInfAndSts*.stsRsnInf*.orgtr=orgtr
+fiToFIPmtStsRpt.txInfAndSts*.stsRsnInf*.rsn=rsn
+fiToFIPmtStsRpt.txInfAndSts*.stsRsnInf*.addtlInf=addtlInf
+fiToFIPmtStsRpt.txInfAndSts*.fctvIntrBkSttlmDt=fctvIntrBkSttlmDt
+fiToFIPmtStsRpt.txInfAndSts*.instgAgt=instgAgt
+fiToFIPmtStsRpt.txInfAndSts*.instdAgt=instdAgt

swift-service/src/main/resources/template/pacs00900108.properties

@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
 appHdr.prty=prty
 appHdr.rltd=rltd
 fiCdtTrf.grpHdr=grpHdr
-fiCdtTrf.cdtTrfTxInf=cdtTrfTxInf
+#fiCdtTrf.cdtTrfTxInf=cdtTrfTxInf
 #appHdr.fr.fiId.finInstnId.bicfi=senderBic
 #appHdr.fr.fiId.finInstnId.nm=senderNm
 #appHdr.to.fiId.finInstnId.bicfi=receiverBic
@@ -24,39 +24,34 @@ fiCdtTrf.cdtTrfTxInf=cdtTrfTxInf
 #fiCdtTrf.grpHdr.msgId=msgId
 #fiCdtTrf.grpHdr.nbOfTxs=nbOfTxs
 #fiCdtTrf.grpHdr.creDtTm=creDtTm
-#fiCdtTrf.cdtTrfTxInf.pmtId.uetr=uetr
-#fiCdtTrf.cdtTrfTxInf.pmtId.instrId=instrId
-#fiCdtTrf.cdtTrfTxInf.pmtId.endToEndId=endToEndId
-#fiCdtTrf.cdtTrfTxInf.pmtTpInf.clrChanl=clrChanl
-#fiCdtTrf.cdtTrfTxInf.pmtTpInf.svcLvl=svcLvl
-#fiCdtTrf.cdtTrfTxInf.pmtTpInf.lclInstrm=lclInstrm
-#fiCdtTrf.cdtTrfTxInf.pmtTpInf.ctgyPurp=ctgyPurp
-#fiCdtTrf.cdtTrfTxInf.intrBkSttlmAmt=intrBkSttlmAmt
-#fiCdtTrf.cdtTrfTxInf.intrBkSttlmDt=intrBkSttlmDt
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt1=prvsInstgAgt1
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt1Acct=prvsInstgAgt1Acct
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt2=prvsInstgAgt2
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt2Acct=prvsInstgAgt2Acct
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt3=prvsInstgAgt3
-#fiCdtTrf.cdtTrfTxInf.prvsInstgAgt3Acct=prvsInstgAgt3Acct
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt1=intrmyAgt1
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt1Acct=intrmyAgt1Acct
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt2=intrmyAgt2
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt2Acct=intrmyAgt2Acct
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt3=intrmyAgt3
-#fiCdtTrf.cdtTrfTxInf.intrmyAgt3Acct=intrmyAgt3Acct
-#fiCdtTrf.cdtTrfTxInf.dbtr=dbtr
-#fiCdtTrf.cdtTrfTxInf.dbtrAcct=dbtrAcct
-#fiCdtTrf.cdtTrfTxInf.dbtrAgt=dbtrAgt
-#fiCdtTrf.cdtTrfTxInf.dbtrAgtAcct=dbtrAgtAcct
-#fiCdtTrf.cdtTrfTxInf.cdtrAgt=cdtrAgt
-#fiCdtTrf.cdtTrfTxInf.cdtrAgtAcct=cdtrAgtAcct
-#fiCdtTrf.cdtTrfTxInf.cdtr=cdtr
-#fiCdtTrf.cdtTrfTxInf.cdtrAcct=cdtrAcct
-#fiCdtTrf.cdtTrfTxInf.instrForCdtrAgt=instrForCdtrAgt
-#fiCdtTrf.cdtTrfTxInf.instrForNxtAgt=instrForNxtAgt
-#fiCdtTrf.cdtTrfTxInf.purp=purp
+fiCdtTrf.cdtTrfTxInf*.pmtId=pmtId
+fiCdtTrf.cdtTrfTxInf*.pmtTpInf=pmtTpInf
+fiCdtTrf.cdtTrfTxInf*.intrBkSttlmAmt=intrBkSttlmAmt
+fiCdtTrf.cdtTrfTxInf*.intrBkSttlmDt=intrBkSttlmDt
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt1=prvsInstgAgt1
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt1Acct=prvsInstgAgt1Acct
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt2=prvsInstgAgt2
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt2Acct=prvsInstgAgt2Acct
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt3=prvsInstgAgt3
+fiCdtTrf.cdtTrfTxInf*.prvsInstgAgt3Acct=prvsInstgAgt3Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt1=intrmyAgt1
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt1Acct=intrmyAgt1Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt2=intrmyAgt2
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt2Acct=intrmyAgt2Acct
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt3=intrmyAgt3
+fiCdtTrf.cdtTrfTxInf*.intrmyAgt3Acct=intrmyAgt3Acct
+fiCdtTrf.cdtTrfTxInf*.dbtr=dbtr
+fiCdtTrf.cdtTrfTxInf*.dbtrAcct=dbtrAcct
+fiCdtTrf.cdtTrfTxInf*.dbtrAgt=dbtrAgt
+fiCdtTrf.cdtTrfTxInf*.dbtrAgtAcct=dbtrAgtAcct
+fiCdtTrf.cdtTrfTxInf*.cdtrAgt=cdtrAgt
+fiCdtTrf.cdtTrfTxInf*.cdtrAgtAcct=cdtrAgtAcct
+fiCdtTrf.cdtTrfTxInf*.cdtr=cdtr
+fiCdtTrf.cdtTrfTxInf*.cdtrAcct=cdtrAcct
+fiCdtTrf.cdtTrfTxInf*.instrForCdtrAgt=instrForCdtrAgt
+fiCdtTrf.cdtTrfTxInf*.instrForNxtAgt=instrForNxtAgt
+fiCdtTrf.cdtTrfTxInf*.purp=purp
+fiCdtTrf.cdtTrfTxInf*.rmtInf=rmtInf
+fiCdtTrf.cdtTrfTxInf*.undrlygCstmrCdtTrf=undrlygCstmrCdtTrf
+fiCdtTrf.cdtTrfTxInf*.instgAgt=instgAgt
+fiCdtTrf.cdtTrfTxInf*.instdAgt=instdAgt
\ No newline at end of file
-#fiCdtTrf.cdtTrfTxInf.rmtInf.ustrd=ustrd
-#fiCdtTrf.cdtTrfTxInf.undrlygCstmrCdtTrf=undrlygCstmrCdtTrf
-#fiCdtTrf.cdtTrfTxInf.instgAgt.finInstnId.bicfi=senderBic
-#fiCdtTrf.cdtTrfTxInf.instdAgt.finInstnId.bicfi=receiverBic
\ No newline at end of file