fix: uptime display

Author: kCn3333

src/main/java/com/kcn/hikvisionmanager/dto/CameraHealthDTO.java

@@ -3,7 +3,7 @@
 import lombok.Builder;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.time.Duration;
 
 @Data
 @Builder
@@ -15,9 +15,7 @@ public class CameraHealthDTO {
     private String status;
     private String currentDeviceTime;
 
-    public String getFormattedUptime() {
-        if (uptimeMinutes < 60) return uptimeMinutes+" minutes";
-        if ((uptimeMinutes/60) < 24) return  (uptimeMinutes/60)+ " hours, "+(uptimeMinutes%60)+" minutes";
-        return ((uptimeMinutes/60) / 24) + " days, " + (uptimeMinutes/60)%24 + " hours, " + (uptimeMinutes%3600) + " minutes";
-    }
+    private String formattedUptime;
 }
+
+

src/main/java/com/kcn/hikvisionmanager/mapper/CameraHealthMapper.java

@@ -5,6 +5,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
@@ -21,8 +22,9 @@ public CameraHealthDTO toCameraHealthDTO(DeviceStatusXml deviceStatus) {
                 .online(true)
                 .cpuUsage(deviceStatus.getCpuList().getCpu().getCpuUtilization())
                 .memoryUsage(deviceStatus.getMemoryList().getMemory().getMemoryUsage())
-                .uptimeMinutes(deviceStatus.getDeviceUpTime() / 60)
+                .uptimeMinutes(deviceStatus.getDeviceUpTime()/60)
                 .status("Connected")
+                .formattedUptime(getFormattedUptime(deviceStatus.getDeviceUpTime()/60))
                 .currentDeviceTime(parseDeviceTime(deviceStatus.getCurrentDeviceTime()))
                 .build();
     }
@@ -46,4 +48,21 @@ private String parseDeviceTime(String deviceTime) {
             return null;
         }
     }
+
+    public String getFormattedUptime(int uptimeMinutes) {
+        Duration duration = Duration.ofMinutes(uptimeMinutes);
+
+        long days = duration.toDays();
+        long hours = duration.toHoursPart();
+        long minutes = duration.toMinutesPart();
+
+        if (days == 0) {
+            if (hours == 0) {
+                return minutes + " minutes";
+            }
+            return hours + " hours, " + minutes + " minutes";
+        }
+        return days + " days, " + hours + " hours, " + minutes + " minutes";
+    }
+
 }

src/main/java/com/kcn/hikvisionmanager/util/TimeUtils.java

@@ -11,11 +11,11 @@ public class TimeUtils {
     private static final ZoneId LOCAL_ZONE = ZoneId.systemDefault();
 
 
-    // Format dla kamery (UTC)
+    // Format (UTC)
     private static final DateTimeFormatter CAMERA_FORMAT =
             DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
-    // Format dla UI (ISO Local DateTime) - TAKI JAK MASZ
+    // Format dla UI (ISO Local DateTime)
     private static final DateTimeFormatter UI_FORMAT =
             DateTimeFormatter.ISO_LOCAL_DATE_TIME; // "yyyy-MM-dd'T'HH:mm"
 
@@ -36,24 +36,4 @@ public static LocalDateTime cameraUtcToLocal(String utcString) {
         return utcTime.atZoneSameInstant(LOCAL_ZONE).toLocalDateTime();
     }
 
-    public static LocalDateTime cameraUtcToLocal(LocalDateTime utcTime) {
-        if (utcTime == null) return null;
-        return utcTime.atOffset(ZoneOffset.UTC)
-                .atZoneSameInstant(LOCAL_ZONE)
-                .toLocalDateTime();
-    }
-
-    /**
-     * Formatowanie dla wyświetlania w UI (jeśli potrzebujesz)
-     */
-    public static String formatForDisplay(LocalDateTime localDateTime) {
-        return localDateTime.format(UI_FORMAT); // Zwraca "2025-10-29T16:00"
-    }
-
-    /**
-     * Parsowanie z UI (jeśli potrzebujesz)
-     */
-    public static LocalDateTime parseFromUi(String uiDateTimeString) {
-        return LocalDateTime.parse(uiDateTimeString, UI_FORMAT);
-    }
 }

src/main/resources/templates/layout.html

@@ -110,7 +110,7 @@
             GitHub
         </a>
         <div class="app-author">
-            <span class="app-author">by <a href="https://kcn333.pl" target="_blank">kCn</a> &copy; 2025</span>
+            <span class="app-author">by <a href="https://kcn333.com" target="_blank">kCn</a> &copy; 2025</span>
         </div>
     </div>
 </footer>