From 273dbf11feb20fdd97c8d6e4577732956cae195a Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 15:33:54 +0800
Subject: [PATCH] 更新
---
src/main/java/testElectronJ/TestController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 0efa514..3f780ab 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -49,6 +49,9 @@
String cap_echart = req.getParameter("cap_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("tempEnvi_echart");//鐜婀垮害鎶樼嚎鍥�
+
String filePath = req.getParameter("filePath");
FboDataInf fboDataInf = new FboDataInf();
@@ -85,6 +88,14 @@
String[] url = vol_echart.split(",");
bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
}
+ if (ServletUtils.isNotNull(tempEnvi_echart)) {
+ String[] url = tempEnvi_echart.split(",");
+ bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
+ }
+ if (ServletUtils.isNotNull(HumiEnvi_echart)) {
+ String[] url = HumiEnvi_echart.split(",");
+ bytes.add(new BASE64Decoder().decodeBuffer(url[1]));
+ }
}catch (Exception e){
e.printStackTrace();
}
@@ -117,7 +128,7 @@
sheet.getRow(rowNumSheet).createCell(1).setCellValue("鍗曚綋鏁伴噺锛�"+start.batt_mon_num);
rowNumSheet++;
sheet.createRow(rowNumSheet);
- sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細"+formartDate(start.testStartTime,"yyyy-MM-dd"));
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細"+formartDate(start.testStartTime,"yyyy-MM-dd HH:mm:ss"));
sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�"+stop.TestTimeLong.hms());
rowNumSheet++;
sheet.createRow(rowNumSheet);
@@ -129,9 +140,7 @@
rowNumSheet+=2;
//鎻掑叆鍥剧墖
int picNum = 0;
- String[] picName = new String[]{
- "鐢垫睜鐢垫祦鎶樼嚎鍥�","缁勭鐢靛帇鎶樼嚎鍥�","娴嬭瘯瀹归噺鎶樼嚎鍥�","瀹為檯瀹归噺鎶樼嚎鍥�","鍗曚綋鐢靛帇鎶樼嚎鍥�"
- };
+ String[] picName = getPicName(start.DataType);
if (picName.length==bytes.size()){
for(int i=0;i<picName.length;i++){
sheet.createRow(rowNumSheet-1);
@@ -217,6 +226,20 @@
}
}
+ 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