房间直播中不能删除

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

@@ -7,6 +7,7 @@ public enum ResultCode {
     PARAM_MISS(4001,"参数缺少"),
     QRCODE_MISS(4002,"获取二维码失败"),
     ROOM_MISS(4003,"房间不存在"),
+    ROOM_ING(4004,"房间直播中，不能删除！"),
     USER_NOT_LOGIN(4008,"用户未登录"),
 
     ;

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

@@ -92,7 +92,7 @@ public class Room implements Serializable {
 
     @TableField("update_time")
     private String updateTime;
-
+    //房间状态 ，0 未开启，1进行中，2已关闭
     @TableField("room_status")
     private Integer roomStatus;
 

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

@@ -99,6 +99,10 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         }
         if(param.getRoomId() != null){
             room.setUpdateTime(null);
+            Room byId = this.getById(room.getRoomId());
+            if(byId.getRoomStatus() == 1){
+                throw new BusinessException(ResultCode.ROOM_ING);
+            }
         }
         this.saveOrUpdate(room);
         roomNumService.addBatch(room.getRoomId(),param.getNumList());
@@ -108,8 +112,14 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
 
     @Override
     public void deleteById(Integer roomId) {
-        roomNumService.deleteByRoomId(roomId);
         Room room = this.getById(roomId);
+        if(room == null ){
+            throw new BusinessException(ResultCode.ROOM_MISS);
+        }
+        if(room.getRoomStatus() == 1){
+            throw new BusinessException(ResultCode.ROOM_ING);
+        }
+        roomNumService.deleteByRoomId(roomId);
         if(StringUtils.isNotBlank(room.getRoomShareUrl())){
             uploadToOssUtil.delete(room.getRoomShareUrl());
         }

src/main/resources/application.yaml

@@ -33,9 +33,9 @@ forest:
   ## 打开/关闭Forest响应内容日志（默认为 false）
   log-response-content: true
   ## 请求超时时间，单位为毫秒, 默认值为3000
-  timeout: 3000000
+  timeout: 3000
   ## 连接超时时间，单位为毫秒, 默认值为2000
-  connect-timeout: 3000000
+  connect-timeout: 3000
 
 upload:
   type: oss