|
|
@@ -1,7 +1,9 @@
|
|
|
package com.example.ili_web.board.service;
|
|
|
|
|
|
import com.example.ili_web.board.domain.Board;
|
|
|
+import com.example.ili_web.board.domain.BoardFile;
|
|
|
import com.example.ili_web.board.dto.*;
|
|
|
+import com.example.ili_web.board.repository.BoardFileRepository;
|
|
|
import com.example.ili_web.board.repository.BoardRepository;
|
|
|
import com.example.ili_web.board.repository.BoardRepositoryDsl;
|
|
|
import com.example.ili_web.main.response.CheckDupleRes;
|
|
|
@@ -22,6 +24,7 @@ import java.io.IOException;
|
|
|
import java.nio.file.Files;
|
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
import static java.net.http.HttpClient.*;
|
|
|
@@ -31,6 +34,7 @@ import static java.net.http.HttpClient.*;
|
|
|
@Slf4j
|
|
|
public class BoardService {
|
|
|
private final BoardRepository repository;
|
|
|
+ private final BoardFileRepository fileRepository;
|
|
|
private final BoardRepositoryDsl boardDsl;
|
|
|
@Value("${multipart.file.storage.win}")
|
|
|
private String fileStorageWindow;
|
|
|
@@ -50,12 +54,7 @@ public class BoardService {
|
|
|
int pageSize = 10;
|
|
|
req.setOffset((currentPage - 1) * pageSize);
|
|
|
req.setLimit(pageSize);
|
|
|
- if (req.getType().equals("NT")) {
|
|
|
- return boardDsl.boardList(req);
|
|
|
- } else {
|
|
|
- return null;
|
|
|
- }
|
|
|
-
|
|
|
+ return boardDsl.boardList(req);
|
|
|
}
|
|
|
|
|
|
public SuccessRes sendSms(SendSmsReq req) {
|
|
|
@@ -99,13 +98,36 @@ public class BoardService {
|
|
|
|
|
|
@Transactional
|
|
|
public void insertBoard(BoardInfoReq req, List<MultipartFile> file) throws IOException {
|
|
|
+ // BOARD 테이블 저장
|
|
|
Board board = new Board(req);
|
|
|
repository.save(board);
|
|
|
+
|
|
|
+ List<BoardFileDTO> fileList = new ArrayList<>();
|
|
|
+ for (int i = 0; i < file.size(); i++) {
|
|
|
+ BoardFileDTO dto = new BoardFileDTO();
|
|
|
+ dto.setFilePath("/"+req.getType()+"/Board" + board.getId()+"/"+file.get(i).getOriginalFilename());
|
|
|
+ dto.setBoardId(board);
|
|
|
+ fileList.add(dto);
|
|
|
+ }
|
|
|
+ insertFile(fileList);
|
|
|
+
|
|
|
String osPath = osProperty();
|
|
|
if (!file.isEmpty()) {
|
|
|
String filePath = osPath + "/" + req.getType() + "/Board" + board.getId()+"/";
|
|
|
fileUpload(filePath, file);
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @Transactional
|
|
|
+ public void insertFile(List<BoardFileDTO> fileList) {
|
|
|
+ List<BoardFile> fList = new ArrayList<>();
|
|
|
+ for (BoardFileDTO dto : fileList) {
|
|
|
+ BoardFile file = new BoardFile(dto);
|
|
|
+ fList.add(file);
|
|
|
+ }
|
|
|
+ log.info(fList.get(0).getFilePath());
|
|
|
+ fileRepository.saveAll(fList);
|
|
|
}
|
|
|
|
|
|
public String osProperty() {
|