From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
index 80ee790..b8c060c 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -1,9 +1,16 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.domain.Issue;
+import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.service.GuideService;
+import kr.wisestone.owl.service.IssueService;
+import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
import kr.wisestone.owl.web.condition.GuideCondition;
import kr.wisestone.owl.web.form.GuideForm;
+import kr.wisestone.owl.web.form.IssueApiForm;
+import kr.wisestone.owl.web.form.IssueForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
@@ -12,30 +19,49 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.util.HashMap;
import java.util.Map;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Stack;
@Controller
public class ApiController extends BaseController {
@Autowired
- private GuideService guideService;
+ private IssueService issueService;
- // �씠�뒋 異붽�
- @RequestMapping(value = "api/issue", produces = MediaType.APPLICATION_JSON_VALUE)
+ // �씠�뒋 異붽�(json 諛⑹떇�쑝濡� �뙆�씪�쟾�넚)
+// @RequestMapping(value = "api/issue", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+// public
+// @ResponseBody
+// Map<String, Object> addIssue(@RequestBody Map<String, Map<String, Object>> params) {
+// Map<String, Object> resJsonData = new HashMap<>();
+//
+// IssueApiForm issueForm = IssueApiForm.make(params.get(Constants.REQ_KEY_CONTENT));
+// Issue issue = this.issueService.addApiIssue(issueForm);
+// // 踰꾩쟾 �깮�꽦
+// this.issueService.addIssueVersion(issue.getId());
+// return this.setSuccessMessage(resJsonData);
+// }
+ @RequestMapping(value = "api/issue", method = RequestMethod.POST)
public
@ResponseBody
- Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException {
Map<String, Object> resJsonData = new HashMap<>();
- // todo
-
+ IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT)), request.getFiles("file"));
+ Issue issue = this.issueService.addApiIssue(issueForm);
+ // 踰꾩쟾 �깮�꽦
+ this.issueService.addIssueVersion(issue.getId());
return this.setSuccessMessage(resJsonData);
}
// �씠�뒋 議고쉶
- @RequestMapping(value = "/api/issuelist", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/issueList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
--
Gitblit v1.8.0