From 30997c6371023d0d197a5a16d317c33a0832f316 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 17 五月 2023 16:16:08 +0800
Subject: [PATCH] 文件解析告警数据导出

---
 src/main/java/com/whyc/service/ExcelExportService.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index de1d6b0..5143dc3 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;
         //鎻掑叆鍥剧墖
@@ -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;
         //鍥剧墖鍏冪礌
@@ -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));

--
Gitblit v1.9.1