From 1bcea4755d662f243400ac916f43550a3bc13ded Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 15 11월 2021 10:10:13 +0900
Subject: [PATCH] 엑셀 이름 커밋
---
src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java | 29 ++++++++++----
src/main/java/kr/wisestone/owl/service/UserDepartmentService.java | 1
src/main/java/kr/wisestone/owl/service/DepartmentService.java | 2
src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java | 11 +++--
src/main/java/kr/wisestone/owl/web/form/DepartmentForm.java | 9 ++++
src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java | 2 +
src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java | 11 +++--
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 12 ++++++
src/main/resources/system_dev.properties | 4 +-
9 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java b/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
index fb614ee..9997607 100644
--- a/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
+++ b/src/main/java/kr/wisestone/owl/mapper/DepartmentMapper.java
@@ -21,5 +21,7 @@
Long findBydepartmentId(Long Id);
+ Long countInDepartment(Long Id);
+
List<Map<String, Object>> findByDepartmentIds(UserCondition condition);
}
diff --git a/src/main/java/kr/wisestone/owl/service/DepartmentService.java b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
index e09de70..09c1ca9 100644
--- a/src/main/java/kr/wisestone/owl/service/DepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/DepartmentService.java
@@ -30,7 +30,7 @@
ModelAndView downloadExcel(HttpServletRequest request, Model model);
- boolean department(Long id);
+ boolean countInDepartment(Long id);
List<Map<String, Object>> findByDepartmentIds( UserCondition condition);
}
diff --git a/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java b/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
index 92d2a52..c364fc5 100644
--- a/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
+++ b/src/main/java/kr/wisestone/owl/service/UserDepartmentService.java
@@ -6,7 +6,6 @@
import kr.wisestone.owl.web.form.UserDepartmentForm;
import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.List;
import java.util.Map;
public interface UserDepartmentService extends AbstractService<UserDepartment, Long, JpaRepository<UserDepartment, Long>> {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
index 763d552..f9c2d2c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/DepartmentServiceImpl.java
@@ -1,7 +1,10 @@
package kr.wisestone.owl.service.impl;
import kr.wisestone.owl.domain.Department;
+import kr.wisestone.owl.domain.UserDepartment;
+import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.mapper.DepartmentMapper;
+import kr.wisestone.owl.service.UserDepartmentService;
import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.UserCondition;
@@ -40,7 +43,10 @@
private DepartmentMapper departmentMapper;
@Autowired
- private UserService userService;
+ private DepartmentService departmentService;
+
+ @Autowired
+ private UserDepartmentService userDepartmentService;
@Autowired
private WorkspaceService workspaceService;
@@ -106,9 +112,14 @@
}
for (Long id : departmentForm.getRemoveIds()) {
- this.departmentRepository.deleteById(id);
- this.departmentRepository.flush();
+ if (!this.departmentService.countInDepartment(id)) {
+ this.departmentRepository.deleteById(id);
+ } else {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
+ }
}
+ this.departmentRepository.flush();
}
@@ -147,6 +158,12 @@
}
+ @Override
+ public boolean countInDepartment(Long id) {
+ return this.departmentMapper.countInDepartment(id) > 0;
+ }
+
+
// �궗�슜�옄 遺��꽌 ID濡� 議고쉶�븳�떎.
@Override
public Department getDepartment(Long id) {
@@ -163,12 +180,6 @@
}
return department;
- }
-
- // �궘�젣 �븷 遺��꽌 �쑀��媛� �궗�슜�븯怨� �엳�뒗吏� �솗�씤
- @Override
- public boolean department(Long Id) {
- return this.departmentMapper.findBydepartmentId(Id) > 0;
}
@Override
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 ea3af08..a088565 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
@@ -133,11 +133,12 @@
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("Hosting 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("Hosting.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("Hosting.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("Hosting.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("Hosting.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("Hosting.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("Hosting.HostingName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("code", this.messageAccessor.message("Hosting.HostingCode"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("Hosting.HostingManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("Hosting.HostingTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("Hosting.HostingEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("Hosting.HostingMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(hostingFieldVos);
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 bb390fe..c666d88 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
@@ -132,11 +132,12 @@
// code_ko_KR �뿉 code紐� �꽕�젙
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("Isp 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("Isp.IspName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("Isp.IspManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("Isp.IspTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("Isp.IspEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("Isp.IspMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("name", this.messageAccessor.message("isp.ispName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("code", this.messageAccessor.message("isp.ispCode"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("manager", this.messageAccessor.message("isp.ispManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("tel", this.messageAccessor.message("isp.ispTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("email", this.messageAccessor.message("isp.ispEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("memo", this.messageAccessor.message("isp.ispMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.setDatas(ispFieldVos);
diff --git a/src/main/java/kr/wisestone/owl/web/form/DepartmentForm.java b/src/main/java/kr/wisestone/owl/web/form/DepartmentForm.java
index 1cf4ce2..1248859 100644
--- a/src/main/java/kr/wisestone/owl/web/form/DepartmentForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/DepartmentForm.java
@@ -14,6 +14,7 @@
private Long id;
private String departmentName;
private String departmentDescription;
+ private Long departmentCount;
private List<Long> removeIds = Lists.newArrayList();
public DepartmentForm() {
@@ -52,6 +53,14 @@
this.departmentDescription = departmentDescription;
}
+ public Long getDepartmentCount() {
+ return departmentCount;
+ }
+
+ public void setDepartmentCount(Long departmentCount) {
+ this.departmentCount = departmentCount;
+ }
+
public List<Long> getRemoveIds() {
return removeIds;
}
diff --git a/src/main/resources/system_dev.properties b/src/main/resources/system_dev.properties
index faa8726..6cc07e1 100644
--- a/src/main/resources/system_dev.properties
+++ b/src/main/resources/system_dev.properties
@@ -41,8 +41,8 @@
# email \uC124\uC815
email.host=mail.g2works.kr
email.port=587
-email.userName=supportowl@wisestone.kr
-email.password=Stone0620**
+email.userName=wyu@maprex.co.kr
+email.password=1234
email.transport.protocol=smtp
email.smtp.auth=true
email.smtp.starttle.enable=true
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 069a473..bd268ce 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -117,3 +117,15 @@
companyField.companyTel=\uC804\uD654\uBC88\uD638
companyField.companyEmail=\uC774\uBA54\uC77C
companyField.companyMemo=\uBE44\uACE0
+isp.ispName=ISP \uC774\uB984
+isp.ispCode=\uCF54\uB4DC
+isp.ispManager=\uB2F4\uB2F9\uC790
+isp.ispTel=\uC804\uD654\uBC88\uD638
+isp.ispEmail=\uC774\uBA54\uC77C
+isp.ispMemo=\uBE44\uACE0
+Hosting.HostingName=\uD638\uC2A4\uD305 \uC774\uB984
+Hosting.HostingCode=\uCF54\uB4DC
+Hosting.HostingManager=\uB2F4\uB2F9\uC790
+Hosting.HostingTel=\uC804\uD654\uBC88\uD638
+Hosting.HostingEmail=\uC774\uBA54\uC77C
+Hosting.HostingMemo=\uBE44\uACE0
--
Gitblit v1.8.0