From 056497f1a33daa943fd498c89a3558c0bc8693cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Mon, 1 Aug 2022 15:44:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E4=B8=BB=E8=A6=81=E6=98=AFTimestamp=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/storeroom/utils/TimestampTool.java | 36 +++++++++++++++++++ .../service/impl/ThirdApiServiceImpl.java | 4 +-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/storeroom/utils/TimestampTool.java b/common/src/main/java/com/storeroom/utils/TimestampTool.java index 7972462..95695f9 100644 --- a/common/src/main/java/com/storeroom/utils/TimestampTool.java +++ b/common/src/main/java/com/storeroom/utils/TimestampTool.java @@ -1,6 +1,42 @@ package com.storeroom.utils; +import java.sql.Timestamp; +import java.util.Date; + public class TimestampTool { + /** + * 字符串转timestamp + * @param time / + * @return / + */ + public static Timestamp string2sqlTimestamp(String time){ + Timestamp timestamp = Timestamp.valueOf(time); + System.out.println(timestamp.toString()); + return timestamp; + } + + /** + * timestamp 转字符串 + * @param timestamp / + * @return / + */ + public static String sqlTimestamp2string(Timestamp timestamp){ + return timestamp.toString(); + } + /** +  * compare two util.Date ,if date1 is earlier return -1,equal return 0, later return 1 +  */ + public static int compareDate(Date date1, Date date2){ + int result = date1.compareTo(date2); + return result; + } + /** +  * compare two sql.Timestamp ,if timestamp1 is earlier return -1,equal return 0, later return 1 +  */ + public static int compareTimestamp(Timestamp timestamp1,Timestamp timestamp2){ + int result = timestamp1.compareTo(timestamp2); + return result; + } } diff --git a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java index 25a920d..549c826 100644 --- a/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java +++ b/storeroom/src/main/java/com/storeroom/modules/storeroom3d/service/impl/ThirdApiServiceImpl.java @@ -11,6 +11,7 @@ import com.storeroom.modules.storeroom3d.service.dto.RealTimeDataDto; import com.storeroom.utils.FastjsonUtils; import com.storeroom.utils.HttpUtils; import com.storeroom.utils.RedisUtils; +import com.storeroom.utils.TimestampTool; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import okhttp3.*; @@ -127,8 +128,7 @@ public class ThirdApiServiceImpl implements ThirdApiService { getCurAlarmDto.setArea_name(jsonObject.get("area_name") == null ? null : jsonObject.get("area_name").toString()); getCurAlarmDto.setEvent_id(jsonObject.get("event_id") == null ? null : jsonObject.get("event_id").toString()); getCurAlarmDto.setEvent_level_name(jsonObject.get("event_level_name") == null ? null : jsonObject.get("event_level_name").toString()); - Timestamp ts = Timestamp.valueOf(jsonObject.get("alarm_time") == null ? null : jsonObject.get("alarm_time").toString()); - getCurAlarmDto.setAlarm_time(ts); + getCurAlarmDto.setAlarm_time(TimestampTool.string2sqlTimestamp(jsonObject.get("alarm_time") == null ? null : jsonObject.get("alarm_time").toString())); getCurAlarmDto.setCategory_name(jsonObject.get("category_name") == null ? null : jsonObject.get("category_name").toString()); getCurAlarmDto.setAlarm_value_descript(jsonObject.get("alarm_value_descript") == null ? null : jsonObject.get("alarm_value_descript").toString()); getCurAlarmDto.setDevice_name(jsonObject.get("device_name") == null ? null : jsonObject.get("device_name").toString());