From edb3a21777bc1a109500d24f29b03d09bfbccafa Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Thu, 11 Jan 2024 09:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MQ=E6=B6=88=E6=81=AF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zcloud/entity/PageData.java | 2 +-
 src/main/java/com/zcloud/util/MqUtil.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zcloud/entity/PageData.java b/src/main/java/com/zcloud/entity/PageData.java
index 19853ad..2fee103 100644
--- a/src/main/java/com/zcloud/entity/PageData.java
+++ b/src/main/java/com/zcloud/entity/PageData.java
@@ -64,7 +64,7 @@ public class PageData extends HashMap<Object, Object> implements Map<Object, Obj
 	}
 
 	public String getString(Object key) {
-		return get(key) == null ? "" : get(key).toString().trim();
+		return get(key) == null ? null : get(key).toString().trim();
 	}
 
 	@Override
diff --git a/src/main/java/com/zcloud/util/MqUtil.java b/src/main/java/com/zcloud/util/MqUtil.java
index 725ea04..4b209fc 100644
--- a/src/main/java/com/zcloud/util/MqUtil.java
+++ b/src/main/java/com/zcloud/util/MqUtil.java
@@ -9,7 +9,7 @@ public class MqUtil {
     private final static SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
 
     public static Integer analysisTime(String time) throws Exception{
-        Date agreed_date = timeFormat.parse(time);
+        Date agreed_date = timeFormat.parse(time.replaceAll("/","-"));
         long time_difference = agreed_date.getTime() - new Date().getTime();
         if (time_difference < 0){
             return 0;