diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java index 70fb709..bd2ac20 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java +++ b/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 insertQna(QnaInsertRQModel rq){ + public ResponseEntity insertQna(QnaInsertRQModel rq){ - boolean success = cnsQnaService.insertQna(rq); + boolean result = cnsQnaService.insertQna(rq); - QnaRSModel rs = new QnaRSModel(success); - - return ResponseEntity.ok().body(rs); + return ResponseEntity.ok().body(result); } @GetMapping("/select") @@ -68,7 +66,7 @@ public class CnsQnaController { @PostMapping("/{qnaSno}/update") @Tag(name = "QNA", description = "QNA 관련 API") @ApiOperation(value = "QnA 업데이트") - public ResponseEntity updateQna(@PathVariable int qnaSno,@RequestBody QnaInsertRQModel rq){ + public ResponseEntity 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 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 deleteQnaFile(){ + log.warn("CnsQnaController - deleteQnaFile()"); + + + return ResponseEntity.ok().body(null); + } } diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java index ac08534..2fbe9f6 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java @@ -91,7 +91,10 @@ public class CnsQnaService { CnsQnaBas entity = cnsQnaBasRepository.findFirstByQnaSnoAndTargetSno(qnaSno, 0); if(entity == null) throw new CustomException(ErrorCode.DATA_NOTFIND); - + + List 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 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(); diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java index 069412b..4dfd56a 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/service/ComnFileService.java @@ -125,16 +125,14 @@ public class ComnFileService { comFileBas.setFileGroupNo(fileGroupNo); return comFileBasRepository.save(comFileBas); - } + } /** * 다건 DB 인서트, 최신데이터 가져온 후 Group NO 1추가함 * @param comFileBas * @return */ - public List saveAll(List comFileBas){ - - int fileGroupNo = this.lastFileGroupNo(); + public List saveAll(List comFileBas, Integer fileGroupNo){ for(ComFileBas fileBas : comFileBas){ fileBas.setFileGroupNo(fileGroupNo); @@ -200,11 +198,11 @@ public class ComnFileService { } - public Integer fileUpload(List files){ + public Integer fileUpload(List 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/"; @@ -255,8 +253,8 @@ public class ComnFileService { e.printStackTrace(); } } - - this.saveAll(comFileBas); + + this.saveAll(comFileBas, fileGroupNo); return fileGroupNo; }