From 2ad663ff09bead7bb783f89a7be6eb5b8e7ffdae Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期一, 21 三月 2022 15:51:37 +0800
Subject: [PATCH] 更新
---
src/main/java/testElectronJ/TestController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 46b95df..0329ebe 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
@Slf4j
@RestController
@RequestMapping("test")
@@ -29,14 +30,14 @@
@PostMapping("/readFboFile")
public Response readFboFile(@RequestParam String filePath){
- log.info("鎺ュ彛readFboFile寮�濮�");
+ //log.info("鎺ュ彛readFboFile寮�濮�");
FboDataInf fboDataInf = new FboDataInf();
- log.info("fboDataInf:"+fboDataInf);
- log.info("filePath:"+filePath);
+ //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("璇诲彇缁撴潫");
+ // log.info(fboDataInf.fboData.toString());
+ // log.info("璇诲彇缁撴潫");
// fileUrl = filePath;
return new Response().set(1,fboDataInf,filePath);
}
@@ -50,7 +51,7 @@
String actualCap_echart = req.getParameter("actualCap_echart"); //瀹為檯瀹归噺鎶樼嚎鍥�
String vol_echart = req.getParameter("vol_echart"); //鍗曚綋鐢靛帇鎶樼嚎鍥�
String tempEnvi_echart = req.getParameter("tempEnvi_echart");//鐜娓╁害鎶樼嚎鍥�
- String HumiEnvi_echart = req.getParameter("tempEnvi_echart");//鐜婀垮害鎶樼嚎鍥�
+ String humiEnvi_echart = req.getParameter("humiEnvi_echart");//鐜婀垮害鎶樼嚎鍥�
String filePath = req.getParameter("filePath");
@@ -92,8 +93,8 @@
String[] url = tempEnvi_echart.split(",");
bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
}
- if (ServletUtils.isNotNull(HumiEnvi_echart)) {
- String[] url = HumiEnvi_echart.split(",");
+ if (ServletUtils.isNotNull(humiEnvi_echart)) {
+ String[] url = humiEnvi_echart.split(",");
bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
}
}catch (Exception e){
@@ -228,12 +229,12 @@
public String[] getPicName(int dateType){
if (dateType==0xFB){
String[] picName1 = new String[]{
- "鐢垫睜鐢垫祦鎶樼嚎鍥�","缁勭鐢靛帇鎶樼嚎鍥�","娴嬭瘯瀹归噺鎶樼嚎鍥�","瀹為檯瀹归噺鎶樼嚎鍥�","鍗曚綋鐢靛帇鎶樼嚎鍥�","鐜娓╁害鎶樼嚎鍥�","鐜婀垮害鎶樼嚎鍥�"
+ "鐢垫睜鐢垫祦鎶樼嚎鍥�","缁勭鐢靛帇鎶樼嚎鍥�","鍗曚綋鐢靛帇鎶樼嚎鍥�","鐜娓╁害鎶樼嚎鍥�","鐜婀垮害鎶樼嚎鍥�"
};
return picName1;
}else{
String[] picName = new String[]{
- "鐢垫睜鐢垫祦鎶樼嚎鍥�","缁勭鐢靛帇鎶樼嚎鍥�","娴嬭瘯瀹归噺鎶樼嚎鍥�","瀹為檯瀹归噺鎶樼嚎鍥�","鍗曚綋鐢靛帇鎶樼嚎鍥�"
+ "鐢垫睜鐢垫祦鎶樼嚎鍥�","缁勭鐢靛帇鎶樼嚎鍥�","娴嬭瘯瀹归噺鎶樼嚎鍥�","鍗曚綋鐢靛帇鎶樼嚎鍥�","鐜娓╁害鎶樼嚎鍥�","鐜婀垮害鎶樼嚎鍥�"
};
return picName;
}
--
Gitblit v1.9.1