From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
index e55ccf4..b6b6e74 100644
--- a/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
+++ b/src/main/java/kr/wisestone/owl/web/condition/CompanyFieldCondition.java
@@ -2,6 +2,7 @@
import kr.wisestone.owl.util.ConvertUtil;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -13,15 +14,21 @@
private String email;
private String url;
private List<String> urls;
- private long ip;
- private String ipStart;
- private String ipEnd;
+ private Long ip;
+ private List<String> ipStarts = new ArrayList<>();
+ private List<String> ipEnds = new ArrayList<>();
private String memo;
private Long ispId;
private Long hostingId;
private Integer Page;
private Integer PageSize;
+
+ public static final Long IP_DEFAULT = -1L;
+
+ public CompanyFieldCondition() {
+ this.ip = IP_DEFAULT;
+ }
public static CompanyFieldCondition make(Map<String, Object> companyFieldCondition) {
return ConvertUtil.convertMapToClass(companyFieldCondition, CompanyFieldCondition.class);
@@ -107,28 +114,28 @@
this.urls = urls;
}
- public long getIp() {
+ public Long getIp() {
return ip;
}
- public void setIp(long ip) {
+ public void setIp(Long ip) {
this.ip = ip;
}
- public String getIpStart() {
- return ipStart;
+ public List<String> getIpStarts() {
+ return ipStarts;
}
- public void setIpStart(String ipStart) {
- this.ipStart = ipStart;
+ public void setIpStarts(List<String> ipStarts) {
+ this.ipStarts = ipStarts;
}
- public String getIpEnd() {
- return ipEnd;
+ public List<String> getIpEnds() {
+ return ipEnds;
}
- public void setIpEnd(String ipEnd) {
- this.ipEnd = ipEnd;
+ public void setIpEnds(List<String> ipEnds) {
+ this.ipEnds = ipEnds;
}
public Long getIspId() {
--
Gitblit v1.8.0