Skip to content

S
swiftISOEditor
Commit 19629814 by lixinyi
Options

代码更新

parent 83f3d719
Showing with 85 additions and 8 deletions
editor_vue/src/iso/components/Date.vue
......@@ -15,7 +15,7 @@ export default {
}
},
mounted:function() {
if (this.dateType=== 'datetime' && this.dataModel.status === 'M' && this.dataModel.defaultValue != 'disabled') {
if (this.dateType=== 'datetime' && this.dataModel.status === 'M' && this.dataModel.defaultValue != 'disabled' && this.dataModel.tag != 'dtTm') {
this.$delete(this.dataModel, 'value');
this.$set(this.dataModel, 'value', this.$moment(new Date()).format("YYYY-MM-DDTHH:mm:ss.SSS+08:00"));
console.log(this.dataModel.value);
......
editor_vue/src/iso/components/TextInput.vue
......@@ -115,7 +115,7 @@ export default {
} else if (
"bizMsgIdr" === this.dataModel.tag ||
"msgId" === this.dataModel.tag ||
("id" === this.dataModel.tag && "16" !== this.dataModel.maxLength && "4" !== this.dataModel.maxLength) ||
("id" === this.dataModel.tag && "16" !== this.dataModel.maxLength && "4" !== this.dataModel.maxLength && "34" !== this.dataModel.maxLength) ||
"cxlId" === this.dataModel.tag && "16" !== this.dataModel.maxLength ||
"rtrId" === this.dataModel.tag ||
"endToEndId" === this.dataModel.tag ||
......
editor_vue/src/iso/script/MsgJson/Head_001_001_02.js
......@@ -33,7 +33,7 @@ export default[
name: "BICFI",
label: "BICFI",
tag: "bicfi",
type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}",
type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}[A-Z0-9]{3,3}",
status: "M",
maxLength: "11",
bicid: "1",
......@@ -116,7 +116,7 @@ export default[
name: "BICFI",
label: "BICFI",
tag: "bicfi",
type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}([A-Z0-9]{3,3}){0,1}",
type: "TextInput#[A-Z0-9]{4,4}[A-Z]{2,2}[A-Z0-9]{2,2}[A-Z0-9]{3,3}",
status: "M",
maxLength:"11",
},
......
editor_vue/src/iso/script/Rule/Cbpr/Camt057.js
......@@ -222,6 +222,10 @@ export default function validator(obj) {
return false;
}
if (!ExpectedValueDateRule(obj.ntfctn)){
return false;
}
if (!Mandatory_Debtor_Rule(obj.ntfctn)) {
return false;
}
......@@ -231,6 +235,29 @@ export default function validator(obj) {
}
return true;
}
//Cross Element Complex Rule : Expected Value Date Rule
function ExpectedValueDateRule(obj){
const msg = "Either ExpectedValueDate or Item/ExpectedValueDate may be present but not both.";
if(isNotEmpty(obj.xpctdValDt)){
if(isNotEmpty(obj.itm)){
var flag = false;
var itm = obj.itm;
for (var index = 0; index < itm.length; index++) {
const element = itm[index];
if(isNotEmpty(element.xpctdValDt)){
flag = true;
}
if(flag){
message(`Notification/item[`+ (index + 1) +`]/ExpectedValueDate`,msg);
return false;
}
}
}
}
return true;
}
//Cross Element Complex Rule : Account And Currency Rule
function AccountAndCurrencyRule(obj,itm) {
const msg = "If Account is present, then all occurrences of Item/Amount must have the same currency.";
......
editor_vue/src/iso/script/Rule/Cbpr/Camt107.js
......@@ -24,6 +24,9 @@ export default function validator(obj) {
if (!CBPR_Structured_vs_Unstructured_FormalRule(element.pyee.pstlAdr, `Cheque/Payee`)) {
return false;
}
if (!CBPR_Structured_vs_Unstructured_FormalRule(element.pyer.pstlAdr, `Cheque/Payer`)) {
return false;
}
//r18
if (!CBPR_Agent_Name_Postal_Address_FormalRule(element.pyee, `Cheque/Payee`)) {
return false;
......
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.23ee7bd5.js"></script><script defer="defer" src="js/app.1e07cfbd.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.bafa1db8.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.23ee7bd5.js"></script><script defer="defer" src="js/app.6bc5397f.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.7f91f7f5.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
swift-service/src/main/resources/template/camt05500108.properties
......@@ -35,8 +35,7 @@ cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstrId=orgnlInstrId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlEndToEndId=orgnlEndToEndId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlTxId=orgnlTxId
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlUETR=orgnlUETR
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.OrgnlInstdAmt=OrgnlInstdAmt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.OrgnlReqdExctnDt=OrgnlReqdExctnDt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlReqdExctnDt=orgnlReqdExctnDt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlReqdColltnDt=orgnlReqdColltnDt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.orgnlInstdAmt=orgnlInstdAmt
cstmrPmtCxlReq.undrlyg*.orgnlPmtInfAndCxl*.txInf*.cxlRsnInf*.orgtr=orgtr
......
swift-service/src/test/java/com/brilliance/mxeditor/TestCIPS.java
......@@ -5,15 +5,21 @@ import com.alibaba.fastjson.JSONObject;
import com.brilliance.cips.framework.Result;
import com.brilliance.cips.packet.model.Msg;
import com.brilliance.cips.utils.MsgUtil;
//import com.brilliance.eibs.util.EntryAutomatic;
import com.brilliance.eibs.util.EntryAutomatic;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class TestCIPS {
private final static Logger logger = LoggerFactory.getLogger(MxTransfer.class);
......@@ -99,4 +105,46 @@ public class TestCIPS {
String swiftGsonStr = new JSONObject(gsonMaps).toJSONString();
System.out.println("CIPSGsonStr------>:::" + swiftGsonStr);
}
@Test
public void EntryAutomatic()throws IOException {
String str1="DE CO LTD";
String str2="DE CO.,LTD";
ArrayList<String> arr = new ArrayList<>();
arr.add("CO=CO");
ArrayList<String> arr1 = new ArrayList<>();
Boolean a = EntryAutomatic.MatchPyeaddr(str1,str2,arr,arr1,"mx");
System.out.println( a);
}
private static String readFile(String filePath) throws IOException {
StringBuilder contentBuilder = new StringBuilder();
try (BufferedReader br = new BufferedReader(new FileReader(filePath))) {
String currentLine;
while ((currentLine = br.readLine()) != null) {
contentBuilder.append(currentLine).append("\n");
}
}
return contentBuilder.toString();
}
private static String removeComments(String content) {
// 匹配XML注释的正则表达式
String commentRegex = "<!--.*?-->";
Pattern pattern = Pattern.compile(commentRegex, Pattern.DOTALL);
Matcher matcher = pattern.matcher(content);
return matcher.replaceAll("");
}
@Test
public void xml() {
String filePath = "D:\\work\\work\\南商\\iso改造\\swiftISOEditor\\swift-service\\src\\main\\resources\\xml\\iso\\00888829.xml"; // 替换为你的XML文件路径
try {
String content = readFile(filePath);
String noCommentsContent = removeComments(content);
System.out.println(noCommentsContent);
} catch (IOException e) {
e.printStackTrace();
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment