From d81a2433ddd01847835729ab0942bcf04651ae78 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 목, 10 2월 2022 09:28:51 +0900 Subject: [PATCH] 1.0.2버전 업 --- src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java | 42 +++++++++++++++++++++++++++--------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java index db50054..bcd8df0 100644 --- a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java +++ b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java @@ -1,11 +1,8 @@ package kr.wisestone.owl.web.controller; -import com.google.common.collect.Lists; import kr.wisestone.owl.constant.Constants; -import kr.wisestone.owl.constant.UseCompany; +import kr.wisestone.owl.constant.UsePartner; import kr.wisestone.owl.service.HostingFieldService; -import kr.wisestone.owl.util.ConvertUtil; -import kr.wisestone.owl.vo.HostingFieldVo; import kr.wisestone.owl.web.condition.HostingFieldCondition; import kr.wisestone.owl.web.form.HostingFieldForm; import org.springframework.beans.factory.annotation.Autowired; @@ -17,11 +14,11 @@ 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; import java.util.HashMap; -import java.util.List; import java.util.Map; @Controller @@ -30,7 +27,7 @@ @Autowired private HostingFieldService HostingFieldService; - // �뾽泥� �깮�꽦 + // �샇�뒪�똿 �깮�꽦 @RequestMapping(value = "/hostingField/add", method = RequestMethod.POST) public @ResponseBody @@ -42,7 +39,7 @@ return this.setSuccessMessage(resJsonData); } - // �뾽泥� 議고쉶 + // �샇�뒪�똿 議고쉶 @RequestMapping(value = "/hostingField/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) public @ResponseBody @@ -55,7 +52,7 @@ return this.setSuccessMessage(resJsonData); } - // �뾽泥� �긽�꽭 議고쉶 + // �샇�뒪�똿 �긽�꽭 議고쉶 @RequestMapping(value = "/hostingField/detail", produces = MediaType.APPLICATION_JSON_VALUE) public @ResponseBody @@ -66,7 +63,7 @@ return this.setSuccessMessage(resJsonData); } - // �뾽泥� �닔�젙 + // �샇�뒪�똿 �닔�젙 @RequestMapping(value = "/hostingField/modify", produces = MediaType.APPLICATION_JSON_VALUE) public @ResponseBody @@ -78,7 +75,7 @@ return this.setSuccessMessage(resJsonData); } - // �뾽泥� �궘�젣 + // �샇�뒪�똿 �궘�젣 @RequestMapping(value = "/hostingField/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) public @ResponseBody @@ -92,21 +89,36 @@ } // �뾽泥�/ISP/�샇�뒪�똿 紐⑸줉 媛��졇�삤湲� - @RequestMapping(value = "/company/getCompanyList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/company/getPartnerList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) public @ResponseBody - Map<String, Object> getCompanyList(@RequestBody Map<String, Map<String, Object>> params) { + Map<String, Object> getPartnerList(@RequestBody Map<String, Map<String, Object>> params) { Map<String, Object> resJsonData = new HashMap<>(); - resJsonData.put(Constants.REQ_KEY_CONTENT, UseCompany.getCompanyList()); + resJsonData.put(Constants.REQ_KEY_CONTENT, UsePartner.getPartnerList()); return this.setSuccessMessage(resJsonData); } - - // �뾽泥� �뿊�� �떎�슫濡쒕뱶 + // �샇�뒪�똿 �뿊�� �떎�슫濡쒕뱶 @RequestMapping(value = "/hostingField/downloadExcel", method = RequestMethod.POST) public ModelAndView downloadExcel(HttpServletRequest request, Model model) { return this.HostingFieldService.downloadExcel(request, model); } + + // �샇�뒪�똿 Import �슜 �뿊�� �뀥�뵆由� �떎�슫濡쒕뱶 + @RequestMapping(value = "/hostingField/downloadExcelTemplate", method = RequestMethod.POST) + public ModelAndView downloadExcelImport(HttpServletRequest request, Model model) { + return this.HostingFieldService.downloadExcelTemplate(request, model); + } + + // �샇�뒪�똿 �뿊�� �벑濡� + @RequestMapping(value = "/hostingField/importExcel", method = RequestMethod.POST) + public @ResponseBody Map<String, Object> importExcel(MultipartHttpServletRequest request) throws Exception { + Map<String, Object> resJsonData = new HashMap<>(); + + this.HostingFieldService.importExcel(request.getFile("file")); + + return this.setSuccessMessage(resJsonData); + } } -- Gitblit v1.8.0