|
@@ -12,6 +12,8 @@ public class Zone implements ISelector{
|
|
|
private String name;
|
|
|
private Long width;
|
|
|
private Long height;
|
|
|
+ private Long rwidth;
|
|
|
+ private Long rheight;
|
|
|
private Integer device;
|
|
|
private Integer position;
|
|
|
private String domain;
|
|
@@ -26,47 +28,16 @@ public class Zone implements ISelector{
|
|
|
private String industry;
|
|
|
private String default_path_small;
|
|
|
|
|
|
- public Long getSupdated() {
|
|
|
- return supdated;
|
|
|
- }
|
|
|
- public void setSupdated(Long supdated) {
|
|
|
- this.supdated = supdated;
|
|
|
- }
|
|
|
- public Long getSizeId() {
|
|
|
- return sizeId;
|
|
|
- }
|
|
|
- public void setSizeId(Long sizeId) {
|
|
|
- this.sizeId = sizeId;
|
|
|
- }
|
|
|
- public String getDefault_path() {
|
|
|
- return default_path;
|
|
|
- }
|
|
|
- public void setDefault_path(String default_path) {
|
|
|
- this.default_path = default_path;
|
|
|
- }
|
|
|
- public String getDefault_url() {
|
|
|
- return default_url;
|
|
|
- }
|
|
|
- public void setDefault_url(String default_url) {
|
|
|
- this.default_url = default_url;
|
|
|
- }
|
|
|
- public Integer getRecheck() {
|
|
|
- return recheck;
|
|
|
- }
|
|
|
- public void setRecheck(Integer recheck) {
|
|
|
- this.recheck = recheck;
|
|
|
- }
|
|
|
- public List<Industry> getIndustryList() {
|
|
|
- return industryList;
|
|
|
- }
|
|
|
- public void setIndustryList(List<Industry> industryList) {
|
|
|
- this.industryList = industryList;
|
|
|
- }
|
|
|
- public String getIndustry() {
|
|
|
- return industry;
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public String getLabel() {
|
|
|
+ // TODO Auto-generated method stub
|
|
|
+ return this.getName();
|
|
|
}
|
|
|
- public void setIndustry(String industry) {
|
|
|
- this.industry = industry;
|
|
|
+ @Override
|
|
|
+ public String getValue() {
|
|
|
+ // TODO Auto-generated method stub
|
|
|
+ return String.valueOf(this.getId());
|
|
|
}
|
|
|
public Long getId() {
|
|
|
return id;
|
|
@@ -86,7 +57,6 @@ public class Zone implements ISelector{
|
|
|
public void setName(String name) {
|
|
|
this.name = name;
|
|
|
}
|
|
|
-
|
|
|
public Long getWidth() {
|
|
|
return width;
|
|
|
}
|
|
@@ -99,10 +69,18 @@ public class Zone implements ISelector{
|
|
|
public void setHeight(Long height) {
|
|
|
this.height = height;
|
|
|
}
|
|
|
- public Integer getStatus() {
|
|
|
- return status;
|
|
|
+ public Long getRwidth() {
|
|
|
+ return rwidth;
|
|
|
+ }
|
|
|
+ public void setRwidth(Long rwidth) {
|
|
|
+ this.rwidth = rwidth;
|
|
|
+ }
|
|
|
+ public Long getRheight() {
|
|
|
+ return rheight;
|
|
|
+ }
|
|
|
+ public void setRheight(Long rheight) {
|
|
|
+ this.rheight = rheight;
|
|
|
}
|
|
|
-
|
|
|
public Integer getDevice() {
|
|
|
return device;
|
|
|
}
|
|
@@ -115,6 +93,15 @@ public class Zone implements ISelector{
|
|
|
public void setPosition(Integer position) {
|
|
|
this.position = position;
|
|
|
}
|
|
|
+ public String getDomain() {
|
|
|
+ return domain;
|
|
|
+ }
|
|
|
+ public void setDomain(String domain) {
|
|
|
+ this.domain = domain;
|
|
|
+ }
|
|
|
+ public Integer getStatus() {
|
|
|
+ return status;
|
|
|
+ }
|
|
|
public void setStatus(Integer status) {
|
|
|
this.status = status;
|
|
|
}
|
|
@@ -124,35 +111,47 @@ public class Zone implements ISelector{
|
|
|
public void setUpdated(Date updated) {
|
|
|
this.updated = updated;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- public String getDomain() {
|
|
|
- return domain;
|
|
|
+ public Long getSupdated() {
|
|
|
+ return supdated;
|
|
|
}
|
|
|
- public void setDomain(String domain) {
|
|
|
- this.domain = domain;
|
|
|
+ public void setSupdated(Long supdated) {
|
|
|
+ this.supdated = supdated;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- @Override
|
|
|
- public String toString() {
|
|
|
- return "Zone [id=" + id + ", operator_id=" + operator_id + ", name="
|
|
|
- + name + ", width=" + width + ", height=" + height
|
|
|
- + ", device=" + device + ", position=" + position + ", domain="
|
|
|
- + domain + ", status=" + status + ", updated=" + updated
|
|
|
- + ", supdated=" + supdated + ", recheck=" + recheck
|
|
|
- + ", default_path=" + default_path + ", default_url="
|
|
|
- + default_url + ", sizeId=" + sizeId + ", industryList="
|
|
|
- + industryList + ", industry=" + industry
|
|
|
- + ", default_path_small=" + default_path_small + "]";
|
|
|
+ public Integer getRecheck() {
|
|
|
+ return recheck;
|
|
|
+ }
|
|
|
+ public void setRecheck(Integer recheck) {
|
|
|
+ this.recheck = recheck;
|
|
|
+ }
|
|
|
+ public String getDefault_path() {
|
|
|
+ return default_path;
|
|
|
+ }
|
|
|
+ public void setDefault_path(String default_path) {
|
|
|
+ this.default_path = default_path;
|
|
|
+ }
|
|
|
+ public String getDefault_url() {
|
|
|
+ return default_url;
|
|
|
+ }
|
|
|
+ public void setDefault_url(String default_url) {
|
|
|
+ this.default_url = default_url;
|
|
|
+ }
|
|
|
+ public Long getSizeId() {
|
|
|
+ return sizeId;
|
|
|
+ }
|
|
|
+ public void setSizeId(Long sizeId) {
|
|
|
+ this.sizeId = sizeId;
|
|
|
+ }
|
|
|
+ public List<Industry> getIndustryList() {
|
|
|
+ return industryList;
|
|
|
+ }
|
|
|
+ public void setIndustryList(List<Industry> industryList) {
|
|
|
+ this.industryList = industryList;
|
|
|
+ }
|
|
|
+ public String getIndustry() {
|
|
|
+ return industry;
|
|
|
+ }
|
|
|
+ public void setIndustry(String industry) {
|
|
|
+ this.industry = industry;
|
|
|
}
|
|
|
public String getDefault_path_small() {
|
|
|
return default_path_small;
|
|
@@ -161,14 +160,16 @@ public class Zone implements ISelector{
|
|
|
this.default_path_small = default_path_small;
|
|
|
}
|
|
|
@Override
|
|
|
- public String getLabel() {
|
|
|
- // TODO Auto-generated method stub
|
|
|
- return this.getName();
|
|
|
- }
|
|
|
- @Override
|
|
|
- public String getValue() {
|
|
|
- // TODO Auto-generated method stub
|
|
|
- return String.valueOf(this.getId());
|
|
|
+ public String toString() {
|
|
|
+ return "Zone [id=" + id + ", operator_id=" + operator_id + ", name="
|
|
|
+ + name + ", width=" + width + ", height=" + height
|
|
|
+ + ", rwidth=" + rwidth + ", rheight=" + rheight + ", device="
|
|
|
+ + device + ", position=" + position + ", domain=" + domain
|
|
|
+ + ", status=" + status + ", updated=" + updated + ", supdated="
|
|
|
+ + supdated + ", recheck=" + recheck + ", default_path="
|
|
|
+ + default_path + ", default_url=" + default_url + ", sizeId="
|
|
|
+ + sizeId + ", industryList=" + industryList + ", industry="
|
|
|
+ + industry + ", default_path_small=" + default_path_small + "]";
|
|
|
}
|
|
|
|
|
|
|