From 7c355d755da928a9add41a992758944bb11a5ee9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:03:32 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java b/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
index 60a23f1..1df08e5 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/Api/ApiController.java
@@ -11,7 +11,6 @@
import kr.wisestone.owl.web.form.ApiIssueAddForm;
import kr.wisestone.owl.web.form.ApiIssueModifyForm;
import kr.wisestone.owl.web.form.IssueApiForm;
-import org.json.simple.parser.ParseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +33,7 @@
/**
+ * �씠�뒋 異붽�
* @param apiIssueAddForm �엯�젰 �뤌 �뜲�씠�꽣
* @param files �뙆�씪
* @return JSON
@@ -45,7 +45,7 @@
@ApiImplicitParam(name = "files", required = false, dataType = "file")
public
@ResponseBody
- Map<String, Object> addIssue(ApiIssueAddForm apiIssueAddForm, @RequestParam("files") List<MultipartFile> files) throws OwlRuntimeException, CloneNotSupportedException, ParseException {
+ Map<String, Object> addIssue(ApiIssueAddForm apiIssueAddForm, @RequestParam("files") List<MultipartFile> files) throws OwlRuntimeException, CloneNotSupportedException {
Map<String, Object> resJsonData = new HashMap<>();
IssueApiForm issueApiForm = ConvertUtil.copyProperties(apiIssueAddForm, IssueApiForm.class);
@@ -68,6 +68,7 @@
}
/**
+ * �씠�뒋 �긽�깭 �닔�젙
* @param apiIssueModifyForm �닔�젙 �뤌 �뜲�씠�꽣
* @return JSON
* @throws OwlRuntimeException �뙆�씪誘명꽣 �삤瑜섏떆 諛쒖깮
@@ -77,7 +78,7 @@
@ApiOperation(value = "�씠�뒋 �긽�깭 �닔�젙", notes = "�궗�슜�옄 �젙�쓽 �븘�뱶媛� �룞�씪�븳 湲곗〈 �씠�뒋瑜� 蹂�寃쏀븳�떎.")
public
@ResponseBody
- Map<String, Object> modifyIssue(ApiIssueModifyForm apiIssueModifyForm) throws OwlRuntimeException, CloneNotSupportedException, ParseException {
+ Map<String, Object> modifyIssue(ApiIssueModifyForm apiIssueModifyForm) throws OwlRuntimeException, CloneNotSupportedException {
Map<String, Object> resJsonData = new HashMap<>();
IssueApiForm issueApiForm = ConvertUtil.copyProperties(apiIssueModifyForm, IssueApiForm.class);
@@ -92,17 +93,5 @@
return this.setSuccessMessage(resJsonData);
}
-
- // �씠�뒋 議고쉶
-// @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) {
-// Map<String, Object> resJsonData = new HashMap<>();
-// Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
-//
-// // todo
-// return this.setSuccessMessage(resJsonData);
-// }
}
--
Gitblit v1.8.0