|
@@ -2,12 +2,12 @@ package com.izouma.yags.web;
|
|
|
|
|
|
|
|
import com.izouma.yags.domain.JoinRoom;
|
|
import com.izouma.yags.domain.JoinRoom;
|
|
|
import com.izouma.yags.domain.Room;
|
|
import com.izouma.yags.domain.Room;
|
|
|
|
|
+import com.izouma.yags.dto.PageQuery;
|
|
|
import com.izouma.yags.dto.RoomDetail;
|
|
import com.izouma.yags.dto.RoomDetail;
|
|
|
import com.izouma.yags.enums.RoomStatus;
|
|
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.exception.BusinessException;
|
|
|
import com.izouma.yags.repo.RoomRepo;
|
|
import com.izouma.yags.repo.RoomRepo;
|
|
|
|
|
+import com.izouma.yags.service.RoomService;
|
|
|
import com.izouma.yags.utils.SecurityUtils;
|
|
import com.izouma.yags.utils.SecurityUtils;
|
|
|
import com.izouma.yags.utils.excel.ExcelUtils;
|
|
import com.izouma.yags.utils.excel.ExcelUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
@@ -15,7 +15,6 @@ import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
@@ -94,8 +93,8 @@ public class RoomController extends BaseController {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@PostMapping("/uploadResult")
|
|
@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")
|
|
@PostMapping("/changeUrl")
|