From ea58f79355dd5715c7889623f59f5e8fca81e811 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 15:51:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 5d4c383..fb3a53a 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -1,15 +1,13 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.Issue;
-import kr.wisestone.owl.service.GuideService;
+import kr.wisestone.owl.domain.User;
+import kr.wisestone.owl.exception.OwlRuntimeException;
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;
@@ -21,6 +19,7 @@
import org.springframework.web.multipart.MultipartHttpServletRequest;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Controller
@@ -45,13 +44,25 @@
@RequestMapping(value = "api/issue", method = RequestMethod.POST)
public
@ResponseBody
- Map<String, Object> addIssue(MultipartHttpServletRequest request) throws Exception {
+ Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException, CloneNotSupportedException {
Map<String, Object> resJsonData = new HashMap<>();
- 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());
+ String str = request.getParameter(Constants.REQ_KEY_CONTENT);
+
+ IssueApiForm issueForm = IssueApiForm.make(ConvertUtil.convertJsonToMap(str), request.getFiles("file"));
+ if (issueForm == null) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_PARAMETER_ERROR));
+ }
+ if (issueForm.getApiType() == IssueApiForm.ApiType.add) {
+ List<Issue> issues = this.issueService.addApiIssue(issueForm);
+ // 踰꾩쟾 �깮�꽦
+ for (Issue issue : issues) {
+ this.issueService.addIssueVersion(issue.getId(), issue.getRegisterId());
+ }
+ } else {
+ this.issueService.modifyIssue(issueForm, request.getFiles("file"));
+ }
+
return this.setSuccessMessage(resJsonData);
}
@@ -64,7 +75,6 @@
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
// todo
-
return this.setSuccessMessage(resJsonData);
}
}
--
Gitblit v1.8.0