Skip to content

S
swiftISOEditor
Commit b710927d by lixinyi
Options

056\057报文检核调整

parent 04fbc029
Showing with 42 additions and 23 deletions
editor_vue/src/iso/components/TextInput.vue
...@@ -202,12 +202,13 @@ export default { ...@@ -202,12 +202,13 @@ export default {
// 点击选择按钮 // 点击选择按钮
choose() { choose() {
this.loadData();
this.allSelectedList = []; this.allSelectedList = [];
this.dialogVisible = true; this.dialogVisible = true;
}, // 点击选择弹窗的确定按钮 }, // 点击选择弹窗的确定按钮
chooseConfirm() { chooseConfirm() {
console.log(this.allSelectedList[0].bic); 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; this.dialogVisible = false;
}, // 加载数据 }, // 加载数据
loadData(newPageConfig) { loadData(newPageConfig) {
......
editor_vue/src/iso/script/Rule/Cbpr/Camt056.js
...@@ -213,7 +213,7 @@ function CBPR_Case_Identification_FormalRule(obj) { ...@@ -213,7 +213,7 @@ function CBPR_Case_Identification_FormalRule(obj) {
"<br/>- The string of 16 characters cannot contain “//”"; "<br/>- The string of 16 characters cannot contain “//”";
if (isNotEmpty(obj)) { if (isNotEmpty(obj)) {
let id = obj.id; let id = obj.id;
const position = " Cancellation Identification"; const position = " Case Identification";
if (isNotEmpty(id)) { if (isNotEmpty(id)) {
if (id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//') >= 0) { if (id.startsWith('/') || id.endsWith('/') || id.length != 16 || id.indexOf('//') >= 0) {
message(position, msg); message(position, msg);
......
swift-service/pom.xml
...@@ -83,6 +83,20 @@ ...@@ -83,6 +83,20 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.brilliance</groupId> <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> <artifactId>swiftCore</artifactId>
<version>2.0</version> <version>2.0</version>
<scope>system</scope> <scope>system</scope>
......
swift-service/src/main/java/com/brilliance/mxeditor/MxTransfer.java
...@@ -30,7 +30,7 @@ public class MxTransfer { ...@@ -30,7 +30,7 @@ public class MxTransfer {
} }
} }
gsonMaps.remove("appHdr"); 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的节点需要读其子节点 //最大数量大于1的节点需要读其子节点
for(String s: list) { for(String s: list) {
if (gsonMaps.get(s) != null) { if (gsonMaps.get(s) != null) {
...@@ -97,6 +97,10 @@ public class MxTransfer { ...@@ -97,6 +97,10 @@ public class MxTransfer {
String swiftGsonStr = new JSONObject(maps).toJSONString(); String swiftGsonStr = new JSONObject(maps).toJSONString();
logger.debug("swiftGsonStr------>:::" + swiftGsonStr); logger.debug("swiftGsonStr------>:::" + swiftGsonStr);
//System.out.println("swiftGsonStr---->:" + swiftGsonStr); //System.out.println("swiftGsonStr---->:" + swiftGsonStr);
//本地测试
// AbstractMX abstractMX = AbstractMX.fromJson(swiftGsonStr);
// return abstractMX.message();
//远程
try { try {
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
map.put("interface", "mxTranslate"); map.put("interface", "mxTranslate");
......
swift-service/src/main/java/com/brilliance/mxeditor/controller/MxEditorController.java
...@@ -371,10 +371,10 @@ public class MxEditorController { ...@@ -371,10 +371,10 @@ public class MxEditorController {
// rs.put("retcode","0000000"); // rs.put("retcode","0000000");
// List<Map<String,Object>> ccdlst = new ArrayList<>(); // List<Map<String,Object>> ccdlst = new ArrayList<>();
// Map<String,Object> tmpmap1 = new HashMap<>(); // Map<String,Object> tmpmap1 = new HashMap<>();
// tmpmap1.put("BIC","1111"); // tmpmap1.put("BIC","CHBHHKHHXXX");
// tmpmap1.put("NAM1","1111"); // tmpmap1.put("NAM1","1111");
// Map<String,Object> tmpmap2 = new HashMap<>(); // Map<String,Object> tmpmap2 = new HashMap<>();
// tmpmap2.put("BIC","2222"); // tmpmap2.put("BIC","CHBHHKHHXXX");
// tmpmap2.put("NAM1","2222"); // tmpmap2.put("NAM1","2222");
// ccdlst.add(tmpmap1); // ccdlst.add(tmpmap1);
// ccdlst.add(tmpmap2); // ccdlst.add(tmpmap2);
......
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> <!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 \ No newline at end of file
swift-service/src/main/resources/template/camt05600108.properties
...@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct ...@@ -11,7 +11,7 @@ appHdr.pssblDplct=pssblDplct
appHdr.prty=prty appHdr.prty=prty
appHdr.rltd=rltd appHdr.rltd=rltd
fiToFIPmtCxlReq.assgnmt=assgnmt fiToFIPmtCxlReq.assgnmt=assgnmt
fiToFIPmtCxlReq.undrlyg=undrlyg #fiToFIPmtCxlReq.undrlyg=undrlyg
#fiToFIPmtCxlReq=fiToFIPmtCxlReq #fiToFIPmtCxlReq=fiToFIPmtCxlReq
#fiToFIPmtCxlReq.assgnmt=assgnmt #fiToFIPmtCxlReq.assgnmt=assgnmt
#fiToFIPmtCxlReq.undrlyg=undrlyg #fiToFIPmtCxlReq.undrlyg=undrlyg
...@@ -28,17 +28,17 @@ fiToFIPmtCxlReq.undrlyg=undrlyg ...@@ -28,17 +28,17 @@ fiToFIPmtCxlReq.undrlyg=undrlyg
#fiToFIPmtCxlReq.assgnmt.creDtTm=creDtTm #fiToFIPmtCxlReq.assgnmt.creDtTm=creDtTm
#fiToFIPmtCxlReq.assgnmt.assgnr.agt=assgnrAgt #fiToFIPmtCxlReq.assgnmt.assgnr.agt=assgnrAgt
#fiToFIPmtCxlReq.assgnmt.assgne.agt=assgneAgt #fiToFIPmtCxlReq.assgnmt.assgne.agt=assgneAgt
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgId=orgnlMsgId fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlGrpInf=orgnlGrpInf
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlMsgNmId=orgnlMsgNmId fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlInstrId=orgnlInstrId
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlGrpInf.orgnlCreDtTm=orgnlCreDtTm fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlEndToEndId=orgnlEndToEndId
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlInstrId=orgnlInstrId fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlTxId=orgnlTxId
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlEndToEndId=orgnlEndToEndId fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlUETR=orgnlUETR
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlTxId=orgnlTxId fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlClrSysRef=orgnlClrSysRef
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlUETR=uetr fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlClrSysRef=orgnlClrSysRef fiToFIPmtCxlReq.undrlyg*.txInf*.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmAmt=orgnlIntrBkSttlmAmt fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.orgtr=orgtr
#fiToFIPmtCxlReq.undrlyg.txInf.orgnlIntrBkSttlmDt=orgnlIntrBkSttlmDt fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.rsn=rsn
#fiToFIPmtCxlReq.undrlyg.txInf.cxlRsnInf=cxlRsnInf fiToFIPmtCxlReq.undrlyg*.txInf*.cxlRsnInf*.AddtlInf=AddtlInf
#fiToFIPmtCxlReq.undrlyg.txInf._case.cretr=cretr fiToFIPmtCxlReq.undrlyg*.txInf*._case=_case
#fiToFIPmtCxlReq.undrlyg.txInf._case.id=caseId #fiToFIPmtCxlReq.undrlyg*.txInf*.case.id=caseId
#fiToFIPmtCxlReq.undrlyg.txInf*.orgnlUETR=uetr fiToFIPmtCxlReq.undrlyg*.txInf*.cxlId=cxlId
\ No newline at end of file \ No newline at end of file
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