From f8d35ef0bfc812494f7d30dff1d075a3327209f1 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 18:30:04 +0900
Subject: [PATCH] - 사용자 정의 필드 필드 유형 변경시 기본값 항목 표시 오류 수정 폼에도 적용 - 입력 폼에서 탭키 안먹는 현상 수정

---
 src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java |   42 +++++++++++++++++++++++++++++-------------
 1 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
index 54967e4..450be62 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
@@ -13,6 +13,7 @@
 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 org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -25,8 +26,8 @@
     @Autowired
     private IspFieldService IspFieldService;
 
-    // �뾽泥� �깮�꽦
-    @RequestMapping(value = "/isp/add", method = RequestMethod.POST)
+    // ISP �깮�꽦
+    @RequestMapping(value = "/ispField/add", method = RequestMethod.POST)
     public
     @ResponseBody
     Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
@@ -37,8 +38,8 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� 議고쉶
-    @RequestMapping(value = "/isp/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP 議고쉶
+    @RequestMapping(value = "/ispField/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
@@ -50,8 +51,8 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �긽�꽭 議고쉶
-    @RequestMapping(value = "/isp/detail", produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �긽�꽭 議고쉶
+    @RequestMapping(value = "/ispField/detail", produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
@@ -61,8 +62,8 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �닔�젙
-    @RequestMapping(value = "/isp/modify", produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �닔�젙
+    @RequestMapping(value = "/ispField/modify", produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
@@ -73,8 +74,8 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-    // �뾽泥� �궘�젣
-    @RequestMapping(value = "/isp/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    // ISP �궘�젣
+    @RequestMapping(value = "/ispField/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     public
     @ResponseBody
     Map<String, Object> remove(@RequestBody Map<String, Map<String, Object>> params) {
@@ -86,11 +87,26 @@
         return this.setSuccessMessage(resJsonData);
     }
 
-
-    // �뾽泥� �뿊�� �떎�슫濡쒕뱶
-    @RequestMapping(value = "/isp/downloadExcel", method = RequestMethod.POST)
+    // ISP �뿊�� �떎�슫濡쒕뱶
+    @RequestMapping(value = "/ispField/downloadExcel", method = RequestMethod.POST)
     public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
         return this.IspFieldService.downloadExcel(request, model);
     }
+
+    //  ISP Import �슜 �뿊�� �뀥�뵆由� �떎�슫濡쒕뱶
+    @RequestMapping(value = "/ispField/downloadExcelTemplate", method = RequestMethod.POST)
+    public ModelAndView downloadExcelImport(HttpServletRequest request, Model model) {
+        return this.IspFieldService.downloadExcelTemplate(request, model);
+    }
+
+    //  ISP �뿊�� �벑濡�
+    @RequestMapping(value = "/ispField/importExcel", method = RequestMethod.POST)
+    public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception {
+        Map<String, Object> resJsonData = new HashMap<>();
+
+        this.IspFieldService.importExcel(request.getFile("file"));
+
+        return this.setSuccessMessage(resJsonData);
+    }
 }
 

--
Gitblit v1.8.0