From d9a5830c40124215452b439a9a5decbb11f1b6d1 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 16 12월 2021 09:42:14 +0900
Subject: [PATCH] - 전이선 클릭 오류 재수정
---
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 b8c060c..ed16ccc 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/ApiController.java
@@ -1,16 +1,12 @@
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.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;
@@ -22,11 +18,8 @@
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;
+import java.util.Map;
@Controller
public class ApiController extends BaseController {
@@ -50,13 +43,23 @@
@RequestMapping(value = "api/issue", method = RequestMethod.POST)
public
@ResponseBody
- Map<String, Object> addIssue(MultipartHttpServletRequest request) throws OwlRuntimeException {
+ 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());
+ 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());
+ }
+ } else {
+ this.issueService.modifyIssue(issueForm, request.getFiles("file"));
+ }
+
return this.setSuccessMessage(resJsonData);
}
@@ -69,7 +72,6 @@
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
// todo
-
return this.setSuccessMessage(resJsonData);
}
}
--
Gitblit v1.8.0