From e200d1dba75e91314240bffb404dbfc56019a393 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Mon, 26 Jan 2026 22:07:07 +0800 Subject: [PATCH] =?UTF-8?q?latest=5F=E6=98=AF=E7=A7=92ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/back/easyexcel/SecondsToHMSConverter.java | 2 ++ .../back/service/impl/DeviceDataBaStatusServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/SecondsToHMSConverter.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/SecondsToHMSConverter.java index 2e85b4d..62fe18d 100644 --- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/SecondsToHMSConverter.java +++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/SecondsToHMSConverter.java @@ -28,6 +28,8 @@ public class SecondsToHMSConverter implements Converter { if (null == value) return ""; + value = value / 1000; + long hours = value / 3600; long minutes = (value % 3600) / 60; long seconds = value % 60; diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java index c9a071e..027626b 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java @@ -163,7 +163,7 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService if (0 == data.getStopRun()) { data.setContinuousRunningTimeStr(SecondsToHMSConverter.covertSeconds(data.getContinuousRunningTime())); } else if (StringUtils.isNotBlank(data.getLatestTs()) && currentTs >= Long.parseLong(data.getLatestTs())) { - long diff = currentTs/1000 - Long.parseLong(data.getLatestTs()); + long diff = currentTs - Long.parseLong(data.getLatestTs()); data.setContinuousRunningTimeStr(SecondsToHMSConverter.covertSeconds(diff)); } }