From 7bfc9733c93691c848ac0bb9828db699e91ab75c Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 09 11월 2021 11:36:31 +0900
Subject: [PATCH] ISP, Hoting 백엔드 수정
---
src/main/java/kr/wisestone/owl/mapper/CompanyFieldMapper.java | 1
src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java | 12 +++
src/main/resources/mybatis/query-template/IspField-template.xml | 1
src/main/java/kr/wisestone/owl/domain/IspField.java | 9 +++
src/main/java/kr/wisestone/owl/mapper/UserLevelMapper.java | 1
src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java | 10 +++
src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java | 9 +++
src/main/resources/migration/V1_11__Alter_Table.sql | 2
src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java | 9 +++
src/main/resources/mybatis/query-template/HostingField-template.xml | 27 ++++----
src/main/java/kr/wisestone/owl/domain/HostingField.java | 9 +++
src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java | 12 ++--
src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java | 12 ++--
src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java | 9 +++
src/main/java/kr/wisestone/owl/vo/IspFieldVo.java | 12 +++
15 files changed, 106 insertions(+), 29 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/domain/HostingField.java b/src/main/java/kr/wisestone/owl/domain/HostingField.java
index 25db7a3..19a4b61 100644
--- a/src/main/java/kr/wisestone/owl/domain/HostingField.java
+++ b/src/main/java/kr/wisestone/owl/domain/HostingField.java
@@ -13,6 +13,7 @@
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -29,6 +30,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/domain/IspField.java b/src/main/java/kr/wisestone/owl/domain/IspField.java
index bf4e72b..7dbdb4c 100644
--- a/src/main/java/kr/wisestone/owl/domain/IspField.java
+++ b/src/main/java/kr/wisestone/owl/domain/IspField.java
@@ -13,6 +13,7 @@
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -29,6 +30,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/mapper/CompanyFieldMapper.java b/src/main/java/kr/wisestone/owl/mapper/CompanyFieldMapper.java
index 34447cb..1cb87aa 100644
--- a/src/main/java/kr/wisestone/owl/mapper/CompanyFieldMapper.java
+++ b/src/main/java/kr/wisestone/owl/mapper/CompanyFieldMapper.java
@@ -1,7 +1,6 @@
package kr.wisestone.owl.mapper;
import kr.wisestone.owl.web.condition.CompanyFieldCondition;
-import kr.wisestone.owl.web.condition.DepartmentManageCondition;
import org.springframework.stereotype.Repository;
import java.util.List;
diff --git a/src/main/java/kr/wisestone/owl/mapper/UserLevelMapper.java b/src/main/java/kr/wisestone/owl/mapper/UserLevelMapper.java
index c94dfd3..ee5de3a 100644
--- a/src/main/java/kr/wisestone/owl/mapper/UserLevelMapper.java
+++ b/src/main/java/kr/wisestone/owl/mapper/UserLevelMapper.java
@@ -1,6 +1,5 @@
package kr.wisestone.owl.mapper;
-import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
index c5a2721..6ee9243 100644
--- a/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/HostingFieldVo.java
@@ -3,6 +3,7 @@
public class HostingFieldVo extends BaseVo{
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -11,9 +12,10 @@
public HostingFieldVo() {}
- public HostingFieldVo(Long id, String name, String manager, String tel, String email, String memo) {
+ public HostingFieldVo(Long id, String code, String name, String manager, String tel, String email, String memo) {
this.id = id;
+ this.code = code;
this.name = name;
this.manager = manager;
this.tel = tel;
@@ -29,6 +31,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
index fda52f7..654c610 100644
--- a/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/IspFieldVo.java
@@ -3,6 +3,7 @@
public class IspFieldVo extends BaseVo{
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -11,9 +12,10 @@
public IspFieldVo() {}
- public IspFieldVo(Long id, String name, String manager, String tel, String email, String memo) {
+ public IspFieldVo(Long id, String code, String name, String manager, String tel, String email, String memo) {
this.id = id;
+ this.code = code;
this.name = name;
this.manager = manager;
this.tel = tel;
@@ -29,6 +31,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
index 25afc50..39319b4 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/HostingFieldCondition.java
@@ -6,6 +6,7 @@
public class HostingFieldCondition {
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -27,6 +28,15 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
index 6c7d3c5..626323f 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/IspFieldCondition.java
@@ -6,6 +6,7 @@
public class IspFieldCondition {
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -27,6 +28,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
index 7b5302d..b903c38 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/HostingFieldController.java
@@ -26,7 +26,7 @@
private HostingFieldService HostingFieldService;
// �뾽泥� �깮�꽦
- @RequestMapping(value = "/hosting/add", method = RequestMethod.POST)
+ @RequestMapping(value = "/hostingField/add", method = RequestMethod.POST)
public
@ResponseBody
Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
@@ -38,7 +38,7 @@
}
// �뾽泥� 議고쉶
- @RequestMapping(value = "/hosting/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/hostingField/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
@@ -51,7 +51,7 @@
}
// �뾽泥� �긽�꽭 議고쉶
- @RequestMapping(value = "/hosting/detail", produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/hostingField/detail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
@@ -62,7 +62,7 @@
}
// �뾽泥� �닔�젙
- @RequestMapping(value = "/hosting/modify", produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/hostingField/modify", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
@@ -74,7 +74,7 @@
}
// �뾽泥� �궘�젣
- @RequestMapping(value = "/hosting/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/hostingField/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> remove(@RequestBody Map<String, Map<String, Object>> params) {
@@ -88,7 +88,7 @@
// �뾽泥� �뿊�� �떎�슫濡쒕뱶
- @RequestMapping(value = "/hosting/downloadExcel", method = RequestMethod.POST)
+ @RequestMapping(value = "/hostingField/downloadExcel", method = RequestMethod.POST)
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
return this.HostingFieldService.downloadExcel(request, model);
}
diff --git a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
index 54967e4..539fb5e 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/IspFieldController.java
@@ -26,7 +26,7 @@
private IspFieldService IspFieldService;
// �뾽泥� �깮�꽦
- @RequestMapping(value = "/isp/add", method = RequestMethod.POST)
+ @RequestMapping(value = "/ispField/add", method = RequestMethod.POST)
public
@ResponseBody
Map<String, Object> add(@RequestBody Map<String, Map<String, Object>> params) {
@@ -38,7 +38,7 @@
}
// �뾽泥� 議고쉶
- @RequestMapping(value = "/isp/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/ispField/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> find(@RequestBody Map<String, Map<String, Object>> params) {
@@ -51,7 +51,7 @@
}
// �뾽泥� �긽�꽭 議고쉶
- @RequestMapping(value = "/isp/detail", produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/ispField/detail", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> detail(@RequestBody Map<String, Map<String, Object>> params) {
@@ -62,7 +62,7 @@
}
// �뾽泥� �닔�젙
- @RequestMapping(value = "/isp/modify", produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/ispField/modify", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
@@ -74,7 +74,7 @@
}
// �뾽泥� �궘�젣
- @RequestMapping(value = "/isp/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/ispField/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> remove(@RequestBody Map<String, Map<String, Object>> params) {
@@ -88,7 +88,7 @@
// �뾽泥� �뿊�� �떎�슫濡쒕뱶
- @RequestMapping(value = "/isp/downloadExcel", method = RequestMethod.POST)
+ @RequestMapping(value = "/ispField/downloadExcel", method = RequestMethod.POST)
public ModelAndView downloadExcel(HttpServletRequest request, Model 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
index 50004a2..1e1fb23 100644
--- a/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/HostingFieldForm.java
@@ -9,6 +9,7 @@
public class HostingFieldForm {
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -35,6 +36,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
index 1ed48fb..62331e9 100644
--- a/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/IspFieldForm.java
@@ -9,6 +9,7 @@
public class IspFieldForm {
private Long id;
+ private String code;
private String name;
private String manager;
private String tel;
@@ -35,6 +36,14 @@
this.id = id;
}
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/resources/migration/V1_11__Alter_Table.sql b/src/main/resources/migration/V1_11__Alter_Table.sql
index b49db13..b786560 100644
--- a/src/main/resources/migration/V1_11__Alter_Table.sql
+++ b/src/main/resources/migration/V1_11__Alter_Table.sql
@@ -14,6 +14,7 @@
CREATE TABLE `isp`(
`id` BIGINT(11) AUTO_INCREMENT,
+ `code` varchar (50) NOT NULL,
`name` VARCHAR(50) NOT NULL,
`manager` VARCHAR(50) NULL,
`tel` VARCHAR (50) NULL,
@@ -29,6 +30,7 @@
CREATE TABLE `hosting`(
`id` BIGINT(11) AUTO_INCREMENT,
+ `code` varchar (50) NOT NULL,
`name` VARCHAR(50) NOT NULL,
`manager` VARCHAR(50) NULL,
`tel` VARCHAR (50) NULL,
diff --git a/src/main/resources/mybatis/query-template/HostingField-template.xml b/src/main/resources/mybatis/query-template/HostingField-template.xml
index c8624ca..de2701d 100644
--- a/src/main/resources/mybatis/query-template/HostingField-template.xml
+++ b/src/main/resources/mybatis/query-template/HostingField-template.xml
@@ -5,20 +5,21 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.HostingFieldCondition">
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
+ ht.id as id,
+ ht.code as code,
+ ht.name as name,
+ ht.manager as manager,
+ ht.tel as tel,
+ ht.email as email,
+ ht.memo as memo
FROM
- hosting h
+ hosting ht
WHERE 1=1
<if test="name != '' and name != null">
- AND h.name like CONCAT('%',#{name},'%')
+ AND ht.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND h.id like CONCAT('%',#{id},'%')
+ AND ht.id like CONCAT('%',#{id},'%')
</if>
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
@@ -27,15 +28,15 @@
<select id="count" resultType="java.lang.Long" parameterType="kr.wisestone.owl.web.condition.HostingFieldCondition">
SELECT
- count(h.id)
+ count(ht.id)
FROM
- hosting h
+ hosting ht
WHERE 1=1
<if test="name != '' and name != null">
- AND h.name like CONCAT('%',#{name},'%')
+ AND ht.name like CONCAT('%',#{name},'%')
</if>
<if test="id != '' and id != null">
- AND h.id like CONCAT('%',#{id},'%')
+ AND ht.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
index 0ebdced..7d08a4e 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -6,6 +6,7 @@
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IspFieldCondition">
SELECT
i.id as id,
+ i.code as code,
i.name as name,
i.manager as manager,
i.tel as tel,
--
Gitblit v1.8.0