From 75364046ec0b3432733b56042e3de2da7831d8a8 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期四, 18 五月 2023 10:03:43 +0800
Subject: [PATCH] 配置
---
src/main/java/com/whyc/service/ExcelExportService.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index 3818d83..fefe59e 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -93,7 +93,7 @@
rowNumSheet++;
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細" + formartDate(capState.StartDT.time,"yyyy-MM-dd HH:mm:ss"));
- sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�" + capState.Test_Time.hour+":"+capState.Test_Time.minute+":"+capState.Test_Time.second);
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�" + getHHMMSS(capState.Test_Time.hour,capState.Test_Time.minute,capState.Test_Time.second));
rowNumSheet += 4;
//鎻掑叆鍥剧墖
@@ -104,7 +104,7 @@
sheet.createRow(rowNumSheet - 1);
sheet.getRow(rowNumSheet - 1).createCell(0).setCellValue(picName[i]);
//rowNum++;
- XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 512, 255, (short) 0, rowNumSheet, (short) 10, rowNumSheet + 27);
+ XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 512, 255, (short) 0, rowNumSheet, (short) 10, rowNumSheet + 24);
anchor.setAnchorType(ClientAnchor.AnchorType.DONT_MOVE_AND_RESIZE);
patriarch.createPicture(anchor, wb.addPicture(bytes.get(picNum), XSSFWorkbook.PICTURE_TYPE_PNG)).resize(1);
picNum++;
@@ -132,7 +132,7 @@
for (int i = 0; i < list.size(); i++) {
sheet1.createRow(rowNum); //鍒涘缓琛�
Fbs5100FbsData fbsData = list.get(i);
- sheet1.getRow(rowNum).createCell(0).setCellValue(fbsData.testTime.hour+":"+fbsData.testTime.minute+":"+fbsData.testTime.second);
+ sheet1.getRow(rowNum).createCell(0).setCellValue(getHHMMSS(fbsData.testTime.hour,fbsData.testTime.minute,fbsData.testTime.second));
sheet1.getRow(rowNum).createCell(1).setCellValue(String.valueOf(fbsData.muxianvol_discharge));
sheet1.getRow(rowNum).createCell(2).setCellValue(String.valueOf(fbsData.muxianvol_charge));
sheet1.getRow(rowNum).createCell(3).setCellValue(String.valueOf(fbsData.boostDCDC_OutVol));
@@ -163,6 +163,27 @@
//灏嗘棩鏈熸牸寮忚浆鎹㈡垚鎸囧畾鐨勫瓧绗︿覆鏍煎紡
public static String formartDate(Date date, String str){
return new SimpleDateFormat(str).format(date);
+ }
+
+ //鑾峰彇鏍囧噯鏍煎紡鏃堕棿
+ public static String getHHMMSS(int hour,int minute,int second){
+ String time="";
+ if(hour<10){
+ time+="0"+hour;
+ }else{
+ time+=""+hour;
+ }
+ if(minute<10){
+ time+=":"+"0"+minute;
+ }else{
+ time+=":"+minute;
+ }
+ if(second<10){
+ time+=":"+"0"+second;
+ }else{
+ time+=":"+second;
+ }
+ return time;
}
public String[] getRowName(String bcp){
if (bcp.equals("bcp")){
@@ -253,7 +274,7 @@
rowNumSheet++;
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("娴嬭瘯寮�濮嬫椂闂达細" + formartDate(chargeState.StartDT.time,"yyyy-MM-dd HH:mm:ss"));
- sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�" + chargeState.Test_Time.hour+":"+chargeState.Test_Time.minute+":"+chargeState.Test_Time.second);
+ sheet.getRow(rowNumSheet).createCell(1).setCellValue("娴嬭瘯鏃堕暱锛�" + getHHMMSS(chargeState.Test_Time.hour,chargeState.Test_Time.minute,chargeState.Test_Time.second));
rowNumSheet += 4;
//鍥剧墖鍏冪礌
@@ -266,7 +287,7 @@
sheet.createRow(rowNumSheet-1);
sheet.getRow(rowNumSheet-1).createCell(0).setCellValue(picName[i]);
//rowNum++;
- XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 512, 255,(short) 0, rowNumSheet, (short) 10, rowNumSheet+27);
+ XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 512, 255,(short) 0, rowNumSheet, (short) 10, rowNumSheet+24);
anchor.setAnchorType(ClientAnchor.AnchorType.DONT_MOVE_AND_RESIZE);
patriarch.createPicture(anchor,wb.addPicture(bytes.get(picNum),XSSFWorkbook.PICTURE_TYPE_PNG)).resize(1);
picNum ++;
@@ -293,7 +314,7 @@
for (int i = 0; i < list.size(); i++) {
sheet1.createRow(rowNum); //鍒涘缓琛�
Fbs5100FbsData fbsData = list.get(i);
- sheet1.getRow(rowNum).createCell(0).setCellValue(fbsData.testTime.hour+":"+fbsData.testTime.minute+":"+fbsData.testTime.second);
+ sheet1.getRow(rowNum).createCell(0).setCellValue(getHHMMSS(fbsData.testTime.hour,fbsData.testTime.minute,fbsData.testTime.second));
sheet1.getRow(rowNum).createCell(1).setCellValue(String.valueOf(fbsData.muxianvol_discharge));
sheet1.getRow(rowNum).createCell(2).setCellValue(String.valueOf(fbsData.muxianvol_charge));
sheet1.getRow(rowNum).createCell(3).setCellValue(String.valueOf(fbsData.boostDCDC_OutVol));
@@ -330,7 +351,6 @@
List<Fbs5100Alarm> list=data.alarms;
//褰撳墠鏃ユ湡
String excelName ="alm-"+new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-
XSSFWorkbook wb = new XSSFWorkbook();
XSSFSheet sheet = wb.createSheet("鏁版嵁鎬昏〃");
int rowNumSheet = 0;
@@ -345,10 +365,10 @@
sheet.createRow(rowNumSheet);
sheet.getRow(rowNumSheet).createCell(0).setCellValue("浜ゆ祦鐢靛帇涓婇檺鍊�:"+alarmParam.AC_VOL_H);
sheet.getRow(rowNumSheet).createCell(1).setCellValue("浜ゆ祦鐢靛帇涓嬮檺鍊�:"+alarmParam.AC_VOL_L);
- rowNumSheet+=4;
+ rowNumSheet++;
//浠庢枃浠朵腑鑾峰彇鏁版嵁
- String testName="娴嬭瘯鏁版嵁";
+ String testName="娴嬭瘯鏁版嵁:";
//鎶ご
sheet.createRow(rowNumSheet).createCell(0).setCellValue(testName);
rowNumSheet++;
--
Gitblit v1.9.1