From 73bb5617e6aeb4ee8f7dfd4ad54b61d477969d86 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 10 六月 2025 20:22:06 +0800
Subject: [PATCH] 自动充放电自动化流程
---
src/main/java/com/whyc/service/ExcelExportService.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index c353fbc..5035407 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -1,8 +1,8 @@
package com.whyc.service;
-import com.whyc.dto.ActmstopReason;
-import com.whyc.pojo.db_batt_testdata.BatttestdataId;
-import com.whyc.pojo.db_batt_testdata.BatttestdataInf;
+import com.whyc.dto.ActmStopReason;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestData;
+import com.whyc.pojo.db_lithium_testdata.BattLithiumTestDataInf;
import com.whyc.util.ActionUtil;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -23,7 +23,7 @@
private SubTablePageInfoService subService;
@Autowired(required = false)
- private BatttestdataInfService infService;
+ private BattLithiumTestDataInfService infService;
//瀵煎嚭鏂囦欢
public void exportExcel1(Integer devId, Integer testRecordCount,HttpServletResponse response) {
@@ -40,12 +40,12 @@
row.createCell(i).setCellValue(titiles[i]);
}
rowNum++;
- List<BatttestdataId> list=subService.getTdataById(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataById(devId,testRecordCount);
if(list!=null){
//鏁版嵁鏍�
for (int i = 0; i < list.size(); i++) {
sheet.createRow(rowNum); //鍒涘缓琛�
- BatttestdataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
for(int j=0;j<titiles.length;j++){
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
sheet.getRow(rowNum).createCell(1).setCellValue(tdata.getBattIdx()+1);
@@ -106,7 +106,7 @@
cellStyle.setFont(font);
String[] titiles=new String[]{"Time(H:M:S)","Group V(V)","Group A(A)","Cap (AH)","Temp H(掳C)","Temp L(掳C)"};
- List<BatttestdataId> list=subService.getTdataByIdWithListA200(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataByIdWithListA200(devId,testRecordCount);
int rowNum=0;
// 鍒涘缓鏍囬琛�
@@ -129,7 +129,7 @@
for (int i = 0; i < list.size(); i++) {
Row row1 = sheet.createRow(rowNum); //鍒涘缓琛�
row1.setHeightInPoints(20.0f);
- BatttestdataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
sheet.getRow(rowNum).createCell(1).setCellValue(String.format("%.1f",tdata.getGroupVol()));
sheet.getRow(rowNum).createCell(2).setCellValue(String.format("%.1f",tdata.getTestCurr()));
@@ -177,7 +177,7 @@
cellStyle.setFont(font);
//鑾峰彇鏀剧數inf
- BatttestdataInf tinf=infService.getTinfExport(devId,testRecordCount);
+ BattLithiumTestDataInf 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()), "鏀剧數鏁版嵁",tinf.getStopTypeReason(),String.format("%.1f",tinf.getTestCap())
@@ -226,7 +226,7 @@
cellStyle.setFont(font);
String[] titiles=new String[]{"娴嬭瘯鏃堕暱"};
- List<BatttestdataId> list=subService.getTdataByIdWithListActm(devId,testRecordCount);
+ List<BattLithiumTestData> list=subService.getTdataByIdWithListActm(devId,testRecordCount);
int rowNum=0;
// 鍒涘缓鏍囬琛�
@@ -252,7 +252,7 @@
for (int i = 0; i < list.size(); i++) {
Row row1 = sheet.createRow(rowNum); //鍒涘缓琛�
row1.setHeightInPoints(20.0f);
- BatttestdataId tdata=list.get(i);
+ BattLithiumTestData tdata=list.get(i);
sheet.getRow(rowNum).createCell(0 ).setCellValue(ActionUtil.secToTime(tdata.getTestTimelong()));
List<Float> monVols = tdata.getMonVols();
List<Float> monCurrs = tdata.getMonCurrs();
@@ -302,11 +302,11 @@
cellStyle.setFont(font);
//鑾峰彇鏀剧數inf
- BatttestdataInf tinf=infService.getTinfExport(devId,testRecordCount);
+ BattLithiumTestDataInf tinf=infService.getTinfExport(devId,testRecordCount);
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[] 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()), tinf.getStopTypeReason()};
int rowNum=5;
--
Gitblit v1.9.1