diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/controller/CnsFaqController.java b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/controller/CnsFaqController.java index d675fd7..4d2b4c6 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/controller/CnsFaqController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/controller/CnsFaqController.java @@ -1,13 +1,69 @@ package com.palnet.biz.api.cns.faq.controller; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.palnet.biz.api.cns.faq.model.FaqBasModel; +import com.palnet.biz.api.cns.faq.model.FaqInsertRQModel; +import com.palnet.biz.api.cns.qna.service.CnsQnaService; + +import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -@RestController @Slf4j +@RestController @RequiredArgsConstructor +@RequestMapping("/api/cns/qna") +@Tag(name = "QNA", description = "QNA 관련 API") public class CnsFaqController { + + private final CnsQnaService cnsQnaService; + + @PostMapping(value = "/insert") + @Tag(name = "QNA", description = "QNA 관련 API") + @ApiOperation(value = "QnA 등록[답변추가]") + public ResponseEntity insertQna(@RequestBody FaqInsertRQModel rq){ + log.warn("CnsFaqController - insertQna()"); + log.warn("rq -> {}", rq); + + + return ResponseEntity.ok().body(null); + } + + @GetMapping("/select") + public ResponseEntity selectQna(@RequestBody FaqBasModel rq){ + log.warn("CnsFaqController - selectQna()"); + log.warn("rq -> {}", rq); + + + return ResponseEntity.ok().body(null); + } + + @PostMapping("/update") + public ResponseEntity updateQna(@RequestBody FaqBasModel rq){ + log.warn("CnsFaqController - updateQna()"); + log.warn("rq -> {}", rq); + + + return ResponseEntity.ok().body(null); + } + + @GetMapping("/delete") + public ResponseEntity deleteQna(@RequestBody FaqBasModel rq){ + log.warn("CnsFaqController - deleteQna()"); + log.warn("rq -> {}", rq); + + + return ResponseEntity.ok().body(null); + } + + + } diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqBasModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqBasModel.java new file mode 100644 index 0000000..6680c93 --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqBasModel.java @@ -0,0 +1,36 @@ +package com.palnet.biz.api.cns.faq.model; + +import java.time.Instant; + +import lombok.Data; + +@Data +public class FaqBasModel { + + private int qnaSno; + + private int targetSno; + + private String category; + + private String title; + + private String content; + + private int fileGroupNo; + + private String expsrYn; + + private String delYn; + + private int viewCnt; + + private String createUserId; + + private Instant createDt; + + private String updateUserId; + + private Instant updateDt; + +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqInsertRQModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqInsertRQModel.java new file mode 100644 index 0000000..f2129ff --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqInsertRQModel.java @@ -0,0 +1,21 @@ +package com.palnet.biz.api.cns.faq.model; + +import java.util.List; + +import org.springframework.web.multipart.MultipartFile; + +import lombok.Data; + +@Data +public class FaqInsertRQModel { + + private int targetSno; // 상위 파일 번호 + + private String category; + + private String title; + + private String content; + + private List files; +} diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqRQModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqRQModel.java deleted file mode 100644 index 9f47071..0000000 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqRQModel.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.palnet.biz.api.cns.faq.model; - -import lombok.Data; - -@Data -public class FaqRQModel { - -} diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/file/constant/ExtensionConstant.java b/pav-server/src/main/java/com/palnet/biz/api/comn/file/constant/ExtensionConstant.java new file mode 100644 index 0000000..0b74066 --- /dev/null +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/file/constant/ExtensionConstant.java @@ -0,0 +1,20 @@ +package com.palnet.biz.api.comn.file.constant; + +public enum ExtensionConstant { + JPG(".jpg"), + PNG(".png"), + JPEG(".jpeg"), + PDF(".pdf"), + XLSX(".xlsx"), + XLS(".xls"), + HWPX(".hwpx"), + HWP(".hwp"), + + ; + + public final String extension; + + private ExtensionConstant(String extension) { + this.extension = extension; + } +} 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 8c5a86a..9faa543 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 @@ -1,6 +1,7 @@ package com.palnet.biz.api.comn.file.service; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; +import com.palnet.biz.api.comn.file.constant.ExtensionConstant; import com.palnet.biz.api.comn.file.model.LaancPdfModel; import com.palnet.biz.jpa.entity.ComFileBas; import com.palnet.biz.jpa.repository.com.ComFileBasRepository; @@ -30,9 +31,7 @@ public class ComnFileService { private final PdfUtils pdfUtils; private final JwtTokenUtil jwtTokenUtil; - private final ComFileBasRepository comFileBasRepository; - - private final String FILE_EXTENSION = ".pdf"; + private final ComFileBasRepository comFileBasRepository; /** * 파일명 만들기, 앞에 기본으로 금일 날짜있음 @@ -53,7 +52,9 @@ public class ComnFileService { .append(name); } - result.append(this.FILE_EXTENSION); + + + result.append(ExtensionConstant.PDF.extension); return result.toString(); }