1

src/main/java/com/fdkankan/tk/entity/Room.java

@@ -13,6 +13,7 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.tk.typehandle.JsonArrayTypeHandler;
+import com.fdkankan.tk.util.Dateutils;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -108,12 +109,10 @@ public class Room implements Serializable {
 
     //使用开始时间    v1.1.0添加字段
     @TableField("use_start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date useStartTime;
 
     //使用结束时间    v1.1.0添加字段
     @TableField("use_end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date useEndTime;
 
     //房间密码  v1.1.0添加字段
@@ -176,6 +175,9 @@ public class Room implements Serializable {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(0);
         }
+        if(useStartTime == null){
+            return new Date();
+        }
         return useStartTime;
     }
 
@@ -183,6 +185,9 @@ public class Room implements Serializable {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(1);
         }
+        if(useEndTime == null){
+            return  Dateutils.getHoursTime(new Date());
+        }
         return useEndTime;
     }
 }

src/main/java/com/fdkankan/tk/util/Dateutils.java

@@ -175,4 +175,10 @@ public class Dateutils {
        return DateUtil.between(useStartTime, useEndTime, dateUnit);
     }
 
+    public static Date getHoursTime(Date date){
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR, 1);
+        return calendar.getTime();
+    }
 }