File update추가

pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java

@@ -35,13 +35,11 @@ public class CnsQnaController {
     @PostMapping(value = "/insert", consumes = "multipart/form-data")
     @Tag(name = "QNA", description = "QNA 관련 API")
     @ApiOperation(value = "QnA 등록[답변추가]")
-    public ResponseEntity<QnaRSModel> insertQna(QnaInsertRQModel rq){
+    public ResponseEntity<Boolean> insertQna(QnaInsertRQModel rq){
 
-        boolean success = cnsQnaService.insertQna(rq);
+        boolean result = cnsQnaService.insertQna(rq);
 
-        QnaRSModel rs = new QnaRSModel(success);    
+        return ResponseEntity.ok().body(result);
-
-        return ResponseEntity.ok().body(rs);
     }
 
     @GetMapping("/select")
@@ -68,7 +66,7 @@ public class CnsQnaController {
     @PostMapping("/{qnaSno}/update")
     @Tag(name = "QNA", description = "QNA 관련 API")
     @ApiOperation(value = "QnA 업데이트")
-    public ResponseEntity<Boolean> updateQna(@PathVariable int qnaSno,@RequestBody QnaInsertRQModel rq){
+    public ResponseEntity<Boolean> updateQna(@PathVariable int qnaSno, QnaInsertRQModel rq){
 
         boolean result = cnsQnaService.updateQna(qnaSno, rq);
 
@@ -79,11 +77,17 @@ public class CnsQnaController {
     @Tag(name = "QNA", description = "QNA 관련 API")
     @ApiOperation(value = "QnA 삭제하기")
     public ResponseEntity<Boolean> deleteQna(@PathVariable int qnaSno){
-        log.warn("CnsFaqController - deleteQna()");
-        log.warn("rq -> {}", qnaSno);        
 
         boolean result = cnsQnaService.deleteQna(qnaSno);
 
         return ResponseEntity.ok().body(result);
     }
+
+    @GetMapping("/{qnaSno}/{fileSno}/delete")
+    public ResponseEntity<Object> deleteQnaFile(){
+        log.warn("CnsQnaController - deleteQnaFile()");
+
+
+        return ResponseEntity.ok().body(null);
+    }
 }

pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java

@@ -92,6 +92,9 @@ public class CnsQnaService {
         CnsQnaBas entity = cnsQnaBasRepository.findFirstByQnaSnoAndTargetSno(qnaSno, 0);
         if(entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND);
                 
+        List<MultipartFile> files = rq.getFiles();        
+        if(files != null && files.size() > 0) comnFileService.fileUpload(files, entity.getFileGroupNo()); // File 업로드
+
         if(rq.getCategory() != null) entity.setCategory(rq.getCategory());
         if(rq.getContent() != null) entity.setContent(rq.getContent());
         if(rq.getTitle() != null) entity.setTitle(rq.getTitle());
@@ -178,7 +181,7 @@ public class CnsQnaService {
 
         List<MultipartFile> files = rq.getFiles();
         Integer fileGroupNo = null;
-        if(files != null && files.size() > 0) fileGroupNo = comnFileService.fileUpload(files); // File 업로드
+        if(files != null && files.size() > 0) fileGroupNo = comnFileService.fileUpload(files, null); // File 업로드
 
         String userId = jwtTokenUtil.getUserIdByToken();
         

pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java

@@ -132,9 +132,7 @@ public class ComnFileService {
      * @param comFileBas
      * @return
      */
-    public List<ComFileBas> saveAll(List<ComFileBas> comFileBas){
+    public List<ComFileBas> saveAll(List<ComFileBas> comFileBas, Integer fileGroupNo){        
-        
-        int fileGroupNo = this.lastFileGroupNo();
 
         for(ComFileBas fileBas : comFileBas){
             fileBas.setFileGroupNo(fileGroupNo);
@@ -200,11 +198,11 @@ public class ComnFileService {
 
     }
 
-    public Integer fileUpload(List<MultipartFile> files){
+    public Integer fileUpload(List<MultipartFile> files, Integer fileGroupNo){
 
         if(!this.validCheck(files)) throw new CustomException(ErrorCode.NON_VALID_PARAMETER);
 
-        Integer fileGroupNo = lastFileGroupNo();
+        if(fileGroupNo == null || fileGroupNo == 0) fileGroupNo = lastFileGroupNo();
 
         // TODO : 절대경로
         String absPath = "/Users/igyeongdo/WokrSpace/";
@@ -256,7 +254,7 @@ public class ComnFileService {
             }                      
         }
                 
-        this.saveAll(comFileBas);
+        this.saveAll(comFileBas, fileGroupNo);        
 
         return fileGroupNo;
     }