时间格式转换为data

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

@@ -108,11 +108,11 @@ public class Room implements Serializable {
 
     //使用开始时间    v1.1.0添加字段
     @TableField("use_start_time")
-    private String useStartTime;
+    private Date useStartTime;
 
     //使用结束时间    v1.1.0添加字段
     @TableField("use_end_time")
-    private String useEndTime;
+    private Date useEndTime;
 
     //房间密码  v1.1.0添加字段
     @TableField("visit_password")
@@ -134,24 +134,24 @@ public class Room implements Serializable {
     private Integer roomUserId;
 
     @TableField(exist = false)
-    private List<String> useTimeList;
+    private List<Date> useTimeList;
 
-    public List<String> getUseTimeList() {
-        if(StringUtils.isNotBlank(useStartTime) && StringUtils.isNotBlank(useEndTime)){
+    public List<Date> getUseTimeList() {
+        if(useStartTime != null && useEndTime != null){
             useTimeList.add(useStartTime);
             useTimeList.add(useEndTime);
         }
         return useTimeList;
     }
 
-    public String getUseStartTime() {
+    public Date getUseStartTime() {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(0);
         }
         return useStartTime;
     }
 
-    public String getUseEndTime() {
+    public Date getUseEndTime() {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(1);
         }

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

@@ -43,12 +43,12 @@ public class RoomUser implements Serializable {
      * 使用时间
      */
     @TableField("use_start_time")
-    private String useStartTime;
+    private Date useStartTime;
     /**
      * 使用时间
      */
     @TableField("use_end_time")
-    private String useEndTime;
+    private Date useEndTime;
 
     /**
      * 房间状态 ，0 未开启，1进行中，2已关闭
@@ -68,24 +68,24 @@ public class RoomUser implements Serializable {
 
 
     @TableField(exist = false)
-    private List<String> useTimeList;
+    private List<Date> useTimeList;
 
-    public List<String> getUseTimeList() {
-        if(StringUtils.isNotBlank(useStartTime) && StringUtils.isNotBlank(useEndTime)){
+    public List<Date> getUseTimeList() {
+        if(useStartTime != null && useEndTime !=null){
             useTimeList.add(useStartTime);
             useTimeList.add(useEndTime);
         }
         return useTimeList;
     }
 
-    public String getUseStartTime() {
+    public Date getUseStartTime() {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(0);
         }
         return useStartTime;
     }
 
-    public String getUseEndTime() {
+    public Date getUseEndTime() {
         if(useTimeList !=null && useTimeList.size() >1){
             return useTimeList.get(1);
         }

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -293,8 +293,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             throw new BusinessException(ResultCode.ROOM_MISS);
         }
 
-        Date date = com.fdkankan.tk.util.DateUtil.parseTime(room.getUseEndTime());
-        if(date != null && date.getTime() <= new Date().getTime()){
+        if(room.getUseEndTime() != null && room.getUseEndTime().getTime() <= new Date().getTime()){
             throw new BusinessException(ResultCode.ROOM_END_EX);
         }
 
@@ -311,8 +310,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
         if(roomUserId != null){             //协作带看
             RoomUser roomuser = roomUserService.getById(roomUserId);
-            date = com.fdkankan.tk.util.DateUtil.parseTime(roomuser.getUseEndTime());
-            if(date != null && date.getTime() <= new Date().getTime()){
+            if(roomuser.getUseEndTime() != null && roomuser.getUseEndTime().getTime() <= new Date().getTime()){
                 throw new BusinessException(ResultCode.ROOM_END_EX);
             }
 

src/main/java/com/fdkankan/tk/task/TaskService.java

@@ -36,11 +36,10 @@ public class TaskService {
             List<Room> roomList = roomService.getRunningRoom();
             List<String> stopRoomIds = new ArrayList<>();
             for (Room room : roomList) {
-                String useEndTime = room.getUseEndTime();
-                if(useEndTime == null){
+                if(room.getUseEndTime() == null){
                     continue;
                 }
-                int comp = DateUtil.compDateStr(useEndTime, new Date());
+                int comp = DateUtil.compDateStr(room.getUseEndTime(), new Date());
                 if(comp < 0){            //房间已过期关闭
                     roomService.stopRoom(room);
                     stopRoomIds.add(room.getRoomId());
@@ -52,11 +51,10 @@ public class TaskService {
                 if(stopRoomIds.contains(roomUser.getRoomId())){
                     continue;
                 }
-                String useEndTime2 = roomUser.getUseEndTime();
-                if(useEndTime2 == null){
+                if(roomUser.getUseEndTime() == null){
                     continue;
                 }
-                int comp2 = DateUtil.compDateStr(useEndTime2, new Date());
+                int comp2 = DateUtil.compDateStr(roomUser.getUseEndTime(), new Date());
                 if(comp2 < 0){            //房间已过期关闭
                     roomUserService.stopRoom(roomUser);
                 }

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

@@ -26,6 +26,12 @@ public class DateUtil {
         }
         return  date1.getTime() > time2.getTime() ? 1 : -1;
     }
+    public static int compDateStr(Date time1, Date time2){
+        if(time1 == null){
+            return -1;
+        }
+        return  time1.getTime() > time2.getTime() ? 1 : -1;
+    }
 
     public static Date getDateByLong(String key) {
         try {