From b7b7b9f3f1d824b08fb173fb945e2f87a5af2faa Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 21 三月 2022 15:15:40 +0800
Subject: [PATCH] 更新
---
src/main/java/testElectronJ/TestController.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/main/java/testElectronJ/TestController.java b/src/main/java/testElectronJ/TestController.java
index 3fd85c0..0efa514 100644
--- a/src/main/java/testElectronJ/TestController.java
+++ b/src/main/java/testElectronJ/TestController.java
@@ -93,7 +93,7 @@
String excelName = "FBX-"+nowFormat;
HSSFWorkbook wb = new HSSFWorkbook();
- HSSFSheet sheet = wb.createSheet("鏁版嵁鎬昏");
+ HSSFSheet sheet = wb.createSheet("鏁版嵁鎬昏〃");
//鍥剧墖鍏冪礌
HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
@@ -106,18 +106,26 @@
int rowNumSheet = 0;
FboDataHeadStart start = fboDataInf.fboDataStart;
+ FboDataHeadStop stop = fboDataInf.fboDataStop;
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("鐢垫睜缁勫悕绉帮細"+start.battNameStr);
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("鐢垫睜鍝佺墝锛�"+start.battBrandStr);
rowNumSheet++;
sheet.createRow(rowNumSheet);
- sheet.getRow(rowNumSheet).createCell(0).setCellValue("鐢垫睜鍝佺墝锛�"+start.battBrandStr);
- sheet.getRow(rowNumSheet).createCell(1).setCellValue("瀹夎鏃ユ湡锛�"+start.batt_date_str);
- sheet.getRow(rowNumSheet).createCell(2).setCellValue("鍗曚綋鏁伴噺锛�"+start.batt_mon_num);
+
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("瀹夎鏃ユ湡锛�"+start.batt_date_str);
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("鍗曚綋鏁伴噺锛�"+start.batt_mon_num);
rowNumSheet++;
sheet.createRow(rowNumSheet);
- //sheet.getRow(rowNumSheet).createCell(0).setCellValue("鐢垫睜鍝佺墝锛�"+formartDate(,"yyyy-MM-dd"));
- //sheet.getRow(rowNumSheet).createCell(1).setCellValue("瀹夎鏃ユ湡锛�"+start.batt_date_str);
- //sheet.getRow(rowNumSheet).createCell(2).setCellValue("鍗曚綋鏁伴噺锛�"+start.batt_mon_num);
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細"+formartDate(start.testStartTime,"yyyy-MM-dd"));
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�"+stop.TestTimeLong.hms());
+ rowNumSheet++;
+ sheet.createRow(rowNumSheet);
+ sheet.getRow(rowNumSheet).createCell(0).setCellValue("姝ｆ瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).PosInsRes);
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("璐熸瀬缁濈紭鐢甸樆锛�"+list.get(list.size()-1).NegInsRes);
+ if(start.DataType==0xFD){
+ sheet.getRow(rowNumSheet).createCell(2).setCellValue("棰勪及瀹為檯瀹归噺锛�"+list.get(list.size()-1).actualCap);
+ }
rowNumSheet+=2;
//鎻掑叆鍥剧墖
int picNum = 0;
@@ -152,15 +160,11 @@
//灞炴�ф爮
- String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","娴嬭瘯瀹归噺","瀹為檯瀹归噺"};
+ String[] rowName = getRowName(start.DataType);
HSSFRow row = sheet1.createRow(rowNum);
for (int i=0;i<rowName.length;i++){
row.createCell(i).setCellValue(rowName[i]);
}
- //row.createCell(0).setCellValue("娴嬭瘯鏃堕棿"); //鍒涘缓鍗曞厓鏍�
- //row.createCell(1).setCellValue("鎬荤數鍘�");
- //row.createCell(2).setCellValue("娴嬭瘯瀹归噺");
- //row.createCell(3).setCellValue("鍓╀綑瀹归噺");
for(int i=0;i<list.get(0).SingleVol.length;i++){
row.createCell(rowName.length+i).setCellValue("#"+Integer.valueOf(i+1));
}
@@ -171,10 +175,15 @@
FboData fbo=list.get(i);
sheet1.getRow(rowNum).createCell(0).setCellValue(fbo.m_TestTime.hms());
sheet1.getRow(rowNum).createCell(1).setCellValue(fbo.SumVoltage);
- sheet1.getRow(rowNum).createCell(2).setCellValue(fbo.testCap);
+ sheet1.getRow(rowNum).createCell(2).setCellValue(fbo.SumCurrent);
sheet1.getRow(rowNum).createCell(3).setCellValue(fbo.actualCap);
+ sheet1.getRow(rowNum).createCell(4).setCellValue(fbo.Temp_Envi);
+ sheet1.getRow(rowNum).createCell(5).setCellValue(fbo.Humi_Envi);
+ if (start.DataType!=0xFB){
+ sheet1.getRow(rowNum).createCell(6).setCellValue(fbo.testCap);
+ }
for (int k = 0;k<list.get(0).SingleVol.length;k++){
- sheet1.getRow(rowNum).createCell(4+k).setCellValue(fbo.SingleVol[k]);
+ sheet1.getRow(rowNum).createCell(rowName.length+k).setCellValue(fbo.SingleVol[k]);
}
rowNum++;
}
@@ -198,6 +207,16 @@
}
+ public String[] getRowName(int dateType){
+ if (dateType==0xFB){
+ String[] rowName = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","瀹為檯瀹归噺","鐜娓╁害","鐜婀垮害"};
+ return rowName;
+ }else{
+ String[] rowName1 = {"娴嬭瘯鏃堕棿","鎬荤數鍘�","鎬荤數娴�","瀹為檯瀹归噺","鐜娓╁害","鐜婀垮害","娴嬭瘯瀹归噺"};
+ return rowName1;
+ }
+ }
+
/**
* 灏嗘棩鏈熸牸寮忚浆鎹㈡垚鎸囧畾鐨勫瓧绗︿覆鏍煎紡
@@ -205,7 +224,7 @@
* @param str 瀛楃涓茬殑鏍煎紡
* @return
*/
- public String formartDate(Date date, String str){
+ public static String formartDate(Date date, String str){
return new SimpleDateFormat(str).format(date);
}
--
Gitblit v1.9.1