From 45625d6aaced524da3abebb5548d8495b77b8aa1 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 14:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whychw/testElectron
---
src/main/java/testElectronJ/TestController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 43e81fa..3fd85c0 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -21,8 +21,6 @@
public class TestController {
//@Autowired
//private FboDataInf fboDataInf;
- public String fileUrl = "";
- public FboDataInf fboDataInf;
@GetMapping("/hello")
public Response hello(){
@@ -31,13 +29,15 @@
@PostMapping("/readFboFile")
public Response readFboFile(@RequestParam String filePath){
- log.info("readFboFile寮�濮�");
- fboDataInf = new FboDataInf();
+ log.info("鎺ュ彛readFboFile寮�濮�");
+ FboDataInf fboDataInf = new FboDataInf();
+ log.info("fboDataInf:"+fboDataInf);
+ log.info("filePath:"+filePath);
//String filePath1 = java.net.URLDecoder.decode(filePath,"utf-8");
fboDataInf.readFboFile(filePath);
log.info(fboDataInf.fboData.toString());
log.info("璇诲彇缁撴潫");
- fileUrl = filePath;
+// fileUrl = filePath;
return new Response().set(1,fboDataInf,filePath);
}
@@ -51,13 +51,15 @@
String vol_echart = req.getParameter("vol_echart"); //鍗曚綋鐢靛帇鎶樼嚎鍥�
String filePath = req.getParameter("filePath");
- if (fboDataInf==null){
- fboDataInf = new FboDataInf();
- if (filePath==null || "".equals(filePath)){
- filePath = fileUrl;
- }
- fboDataInf.readFboFile(filePath);
- }
+ FboDataInf fboDataInf = new FboDataInf();
+ fboDataInf.readFboFile(filePath);
+// if (fboDataInf==null){
+// fboDataInf = new FboDataInf();
+// if (filePath==null || "".equals(filePath)){
+// filePath = fileUrl;
+// }
+// fboDataInf.readFboFile(filePath);
+// }
//浠庢枃浠朵腑鑾峰彇鏁版嵁
List<FboData> list = fboDataInf.fboData;
//鍥剧墖base64鍚庣殑鏁版嵁
--
Gitblit v1.9.1