退回编辑修改，js文件位置修改

aa90388e · lixinyi · ac6fc97f · aa90388e · aa90388e · aa90388e
Commit aa90388e authored May 06, 2024 by lixinyi
6 changed files
--- a/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/cips_111_001_02.js
@@ -336,6 +336,24 @@ export default [
                                    },
                                ],
                            },
+                            {
+                                path: "0.1.11.1",
+                                name: "39. BranchIdentification",
+                                label: "BranchIdentification",
+                                tag: "BrnchId",
+                                status: "O",
+                                children: [
+                                    {
+                                        path: "0.1.11.1.0",
+                                        name: "40. Identification",
+                                        label: "Identification",
+                                        tag: "Id",
+                                        type: "TextInput",
+                                        status: "O",
+                                        maxLength: "35",
+                                    },
+                                ],
+                            },
                        ],
                    },
                    {

--- a/editor_vue/src/iso/script/MsgJson/cips_112_001_02.js
+++ b/editor_vue/src/iso/script/MsgJson/cips_112_001_02.js
--- a/swift-service/src/main/java/com/brilliance/mxeditor/controller/CipsEditorController.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/controller/CipsEditorController.java
@@ -203,18 +203,17 @@ public class CipsEditorController {
 //            }
            if (cipsVo.getType() != null) {
                try {
-                    String xml = transfer(cipsVo.getJson());
                    Map<String, Object> transmap = new HashMap();
                    transmap.put("interface", "cips2map");
                    transmap.put("transaction", "cips2map");
-                    transmap.put("cipsStr", xml);
+                    transmap.put("cipsStr", xmlStr);
                    Map transres = (Map) CommonSend.send(transmap);
                    String transretcod = (String) transres.get("retcode");
                    String transretmsg = (String) transres.get("retmsg");
                    logger.info("cips2map结果："+transres.toString());
                    Map<String, Object> xmlMaps = new HashMap<>();
                    if (transretcod != null && transretcod.endsWith("0000000")) {
-                        xmlMaps = res;
+                        xmlMaps = transres;
                    } else{
                        return null;
                    }

--- a/swift-service/src/main/java/com/brilliance/mxeditor/util/SwiftTransferUtil.java
+++ b/swift-service/src/main/java/com/brilliance/mxeditor/util/SwiftTransferUtil.java
@@ -92,7 +92,7 @@ public class SwiftTransferUtil {
     * @param sheetName
     */
    public static void generateJsTemplateFile(String sheetName) {
-        InputStream resourceAsStream = SwiftTransferUtil.class.getResourceAsStream("/js/CIPS.xlsx");
+        InputStream resourceAsStream = SwiftTransferUtil.class.getClassLoader().getResourceAsStream("cipsjs/CIPS.xlsx");
        ExcelReader reader = ExcelUtil.getReader(resourceAsStream, sheetName);
        List<Map<String, Object>> content = reader.readAll();
        if (content.size() > 0) {
@@ -145,7 +145,7 @@ public class SwiftTransferUtil {
            message = "export default [\r\n" + message + "\r\n]";
            try {
 //                File msgFolder = new File(System.getProperty("user.dir") + "/swift-service/src/main/resources/js");
-                File msgFolder = new File(System.getProperty("user.dir") + "/src/main/resources/js");
+                File msgFolder = new File(System.getProperty("user.dir") + "/src/main/resources/cipsjs");
                File msgFile = new File(msgFolder, sheetName.replace(".", "_") + ".js");
                FileWriter fileWriter = new FileWriter(msgFile);
                IOUtils.write(message, fileWriter);
@@ -260,7 +260,7 @@ public class SwiftTransferUtil {
    }

    public static void main(String[] args) throws Exception {
-        generateJsTemplateFile("cips.112.001.02");
+        generateJsTemplateFile("cips.111.001.02");
 //        generateBTCFile();
    }
 }
--- a/swift-service/src/main/resources/cipsjs/CIPS.xlsx
+++ b/swift-service/src/main/resources/cipsjs/CIPS.xlsx
--- 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.dbe64cdc.js"></script><script defer="defer" src="js/app.9f47b6c5.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.ca356171.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.dbe64cdc.js"></script><script defer="defer" src="js/app.2a5cae72.js"></script><script defer="defer" src="js/main.59945214.js"></script><link href="css/chunk-vendors.77489a8d.css" rel="stylesheet"><link href="css/app.ca356171.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