From f34db1213a5c287bbc9e5444e0fdb9108cc613ac Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 04 十一月 2024 08:44:26 +0800
Subject: [PATCH] actm实时添加停止原因和放电记录inf加停止原因stopTypeReason，导出也修改
---
src/main/java/com/whyc/service/ExcelExportService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 12b3498..e881a5e 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -183,13 +183,13 @@
BatttestdataInf tinf=infService.getTinfExport(devId,testRecordCount);
String[] titiles33=new String[]{"PACK/妯＄粍鍙�:","娴嬭瘯寮�濮嬫椂闂�:","娴嬭瘯缁撴潫鏃堕棿:","鏁版嵁绫诲瀷:","鍋滄鍘熷洜:","棰勬斁瀹归噺(AH):"
,"鏀剧數鐢垫祦(A):","娴嬭瘯鏃堕暱(h:m:s):","鍗曚覆涓嬮檺(V):","缁勭涓嬮檺(V):","鐢佃姱涓叉暟:","鏈�楂樻俯搴�(掳C):","鏈�浣庢俯搴�(掳C):","閲囬泦棰戠巼(绉�):"};
- String[] titiles34=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "鏀剧數鏁版嵁",A200stopReason.getStopReason(tinf.getTestStoptype()),String.format("%.1f",tinf.getTestCap())
+ String[] titiles34=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "鏀剧數鏁版嵁",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCap())
,String.format("%.1f",tinf.getTestCurr()),ActionUtil.secToTime(tinf.getTestTimelong()),String.format("%.1f",tinf.getMonVolLow()),String.format("%.1f",tinf.getGroupVolLow()),String.valueOf(tinf.getBatteryNumber())
,String.format("%.1f",tinf.getMaxTemp()),String.format("%.1f",tinf.getMinTemp()),String.valueOf(tinf.getSaveInverter())};
String[] titiles23=new String[]{"PACK/妯＄粍鍙�:","娴嬭瘯寮�濮嬫椂闂�:","娴嬭瘯缁撴潫鏃堕棿:","鏁版嵁绫诲瀷:","鍋滄鍘熷洜:","鍏呯數闄愭祦(A):"
,"娴嬭瘯鏃堕暱(h:m:s):","鍗曚覆涓婇檺(V):","鐢垫祦闃�鍊�(A):","鐢佃姱涓叉暟:","鍏呯數闄愬帇(V)","鏈�楂樻俯搴�(掳C):","鏈�浣庢俯搴�(掳C):","閲囬泦棰戠巼(绉�):"};
- String[] titiles24=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "鍏呯數鏁版嵁",A200stopReason.getStopReason(tinf.getTestStoptype()),String.format("%.1f",tinf.getTestCurr())
+ String[] titiles24=new String[]{tinf.getBatteryName(),ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), "鍏呯數鏁版嵁",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCurr())
,ActionUtil.secToTime(tinf.getTestTimelong()),String.format("%.1f",tinf.getMonVolHigh()),String.format("%.1f",tinf.getTestcurrLimit()),String.valueOf(tinf.getBatteryNumber())
,String.format("%.1f",tinf.getCharVoltage()),String.format("%.1f",tinf.getMaxTemp()),String.format("%.1f",tinf.getMinTemp()),String.valueOf(tinf.getSaveInverter())};
@@ -310,7 +310,7 @@
String[] titiles3=new String[]{"鐢垫睜鍖呭簭鍙�:","妯＄粍缂栧彿:","宸ヤ綔妯″紡:","鐢垫睜绫诲瀷:","鐢垫睜涓叉暟:","鐢靛帇闃�鍊�(v):"
,"宸ヤ綔鐢垫祦(A):","寮�濮嬫祴璇曟椂闂�:","缁撴潫娴嬭瘯鏃堕棿:","鍋滄鍘熷洜:"};
String[] titiles4=new String[]{String.valueOf(tinf.getBattIdx()+1),tinf.getBatteryName(),ActmstopReason.getTestType(tinf.getTestType()),ActmstopReason.getBattType(tinf.getBattType()),String.valueOf(tinf.getBatteryNumber()),String.format("%.1f",tinf.getVolThreshold())
- ,String.format("%.1f",tinf.getTestCurr()), ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), ActmstopReason.getStopReason(tinf.getTestStoptype())};
+ ,String.format("%.1f",tinf.getTestCurr()), ActionUtil.sdf.format(tinf.getTestStarttime()),ActionUtil.sdf.format(tinf.getRecordTime()), tinf.getStopTypeReason()};
int rowNum=5;
for (int i=0;i<titiles3.length;i++){
--
Gitblit v1.9.1