From 93bef5c0ea596242fb18018c86c9018cabcf3298 Mon Sep 17 00:00:00 2001
From: lifangliang <fangliang.li@jmalltech.com>
Date: Fri, 29 Aug 2025 15:18:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../printserver/main/PrintController.java      |  9 ++++++++-
 .../printserver/main/domain/PrintTask.java     | 18 +++++++++++++++---
 .../main/service/PrintQueueService.java        | 18 +++++++++++++++---
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/goeing/printserver/main/PrintController.java b/src/main/java/com/goeing/printserver/main/PrintController.java
index cebb3ba..f6d7c62 100644
--- a/src/main/java/com/goeing/printserver/main/PrintController.java
+++ b/src/main/java/com/goeing/printserver/main/PrintController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 // 使用完全限定名称避免与自定义PrintService接口冲突
 import java.awt.print.PrinterJob;
 import java.io.File;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -144,7 +145,13 @@ public class PrintController implements PrintService {
                     taskMap.put("fileName", extractFileName(task.getFileUrl()));
                     taskMap.put("printer", task.getPrinter());
                     taskMap.put("status", task.getStatus());
-                    taskMap.put("createTime", task.getQueuedTime());
+                    // 格式化创建时间为 yyyy-MM-dd HH:mm:ss
+                    if (task.getQueuedTime() != null) {
+                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                        taskMap.put("createTime", task.getQueuedTime().format(formatter));
+                    } else {
+                        taskMap.put("createTime", "N/A");
+                    }
                     taskMap.put("fileUrl", task.getFileUrl());
                     return taskMap;
                 })
diff --git a/src/main/java/com/goeing/printserver/main/domain/PrintTask.java b/src/main/java/com/goeing/printserver/main/domain/PrintTask.java
index 0da0783..ab47415 100644
--- a/src/main/java/com/goeing/printserver/main/domain/PrintTask.java
+++ b/src/main/java/com/goeing/printserver/main/domain/PrintTask.java
@@ -4,6 +4,7 @@ import com.goeing.printserver.main.domain.bo.PrintOption;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -40,16 +41,27 @@ public class PrintTask {
      */
     public Map<String, Object> toMap() {
         Map<String, Object> map = new HashMap<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        
         map.put("fileUrl", fileUrl);
         map.put("printerName", printer);
         map.put("status", status);
-        map.put("queuedTime", queuedTime);
+        
+        // 格式化时间字段
+        if (queuedTime != null) {
+            map.put("queuedTime", queuedTime.format(formatter));
+        } else {
+            map.put("queuedTime", "N/A");
+        }
+        
         if (startTime != null) {
-            map.put("startTime", startTime);
+            map.put("startTime", startTime.format(formatter));
         }
+        
         if (endTime != null) {
-            map.put("endTime", endTime);
+            map.put("endTime", endTime.format(formatter));
         }
+        
         return map;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java b/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java
index ee78438..e168d4f 100644
--- a/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java
+++ b/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -121,16 +122,27 @@ public class PrintQueueService {
         
         public Map<String, Object> toMap() {
             Map<String, Object> map = new HashMap<>();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            
             map.put("fileUrl", printRequest.getFileUrl());
             map.put("printerName", printRequest.getPrinterName());
             map.put("status", status);
-            map.put("queuedTime", queuedTime);
+            
+            // 格式化时间字段
+            if (queuedTime != null) {
+                map.put("queuedTime", queuedTime.format(formatter));
+            } else {
+                map.put("queuedTime", "N/A");
+            }
+            
             if (startTime != null) {
-                map.put("startTime", startTime);
+                map.put("startTime", startTime.format(formatter));
             }
+            
             if (endTime != null) {
-                map.put("endTime", endTime);
+                map.put("endTime", endTime.format(formatter));
             }
+            
             return map;
         }
     }