xiongzhu 3 lat temu
rodzic
commit
e9f73239c5

+ 4 - 4
src/main/java/com/izouma/yags/service/RoomService.java

@@ -259,8 +259,8 @@ public class RoomService {
 
     public void uploadResult(Long userId, Long roomId, String screenShot, MultipartFile file) throws IOException {
         Room room = roomRepo.findById(roomId).orElseThrow(new BusinessException("房间无记录"));
-        if (LocalDateTime.now().isBefore(room.getStartAt().plusMinutes(10))) {
-            throw new BusinessException("比赛时间过短:10分钟");
+        if (LocalDateTime.now().isBefore(room.getStartAt().plusMinutes(5))) {
+            throw new BusinessException("比赛时间过短:5分钟");
         }
         if (room.isNeedAudit()) {
             if (!(room.getStatus() == RoomStatus.GAMING || room.getStatus() == RoomStatus.AUDIT)) {
@@ -347,8 +347,8 @@ public class RoomService {
 
     public void uploadResultNew(Long userId, Long roomId, String screenShot) throws Exception {
         Room room = roomRepo.findById(roomId).orElseThrow(new BusinessException("房间无记录"));
-        if (LocalDateTime.now().isBefore(room.getStartAt().plusMinutes(10))) {
-            throw new BusinessException("比赛时间过短:10分钟");
+        if (LocalDateTime.now().isBefore(room.getStartAt().plusMinutes(5))) {
+            throw new BusinessException("比赛时间过短:5分钟");
         }
         JoinRoom joinRoom = joinRoomRepo.findFirstByRoomIdAndUserId(roomId, userId).orElseThrow(new BusinessException("无记录"));
         if (!(room.getStatus() == RoomStatus.GAMING || room.getStatus() == RoomStatus.AUDIT)) {

+ 4 - 5
src/main/java/com/izouma/yags/web/RoomController.java

@@ -2,12 +2,12 @@ package com.izouma.yags.web;
 
 import com.izouma.yags.domain.JoinRoom;
 import com.izouma.yags.domain.Room;
+import com.izouma.yags.dto.PageQuery;
 import com.izouma.yags.dto.RoomDetail;
 import com.izouma.yags.enums.RoomStatus;
-import com.izouma.yags.service.RoomService;
-import com.izouma.yags.dto.PageQuery;
 import com.izouma.yags.exception.BusinessException;
 import com.izouma.yags.repo.RoomRepo;
+import com.izouma.yags.service.RoomService;
 import com.izouma.yags.utils.SecurityUtils;
 import com.izouma.yags.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
@@ -15,7 +15,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -94,8 +93,8 @@ public class RoomController extends BaseController {
     }
 
     @PostMapping("/uploadResult")
-    public void uploadResult(@RequestParam Long roomId, @RequestParam String screenShot, MultipartFile file) throws IOException {
-        roomService.uploadResult(SecurityUtils.getAuthenticatedUser().getId(), roomId, screenShot, file);
+    public void uploadResult(@RequestParam Long roomId, @RequestParam String screenShot) throws Exception {
+        roomService.uploadResultNew(SecurityUtils.getAuthenticatedUser().getId(), roomId, screenShot);
     }
 
     @PostMapping("/changeUrl")