From 92a009c218359ee52d7f9e3f400b41199cbf6c5e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 09 11월 2021 13:40:57 +0900
Subject: [PATCH] ISP, Hoting 백앤드 수정
---
src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java | 12 ++---
src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java | 25 ++++--------
src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java | 26 ++++---------
3 files changed, 21 insertions(+), 42 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
index 65d1031..8afb8b0 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
+++ b/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) {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
index ad51efc..2b54737 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
+++ b/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) {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
index ad7edf2..f83eb6a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserServiceImpl.java
+++ b/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);
// �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩씠 怨듬갚�씠硫� �뵒�뤃�듃 �씠硫붿씪 �븣由� �삁�젙 �떆媛꾩쑝濡� �꽕�젙�븳�떎.
--
Gitblit v1.8.0