From f23d2851838aa1b1a9bc7884f3eaa2861c043362 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 09 11월 2021 11:00:39 +0900
Subject: [PATCH] ISP, Hosting 백엔드 수정
---
src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java | 6
src/main/java/kr/wisestone/owl/service/HostingFieldService.java | 30 +
src/main/java/kr/wisestone/owl/repository/IspFieldRepository.java | 8
src/main/java/kr/wisestone/owl/service/CompanyFieldService.java | 2
src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java | 191 +++++++++++
src/main/java/kr/wisestone/owl/service/IspFieldService.java | 29 +
src/main/java/kr/wisestone/owl/constant/MsgConstants.java | 6
src/main/resources/mybatis/query-template/IspField-template.xml | 41 ++
/dev/null | 85 -----
src/main/java/kr/wisestone/owl/domain/IspField.java | 4
src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java | 6
src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java | 85 +++++
src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java | 6
src/main/resources/mybatis/query-template/HostingField-template.xml | 41 ++
src/main/java/kr/wisestone/owl/domain/HostingField.java | 4
src/main/java/kr/wisestone/owl/mapper/HostingFieldMapper.java | 21 +
src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java | 20
src/main/java/kr/wisestone/owl/repository/HostingFieldRepository.java | 8
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 6
src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java | 22
src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java | 85 +++++
src/main/java/kr/wisestone/owl/mapper/IspFieldMapper.java | 21 +
src/main/java/kr/wisestone/owl/vo/IspFieldVo.java | 6
src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java | 191 +++++++++++
24 files changed, 792 insertions(+), 132 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
index 9a75dee..bdface4 100644
--- a/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
+++ b/src/main/java/kr/wisestone/owl/constant/MsgConstants.java
@@ -215,10 +215,12 @@
public static final String DEPARTMENT_ALREADY_IN_USE = "DEPARTMENT_ALREADY_IN_USE"; // �꽑�깮�븳 遺��꽌�뒗 �씠誘� �궗�슜�븯怨� �엳�뒿�땲�떎.
public static final String DEPARTMENT_REMOVE_NOT_SELECT = "DEPARTMENT_REMOVE_NOT_SELECT"; // �궘�젣�븷 遺��꽌媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
-
-
public static final String COMPANY_REMOVE_NOT_SELECT = "COMPANY_REMOVE_NOT_SELECT"; // �궘�젣�븷 �뾽泥닿� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
public static final String COMPANYFIELD_NOT_EXIST = "COMPANYFIELD_NOT_EXIST"; // �뾽泥닿� 議댁옱�븯吏� �븡�뒿�땲�떎.
+ public static final String HOSTING_NOT_EXIST = "HOSTING_NOT_EXIST"; // �샇�뒪�똿�씠 議댁옱�븯吏� �븡�뒿�땲�떎.
+ public static final String HOSTING_REMOVE_NOT_SELECT = "HOSTING_REMOVE_NOT_SELECT"; // �궘�젣�븷 �샇�뒪�똿�씠 �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
+ public static final String ISP_NOT_EXIST = "ISP_NOT_EXIST"; // ISP媛� 議댁옱�븯吏� �븡�뒿�땲�떎.
+ public static final String ISP_REMOVE_NOT_SELECT = "ISP_REMOVE_NOT_SELECT"; // �궘�젣�븷 ISP媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.
}
diff --git a/src/main/java/kr/wisestone/owl/domain/Hosting.java b/src/main/java/kr/wisestone/owl/domain/HostingField.java
similarity index 92%
rename from src/main/java/kr/wisestone/owl/domain/Hosting.java
rename to src/main/java/kr/wisestone/owl/domain/HostingField.java
index d842bb8..25db7a3 100644
--- a/src/main/java/kr/wisestone/owl/domain/Hosting.java
+++ b/src/main/java/kr/wisestone/owl/domain/HostingField.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
@Entity
-public class Hosting extends BaseEntity implements Serializable {
+public class HostingField extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@@ -19,7 +19,7 @@
private String email;
private String memo;
- public Hosting() {}
+ public HostingField() {}
public Long getId() {
return id;
diff --git a/src/main/java/kr/wisestone/owl/domain/Isp.java b/src/main/java/kr/wisestone/owl/domain/Isp.java
deleted file mode 100644
index 55f4334..0000000
--- a/src/main/java/kr/wisestone/owl/domain/Isp.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package kr.wisestone.owl.domain;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Entity
-public class Isp extends BaseEntity implements Serializable {
- private static final long serialVersionUID = 1L;
-
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private Long id;
- private String name;
- private String manager;
- private String tel;
- private String email;
- private String memo;
-
- public Isp() {}
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getManager() {
- return manager;
- }
-
- public void setManager(String manager) {
- this.manager = manager;
- }
-
- public String getTel() {
- return tel;
- }
-
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-}
diff --git a/src/main/java/kr/wisestone/owl/domain/Hosting.java b/src/main/java/kr/wisestone/owl/domain/IspField.java
similarity index 92%
copy from src/main/java/kr/wisestone/owl/domain/Hosting.java
copy to src/main/java/kr/wisestone/owl/domain/IspField.java
index d842bb8..bf4e72b 100644
--- a/src/main/java/kr/wisestone/owl/domain/Hosting.java
+++ b/src/main/java/kr/wisestone/owl/domain/IspField.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
@Entity
-public class Hosting extends BaseEntity implements Serializable {
+public class IspField extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@@ -19,7 +19,7 @@
private String email;
private String memo;
- public Hosting() {}
+ public IspField() {}
public Long getId() {
return id;
diff --git a/src/main/java/kr/wisestone/owl/mapper/HostingFieldMapper.java b/src/main/java/kr/wisestone/owl/mapper/HostingFieldMapper.java
new file mode 100644
index 0000000..e9afb76
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/mapper/HostingFieldMapper.java
@@ -0,0 +1,21 @@
+package kr.wisestone.owl.mapper;
+
+import kr.wisestone.owl.web.condition.HostingFieldCondition;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by wisestone on 2018-02-26.
+ */
+@Repository
+public interface HostingFieldMapper {
+ List<Map<String, Object>> find(HostingFieldCondition hostingFieldCondition);
+
+ Long count(HostingFieldCondition hostingFieldCondition);
+
+ List<Map<String, Object>> findEvent();
+
+ Long findByHosting(Long id);
+}
diff --git a/src/main/java/kr/wisestone/owl/mapper/HostingMapper.java b/src/main/java/kr/wisestone/owl/mapper/HostingMapper.java
deleted file mode 100644
index 13db3fa..0000000
--- a/src/main/java/kr/wisestone/owl/mapper/HostingMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package kr.wisestone.owl.mapper;
-
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by wisestone on 2018-02-26.
- */
-@Repository
-public interface HostingMapper {
- List<Map<String, Object>> find(CompanyFieldCondition companyFieldCondition);
-
- Long count(CompanyFieldCondition companyFieldCondition);
-
- List<Map<String, Object>> findEvent();
-
- Long findByCompany(Long id);
-}
diff --git a/src/main/java/kr/wisestone/owl/mapper/IspFieldMapper.java b/src/main/java/kr/wisestone/owl/mapper/IspFieldMapper.java
new file mode 100644
index 0000000..dbede2d
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/mapper/IspFieldMapper.java
@@ -0,0 +1,21 @@
+package kr.wisestone.owl.mapper;
+
+import kr.wisestone.owl.web.condition.IspFieldCondition;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by wisestone on 2018-02-26.
+ */
+@Repository
+public interface IspFieldMapper {
+ List<Map<String, Object>> find(IspFieldCondition ispFieldCondition);
+
+ Long count(IspFieldCondition ispFieldCondition);
+
+ List<Map<String, Object>> findEvent();
+
+ Long findByIsp(Long id);
+}
diff --git a/src/main/java/kr/wisestone/owl/mapper/IspMapper.java b/src/main/java/kr/wisestone/owl/mapper/IspMapper.java
deleted file mode 100644
index 62ef1c1..0000000
--- a/src/main/java/kr/wisestone/owl/mapper/IspMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package kr.wisestone.owl.mapper;
-
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by wisestone on 2018-02-26.
- */
-@Repository
-public interface IspMapper {
- List<Map<String, Object>> find(CompanyFieldCondition companyFieldCondition);
-
- Long count(CompanyFieldCondition companyFieldCondition);
-
- List<Map<String, Object>> findEvent();
-
- Long findByCompany(Long id);
-}
diff --git a/src/main/java/kr/wisestone/owl/repository/HostingFieldRepository.java b/src/main/java/kr/wisestone/owl/repository/HostingFieldRepository.java
new file mode 100644
index 0000000..406f77d
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/repository/HostingFieldRepository.java
@@ -0,0 +1,8 @@
+package kr.wisestone.owl.repository;
+
+import kr.wisestone.owl.domain.HostingField;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface HostingFieldRepository extends JpaRepository<HostingField, Long> {
+
+}
diff --git a/src/main/java/kr/wisestone/owl/repository/HostingRepository.java b/src/main/java/kr/wisestone/owl/repository/HostingRepository.java
deleted file mode 100644
index 9b22148..0000000
--- a/src/main/java/kr/wisestone/owl/repository/HostingRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package kr.wisestone.owl.repository;
-
-import kr.wisestone.owl.domain.CompanyField;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface HostingRepository extends JpaRepository<CompanyField, Long> {
-
-}
diff --git a/src/main/java/kr/wisestone/owl/repository/IspFieldRepository.java b/src/main/java/kr/wisestone/owl/repository/IspFieldRepository.java
new file mode 100644
index 0000000..1da6f7f
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/repository/IspFieldRepository.java
@@ -0,0 +1,8 @@
+package kr.wisestone.owl.repository;
+
+import kr.wisestone.owl.domain.IspField;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface IspFieldRepository extends JpaRepository<IspField, Long> {
+
+}
diff --git a/src/main/java/kr/wisestone/owl/repository/IspRepository.java b/src/main/java/kr/wisestone/owl/repository/IspRepository.java
deleted file mode 100644
index 36f8c96..0000000
--- a/src/main/java/kr/wisestone/owl/repository/IspRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package kr.wisestone.owl.repository;
-
-import kr.wisestone.owl.domain.CompanyField;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface IspRepository extends JpaRepository<CompanyField, Long> {
-
-}
diff --git a/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java b/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java
index c9e836b..99c35b7 100644
--- a/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java
+++ b/src/main/java/kr/wisestone/owl/service/CompanyFieldService.java
@@ -26,6 +26,4 @@
void removeCompany(CompanyFieldForm make);
ModelAndView downloadExcel(HttpServletRequest request, Model model);
-
- boolean company(Long id);
}
diff --git a/src/main/java/kr/wisestone/owl/service/HostingFieldService.java b/src/main/java/kr/wisestone/owl/service/HostingFieldService.java
new file mode 100644
index 0000000..e1ddbec
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/service/HostingFieldService.java
@@ -0,0 +1,30 @@
+package kr.wisestone.owl.service;
+
+import kr.wisestone.owl.domain.HostingField;
+import kr.wisestone.owl.vo.HostingFieldVo;
+import kr.wisestone.owl.web.condition.HostingFieldCondition;
+import kr.wisestone.owl.web.form.HostingFieldForm;
+import org.springframework.data.domain.Pageable;
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+public interface HostingFieldService {
+ HostingField add(HostingFieldForm hostingFieldForm);
+
+ List<HostingFieldVo> find(Map<String, Object> resJsonData, HostingFieldCondition make, Pageable pageable);
+
+ HostingField getHosting(Long id);
+
+ void detail(Map<String, Object> resJsonData, HostingFieldCondition make);
+
+ void modify(HostingFieldForm make);
+
+ void remove(HostingFieldForm make);
+
+ ModelAndView downloadExcel(HttpServletRequest request, Model model);
+
+}
diff --git a/src/main/java/kr/wisestone/owl/service/HostingService.java b/src/main/java/kr/wisestone/owl/service/HostingService.java
deleted file mode 100644
index f0bf726..0000000
--- a/src/main/java/kr/wisestone/owl/service/HostingService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package kr.wisestone.owl.service;
-
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.vo.CompanyFieldVo;
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.form.CompanyFieldForm;
-import org.springframework.data.domain.Pageable;
-import org.springframework.ui.Model;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-public interface HostingService {
- CompanyField addCompany(CompanyFieldForm companyFieldForm);
-
- List<CompanyFieldVo> findCompany(Map<String, Object> resJsonData, CompanyFieldCondition make, Pageable pageable);
-
- CompanyField getCompany(Long id);
-
- void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition make);
-
- void modifyCompany(CompanyFieldForm make);
-
- void removeCompany(CompanyFieldForm make);
-
- ModelAndView downloadExcel(HttpServletRequest request, Model model);
-
- boolean company(Long id);
-}
diff --git a/src/main/java/kr/wisestone/owl/service/IspFieldService.java b/src/main/java/kr/wisestone/owl/service/IspFieldService.java
new file mode 100644
index 0000000..9278825
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/service/IspFieldService.java
@@ -0,0 +1,29 @@
+package kr.wisestone.owl.service;
+
+import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.vo.IspFieldVo;
+import kr.wisestone.owl.web.condition.IspFieldCondition;
+import kr.wisestone.owl.web.form.IspFieldForm;
+import org.springframework.data.domain.Pageable;
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+public interface IspFieldService {
+ IspField add(IspFieldForm ispFieldForm);
+
+ List<IspFieldVo> find(Map<String, Object> resJsonData, IspFieldCondition make, Pageable pageable);
+
+ IspField getIsp(Long id);
+
+ void detail(Map<String, Object> resJsonData, IspFieldCondition make);
+
+ void modify(IspFieldForm make);
+
+ void remove(IspFieldForm make);
+
+ ModelAndView downloadExcel(HttpServletRequest request, Model model);
+}
diff --git a/src/main/java/kr/wisestone/owl/service/IspService.java b/src/main/java/kr/wisestone/owl/service/IspService.java
deleted file mode 100644
index 7f1bd89..0000000
--- a/src/main/java/kr/wisestone/owl/service/IspService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package kr.wisestone.owl.service;
-
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.vo.CompanyFieldVo;
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.form.CompanyFieldForm;
-import org.springframework.data.domain.Pageable;
-import org.springframework.ui.Model;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-public interface IspService {
- CompanyField addCompany(CompanyFieldForm companyFieldForm);
-
- List<CompanyFieldVo> findCompany(Map<String, Object> resJsonData, CompanyFieldCondition make, Pageable pageable);
-
- CompanyField getCompany(Long id);
-
- void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition make);
-
- void modifyCompany(CompanyFieldForm make);
-
- void removeCompany(CompanyFieldForm make);
-
- ModelAndView downloadExcel(HttpServletRequest request, Model model);
-
- boolean company(Long id);
-}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index e3b5d16..911f3db 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -151,12 +151,6 @@
return new ModelAndView(this.excelView);
}
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
- }
-
// 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
private List<CompanyFieldVo> convertCompanyVoToMap(List<Map<String, Object>> results, Long totalCompanyCount, Pageable pageable, Map<String, Object> resJsonData) {
List<CompanyFieldVo> companyFieldVos = Lists.newArrayList();
diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
new file mode 100644
index 0000000..65d1031
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/service/impl/HostingFieldFieldServiceImpl.java
@@ -0,0 +1,191 @@
+package kr.wisestone.owl.service.impl;
+
+import com.google.common.collect.Lists;
+import kr.wisestone.owl.common.ExcelConditionCheck;
+import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.domain.HostingField;
+import kr.wisestone.owl.exception.OwlRuntimeException;
+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;
+import kr.wisestone.owl.vo.ExportExcelAttrVo;
+import kr.wisestone.owl.vo.ExportExcelVo;
+import kr.wisestone.owl.vo.ResPage;
+import kr.wisestone.owl.web.condition.HostingFieldCondition;
+import kr.wisestone.owl.web.form.HostingFieldForm;
+import kr.wisestone.owl.web.view.ExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class HostingFieldFieldServiceImpl extends AbstractServiceImpl<HostingField, Long, JpaRepository<HostingField, Long>> implements HostingFieldService {
+
+ @Autowired
+ private HostingFieldRepository hostingFieldRepository;
+
+ @Autowired
+ private HostingFieldMapper hostingFieldMapper;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private WorkspaceService workspaceService;
+
+ @Autowired
+ private ExcelView excelView;
+
+ @Autowired
+ private ExcelConditionCheck excelConditionCheck;
+
+ @Override
+ protected JpaRepository<HostingField, Long> getRepository() {
+ return this.hostingFieldRepository;
+ }
+
+ // �뾽泥� 異붽�
+ @Override
+ public HostingField add(HostingFieldForm HostingFieldForm) {
+ HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
+ hostingFieldRepository.saveAndFlush(HostingField);
+ return HostingField;
+ }
+
+ // �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
+ @Override
+ public List<HostingFieldVo> find(Map<String, Object> resJsonData,
+ HostingFieldCondition condition, Pageable pageable) {
+ condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
+ condition.setPageSize(pageable.getPageSize());
+
+ List<Map<String, Object>> results = this.hostingFieldMapper.find(condition);
+ Long totalHostingCount = this.hostingFieldMapper.count(condition);
+
+ return this.convertHostingVoToMap(results, totalHostingCount, pageable, resJsonData);
+ }
+
+
+ // �뾽泥� �긽�꽭 議고쉶�븳�떎.
+ @Override
+ public void detail(Map<String, Object> resJsonData, HostingFieldCondition hostingFieldCondition) {
+ HostingFieldVo HostingFieldVo = new HostingFieldVo();
+
+ Long hostingId = hostingFieldCondition.getId();
+ if (hostingId != null) {
+ HostingField HostingField = this.getHosting(hostingId);
+ HostingFieldVo = ConvertUtil.copyProperties(HostingField, HostingFieldVo.class);
+ }
+ resJsonData.put(Constants.REQ_KEY_CONTENT, HostingFieldVo);
+ }
+
+ // �뾽泥� �젙濡쒕�� �닔�젙�븳�떎.
+ @Override
+ public void modify(HostingFieldForm HostingFieldForm) {
+ HostingField HostingField = ConvertUtil.copyProperties(HostingFieldForm, HostingField.class);
+ hostingFieldRepository.saveAndFlush(HostingField);
+ }
+
+
+ // �뾽泥대�� �궘�젣�븳�떎.
+ @Override
+ public void remove(HostingFieldForm HostingFieldForm) {
+ if (HostingFieldForm.getRemoveIds().size() < 1) {
+ throw new OwlRuntimeException(
+ 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();
+ }
+
+ // �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ @Override
+ public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
+ ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ Map<String, Object> conditions = new HashMap<>();
+ // �뿊�� �떎�슫濡쒕뱶�뿉 �븘�슂�븳 寃��깋 議곌굔 �젙蹂대�� 異붿텧�븯怨� 寃��깋 議곌굔 異붿텧�뿉 �삤瑜섍� 諛쒖깮�븯硫� 寃쎄퀬瑜� �몴�떆�빐以��떎.
+ modelAndView = this.excelConditionCheck.checkCondition(conditions, request, model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ HostingFieldCondition hostingFieldCondition = HostingFieldCondition.make(conditions);
+
+
+ List<Map<String, Object>> results = this.hostingFieldMapper.find(hostingFieldCondition);
+ List<HostingFieldVo> hostingFieldVos = ConvertUtil.convertListToListClass(results, HostingFieldVo.class);
+ // code_ko_KR �뿉 code紐� �꽕�젙
+ ExportExcelVo excelInfo = new ExportExcelVo();
+ excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
+ 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));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("Hosting.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("companyMemo", this.messageAccessor.message("Hosting.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+
+ excelInfo.setDatas(hostingFieldVos);
+
+ model.addAttribute(Constants.EXCEL, excelInfo);
+ return new ModelAndView(this.excelView);
+ }
+
+ // 寃��깋 寃곌낵瑜� HostingVo 濡� 蹂��솚�븳�떎.
+ private List<HostingFieldVo> convertHostingVoToMap(List<Map<String, Object>> results, Long totalHostingCount, Pageable pageable, Map<String, Object> resJsonData) {
+ List<HostingFieldVo> hostingFieldVos = Lists.newArrayList();
+
+ for (Map<String, Object> result : results) {
+ HostingFieldVo HostingFieldVo = ConvertUtil.convertMapToClass(result, HostingFieldVo.class);
+ hostingFieldVos.add(HostingFieldVo);
+ }
+
+ int totalPage = (int) Math.ceil((totalHostingCount - 1) / pageable.getPageSize()) + 1;
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, hostingFieldVos);
+ resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
+ totalPage, totalHostingCount));
+
+ return hostingFieldVos;
+ }
+
+ // �뾽泥� ID 濡� 議고쉶�븳�떎
+ @Override
+ public HostingField getHosting(Long id) {
+ if (id == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.HOSTING_NOT_EXIST));
+ }
+
+ HostingField HostingField = this.findOne(id);
+
+ if (HostingField == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.HOSTING_NOT_EXIST));
+ }
+ return HostingField;
+ }
+}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/HostingServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/HostingServiceImpl.java
deleted file mode 100644
index 22bde04..0000000
--- a/src/main/java/kr/wisestone/owl/service/impl/HostingServiceImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package kr.wisestone.owl.service.impl;
-
-import com.google.common.collect.Lists;
-import kr.wisestone.owl.common.ExcelConditionCheck;
-import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.exception.OwlRuntimeException;
-import kr.wisestone.owl.mapper.CompanyFieldMapper;
-import kr.wisestone.owl.repository.CompanyFieldRepository;
-import kr.wisestone.owl.service.CompanyFieldService;
-import kr.wisestone.owl.service.UserService;
-import kr.wisestone.owl.service.WorkspaceService;
-import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.vo.CompanyFieldVo;
-import kr.wisestone.owl.vo.ExportExcelAttrVo;
-import kr.wisestone.owl.vo.ExportExcelVo;
-import kr.wisestone.owl.vo.ResPage;
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.form.CompanyFieldForm;
-import kr.wisestone.owl.web.view.ExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class HostingServiceImpl extends AbstractServiceImpl<CompanyField, Long, JpaRepository<CompanyField, Long>> implements CompanyFieldService {
-
- @Autowired
- private CompanyFieldRepository companyFieldRepository;
-
- @Autowired
- private CompanyFieldMapper companyFieldMapper;
-
- @Autowired
- private UserService userService;
-
- @Autowired
- private WorkspaceService workspaceService;
-
- @Autowired
- private ExcelView excelView;
-
- @Autowired
- private ExcelConditionCheck excelConditionCheck;
-
- @Override
- protected JpaRepository<CompanyField, Long> getRepository() {
- return this.companyFieldRepository;
- }
-
- // �뾽泥� 異붽�
- @Override
- public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
- CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
- companyFieldRepository.saveAndFlush(companyField);
- return companyField;
- }
-
- // �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
- @Override
- public List<CompanyFieldVo> findCompany(Map<String, Object> resJsonData,
- CompanyFieldCondition condition, Pageable pageable) {
- condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
- condition.setPageSize(pageable.getPageSize());
-
- List<Map<String, Object>> results = this.companyFieldMapper.find(condition);
- Long totalCompanyCount = this.companyFieldMapper.count(condition);
-
- return this.convertCompanyVoToMap(results, totalCompanyCount, pageable, resJsonData);
- }
-
-
- // �뾽泥� �긽�꽭 議고쉶�븳�떎.
- @Override
- public void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition companyFieldCondition) {
- CompanyFieldVo companyFieldVo = new CompanyFieldVo();
-
- Long companyId = companyFieldCondition.getId();
- if (companyId != null) {
- CompanyField companyField = this.getCompany(companyId);
- companyFieldVo = ConvertUtil.copyProperties(companyField, CompanyFieldVo.class);
- }
- resJsonData.put(Constants.REQ_KEY_CONTENT, companyFieldVo);
- }
-
- // �뾽泥� �젙濡쒕�� �닔�젙�븳�떎.
- @Override
- public void modifyCompany(CompanyFieldForm companyFieldForm) {
- CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
- companyFieldRepository.saveAndFlush(companyField);
- }
-
-
- // �뾽泥대�� �궘�젣�븳�떎.
- @Override
- public void removeCompany(CompanyFieldForm companyFieldForm) {
- if (companyFieldForm.getRemoveIds().size() < 1) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT));
- }
- for (Long id : companyFieldForm.getRemoveIds()) {
- if (!this.userService.useUserLevel(id)) {
- this.companyFieldRepository.deleteById(id);
- } else {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
- }
-
- }
- this.companyFieldRepository.flush();
- }
-
- // �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
- @Override
- public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
- ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
- if (modelAndView != null) {
- return modelAndView;
- }
-
- Map<String, Object> conditions = new HashMap<>();
- // �뿊�� �떎�슫濡쒕뱶�뿉 �븘�슂�븳 寃��깋 議곌굔 �젙蹂대�� 異붿텧�븯怨� 寃��깋 議곌굔 異붿텧�뿉 �삤瑜섍� 諛쒖깮�븯硫� 寃쎄퀬瑜� �몴�떆�빐以��떎.
- modelAndView = this.excelConditionCheck.checkCondition(conditions, request, model);
- if (modelAndView != null) {
- return modelAndView;
- }
-
- CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
-
-
- List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
- List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
- // code_ko_KR �뿉 code紐� �꽕�젙
- ExportExcelVo excelInfo = new ExportExcelVo();
- excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyManager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyTel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyMemo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
-
- excelInfo.setDatas(companyFieldVos);
-
- model.addAttribute(Constants.EXCEL, excelInfo);
- return new ModelAndView(this.excelView);
- }
-
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
- }
-
- // 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
- private List<CompanyFieldVo> convertCompanyVoToMap(List<Map<String, Object>> results, Long totalCompanyCount, Pageable pageable, Map<String, Object> resJsonData) {
- List<CompanyFieldVo> companyFieldVos = Lists.newArrayList();
-
- for (Map<String, Object> result : results) {
- CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
- companyFieldVos.add(companyFieldVo);
- }
-
- int totalPage = (int) Math.ceil((totalCompanyCount - 1) / pageable.getPageSize()) + 1;
-
- resJsonData.put(Constants.RES_KEY_CONTENTS, companyFieldVos);
- resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- totalPage, totalCompanyCount));
-
- return companyFieldVos;
- }
-
- // �뾽泥� ID 濡� 議고쉶�븳�떎
- @Override
- public CompanyField getCompany(Long id) {
- if (id == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
- }
-
- CompanyField companyField = this.findOne(id);
-
- if (companyField == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
- }
- return companyField;
- }
-}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
new file mode 100644
index 0000000..ad51efc
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/service/impl/IspFieldFieldServiceImpl.java
@@ -0,0 +1,191 @@
+package kr.wisestone.owl.service.impl;
+
+import com.google.common.collect.Lists;
+import kr.wisestone.owl.common.ExcelConditionCheck;
+import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.constant.MsgConstants;
+import kr.wisestone.owl.domain.IspField;
+import kr.wisestone.owl.exception.OwlRuntimeException;
+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;
+import kr.wisestone.owl.vo.ExportExcelAttrVo;
+import kr.wisestone.owl.vo.ExportExcelVo;
+import kr.wisestone.owl.vo.ResPage;
+import kr.wisestone.owl.web.condition.IspFieldCondition;
+import kr.wisestone.owl.web.form.IspFieldForm;
+import kr.wisestone.owl.web.view.ExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class IspFieldFieldServiceImpl extends AbstractServiceImpl<IspField, Long, JpaRepository<IspField, Long>> implements IspFieldService {
+
+ @Autowired
+ private IspFieldRepository ispFieldRepository;
+
+ @Autowired
+ private IspFieldMapper ispFieldMapper;
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private WorkspaceService workspaceService;
+
+ @Autowired
+ private ExcelView excelView;
+
+ @Autowired
+ private ExcelConditionCheck excelConditionCheck;
+
+ @Override
+ protected JpaRepository<IspField, Long> getRepository() {
+ return this.ispFieldRepository;
+ }
+
+ // �뾽泥� 異붽�
+ @Override
+ public IspField add(IspFieldForm IspFieldForm) {
+ IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
+ ispFieldRepository.saveAndFlush(IspField);
+ return IspField;
+ }
+
+ // �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
+ @Override
+ public List<IspFieldVo> find(Map<String, Object> resJsonData,
+ IspFieldCondition condition, Pageable pageable) {
+ condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
+ condition.setPageSize(pageable.getPageSize());
+
+ List<Map<String, Object>> results = this.ispFieldMapper.find(condition);
+ Long totalIspCount = this.ispFieldMapper.count(condition);
+
+ return this.convertIspVoToMap(results, totalIspCount, pageable, resJsonData);
+ }
+
+
+ // �뾽泥� �긽�꽭 議고쉶�븳�떎.
+ @Override
+ public void detail(Map<String, Object> resJsonData, IspFieldCondition ispFieldCondition) {
+ IspFieldVo IspFieldVo = new IspFieldVo();
+
+ Long IspId = ispFieldCondition.getId();
+ if (IspId != null) {
+ IspField IspField = this.getIsp(IspId);
+ IspFieldVo = ConvertUtil.copyProperties(IspField, IspFieldVo.class);
+ }
+ resJsonData.put(Constants.REQ_KEY_CONTENT, IspFieldVo);
+ }
+
+ // �뾽泥� �젙濡쒕�� �닔�젙�븳�떎.
+ @Override
+ public void modify(IspFieldForm IspFieldForm) {
+ IspField IspField = ConvertUtil.copyProperties(IspFieldForm, IspField.class);
+ ispFieldRepository.saveAndFlush(IspField);
+ }
+
+
+ // �뾽泥대�� �궘�젣�븳�떎.
+ @Override
+ public void remove(IspFieldForm IspFieldForm) {
+ if (IspFieldForm.getRemoveIds().size() < 1) {
+ throw new OwlRuntimeException(
+ 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();
+ }
+
+ // �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ @Override
+ public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
+ ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ Map<String, Object> conditions = new HashMap<>();
+ // �뿊�� �떎�슫濡쒕뱶�뿉 �븘�슂�븳 寃��깋 議곌굔 �젙蹂대�� 異붿텧�븯怨� 寃��깋 議곌굔 異붿텧�뿉 �삤瑜섍� 諛쒖깮�븯硫� 寃쎄퀬瑜� �몴�떆�빐以��떎.
+ modelAndView = this.excelConditionCheck.checkCondition(conditions, request, model);
+ if (modelAndView != null) {
+ return modelAndView;
+ }
+
+ IspFieldCondition ispFieldCondition = IspFieldCondition.make(conditions);
+
+
+ List<Map<String, Object>> results = this.ispFieldMapper.find(ispFieldCondition);
+ List<IspFieldVo> ispFieldVos = ConvertUtil.convertListToListClass(results, IspFieldVo.class);
+ // code_ko_KR �뿉 code紐� �꽕�젙
+ ExportExcelVo excelInfo = new ExportExcelVo();
+ excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
+ 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));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("IspEmail", this.messageAccessor.message("Isp.IspEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("IspMemo", this.messageAccessor.message("Isp.IspMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
+
+ excelInfo.setDatas(ispFieldVos);
+
+ model.addAttribute(Constants.EXCEL, excelInfo);
+ return new ModelAndView(this.excelView);
+ }
+
+ // 寃��깋 寃곌낵瑜� IspVo 濡� 蹂��솚�븳�떎.
+ private List<IspFieldVo> convertIspVoToMap(List<Map<String, Object>> results, Long totalIspCount, Pageable pageable, Map<String, Object> resJsonData) {
+ List<IspFieldVo> ispFieldVos = Lists.newArrayList();
+
+ for (Map<String, Object> result : results) {
+ IspFieldVo IspFieldVo = ConvertUtil.convertMapToClass(result, IspFieldVo.class);
+ ispFieldVos.add(IspFieldVo);
+ }
+
+ int totalPage = (int) Math.ceil((totalIspCount - 1) / pageable.getPageSize()) + 1;
+
+ resJsonData.put(Constants.RES_KEY_CONTENTS, ispFieldVos);
+ resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
+ totalPage, totalIspCount));
+
+ return ispFieldVos;
+ }
+
+ // �뾽泥� ID 濡� 議고쉶�븳�떎
+ @Override
+ public IspField getIsp(Long id) {
+ if (id == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISP_NOT_EXIST));
+ }
+
+ IspField IspField = this.findOne(id);
+
+ if (IspField == null) {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ISP_NOT_EXIST));
+ }
+ return IspField;
+ }
+}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IspServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IspServiceImpl.java
deleted file mode 100644
index e76466e..0000000
--- a/src/main/java/kr/wisestone/owl/service/impl/IspServiceImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package kr.wisestone.owl.service.impl;
-
-import com.google.common.collect.Lists;
-import kr.wisestone.owl.common.ExcelConditionCheck;
-import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.constant.MsgConstants;
-import kr.wisestone.owl.domain.CompanyField;
-import kr.wisestone.owl.exception.OwlRuntimeException;
-import kr.wisestone.owl.mapper.CompanyFieldMapper;
-import kr.wisestone.owl.repository.CompanyFieldRepository;
-import kr.wisestone.owl.service.CompanyFieldService;
-import kr.wisestone.owl.service.UserService;
-import kr.wisestone.owl.service.WorkspaceService;
-import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.vo.CompanyFieldVo;
-import kr.wisestone.owl.vo.ExportExcelAttrVo;
-import kr.wisestone.owl.vo.ExportExcelVo;
-import kr.wisestone.owl.vo.ResPage;
-import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.form.CompanyFieldForm;
-import kr.wisestone.owl.web.view.ExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class IspServiceImpl extends AbstractServiceImpl<CompanyField, Long, JpaRepository<CompanyField, Long>> implements CompanyFieldService {
-
- @Autowired
- private CompanyFieldRepository companyFieldRepository;
-
- @Autowired
- private CompanyFieldMapper companyFieldMapper;
-
- @Autowired
- private UserService userService;
-
- @Autowired
- private WorkspaceService workspaceService;
-
- @Autowired
- private ExcelView excelView;
-
- @Autowired
- private ExcelConditionCheck excelConditionCheck;
-
- @Override
- protected JpaRepository<CompanyField, Long> getRepository() {
- return this.companyFieldRepository;
- }
-
- // �뾽泥� 異붽�
- @Override
- public CompanyField addCompany(CompanyFieldForm companyFieldForm) {
- CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
- companyFieldRepository.saveAndFlush(companyField);
- return companyField;
- }
-
- // �뾽泥� 紐⑸줉�쓣 媛��졇�삩�떎.
- @Override
- public List<CompanyFieldVo> findCompany(Map<String, Object> resJsonData,
- CompanyFieldCondition condition, Pageable pageable) {
- condition.setPage(pageable.getPageNumber() * pageable.getPageSize());
- condition.setPageSize(pageable.getPageSize());
-
- List<Map<String, Object>> results = this.companyFieldMapper.find(condition);
- Long totalCompanyCount = this.companyFieldMapper.count(condition);
-
- return this.convertCompanyVoToMap(results, totalCompanyCount, pageable, resJsonData);
- }
-
-
- // �뾽泥� �긽�꽭 議고쉶�븳�떎.
- @Override
- public void detailCompany(Map<String, Object> resJsonData, CompanyFieldCondition companyFieldCondition) {
- CompanyFieldVo companyFieldVo = new CompanyFieldVo();
-
- Long companyId = companyFieldCondition.getId();
- if (companyId != null) {
- CompanyField companyField = this.getCompany(companyId);
- companyFieldVo = ConvertUtil.copyProperties(companyField, CompanyFieldVo.class);
- }
- resJsonData.put(Constants.REQ_KEY_CONTENT, companyFieldVo);
- }
-
- // �뾽泥� �젙濡쒕�� �닔�젙�븳�떎.
- @Override
- public void modifyCompany(CompanyFieldForm companyFieldForm) {
- CompanyField companyField = ConvertUtil.copyProperties(companyFieldForm, CompanyField.class);
- companyFieldRepository.saveAndFlush(companyField);
- }
-
-
- // �뾽泥대�� �궘�젣�븳�떎.
- @Override
- public void removeCompany(CompanyFieldForm companyFieldForm) {
- if (companyFieldForm.getRemoveIds().size() < 1) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANY_REMOVE_NOT_SELECT));
- }
- for (Long id : companyFieldForm.getRemoveIds()) {
- if (!this.userService.useUserLevel(id)) {
- this.companyFieldRepository.deleteById(id);
- } else {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.DEPARTMENT_ALREADY_IN_USE));
- }
-
- }
- this.companyFieldRepository.flush();
- }
-
- // �뾽泥� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
- @Override
- public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
- ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
- if (modelAndView != null) {
- return modelAndView;
- }
-
- Map<String, Object> conditions = new HashMap<>();
- // �뿊�� �떎�슫濡쒕뱶�뿉 �븘�슂�븳 寃��깋 議곌굔 �젙蹂대�� 異붿텧�븯怨� 寃��깋 議곌굔 異붿텧�뿉 �삤瑜섍� 諛쒖깮�븯硫� 寃쎄퀬瑜� �몴�떆�빐以��떎.
- modelAndView = this.excelConditionCheck.checkCondition(conditions, request, model);
- if (modelAndView != null) {
- return modelAndView;
- }
-
- CompanyFieldCondition companyFieldCondition = CompanyFieldCondition.make(conditions);
-
-
- List<Map<String, Object>> results = this.companyFieldMapper.find(companyFieldCondition);
- List<CompanyFieldVo> companyFieldVos = ConvertUtil.convertListToListClass(results, CompanyFieldVo.class);
- // code_ko_KR �뿉 code紐� �꽕�젙
- ExportExcelVo excelInfo = new ExportExcelVo();
- excelInfo.setFileName(this.messageAccessor.message("�뾽泥� 紐⑸줉"));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyName", this.messageAccessor.message("companyField.companyName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyManager", this.messageAccessor.message("companyField.companyManager"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyTel", this.messageAccessor.message("companyField.companyTel"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyEmail", this.messageAccessor.message("companyField.companyEmail"), 10, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("companyMemo", this.messageAccessor.message("companyField.companyMemo"), 10, ExportExcelAttrVo.ALIGN_CENTER));
-
- excelInfo.setDatas(companyFieldVos);
-
- model.addAttribute(Constants.EXCEL, excelInfo);
- return new ModelAndView(this.excelView);
- }
-
- // �궘�젣 �븷 �뾽泥닿� �엳�뒗吏� �솗�씤
- @Override
- public boolean company(Long Id) {
- return this.companyFieldMapper.findByCompany(Id) > 0;
- }
-
- // 寃��깋 寃곌낵瑜� CompanyFieldVo 濡� 蹂��솚�븳�떎.
- private List<CompanyFieldVo> convertCompanyVoToMap(List<Map<String, Object>> results, Long totalCompanyCount, Pageable pageable, Map<String, Object> resJsonData) {
- List<CompanyFieldVo> companyFieldVos = Lists.newArrayList();
-
- for (Map<String, Object> result : results) {
- CompanyFieldVo companyFieldVo = ConvertUtil.convertMapToClass(result, CompanyFieldVo.class);
- companyFieldVos.add(companyFieldVo);
- }
-
- int totalPage = (int) Math.ceil((totalCompanyCount - 1) / pageable.getPageSize()) + 1;
-
- resJsonData.put(Constants.RES_KEY_CONTENTS, companyFieldVos);
- resJsonData.put(Constants.REQ_KEY_PAGE_VO, new ResPage(pageable.getPageNumber(), pageable.getPageSize(),
- totalPage, totalCompanyCount));
-
- return companyFieldVos;
- }
-
- // �뾽泥� ID 濡� 議고쉶�븳�떎
- @Override
- public CompanyField getCompany(Long id) {
- if (id == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
- }
-
- CompanyField companyField = this.findOne(id);
-
- if (companyField == null) {
- throw new OwlRuntimeException(
- this.messageAccessor.getMessage(MsgConstants.COMPANYFIELD_NOT_EXIST));
- }
- return companyField;
- }
-}
diff --git a/src/main/java/kr/wisestone/owl/vo/IspVo.java b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
similarity index 86%
rename from src/main/java/kr/wisestone/owl/vo/IspVo.java
rename to src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
index 5ed4f90..c5a2721 100644
--- a/src/main/java/kr/wisestone/owl/vo/IspVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
@@ -1,6 +1,6 @@
package kr.wisestone.owl.vo;
-public class IspVo extends BaseVo{
+public class HostingFieldVo extends BaseVo{
private Long id;
private String name;
@@ -9,9 +9,9 @@
private String email;
private String memo;
- public IspVo() {}
+ public HostingFieldVo() {}
- public IspVo(Long id, String name, String manager, String tel, String email, String memo) {
+ public HostingFieldVo(Long id, String name, String manager, String tel, String email, String memo) {
this.id = id;
this.name = name;
diff --git a/src/main/java/kr/wisestone/owl/vo/HostingVo.java b/src/main/java/kr/wisestone/owl/vo/HostingVo.java
deleted file mode 100644
index f9855b1..0000000
--- a/src/main/java/kr/wisestone/owl/vo/HostingVo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package kr.wisestone.owl.vo;
-
-public class HostingVo extends BaseVo{
-
- private Long id;
- private String name;
- private String manager;
- private String tel;
- private String email;
- private String memo;
-
- public HostingVo() {}
-
- public HostingVo(Long id, String name, String manager, String tel, String email, String memo) {
-
- this.id = id;
- this.name = name;
- this.manager = manager;
- this.tel = tel;
- this.email = email;
- this.memo = memo;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getManager() {
- return manager;
- }
-
- public void setManager(String manager) {
- this.manager = manager;
- }
-
- public String getTel() {
- return tel;
- }
-
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-}
diff --git a/src/main/java/kr/wisestone/owl/vo/IspVo.java b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
similarity index 86%
copy from src/main/java/kr/wisestone/owl/vo/IspVo.java
copy to src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
index 5ed4f90..fda52f7 100644
--- a/src/main/java/kr/wisestone/owl/vo/IspVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
@@ -1,6 +1,6 @@
package kr.wisestone.owl.vo;
-public class IspVo extends BaseVo{
+public class IspFieldVo extends BaseVo{
private Long id;
private String name;
@@ -9,9 +9,9 @@
private String email;
private String memo;
- public IspVo() {}
+ public IspFieldVo() {}
- public IspVo(Long id, String name, String manager, String tel, String email, String memo) {
+ public IspFieldVo(Long id, String name, String manager, String tel, String email, String memo) {
this.id = id;
this.name = name;
diff --git a/src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
similarity index 85%
copy from src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java
copy to src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
index 477cb95..25afc50 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
@@ -4,7 +4,7 @@
import java.util.Map;
-public class HostingCondition {
+public class HostingFieldCondition {
private Long id;
private String name;
private String manager;
@@ -15,8 +15,8 @@
private Integer Page;
private Integer PageSize;
- public static HostingCondition make(Map<String, Object> companyFieldCondition) {
- return ConvertUtil.convertMapToClass(companyFieldCondition, HostingCondition.class);
+ public static HostingFieldCondition make(Map<String, Object> hostingFieldCondition) {
+ return ConvertUtil.convertMapToClass(hostingFieldCondition, HostingFieldCondition.class);
}
public Long getId() {
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IspCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IspCondition.java
deleted file mode 100644
index d13871d..0000000
--- a/src/main/java/kr/wisestone/owl/web/condition/IspCondition.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package kr.wisestone.owl.web.condition;
-
-import kr.wisestone.owl.util.ConvertUtil;
-
-import java.util.Map;
-
-public class IspCondition {
- private Long id;
- private String name;
- private String manager;
- private String tel;
- private String email;
- private String memo;
-
- private Integer Page;
- private Integer PageSize;
-
- public static IspCondition make(Map<String, Object> companyFieldCondition) {
- return ConvertUtil.convertMapToClass(companyFieldCondition, IspCondition.class);
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getManager() {
- return manager;
- }
-
- public void setManager(String manager) {
- this.manager = manager;
- }
-
- public String getTel() {
- return tel;
- }
-
- public void setTel(String tel) {
- this.tel = tel;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Integer getPage() {
- return Page;
- }
-
- public void setPage(Integer page) {
- Page = page;
- }
-
- public Integer getPageSize() {
- return PageSize;
- }
-
- public void setPageSize(Integer pageSize) {
- PageSize = pageSize;
- }
-}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
similarity index 90%
rename from src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java
rename to src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
index 477cb95..6c7d3c5 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/HostingCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
@@ -4,7 +4,7 @@
import java.util.Map;
-public class HostingCondition {
+public class IspFieldCondition {
private Long id;
private String name;
private String manager;
@@ -15,8 +15,8 @@
private Integer Page;
private Integer PageSize;
- public static HostingCondition make(Map<String, Object> companyFieldCondition) {
- return ConvertUtil.convertMapToClass(companyFieldCondition, HostingCondition.class);
+ public static IspFieldCondition make(Map<String, Object> companyFieldCondition) {
+ return ConvertUtil.convertMapToClass(companyFieldCondition, IspFieldCondition.class);
}
public Long getId() {
diff --git a/src/main/java/kr/wisestone/owl/web/controller/HostingController.java b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
similarity index 78%
rename from src/main/java/kr/wisestone/owl/web/controller/HostingController.java
rename to src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
index d16c779..7b5302d 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/HostingController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
@@ -1,9 +1,9 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.service.HostingService;
-import kr.wisestone.owl.web.condition.HostingCondition;
-import kr.wisestone.owl.web.form.HostingForm;
+import kr.wisestone.owl.service.HostingFieldService;
+import kr.wisestone.owl.web.condition.HostingFieldCondition;
+import kr.wisestone.owl.web.form.HostingFieldForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
@@ -20,10 +20,10 @@
import java.util.Map;
@Controller
-public class HostingController extends BaseController{
+public class HostingFieldController extends BaseController{
@Autowired
- private HostingService HostingService;
+ private HostingFieldService HostingFieldService;
// �뾽泥� �깮�꽦
@RequestMapping(value = "/hosting/add", method = RequestMethod.POST)
@@ -32,7 +32,7 @@
Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.HostingService.addCompany(HostingForm.make(content));
+ this.HostingFieldService.add(HostingFieldForm.make(content));
return this.setSuccessMessage(resJsonData);
}
@@ -45,7 +45,7 @@
Map<String, Object> resJsonData = new HashMap<>();
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
- this.HostingService.findCompany(resJsonData, HostingCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ this.HostingFieldService.find(resJsonData, HostingFieldCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
return this.setSuccessMessage(resJsonData);
}
@@ -56,7 +56,7 @@
@ResponseBody
Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.HostingService.detailCompany(resJsonData, HostingCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.HostingFieldService.detail(resJsonData, HostingFieldCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -68,7 +68,7 @@
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.HostingService.modifyCompany(HostingForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.HostingFieldService.modify(HostingFieldForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -81,7 +81,7 @@
Map<String, Object> resJsonData = new HashMap<>();
Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.HostingService.removeCompany(HostingForm.make(content));
+ this.HostingFieldService.remove(HostingFieldForm.make(content));
return this.setSuccessMessage(resJsonData);
}
@@ -90,7 +90,7 @@
// �뾽泥� �뿊�� �떎�슫濡쒕뱶
@RequestMapping(value = "/hosting/downloadExcel", method = RequestMethod.POST)
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
- return this.HostingService.downloadExcel(request, model);
+ return this.HostingFieldService.downloadExcel(request, model);
}
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IspController.java b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
similarity index 80%
rename from src/main/java/kr/wisestone/owl/web/controller/IspController.java
rename to src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
index 3a9d989..4285f77 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IspController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
@@ -1,9 +1,9 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.service.IspService;
+import kr.wisestone.owl.service.IspFieldService;
import kr.wisestone.owl.web.condition.IspCondition;
-import kr.wisestone.owl.web.form.IspForm;
+import kr.wisestone.owl.web.form.IspFieldForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
@@ -20,10 +20,10 @@
import java.util.Map;
@Controller
-public class IspController extends BaseController{
+public class IspFieldController extends BaseController{
@Autowired
- private IspService IspService;
+ private IspFieldService IspFieldService;
// �뾽泥� �깮�꽦
@RequestMapping(value = "/isp/add", method = RequestMethod.POST)
@@ -32,7 +32,7 @@
Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.IspService.addCompany(IspForm.make(content));
+ this.IspFieldService.add(IspFieldForm.make(content));
return this.setSuccessMessage(resJsonData);
}
@@ -45,7 +45,7 @@
Map<String, Object> resJsonData = new HashMap<>();
Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
- this.IspService.findCompany(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+ this.IspFieldService.find(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
return this.setSuccessMessage(resJsonData);
}
@@ -56,7 +56,7 @@
@ResponseBody
Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.IspService.detailCompany(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.IspFieldService.detail(resJsonData, IspCondition.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -68,7 +68,7 @@
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- this.IspService.modifyCompany(IspForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+ this.IspFieldService.modify(IspFieldForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -81,7 +81,7 @@
Map<String, Object> resJsonData = new HashMap<>();
Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.IspService.removeCompany(IspForm.make(content));
+ this.IspFieldService.remove(IspFieldForm.make(content));
return this.setSuccessMessage(resJsonData);
}
@@ -90,7 +90,7 @@
// �뾽泥� �뿊�� �떎�슫濡쒕뱶
@RequestMapping(value = "/isp/downloadExcel", method = RequestMethod.POST)
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
- return this.IspService.downloadExcel(request, model);
+ return this.IspFieldService.downloadExcel(request, model);
}
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
new file mode 100644
index 0000000..50004a2
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
@@ -0,0 +1,85 @@
+package kr.wisestone.owl.web.form;
+
+import com.google.common.collect.Lists;
+import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
+
+import java.util.List;
+import java.util.Map;
+
+public class HostingFieldForm {
+ private Long id;
+ private String name;
+ private String manager;
+ private String tel;
+ private String email;
+ private String memo;
+ private List<Long> removeIds = Lists.newArrayList();
+
+ public HostingFieldForm() {
+ }
+ public static HostingFieldForm make(Map<String, Object> params) {
+ HostingFieldForm form = ConvertUtil.convertMapToClass(params, HostingFieldForm.class);
+
+ if (MapUtil.getLongs(params,"removeIds") != null) {
+ form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
+ }
+ return form;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getManager() {
+ return manager;
+ }
+
+ public void setManager(String manager) {
+ this.manager = manager;
+ }
+
+ public String getTel() {
+ return tel;
+ }
+
+ public void setTel(String tel) {
+ this.tel = tel;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ public List<Long> getRemoveIds() {
+ return removeIds;
+ }
+
+ public void setRemoveIds(List<Long> removeIds) {
+ this.removeIds = removeIds;
+ }
+}
diff --git a/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
new file mode 100644
index 0000000..1ed48fb
--- /dev/null
+++ b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
@@ -0,0 +1,85 @@
+package kr.wisestone.owl.web.form;
+
+import com.google.common.collect.Lists;
+import kr.wisestone.owl.util.ConvertUtil;
+import kr.wisestone.owl.util.MapUtil;
+
+import java.util.List;
+import java.util.Map;
+
+public class IspFieldForm {
+ private Long id;
+ private String name;
+ private String manager;
+ private String tel;
+ private String email;
+ private String memo;
+ private List<Long> removeIds = Lists.newArrayList();
+
+ public IspFieldForm() {
+ }
+ public static IspFieldForm make(Map<String, Object> params) {
+ IspFieldForm form = ConvertUtil.convertMapToClass(params, IspFieldForm.class);
+
+ if (MapUtil.getLongs(params,"removeIds") != null) {
+ form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
+ }
+ return form;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getManager() {
+ return manager;
+ }
+
+ public void setManager(String manager) {
+ this.manager = manager;
+ }
+
+ public String getTel() {
+ return tel;
+ }
+
+ public void setTel(String tel) {
+ this.tel = tel;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ public List<Long> getRemoveIds() {
+ return removeIds;
+ }
+
+ public void setRemoveIds(List<Long> removeIds) {
+ this.removeIds = removeIds;
+ }
+}
diff --git a/src/main/resources/mybatis/query-template/HostingField-template.xml b/src/main/resources/mybatis/query-template/HostingField-template.xml
new file mode 100644
index 0000000..623681a
--- /dev/null
+++ b/src/main/resources/mybatis/query-template/HostingField-template.xml
@@ -0,0 +1,41 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="kr.wisestone.owl.mapper.HostingFieldMapper">
+
+ <select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.HostingCondition">
+ SELECT
+ h.id as id,
+ h.name as name,
+ h.manager as manager,
+ h.tel as tel,
+ h.email as email,
+ h.memo as memo
+ FROM
+ hosting h
+ WHERE 1=1
+ <if test="name != '' and name != null">
+ AND h.name like CONCAT('%',#{name},'%')
+ </if>
+ <if test="id != '' and id != null">
+ AND h.id like CONCAT('%',#{id},'%')
+ </if>
+ <if test="pageSize != '' and pageSize != null">
+ limit #{pageSize} offset #{page};
+ </if>
+ </select>
+
+ <select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.HostingCondition">
+ SELECT
+ count(h.id)
+ FROM
+ hosting h
+ WHERE 1=1
+ <if test="name != '' and name != null">
+ AND h.name like CONCAT('%',#{name},'%')
+ </if>
+ <if test="id != '' and id != null">
+ AND h.id like CONCAT('%',#{id},'%')
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/query-template/IspField-template.xml b/src/main/resources/mybatis/query-template/IspField-template.xml
new file mode 100644
index 0000000..4e41942
--- /dev/null
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -0,0 +1,41 @@
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="kr.wisestone.owl.mapper.IspFieldMapper">
+
+ <select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IspCondition">
+ SELECT
+ i.id as id,
+ i.name as name,
+ i.manager as manager,
+ i.tel as tel,
+ i.email as email,
+ i.memo as memo
+ FROM
+ isp i
+ WHERE 1=1
+ <if test="name != '' and name != null">
+ AND i.name like CONCAT('%',#{name},'%')
+ </if>
+ <if test="id != '' and id != null">
+ AND i.id like CONCAT('%',#{id},'%')
+ </if>
+ <if test="pageSize != '' and pageSize != null">
+ limit #{pageSize} offset #{page};
+ </if>
+ </select>
+
+ <select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.IspCondition">
+ SELECT
+ count(i.id)
+ FROM
+ isp i
+ WHERE 1=1
+ <if test="name != '' and name != null">
+ AND i.name like CONCAT('%',#{name},'%')
+ </if>
+ <if test="id != '' and id != null">
+ AND i.id like CONCAT('%',#{id},'%')
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0