부서관리 백엔드 수정

wyu

2021-11-05 8e538d93ca3f8da8d082ad2ee497625349d9a4dd

부서관리 백엔드 수정

 src/main/java/kr/wisestone/owl/service/DepartmentManageService.java

@@ -16,12 +16,15 @@
public interface DepartmentManageService extends AbstractService<DepartmentManage, Long, JpaRepository<DepartmentManage, Long>> {
    DepartmentManage addDepartmentManage(DepartmentManageForm departmentManageForm);

    DepartmentManage getDepartment(Long id);

    List<DepartmentManageVo> findDepartment(Map<String, Object> resJsonData,
                                            DepartmentManageCondition make, Pageable pageable);
    DepartmentManage getDepartment(Long id);

    void modifyDepartment(DepartmentManageForm departmentManageForm);

    void removeDepartment(DepartmentManageForm departmentManageForm);

    void detailDepartment(Map<String, Object> resJsonData, DepartmentManageCondition make);

    ModelAndView downloadExcel(HttpServletRequest request, Model model);

    void removeUserLevel(DepartmentManageForm departmentManageForm);
}

 src/main/java/kr/wisestone/owl/service/impl/DepartmentManageServiceImpl.java

@@ -1,5 +1,6 @@
package kr.wisestone.owl.service.impl;

import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.ui.Model;
import com.google.common.collect.Lists;
@@ -72,8 +73,6 @@
        return this.convertDepartmentManageVoToMap(results, totalDepartmentCount, pageable, resJsonData);
    }



    // 사용자 부서 ID로 조회한다.
    @Override
    public DepartmentManage getDepartment(Long id) {
@@ -94,12 +93,31 @@

    // 부서를 삭제한다.
    @Override
    public void removeUserLevel(DepartmentManageForm departmentManageForm) {
    public void removeDepartment(DepartmentManageForm departmentManageForm) {
        if (departmentManageForm.getRemoveIds().size() < 1) {
            throw new OwlRuntimeException(
                    this.messageAccessor.getMessage(MsgConstants.PROJECT_REMOVE_NOT_SELECT));
        }
        this.departmentManageRepository.flush();
    }

    // 부서 상세 조회한다.
    @Override
    public void detailDepartment(Map<String, Object> resJsonData, DepartmentManageCondition departmentManageCondition) {
        DepartmentManageVo departmentManageVo = new DepartmentManageVo();

        if (departmentManageVo.getId() != null) {
            DepartmentManage departmentManage = this.getDepartment(departmentManageCondition.getId());
            departmentManageVo = ConvertUtil.copyProperties(departmentManage, DepartmentManageVo.class);
        }
        resJsonData.put(Constants.RES_KEY_CONTENTS, departmentManageVo);
    }

    // 부서 정보를 수정한다.
    @Override
    public void modifyDepartment(DepartmentManageForm departmentManageForm) {
        DepartmentManage departmentManage = ConvertUtil.copyProperties(departmentManageForm, DepartmentManage.class);
        departmentManageRepository.saveAndFlush(departmentManage);
    }


@@ -121,6 +139,7 @@
        return departmentManageVos;
    }

    // 부서 목록을 엑셀로 다운로드 한다.
    @Override
    public ModelAndView downloadExcel(HttpServletRequest request, Model model) {

@@ -147,6 +166,7 @@
        excelInfo.setFileName(this.messageAccessor.message("부서 목록"));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentName", this.messageAccessor.message("departmentManage.departmentName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentDescription", this.messageAccessor.message("departmentManage.departmentDescription"), 20, ExportExcelAttrVo.ALIGN_CENTER));
        excelInfo.addAttrInfos(new ExportExcelAttrVo("departmentCount", this.messageAccessor.message("departmentManage.departmentCount"), 3, ExportExcelAttrVo.ALIGN_CENTER));

        excelInfo.setDatas(departmentManageVos);


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

@@ -54,30 +54,30 @@
    }

    //
//    //  부서 상세 조회
//    @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/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 = "/departmentManage/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.departmentManageService.detailDepartment(resJsonData, DepartmentManageCondition.make(params.get(Constants.REQ_KEY_CONTENT)));

       return this.setSuccessMessage(resJsonData);
   }

   //  부서 수정
   @RequestMapping(value = "/departmentManage/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.departmentManageService.modifyDepartment(DepartmentManageForm.make(params.get(Constants.REQ_KEY_CONTENT)));

       return this.setSuccessMessage(resJsonData);
   }

   //  부서 삭제
    @RequestMapping(value = "/departmentManage/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
    public
    @ResponseBody
@@ -85,7 +85,7 @@
        Map<String, Object> resJsonData = new HashMap<>();
        Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);

        this.departmentManageService.removeUserLevel(DepartmentManageForm.make(content));
        this.departmentManageService.removeDepartment(DepartmentManageForm.make(content));

        return this.setSuccessMessage(resJsonData);
    }

 src/main/webapp/WEB-INF/i18n/code_ko_KR.properties

@@ -111,3 +111,4 @@
manageUser.manageGuidePerm=\uAC00\uC774\uB4DC \uAD00\uB9AC
departmentManage.departmentName=\uBD80\uC11C\uBA85
departmentManage.departmentDescription=\uBD80\uC11C\uC124\uBA85
departmentManage.departmentCount=\uBD80\uC11C\uC778\uC6D0