From 79f5048aeb1f0f4ac3e3300bcd3f23d3296cc8e5 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 16:07:54 +0800
Subject: [PATCH] 更新
---
src/main/java/testElectronJ/TestController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 0329ebe..35be7f0 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -48,7 +48,7 @@
String curr_echart = req.getParameter("curr_echart"); //鐢垫睜鐢垫祦鎶樼嚎鍥�
String groupVol_echart = req.getParameter("groupVol_echart"); //缁勭鐢靛帇鎶樼嚎鍥�
String cap_echart = req.getParameter("cap_echart"); //娴嬭瘯瀹归噺鎶樼嚎鍥�
- String actualCap_echart = req.getParameter("actualCap_echart"); //瀹為檯瀹归噺鎶樼嚎鍥�
+ //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("humiEnvi_echart");//鐜婀垮害鎶樼嚎鍥�
@@ -81,10 +81,10 @@
String[] url = cap_echart.split(",");
bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
}
- if (ServletUtils.isNotNull(actualCap_echart)) {
- String[] url = actualCap_echart.split(",");
- bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
- }
+ //if (ServletUtils.isNotNull(actualCap_echart)) {
+ // String[] url = actualCap_echart.split(",");
+ // bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
+ //}
if (ServletUtils.isNotNull(vol_echart)) {
String[] url = vol_echart.split(",");
bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
@@ -127,18 +127,23 @@
sheet.getRow(rowNumSheet).createCell(0).setCellValue("瀹夎鏃ユ湡锛�"+start.batt_date_str);
sheet.getRow(rowNumSheet).createCell(1).setCellValue("鍗曚綋鏁伴噺锛�"+start.batt_mon_num);
+ sheet.getRow(rowNumSheet).createCell(2).setCellValue("鏍囩О瀹归噺锛�"+start.batt_std_cap+"AH");
rowNumSheet++;
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細"+formartDate(start.testStartTime,"yyyy-MM-dd HH:mm:ss"));
sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�"+stop.TestTimeLong.hms());
+ sheet.getRow(rowNumSheet).createCell(2).setCellValue("鏍囩О鐢靛锛�"+start.batt_std_cte);
rowNumSheet++;
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("姝ｆ瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).PosInsRes+"k惟");
sheet.getRow(rowNumSheet).createCell(1).setCellValue("璐熸瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).NegInsRes+"k惟");
+ sheet.getRow(rowNumSheet).createCell(2).setCellValue("鏍囩О鍐呴樆锛�"+start.batt_std_res+"k惟");
if(start.DataType==0xFD){
- sheet.getRow(rowNumSheet).createCell(2).setCellValue("棰勪及瀹為檯瀹归噺锛�"+list.get(list.size()-1).actualCap+"AH");
+ rowNumSheet++;
+ sheet.createRow(rowNumSheet);
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("棰勪及瀹為檯瀹归噺锛�"+list.get(list.size()-1).actualCap+"AH");
}
- rowNumSheet+=2;
+ rowNumSheet+=4;
//鎻掑叆鍥剧墖
int picNum = 0;
String[] picName = getPicName(start.DataType);
@@ -218,10 +223,10 @@
public String[] getRowName(int dateType){
if (dateType==0xFB){
- String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","鐜娓╁害","鐜婀垮害"};
+ String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�(V)","鎬荤數娴�(A)","鐜娓╁害","鐜婀垮害"};
return rowName;
}else{
- String[] rowName1 = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","鐜娓╁害","鐜婀垮害","娴嬭瘯瀹归噺"};
+ String[] rowName1 = {"娴嬭瘯鏃堕棿","鎬荤數鍘�(V)","鎬荤數娴�(A)","鐜娓╁害","鐜婀垮害","娴嬭瘯瀹归噺(AH)"};
return rowName1;
}
}
--
Gitblit v1.9.1