src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
@@ -9,7 +9,6 @@ import kr.wisestone.owl.mapper.HostingFieldMapper; import kr.wisestone.owl.repository.HostingFieldRepository; import kr.wisestone.owl.service.HostingFieldService; import kr.wisestone.owl.service.UserService; import kr.wisestone.owl.service.WorkspaceService; import kr.wisestone.owl.util.ConvertUtil; import kr.wisestone.owl.vo.HostingFieldVo; @@ -41,9 +40,6 @@ private HostingFieldMapper hostingFieldMapper; @Autowired private UserService userService; @Autowired private WorkspaceService workspaceService; @Autowired @@ -57,7 +53,7 @@ return this.hostingFieldRepository; } // 업체 추가 // Hosting 추가 @Override public HostingField add(HostingFieldForm HostingFieldForm) { HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class); @@ -65,7 +61,7 @@ return HostingField; } // 업체 목록을 가져온다. // Hosting 목록을 가져온다. @Override public List<HostingFieldVo> find(Map<String, Object> resJsonData, HostingFieldCondition condition, Pageable pageable) { @@ -79,7 +75,7 @@ } // 업체 상세 조회한다. // Hosting 상세 조회한다. @Override public void detail(Map<String, Object> resJsonData, HostingFieldCondition hostingFieldCondition) { HostingFieldVo HostingFieldVo = new HostingFieldVo(); @@ -92,7 +88,7 @@ resJsonData.put(Constants.REQ_KEY_CONTENT, HostingFieldVo); } // 업체 정로를 수정한다. // Hosting 정로를 수정한다. @Override public void modify(HostingFieldForm HostingFieldForm) { HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class); @@ -100,7 +96,7 @@ } // 업체를 삭제한다. // Hosting를 삭제한다. @Override public void remove(HostingFieldForm HostingFieldForm) { if (HostingFieldForm.getRemoveIds().size() < 1) { @@ -108,18 +104,13 @@ this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT)); } for (Long id : HostingFieldForm.getRemoveIds()) { if (!this.userService.useUserLevel(id)) { this.hostingFieldRepository.deleteById(id); } else { throw new OwlRuntimeException( this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE)); } } this.hostingFieldRepository.flush(); } // 업체 목록을 엑셀로 다운로드 한다. // Hosting 목록을 엑셀로 다운로드 한다. @Override public ModelAndView downloadExcel(HttpServletRequest request, Model model) { ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model); @@ -141,7 +132,7 @@ List<HostingFieldVo> hostingFieldVos = ConvertUtil.convertListToListClass(results, HostingFieldVo.class); // code_ko_KR 에 code명 설정 ExportExcelVo excelInfo = new ExportExcelVo(); excelInfo.setFileName(this.messageAccessor.message("업체 목록")); excelInfo.setFileName(this.messageAccessor.message("Hosting 목록")); excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("Hosting.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER)); excelInfo.addAttrInfos(new ExportExcelAttrVo("companyManager", this.messageAccessor.message("Hosting.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER)); excelInfo.addAttrInfos(new ExportExcelAttrVo("companyTel", this.messageAccessor.message("Hosting.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER)); @@ -172,7 +163,7 @@ return hostingFieldVos; } // 업체 ID 로 조회한다 // Hosting ID 로 조회한다 @Override public HostingField getHosting(Long id) { if (id == null) { src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
@@ -9,7 +9,6 @@ import kr.wisestone.owl.mapper.IspFieldMapper; import kr.wisestone.owl.repository.IspFieldRepository; import kr.wisestone.owl.service.IspFieldService; import kr.wisestone.owl.service.UserService; import kr.wisestone.owl.service.WorkspaceService; import kr.wisestone.owl.util.ConvertUtil; import kr.wisestone.owl.vo.IspFieldVo; @@ -41,9 +40,6 @@ private IspFieldMapper ispFieldMapper; @Autowired private UserService userService; @Autowired private WorkspaceService workspaceService; @Autowired @@ -57,7 +53,7 @@ return this.ispFieldRepository; } // 업체 추가 // Isp 추가 @Override public IspField add(IspFieldForm IspFieldForm) { IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class); @@ -65,7 +61,7 @@ return IspField; } // 업체 목록을 가져온다. // Isp 목록을 가져온다. @Override public List<IspFieldVo> find(Map<String, Object> resJsonData, IspFieldCondition condition, Pageable pageable) { @@ -79,7 +75,7 @@ } // 업체 상세 조회한다. // Isp 상세 조회한다. @Override public void detail(Map<String, Object> resJsonData, IspFieldCondition ispFieldCondition) { IspFieldVo IspFieldVo = new IspFieldVo(); @@ -92,7 +88,7 @@ resJsonData.put(Constants.REQ_KEY_CONTENT, IspFieldVo); } // 업체 정로를 수정한다. // Isp 정로를 수정한다. @Override public void modify(IspFieldForm IspFieldForm) { IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class); @@ -100,7 +96,7 @@ } // 업체를 삭제한다. // Isp를 삭제한다. @Override public void remove(IspFieldForm IspFieldForm) { if (IspFieldForm.getRemoveIds().size() < 1) { @@ -108,18 +104,12 @@ this.messageAccessor.getMessage(MsgConstants.ISP_REMOVE_NOT_SELECT)); } for (Long id : IspFieldForm.getRemoveIds()) { if (!this.userService.useUserLevel(id)) { this.ispFieldRepository.deleteById(id); } else { throw new OwlRuntimeException( this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE)); } } this.ispFieldRepository.flush(); } // 업체 목록을 엑셀로 다운로드 한다. // Isp 목록을 엑셀로 다운로드 한다. @Override public ModelAndView downloadExcel(HttpServletRequest request, Model model) { ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model); @@ -141,7 +131,7 @@ List<IspFieldVo> ispFieldVos = ConvertUtil.convertListToListClass(results, IspFieldVo.class); // code_ko_KR 에 code명 설정 ExportExcelVo excelInfo = new ExportExcelVo(); excelInfo.setFileName(this.messageAccessor.message("업체 목록")); excelInfo.setFileName(this.messageAccessor.message("Isp 목록")); excelInfo.addAttrInfos(new ExportExcelAttrVo("IspName", this.messageAccessor.message("Isp.IspName"), 6, ExportExcelAttrVo.ALIGN_CENTER)); excelInfo.addAttrInfos(new ExportExcelAttrVo("IspManager", this.messageAccessor.message("Isp.IspManager"), 10, ExportExcelAttrVo.ALIGN_CENTER)); excelInfo.addAttrInfos(new ExportExcelAttrVo("IspTel", this.messageAccessor.message("Isp.IspTel"), 10, ExportExcelAttrVo.ALIGN_CENTER)); @@ -172,7 +162,7 @@ return ispFieldVos; } // 업체 ID 로 조회한다 // Isp ID 로 조회한다 @Override public IspField getIsp(Long id) { if (id == null) { src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
@@ -241,13 +241,6 @@ this.userLevelService.addNormalUserLevel(); // DepartmentManage에 임시로 Name, Description 값 추가 DepartmentManageForm departmentManageForm = new DepartmentManageForm(); departmentManageForm.setDepartmentName("부서 없음"); DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm); user.setDepartmentManage(departmentManage); if(primaryWorkspace == null || primaryWorkspace.getName() != userForm.getWorkspaceName()) { // 업무 공간를 생성한다. 가입한 사용자는 업무 공간의 주인이다. Workspace workspace = this.workspaceService.addWorkspace(userForm.getWorkspaceName()); @@ -266,6 +259,11 @@ /*user.setPermission(MngPermission.makeSubAllPermission());*/ } } DepartmentManageForm departmentManageForm = new DepartmentManageForm(); departmentManageForm.setDepartmentName("부서 없음"); DepartmentManage departmentManage = this.departmentManageService.addDepartmentManage(departmentManageForm); user.setDepartmentManage(departmentManage); this.userRepository.saveAndFlush(user); // 이메일 알림 예정 시간이 공백이면 디폴트 이메일 알림 예정 시간으로 설정한다.
