1

src/main/java/com/fdkankan/tk/common/ResultCode.java

@@ -23,10 +23,11 @@ public enum ResultCode {
     WX_CONFIG_ERROR(7004,"项目未配置Wxconfig,请于数据库中配置"),
     WX_CONFIG_ERROR_2(7005,"项目配置Wxconfig,存在多个配置,请确保有且只有一个"),
 
-    FD_USER_NOT_EXIST(8001,"授权失败！此账号不存在！"),
+    FD_USER_NOT_EXIST(8001,"账号不存在，请核对后输入！"),
     ROOM_END_EX(8002,"房间设置开启时间过期"),
     ROOM_PASSWORD_ERROR(8003,"房间密码错误"),
-    ROOM_TIME_ERROR(8004,"房间协作者使用时间错误"),
+    ROOM_TIME_ERROR(8004,"未到开播时间"),
+    ROOM_PER_ERROR(8005,"不能授权给本人！"),
 
 
     ;

src/main/java/com/fdkankan/tk/controller/RoomUserController.java

@@ -1,7 +1,10 @@
 package com.fdkankan.tk.controller;
 
 
+import com.fdkankan.tk.common.ResultCode;
 import com.fdkankan.tk.common.ResultData;
+import com.fdkankan.tk.common.util.JwtUtil;
+import com.fdkankan.tk.exception.BusinessException;
 import com.fdkankan.tk.httpClient.FdKKService;
 import com.fdkankan.tk.response.RoomAddUserParam;
 import com.fdkankan.tk.service.IRoomUserService;
@@ -18,13 +21,18 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/roomUser")
-public class RoomUserController {
+public class RoomUserController extends BaseController {
 
     @Autowired
     FdKKService fdKKService;
 
     @GetMapping("/addUserCheck")
     public ResultData addUserCheck(@RequestParam(required = false) String userName){
+        String userName1 = JwtUtil.getUserName(getToken());
+        if(userName.equals(userName1)){
+            throw new BusinessException(ResultCode.ROOM_PER_ERROR);
+        }
+
         return ResultData.ok( fdKKService.checkUser(userName));
     }
 }

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

@@ -312,6 +312,10 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
             throw new BusinessException(ResultCode.ROOM_MISS);
         }
 
+        if(room.getUseStartTime() != null && room.getUseStartTime().getTime() > new Date().getTime()){
+            throw new BusinessException(ResultCode.ROOM_TIME_ERROR);
+        }
+
         if(room.getUseEndTime() != null && room.getUseEndTime().getTime() <= new Date().getTime()){
             throw new BusinessException(ResultCode.ROOM_END_EX);
         }
@@ -375,7 +379,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     @Override
     public List<Room> getRunningRoom() {
         LambdaQueryWrapper<Room> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Room::getRoomStatus,1);
+        wrapper.in(Room::getRoomStatus,0,1);
         return this.list(wrapper);
     }
 

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

@@ -46,19 +46,19 @@ public class TaskService {
                 }
             }
 
-            List<RoomUser> roomUserList = roomUserService.getRunningRoom();
-            for (RoomUser roomUser : roomUserList) {
-                if(stopRoomIds.contains(roomUser.getRoomId())){
-                    continue;
-                }
-                if(roomUser.getUseEndTime() == null){
-                    continue;
-                }
-                int comp2 = DateUtil.compDateStr(roomUser.getUseEndTime(), new Date());
-                if(comp2 < 0){            //房间已过期关闭
-                    roomUserService.stopRoom(roomUser);
-                }
-            }
+//            List<RoomUser> roomUserList = roomUserService.getRunningRoom();
+//            for (RoomUser roomUser : roomUserList) {
+//                if(stopRoomIds.contains(roomUser.getRoomId())){
+//                    continue;
+//                }
+//                if(roomUser.getUseEndTime() == null){
+//                    continue;
+//                }
+//                int comp2 = DateUtil.compDateStr(roomUser.getUseEndTime(), new Date());
+//                if(comp2 < 0){            //房间已过期关闭
+//                    roomUserService.stopRoom(roomUser);
+//                }
+//            }
 
         }catch (Exception e){