From c971825d2a2bc48c74f2ffe97127b50b14445e12 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期一, 09 六月 2025 20:56:16 +0800
Subject: [PATCH] 压入变动的时间列的总电压和电流
---
src/main/java/com/whyc/service/ExcelService.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelService.java b/src/main/java/com/whyc/service/ExcelService.java
index 88e77f6..4927078 100644
--- a/src/main/java/com/whyc/service/ExcelService.java
+++ b/src/main/java/com/whyc/service/ExcelService.java
@@ -588,9 +588,13 @@
CellRangeAddress region25 = new CellRangeAddress(1, 1, 18, 24);
sheet.addMergedRegion(region25);
- //绗笁琛岀殑鍚堝苟鍒�,鍓嶄袱涓崟鍏冩ā鍧楁槸鍥哄畾鐨�,鍏朵腑1涓悎骞跺崟鍏�
+ //绗笁琛�,绗簲琛�,绗叚琛岀殑鍚堝苟鍒�,鍓嶄袱涓崟鍏冩ā鍧楁槸鍥哄畾鐨�,鍏朵腑1涓悎骞跺崟鍏�
CellRangeAddress region31 = new CellRangeAddress(2, 2, 2, 3);
+ CellRangeAddress region51 = new CellRangeAddress(4, 4, 2, 3);
+ CellRangeAddress region61 = new CellRangeAddress(5, 5, 2, 3);
sheet.addMergedRegion(region31);
+ sheet.addMergedRegion(region51);
+ sheet.addMergedRegion(region61);
// 鍒涘缓灞呬腑鏍峰紡
@@ -633,6 +637,9 @@
//绗洓琛屾槸鐢靛帇鍒楀拰娓╁害鍒楁爣璇�
XSSFRow row2 = sheet.createRow(2);
XSSFRow row3 = sheet.createRow(3);
+ XSSFRow row4 = sheet.createRow(4);
+ XSSFRow row5 = sheet.createRow(5);
+
row2.createCell(0).setCellValue("钃勭數姹犲彿锛�#锛�");
row2.createCell(1).setCellValue("钃勭數姹犳诞鍏呯數鍘嬪�硷紙V锛�");
row2.createCell(2).setCellValue("鏀剧數鍓嶈搫鐢垫睜寮�璺數鍘嬪�硷紙V锛�");
@@ -647,14 +654,26 @@
if(dischargeColumnCount > 0){
row2.createCell(5).setCellValue("鏀剧數0.5h钃勭數姹犵數鍘嬪�硷紙V锛�");
CellRangeAddress region33 = new CellRangeAddress(2, 2, 4, 5);
+ CellRangeAddress region53 = new CellRangeAddress(4, 4, 4, 5);
+ CellRangeAddress region63 = new CellRangeAddress(5, 5, 4, 5);
+
sheet.addMergedRegion(region33);
+ sheet.addMergedRegion(region53);
+ sheet.addMergedRegion(region63);
+
row3.createCell(4).setCellValue("0.5锛堢數鍘嬶級");
row3.createCell(5).setCellValue("0.5锛堟俯搴︼級");
columnIndex+=2;
if(dischargeColumnCount > 2){ //鍚堝苟鍗曞厓鏍间簡,鎵�浠ョ储寮�+2
row2.createCell(7).setCellValue("鏀剧數1h钃勭數姹犵數鍘嬪�硷紙V锛�");
CellRangeAddress region34 = new CellRangeAddress(2, 2, 6, 7);
+ CellRangeAddress region54 = new CellRangeAddress(4, 2, 6, 7);
+ CellRangeAddress region64 = new CellRangeAddress(5, 2, 6, 7);
+
sheet.addMergedRegion(region34);
+ sheet.addMergedRegion(region54);
+ sheet.addMergedRegion(region64);
+
row3.createCell(6).setCellValue("1锛堢數鍘嬶級");
row3.createCell(7).setCellValue("1锛堟俯搴︼級");
columnIndex+=2;
@@ -800,7 +819,7 @@
rowTemp.createCell(0).setCellValue("鎬荤數娴�");
}
else if(j<106) {
- rowTemp.createCell(0).setCellValue((j + 1) + "#");
+ rowTemp.createCell(0).setCellValue((j - 1) + "#");
}else{
if(j == 106){
rowTemp.createCell(0).setCellValue("鍗曡妭骞冲潎鐢靛帇");
@@ -819,12 +838,13 @@
if(j == 0){
rowTemp.createCell(1).setCellValue(fcVolList.get(j).getGroupVol());
rowTemp.createCell(2).setCellValue(preVolList.get(j).getGroupVol());
+ rowTemp.createCell(3);
}else if (j == 1){
rowTemp.createCell(1).setCellValue(fcVolList.get(j).getGroupCurr());
rowTemp.createCell(2).setCellValue(preVolList.get(j).getGroupCurr());
+ rowTemp.createCell(3);
}else {
rowTemp.createCell(1).setCellValue(fcVolList.get(j).getMonVol());
-
rowTemp.createCell(2).setCellValue(preVolList.get(j).getMonVol());
rowTemp.createCell(3).setCellValue(preVolList.get(j).getMonTmp());
}
@@ -838,10 +858,14 @@
//鏃堕棿鍦ㄦ祴璇曞紑濮嬫椂闂�+0.5h
dischargeCalendar.add(Calendar.MINUTE,30);
Date recordTime = dischargeCalendar.getTime();
- List<BattRealTimeDataHistory> dischargeListOne = battRTDataHisService.getRecordList(battGroupId,recordTime);
+ List<BattRealTimeDataHistory> dischargeListOne = new ArrayList<>();
+ List<BattRealTimeDataHistory> dischargeListOneOriginal = battRTDataHisService.getRecordList(battGroupId,recordTime);
//鎸夊崟浣撶紪鍙锋帓搴�,鎸夌紪鍙峰崌搴�
- dischargeListOne.sort(Comparator.comparingInt(BattRealTimeDataHistory::getMonNum));
- addStatistics(dischargeListOne,"vol");
+ dischargeListOneOriginal.sort(Comparator.comparingInt(BattRealTimeDataHistory::getMonNum));
+ addStatistics(dischargeListOneOriginal,"vol");
+ //鎬荤數娴佹�荤數鍘嬪垪鍏�
+
+
//rowTemp.createCell(5).setCellValue("鏀剧數0.5h鐢靛帇鍊硷紙V锛�:"+(j+1)+"#");
//rowTemp.createCell(6).setCellValue("鏀剧數0.5h娓╁害鍊�:"+(j+1)+"#");
rowTemp.createCell(4).setCellValue(dischargeListOne.get(j).getMonVol());
--
Gitblit v1.9.1