Revert "- api Response 수정"

jhjang

2022-01-13 77a84ace0b0df4c717cf2df5921ce6826ac4ebd2

 src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java

@@ -1,13 +1,8 @@
package kr.wisestone.owl.web.controller;

import kr.wisestone.owl.constant.Constants;
import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.service.UserLevelService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -15,7 +10,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
@@ -23,7 +17,7 @@
import java.util.Map;

/**
 * Created by jeong on 2017-08-02.
 * Created by jeong on 2021-11-05.
 */
@Controller
public class UserLevelController extends BaseController {
@@ -35,9 +29,9 @@
    @RequestMapping(value = "/userLevel/add", method = RequestMethod.POST)
    public
    @ResponseBody
    Map<String, Object> addUserLevel(MultipartHttpServletRequest request) {
    Map<String, Object> addUserLevel(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();
        Map<String, Object> content = ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT));
        Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
        this.userLevelService.addUserLevel(UserLevelForm.make(content));

        return this.setSuccessMessage(resJsonData);
@@ -56,35 +50,61 @@
        return this.setSuccessMessage(resJsonData);
    }

    //  사용자등급 상세 조회
    @RequestMapping(value = "/userLevel/detail", produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();
        this.userLevelService.detailUserLevel(resJsonData, UserLevelCondition.make(params.get(Constants.REQ_KEY_CONTENT)));

        return this.setSuccessMessage(resJsonData);
    }

    //  사용자등급명만 수정
    @RequestMapping(value = "/userLevel/nameModify", produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> nameModify(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();

        this.userLevelService.modifyLevelName(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));

        return this.setSuccessMessage(resJsonData);
    }

    //  사용자등급 수정
//    @RequestMapping(value = "/userLevel/modify", produces = MediaType.APPLICATION_JSON_VALUE)
//    public
//    @ResponseBody
//    Map<String, Object> modify(MultipartHttpServletRequest request) {
//        Map<String, Object> resJsonData = new HashMap<>();
//
//        this.userService.modifyUser(UserForm.make(ConvertUtil.convertJsonToMap(request.getParameter(Constants.REQ_KEY_CONTENT))), request.getFile("file"));
//
//        return this.setSuccessMessage(resJsonData);
//    }
    @RequestMapping(value = "/userLevel/modify", produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();

        this.userLevelService.modifyLevelPermission(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));

        return this.setSuccessMessage(resJsonData);
    }

    //  사용자등급 삭제
//    @RequestMapping(value = "/userLevel/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
//    public
//    @ResponseBody
//    Map<String, Object> withDraw() {
//        Map<String, Object> resJsonData = new HashMap<>();
//
//        this.userService.withDrawUser();
//
//        return this.setSuccessMessage(resJsonData);
//    }
    @RequestMapping(value = "/userLevel/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
    Map<String, Object> remove(@RequestBody Map<String, Map<String, Object>> params) {
        Map<String, Object> resJsonData = new HashMap<>();
        Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);

        this.userLevelService.removeUserLevel(UserLevelForm.make(content));

        return this.setSuccessMessage(resJsonData);
    }


    //  사용자 등급 엑셀 다운로드
//    @RequestMapping(value = "/userLevel/downloadExcel", method = RequestMethod.POST)
//    public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
//        return this.userService.downloadExcel(model);
//    }
    @RequestMapping(value = "/userLevel/downloadExcel", method = RequestMethod.POST)
    public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
        return this.userLevelService.downloadExcel(request, model);
    }


    /*//  이벤트 당첨자 엑셀 다운로드
    @RequestMapping(value = "/user/downloadExcelEvent", method = RequestMethod.POST)