Class 정리

pav-server/src/main/java/com/palnet/biz/api/cns/faq/controller/CnsFaqController.java

@@ -7,8 +7,8 @@ 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.qna.model.QnaBasModel;
-import com.palnet.biz.api.cns.faq.model.FaqInsertRQModel;
+import com.palnet.biz.api.cns.qna.model.QnaInsertRQModel;
 import com.palnet.biz.api.cns.qna.service.CnsQnaService;
 
 import io.swagger.annotations.ApiOperation;
@@ -23,46 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 @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<Object> insertQna(@RequestBody FaqInsertRQModel rq){
-        log.warn("CnsFaqController - insertQna()");
-        log.warn("rq -> {}", rq);
-
-
-        return ResponseEntity.ok().body(null);
-    }
-
-    @GetMapping("/select")
-    public ResponseEntity<Object> selectQna(@RequestBody FaqBasModel rq){
-        log.warn("CnsFaqController - selectQna()");
-        log.warn("rq -> {}", rq);
-
-
-        return ResponseEntity.ok().body(null);
-    }
-
-    @PostMapping("/update")
-    public ResponseEntity<Object> updateQna(@RequestBody FaqBasModel rq){
-        log.warn("CnsFaqController - updateQna()");
-        log.warn("rq -> {}", rq);
-
-
-        return ResponseEntity.ok().body(null);
-    }
-
-    @GetMapping("/delete")
-    public ResponseEntity<Object> deleteQna(@RequestBody FaqBasModel rq){
-        log.warn("CnsFaqController - deleteQna()");
-        log.warn("rq -> {}", rq);
-
-
-        return ResponseEntity.ok().body(null);
-    }
 
 
 

pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqListRQModel.java

@@ -4,9 +4,5 @@ import lombok.Data;
 
 @Data
 public class FaqListRQModel {
-	
+	   
-    private String category;
-    
-    private String word;
-    
 }

pav-server/src/main/java/com/palnet/biz/api/cns/faq/model/FaqListRSModel.java

@@ -1,32 +1,8 @@
 package com.palnet.biz.api.cns.faq.model;
 
-import java.time.Instant;
-
 import lombok.Data;
 
 @Data
 public class FaqListRSModel {
-	
-    private int qnaSno;
-    
-    private String category;
-    
-    private String title;
-    
-    private String content;
-    
-    private int viewCnt;
-    
-    private String expsrYn;
-    
-    private String delYn;
-    
-    private String createUserId;
-    
-    private Instant createDt;
-    
-    private String updateUserId;
-    
-    private Instant updateDt;
     
 }

pav-server/src/main/java/com/palnet/biz/api/cns/faq/service/CnsFaqService.java

@@ -9,5 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @RequiredArgsConstructor
 public class CnsFaqService {
-    
+
+  
+
 }

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

@@ -1,7 +1,17 @@
 package com.palnet.biz.api.cns.qna.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.RestController;
 
+import com.palnet.biz.api.cns.qna.model.QnaBasModel;
+import com.palnet.biz.api.cns.qna.model.QnaInsertRQModel;
+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;
 
@@ -9,5 +19,46 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @RequiredArgsConstructor
 public class CnsQnaController {
+
+    private final CnsQnaService cnsQnaService;
     
+    
+    @PostMapping(value = "/insert", consumes = "multipart/form-data")
+    @Tag(name = "QNA", description = "QNA 관련 API")
+    @ApiOperation(value = "QnA 등록[답변추가]")
+    public ResponseEntity<Object> insertQna(QnaInsertRQModel rq){
+        log.warn("CnsFaqController - insertQna()");
+        log.warn("rq -> {}", rq);
+
+        
+
+        return ResponseEntity.ok().body(null);
+    }
+
+    @GetMapping("/select")
+    public ResponseEntity<Object> selectQna(@RequestBody QnaBasModel rq){
+        log.warn("CnsFaqController - selectQna()");
+        log.warn("rq -> {}", rq);
+
+
+        return ResponseEntity.ok().body(null);
+    }
+
+    @PostMapping("/update")
+    public ResponseEntity<Object> updateQna(@RequestBody QnaBasModel rq){
+        log.warn("CnsFaqController - updateQna()");
+        log.warn("rq -> {}", rq);
+
+
+        return ResponseEntity.ok().body(null);
+    }
+
+    @GetMapping("/delete")
+    public ResponseEntity<Object> deleteQna(@RequestBody QnaBasModel rq){
+        log.warn("CnsFaqController - deleteQna()");
+        log.warn("rq -> {}", rq);
+
+
+        return ResponseEntity.ok().body(null);
+    }
 }

pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaBasModel.java

@@ -1,11 +1,11 @@
-package com.palnet.biz.api.cns.faq.model;
+package com.palnet.biz.api.cns.qna.model;
 
 import java.time.Instant;
 
 import lombok.Data;
 
 @Data
-public class FaqBasModel {    
+public class QnaBasModel {    
 
     private int qnaSno;
 

pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaInsertRQModel.java

@@ -1,4 +1,4 @@
-package com.palnet.biz.api.cns.faq.model;
+package com.palnet.biz.api.cns.qna.model;
 
 import java.util.List;
 
@@ -7,7 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
 import lombok.Data;
 
 @Data
-public class FaqInsertRQModel {    
+public class QnaInsertRQModel {    
 
     private int targetSno; // 상위 파일 번호
     

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

@@ -2,6 +2,9 @@ package com.palnet.biz.api.cns.qna.service;
 
 import org.springframework.stereotype.Service;
 
+import com.palnet.biz.api.cns.qna.model.QnaInsertRQModel;
+import com.palnet.biz.api.comn.file.service.ComnFileService;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -9,5 +12,13 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 @RequiredArgsConstructor
 public class CnsQnaService {
-    
+      
+
+    private final ComnFileService comnFileService;
+
+
+    public boolean insertQna(QnaInsertRQModel rq){
+
+        return true;
+    }
 }

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

@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.time.Instant;
 import java.util.Base64;
+import java.util.List;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -103,14 +104,29 @@ public class ComnFileService {
 
         // DB Insert
 //        ComFileBas lastComFileBas = comFileBasRepository.findFirstByOrderByFileSnoDesc();
-        ComFileBas lastComFileBas = comFileBasRepository.findFirstByOrderByFileGroupNoDesc();
+        int fileGroupNo = this.lastFileGroupNo();
-        int fileGroupNo = (lastComFileBas == null) ? 1 : lastComFileBas.getFileGroupNo() + 1;
 
         comFileBas.setFileGroupNo(fileGroupNo);
 
         return comFileBasRepository.save(comFileBas);
     }
 
+    /**
+     * 다건 DB 인서트, 최신데이터 가져온 후 Group NO 1추가함
+     * @param comFileBas
+     * @return
+     */
+    public List<ComFileBas> saveAll(List<ComFileBas> comFileBas){
+        
+        int fileGroupNo = this.lastFileGroupNo();
+
+        for(ComFileBas fileBas : comFileBas){
+            fileBas.setFileGroupNo(fileGroupNo);
+        }
+
+        return comFileBasRepository.saveAll(comFileBas);
+    }
+
     /**
      * 파일 다운로드
      *
@@ -150,4 +166,23 @@ public class ComnFileService {
     }
 
 
+    public boolean fileUpload(ComFileBas comFileBas){
+
+
+
+        return true;
+    }
+
+    /**
+     * 마지막 fileGroupNo 가져와 +1 후 반환
+     * @return
+     */
+    private int lastFileGroupNo(){
+        ComFileBas lastComFileBas = comFileBasRepository.findFirstByOrderByFileGroupNoDesc();
+        int fileGroupNo = (lastComFileBas == null) ? 1 : lastComFileBas.getFileGroupNo() + 1;
+
+        return fileGroupNo;
+    }
+
+
 }

pav-server/src/main/resources/config/log/logback-spring.xml

@@ -37,11 +37,11 @@
 
 	</springProfile>
 
-	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+	<!-- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<layout class="ch.qos.logback.classic.PatternLayout">
 			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%-5p][$thread] %logger{40} [%F]%M\(%L\) : %m%n</pattern>
 		</layout>
-	</appender>
+	</appender> -->
 	<!-- JDBC -->
 	<logger name="jdbc" level="OFF"/>
 	<logger name="jdbc.sqlonly" level="OFF"/>
@@ -62,7 +62,7 @@
 		<logger name="com.ibe.framework" level="DEBUG" />
 		<logger name="jdbc.resultsettable" level="WARN"/>
 		<root level="INFO">
-			<appender-ref ref="FILE" />
+			<!-- <appender-ref ref="FILE" /> -->
 			<appender-ref ref="CONSOLE" />
 		</root>
 	</springProfile>