From 24c81f24ac0f82f9d1a50cf76d16565b96ffda79 Mon Sep 17 00:00:00 2001
From: xiaojinfei <378266566@qq.com>
Date: Sun, 4 Jan 2026 11:13:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=9B=86=E4=B8=AD=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/warn/vo/WarnRespVO.java  | 26 +++++++++++++++--
 .../alert/dal/dataobject/warn/WarnDO.java     |  7 ++---
 .../alert/service/warn/WarnServiceImpl.java   | 29 ++++++++++---------
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
index 841bf60..803fbf0 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
@@ -85,6 +85,28 @@ public class WarnRespVO {
     private String systemName;
     private String  unitName;
 
+    /**
+     * 预警时间
+     *
+     *
+     */
+
+    @Schema(description = "预警时间", example = "2025-01-01 12:00:00")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime insertTime;
+//    /**
+//     * 当前时间
+//     *
+//     *
+//     */
+//
+//    @Schema(description = "当前时间", example = "2025-01-01 12:00:00")
+//    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+//    @JsonSerialize(using = LocalDateTimeSerializer.class)
+//    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    private LocalDateTime currentTime;
     /**
      * 创建者-名称
      *
@@ -129,6 +151,6 @@ public class WarnRespVO {
     @Schema(description = "时间差", example = "id")
     private Long timeDiff;
     //    时间差=当前时间-创建时间（单位：秒）--时间字符串
-    @Schema(description = "持续时长", example = "id")
-    private String timeDiffStr;
+//    @Schema(description = "持续时长", example = "id")
+//    private String timeDiffStr;
 }
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
index 200a1c7..5ab8bbf 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
@@ -72,13 +72,10 @@ public class WarnDO extends BaseDO {
     private String lowlimit;
 
     private String systemName;
-
-    private String createName;
-    private String updateName;
-
+//预警时间
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)
-    private LocalDateTime createTime;
+    private LocalDateTime insertTime;
     private String  unitName;
     private String  systemTypeName;
     private Long unitId;
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
index e750506..09a0775 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
@@ -162,19 +162,22 @@ public class WarnServiceImpl implements WarnService {
                     respVO.setLowlimit(originalLowlimit);
                 }
             }
-            //计算当前时间与create_time的时间差（单位：秒）
-            long totalSeconds = ChronoUnit.SECONDS.between(warnDO.getCreateTime(), LocalDateTime.now());
-            respVO.setTimeDiff(totalSeconds);
-            // 转换为天、时、分、秒
-            long days = totalSeconds / 86400; // 1天 = 86400秒
-            long remainingSeconds = totalSeconds % 86400;
-            long hours = remainingSeconds / 3600; // 1小时 = 3600秒
-            remainingSeconds %= 3600;
-            long minutes = remainingSeconds / 60; // 1分钟 = 60秒
-            long seconds = remainingSeconds % 60;
-            // 格式化时间差字符串（例如：1天2小时3分4秒）
-            String timeDiffStr = String.format("%d天%d小时%d分%d秒", days, hours, minutes, seconds);
-            respVO.setTimeDiffStr(timeDiffStr);
+
+            //当前时间
+//            respVO.setCurrentTime(LocalDateTime.now());
+//            //计算当前时间与insert_time的时间差（单位：秒）
+//            long totalSeconds = ChronoUnit.SECONDS.between(warnDO.getInsertTime(), LocalDateTime.now());
+//            respVO.setTimeDiff(totalSeconds);
+//            // 转换为天、时、分、秒
+//            long days = totalSeconds / 86400; // 1天 = 86400秒
+//            long remainingSeconds = totalSeconds % 86400;
+//            long hours = remainingSeconds / 3600; // 1小时 = 3600秒
+//            remainingSeconds %= 3600;
+//            long minutes = remainingSeconds / 60; // 1分钟 = 60秒
+//            long seconds = remainingSeconds % 60;
+//            // 格式化时间差字符串（例如：1天2小时3分4秒）
+//            String timeDiffStr = String.format("%d天%d小时%d分%d秒", days, hours, minutes, seconds);
+//            respVO.setTimeDiffStr(timeDiffStr);
             return respVO;
         }).collect(Collectors.toList());