From 1b960584383766692a257a4cdd92daf19bab172d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 27 12월 2021 09:32:50 +0900
Subject: [PATCH] - API 추가/수정시 사용자 정의 필드 항목이 없을 경우 오류 처리 - API 에서 도메인만 추출하여 같은 도메인을 갖는 업체/isp/hosting 자동 입력하도록 수정
---
src/main/java/kr/wisestone/owl/web/controller/ApiController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 ed640c5..9c7b5f4 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,13 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.service.GuideService;
-import kr.wisestone.owl.web.condition.GuideCondition;
-import kr.wisestone.owl.web.form.GuideForm;
+import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.domain.Issue;
+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.web.form.IssueApiForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
@@ -12,30 +16,65 @@
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.List;
import java.util.Map;
@Controller
public class ApiController extends BaseController {
@Autowired
- private GuideService guideService;
+ private IssueService issueService;
- // �씠�뒋 異붽�
- @RequestMapping(value = "/api/add", 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, CloneNotSupportedException {
Map<String, Object> resJsonData = new HashMap<>();
- // todo
+ 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));
+ }
+ // �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�쓣 寃쎌슦 寃��깋�쓣 �븷 �닔 �뾾湲� �븣臾몄뿉 �삁�쇅泥섎━
+ else if (issueForm.getCustomFieldValues() == null || issueForm.getCustomFieldValues().size() == 0) {
+ throw new OwlRuntimeException(this.messageAccessor.getMessage(MsgConstants.API_CUSTOM_FIELD_NOT_EXIST));
+ }
+
+ 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);
}
// �씠�뒋 議고쉶
- @RequestMapping(value = "/api/find", method = RequestMethod.POST, 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) {
@@ -43,7 +82,6 @@
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
// todo
-
return this.setSuccessMessage(resJsonData);
}
}
--
Gitblit v1.8.0