From 306f6173e4dc458074f74ceeddbfbc0d52765401 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 06 1월 2022 10:49:46 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java | 65 +++++++++++++-------------------
1 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
index aaab370..9ab2b02 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IssueApiForm.java
@@ -4,10 +4,13 @@
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
import org.springframework.web.multipart.MultipartFile;
-
+import java.io.Serializable;
import java.util.*;
-public class IssueApiForm {
+/**
+ * API �씠�뒋 異붽� / �닔�젙�슜 form class
+ */
+public class IssueApiForm implements Serializable {
public enum ApiType {
add,
@@ -37,44 +40,30 @@
public IssueApiForm() {
}
- public static IssueApiForm make(Map<String, Object> content, List<MultipartFile> files) {
- IssueApiForm form = ConvertUtil.convertMapToClass(content, IssueApiForm.class);
- form.setMultipartFiles(files);
- // api ���엯
- if (MapUtil.getString(content, "apiType") != null) {
- try {
- form.setApiType(ApiType.valueOf(MapUtil.getString(content, "apiType")));
- } catch (Exception ex) {
- return null;
- }
+ /**
+ * �궗�슜�옄 �젙�쓽 �븘�뱶 蹂��솚
+ * @param customFieldJson �궗�슜�옄 �젙�쓽 �븘�뱶 json
+ */
+ public void parseCustomFields(String customFieldJson) {
+
+ Map<String, Object> json = ConvertUtil.convertJsonToMap(customFieldJson);
+ List<Map<String, Object>> customFields = (List) MapUtil.getObject(json, "customFields");
+ for (Map<String, Object> customField : customFields) {
+ IssueCustomFieldValueForm issueCustomFieldValueForm = ConvertUtil.convertMapToClass(customField, IssueCustomFieldValueForm.class);
+ this.addIssueCustomFieldValue(issueCustomFieldValueForm);
+
+ Map<String, Object> customFieldVo = new HashMap<>();
+ customFieldVo.put("id", issueCustomFieldValueForm.getCustomFieldId());
+
+ customField.put("customFieldVo", customFieldVo);
+
+ List<String> useValues = Lists.newArrayList();
+ useValues.add(issueCustomFieldValueForm.getUseValue());
+ customField.put("useValues", useValues);
+
+ this.addCustomFieldValue(customField);
}
-
- // �궗�슜�옄 �븘�뱶 �젙蹂�
- if (MapUtil.getObject(content, "customFields") != null){
- List<Map<String, Object>> customFields = (List)MapUtil.getObject(content, "customFields");
- for (Map<String, Object> customField : customFields) {
- IssueCustomFieldValueForm issueCustomFieldValueForm = ConvertUtil.convertMapToClass(customField, IssueCustomFieldValueForm.class);
- form.addIssueCustomFieldValue(issueCustomFieldValueForm);
-
- Map<String, Object> customFieldVo = new HashMap<>();
- customFieldVo.put("id", issueCustomFieldValueForm.getCustomFieldId());
-
- customField.put("customFieldVo", customFieldVo);
-
- List<String> useValues = Lists.newArrayList();
- useValues.add(issueCustomFieldValueForm.getUseValue());
- customField.put("useValues", useValues);
-
- form.addCustomFieldValue(customField);
- }
- }
-
- // 泥⑤� �뙆�씪
-// if (MapUtil.getObject(content, "files") != null){
-// form.setFiles((List)MapUtil.getObject(content, "files"));
-// }
- return form;
}
public String getToken() {
--
Gitblit v1.8.0