diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java index be16ffd..1d7f47e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java @@ -54,7 +54,10 @@ public class TerminalsWithHeart implements Serializable { private String equipmentType; + private Integer devType; + private Integer isfavor; + private static final long serialVersionUID = 1L; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java index f20d5ab..3342820 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java @@ -1,24 +1,38 @@ package com.shxy.xymanager_common.entity; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "电压", description = "电压") public class DyLevel implements Serializable { + @ApiModelProperty(value = "电压编号", example = "123456") private Integer id; + @ApiModelProperty(value = "电压名称", example = "AAAA") private String name; + @ApiModelProperty(value = "电压大小", example = "AAAA") private Integer dyValue; + @ApiModelProperty(value = "电压状态", example = "AAAA") private Integer status; private Date createTime; private Date updateTime; + @ApiModelProperty(value = "线路列表", example = "[]") + public List list = new ArrayList<>(); + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelBak.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelBak.java new file mode 100644 index 0000000..63d367f --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelBak.java @@ -0,0 +1,24 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class DyLevelBak implements Serializable { + private Integer id; + + private String name; + + private Integer dyValue; + + private Integer status; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelExample.java new file mode 100644 index 0000000..26c7fa8 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelExample.java @@ -0,0 +1,571 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class DyLevelExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DyLevelExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andDyValueIsNull() { + addCriterion("dy_value is null"); + return (Criteria) this; + } + + public Criteria andDyValueIsNotNull() { + addCriterion("dy_value is not null"); + return (Criteria) this; + } + + public Criteria andDyValueEqualTo(Integer value) { + addCriterion("dy_value =", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueNotEqualTo(Integer value) { + addCriterion("dy_value <>", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueGreaterThan(Integer value) { + addCriterion("dy_value >", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueGreaterThanOrEqualTo(Integer value) { + addCriterion("dy_value >=", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueLessThan(Integer value) { + addCriterion("dy_value <", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueLessThanOrEqualTo(Integer value) { + addCriterion("dy_value <=", value, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueIn(List values) { + addCriterion("dy_value in", values, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueNotIn(List values) { + addCriterion("dy_value not in", values, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueBetween(Integer value1, Integer value2) { + addCriterion("dy_value between", value1, value2, "dyValue"); + return (Criteria) this; + } + + public Criteria andDyValueNotBetween(Integer value1, Integer value2) { + addCriterion("dy_value not between", value1, value2, "dyValue"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java index 540d069..c9dd0b5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java @@ -1,21 +1,42 @@ package com.shxy.xymanager_common.entity; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.shxy.xymanager_common.model.PermissionDyLineTreeListModel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "线路", description = "线路") public class Lines implements Serializable { + + @ApiModelProperty(value = "线路编号", example = "123456") private Integer id; + @ApiModelProperty(value = "线路名称", example = "AAAA") private String name; + @ApiModelProperty(value = "单位", example = "123456") private String bsManufacturer; private Integer dyLevelId; + @ApiModelProperty(value = "线路状态", example = "AAAA") private Integer status; + private Date createTime; + + private Date updateTime; + + @ApiModelProperty(value = "杆塔信息", example = "123456") + private List list = new ArrayList<>(); + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesBak.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesBak.java new file mode 100644 index 0000000..347b54d --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesBak.java @@ -0,0 +1,28 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class LinesBak implements Serializable { + private Integer id; + + private String name; + + private String bsManufacturer; + + private Integer dyLevelId; + + private Integer status; + + private Date createTime; + + private Date updateTime; + + private Float tes; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesExample.java new file mode 100644 index 0000000..a2cc656 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesExample.java @@ -0,0 +1,701 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class LinesExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public LinesExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIsNull() { + addCriterion("bs_manufacturer is null"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIsNotNull() { + addCriterion("bs_manufacturer is not null"); + return (Criteria) this; + } + + public Criteria andBsManufacturerEqualTo(String value) { + addCriterion("bs_manufacturer =", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotEqualTo(String value) { + addCriterion("bs_manufacturer <>", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerGreaterThan(String value) { + addCriterion("bs_manufacturer >", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerGreaterThanOrEqualTo(String value) { + addCriterion("bs_manufacturer >=", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLessThan(String value) { + addCriterion("bs_manufacturer <", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLessThanOrEqualTo(String value) { + addCriterion("bs_manufacturer <=", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLike(String value) { + addCriterion("bs_manufacturer like", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotLike(String value) { + addCriterion("bs_manufacturer not like", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIn(List values) { + addCriterion("bs_manufacturer in", values, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotIn(List values) { + addCriterion("bs_manufacturer not in", values, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerBetween(String value1, String value2) { + addCriterion("bs_manufacturer between", value1, value2, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotBetween(String value1, String value2) { + addCriterion("bs_manufacturer not between", value1, value2, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andDyLevelIdIsNull() { + addCriterion("dy_level_id is null"); + return (Criteria) this; + } + + public Criteria andDyLevelIdIsNotNull() { + addCriterion("dy_level_id is not null"); + return (Criteria) this; + } + + public Criteria andDyLevelIdEqualTo(Integer value) { + addCriterion("dy_level_id =", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdNotEqualTo(Integer value) { + addCriterion("dy_level_id <>", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdGreaterThan(Integer value) { + addCriterion("dy_level_id >", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdGreaterThanOrEqualTo(Integer value) { + addCriterion("dy_level_id >=", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdLessThan(Integer value) { + addCriterion("dy_level_id <", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdLessThanOrEqualTo(Integer value) { + addCriterion("dy_level_id <=", value, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdIn(List values) { + addCriterion("dy_level_id in", values, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdNotIn(List values) { + addCriterion("dy_level_id not in", values, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdBetween(Integer value1, Integer value2) { + addCriterion("dy_level_id between", value1, value2, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andDyLevelIdNotBetween(Integer value1, Integer value2) { + addCriterion("dy_level_id not between", value1, value2, "dyLevelId"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andTesIsNull() { + addCriterion("tes is null"); + return (Criteria) this; + } + + public Criteria andTesIsNotNull() { + addCriterion("tes is not null"); + return (Criteria) this; + } + + public Criteria andTesEqualTo(Float value) { + addCriterion("tes =", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesNotEqualTo(Float value) { + addCriterion("tes <>", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesGreaterThan(Float value) { + addCriterion("tes >", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesGreaterThanOrEqualTo(Float value) { + addCriterion("tes >=", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesLessThan(Float value) { + addCriterion("tes <", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesLessThanOrEqualTo(Float value) { + addCriterion("tes <=", value, "tes"); + return (Criteria) this; + } + + public Criteria andTesIn(List values) { + addCriterion("tes in", values, "tes"); + return (Criteria) this; + } + + public Criteria andTesNotIn(List values) { + addCriterion("tes not in", values, "tes"); + return (Criteria) this; + } + + public Criteria andTesBetween(Float value1, Float value2) { + addCriterion("tes between", value1, value2, "tes"); + return (Criteria) this; + } + + public Criteria andTesNotBetween(Float value1, Float value2) { + addCriterion("tes not between", value1, value2, "tes"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java index 4482120..e148f8d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_common.entity; import lombok.Data; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; import java.util.Date; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java index 044bc64..c9d90db 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java @@ -1,5 +1,8 @@ package com.shxy.xymanager_common.entity; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -7,7 +10,11 @@ import java.math.BigInteger; import java.util.Date; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "装置", description = "装置") public class Terminals implements Serializable { + + @ApiModelProperty(value = "装置编号", example = "123456") private Integer id; private Integer lineid; @@ -54,7 +61,7 @@ public class Terminals implements Serializable { private Integer status; - + private Integer devType; private Integer protocol; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsBak.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsBak.java new file mode 100644 index 0000000..7732f8f --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsBak.java @@ -0,0 +1,258 @@ +package com.shxy.xymanager_common.entity; + +import java.io.Serializable; +import java.util.Date; + +public class TerminalsBak implements Serializable { + private Integer id; + + private Integer lineId; + + private Integer towerId; + + private String cmdid; + + private Integer status; + + private Short orgId; + + private String equipName; + + private String displayName; + + private String model; + + private String essentialInfoVersion; + + private Byte hasPan; + + private String bsManufacturer; + + private Date bsProductionDate; + + private String bsIdentifier; + + private Double latitude; + + private Double longitude; + + private Date createTime; + + private Date updateTime; + + private String sim; + + private Date workingDate; + + private Integer netType; + + private Integer isfavor; + + private Integer protocol; + + private String phase; + + private String equipmentType; + + private static final long serialVersionUID = 1L; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getLineId() { + return lineId; + } + + public void setLineId(Integer lineId) { + this.lineId = lineId; + } + + public Integer getTowerId() { + return towerId; + } + + public void setTowerId(Integer towerId) { + this.towerId = towerId; + } + + public String getCmdid() { + return cmdid; + } + + public void setCmdid(String cmdid) { + this.cmdid = cmdid == null ? null : cmdid.trim(); + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Short getOrgId() { + return orgId; + } + + public void setOrgId(Short orgId) { + this.orgId = orgId; + } + + public String getEquipName() { + return equipName; + } + + public void setEquipName(String equipName) { + this.equipName = equipName == null ? null : equipName.trim(); + } + + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName == null ? null : displayName.trim(); + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model == null ? null : model.trim(); + } + + public String getEssentialInfoVersion() { + return essentialInfoVersion; + } + + public void setEssentialInfoVersion(String essentialInfoVersion) { + this.essentialInfoVersion = essentialInfoVersion == null ? null : essentialInfoVersion.trim(); + } + + public Byte getHasPan() { + return hasPan; + } + + public void setHasPan(Byte hasPan) { + this.hasPan = hasPan; + } + + public String getBsManufacturer() { + return bsManufacturer; + } + + public void setBsManufacturer(String bsManufacturer) { + this.bsManufacturer = bsManufacturer == null ? null : bsManufacturer.trim(); + } + + public Date getBsProductionDate() { + return bsProductionDate; + } + + public void setBsProductionDate(Date bsProductionDate) { + this.bsProductionDate = bsProductionDate; + } + + public String getBsIdentifier() { + return bsIdentifier; + } + + public void setBsIdentifier(String bsIdentifier) { + this.bsIdentifier = bsIdentifier == null ? null : bsIdentifier.trim(); + } + + public Double getLatitude() { + return latitude; + } + + public void setLatitude(Double latitude) { + this.latitude = latitude; + } + + public Double getLongitude() { + return longitude; + } + + public void setLongitude(Double longitude) { + this.longitude = longitude; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getSim() { + return sim; + } + + public void setSim(String sim) { + this.sim = sim == null ? null : sim.trim(); + } + + public Date getWorkingDate() { + return workingDate; + } + + public void setWorkingDate(Date workingDate) { + this.workingDate = workingDate; + } + + public Integer getNetType() { + return netType; + } + + public void setNetType(Integer netType) { + this.netType = netType; + } + + public Integer getIsfavor() { + return isfavor; + } + + public void setIsfavor(Integer isfavor) { + this.isfavor = isfavor; + } + + public Integer getProtocol() { + return protocol; + } + + public void setProtocol(Integer protocol) { + this.protocol = protocol; + } + + public String getPhase() { + return phase; + } + + public void setPhase(String phase) { + this.phase = phase == null ? null : phase.trim(); + } + + public String getEquipmentType() { + return equipmentType; + } + + public void setEquipmentType(String equipmentType) { + this.equipmentType = equipmentType == null ? null : equipmentType.trim(); + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java new file mode 100644 index 0000000..909a47f --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalsExample.java @@ -0,0 +1,1828 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; + +public class TerminalsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalsExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + protected void addCriterionForJDBCDate(String condition, Date value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + addCriterion(condition, new java.sql.Date(value.getTime()), property); + } + + protected void addCriterionForJDBCDate(String condition, List values, String property) { + if (values == null || values.size() == 0) { + throw new RuntimeException("Value list for " + property + " cannot be null or empty"); + } + List dateList = new ArrayList(); + Iterator iter = values.iterator(); + while (iter.hasNext()) { + dateList.add(new java.sql.Date(iter.next().getTime())); + } + addCriterion(condition, dateList, property); + } + + protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andLineIdIsNull() { + addCriterion("line_id is null"); + return (Criteria) this; + } + + public Criteria andLineIdIsNotNull() { + addCriterion("line_id is not null"); + return (Criteria) this; + } + + public Criteria andLineIdEqualTo(Integer value) { + addCriterion("line_id =", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotEqualTo(Integer value) { + addCriterion("line_id <>", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdGreaterThan(Integer value) { + addCriterion("line_id >", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdGreaterThanOrEqualTo(Integer value) { + addCriterion("line_id >=", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdLessThan(Integer value) { + addCriterion("line_id <", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdLessThanOrEqualTo(Integer value) { + addCriterion("line_id <=", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdIn(List values) { + addCriterion("line_id in", values, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotIn(List values) { + addCriterion("line_id not in", values, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdBetween(Integer value1, Integer value2) { + addCriterion("line_id between", value1, value2, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotBetween(Integer value1, Integer value2) { + addCriterion("line_id not between", value1, value2, "lineId"); + return (Criteria) this; + } + + public Criteria andTowerIdIsNull() { + addCriterion("tower_id is null"); + return (Criteria) this; + } + + public Criteria andTowerIdIsNotNull() { + addCriterion("tower_id is not null"); + return (Criteria) this; + } + + public Criteria andTowerIdEqualTo(Integer value) { + addCriterion("tower_id =", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdNotEqualTo(Integer value) { + addCriterion("tower_id <>", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdGreaterThan(Integer value) { + addCriterion("tower_id >", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdGreaterThanOrEqualTo(Integer value) { + addCriterion("tower_id >=", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdLessThan(Integer value) { + addCriterion("tower_id <", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdLessThanOrEqualTo(Integer value) { + addCriterion("tower_id <=", value, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdIn(List values) { + addCriterion("tower_id in", values, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdNotIn(List values) { + addCriterion("tower_id not in", values, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdBetween(Integer value1, Integer value2) { + addCriterion("tower_id between", value1, value2, "towerId"); + return (Criteria) this; + } + + public Criteria andTowerIdNotBetween(Integer value1, Integer value2) { + addCriterion("tower_id not between", value1, value2, "towerId"); + return (Criteria) this; + } + + public Criteria andCmdidIsNull() { + addCriterion("cmdid is null"); + return (Criteria) this; + } + + public Criteria andCmdidIsNotNull() { + addCriterion("cmdid is not null"); + return (Criteria) this; + } + + public Criteria andCmdidEqualTo(String value) { + addCriterion("cmdid =", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidNotEqualTo(String value) { + addCriterion("cmdid <>", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidGreaterThan(String value) { + addCriterion("cmdid >", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidGreaterThanOrEqualTo(String value) { + addCriterion("cmdid >=", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidLessThan(String value) { + addCriterion("cmdid <", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidLessThanOrEqualTo(String value) { + addCriterion("cmdid <=", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidLike(String value) { + addCriterion("cmdid like", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidNotLike(String value) { + addCriterion("cmdid not like", value, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidIn(List values) { + addCriterion("cmdid in", values, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidNotIn(List values) { + addCriterion("cmdid not in", values, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidBetween(String value1, String value2) { + addCriterion("cmdid between", value1, value2, "cmdid"); + return (Criteria) this; + } + + public Criteria andCmdidNotBetween(String value1, String value2) { + addCriterion("cmdid not between", value1, value2, "cmdid"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andOrgIdIsNull() { + addCriterion("org_id is null"); + return (Criteria) this; + } + + public Criteria andOrgIdIsNotNull() { + addCriterion("org_id is not null"); + return (Criteria) this; + } + + public Criteria andOrgIdEqualTo(Short value) { + addCriterion("org_id =", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotEqualTo(Short value) { + addCriterion("org_id <>", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdGreaterThan(Short value) { + addCriterion("org_id >", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdGreaterThanOrEqualTo(Short value) { + addCriterion("org_id >=", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdLessThan(Short value) { + addCriterion("org_id <", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdLessThanOrEqualTo(Short value) { + addCriterion("org_id <=", value, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdIn(List values) { + addCriterion("org_id in", values, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotIn(List values) { + addCriterion("org_id not in", values, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdBetween(Short value1, Short value2) { + addCriterion("org_id between", value1, value2, "orgId"); + return (Criteria) this; + } + + public Criteria andOrgIdNotBetween(Short value1, Short value2) { + addCriterion("org_id not between", value1, value2, "orgId"); + return (Criteria) this; + } + + public Criteria andEquipNameIsNull() { + addCriterion("equip_name is null"); + return (Criteria) this; + } + + public Criteria andEquipNameIsNotNull() { + addCriterion("equip_name is not null"); + return (Criteria) this; + } + + public Criteria andEquipNameEqualTo(String value) { + addCriterion("equip_name =", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameNotEqualTo(String value) { + addCriterion("equip_name <>", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameGreaterThan(String value) { + addCriterion("equip_name >", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameGreaterThanOrEqualTo(String value) { + addCriterion("equip_name >=", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameLessThan(String value) { + addCriterion("equip_name <", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameLessThanOrEqualTo(String value) { + addCriterion("equip_name <=", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameLike(String value) { + addCriterion("equip_name like", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameNotLike(String value) { + addCriterion("equip_name not like", value, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameIn(List values) { + addCriterion("equip_name in", values, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameNotIn(List values) { + addCriterion("equip_name not in", values, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameBetween(String value1, String value2) { + addCriterion("equip_name between", value1, value2, "equipName"); + return (Criteria) this; + } + + public Criteria andEquipNameNotBetween(String value1, String value2) { + addCriterion("equip_name not between", value1, value2, "equipName"); + return (Criteria) this; + } + + public Criteria andDisplayNameIsNull() { + addCriterion("display_name is null"); + return (Criteria) this; + } + + public Criteria andDisplayNameIsNotNull() { + addCriterion("display_name is not null"); + return (Criteria) this; + } + + public Criteria andDisplayNameEqualTo(String value) { + addCriterion("display_name =", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameNotEqualTo(String value) { + addCriterion("display_name <>", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameGreaterThan(String value) { + addCriterion("display_name >", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameGreaterThanOrEqualTo(String value) { + addCriterion("display_name >=", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameLessThan(String value) { + addCriterion("display_name <", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameLessThanOrEqualTo(String value) { + addCriterion("display_name <=", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameLike(String value) { + addCriterion("display_name like", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameNotLike(String value) { + addCriterion("display_name not like", value, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameIn(List values) { + addCriterion("display_name in", values, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameNotIn(List values) { + addCriterion("display_name not in", values, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameBetween(String value1, String value2) { + addCriterion("display_name between", value1, value2, "displayName"); + return (Criteria) this; + } + + public Criteria andDisplayNameNotBetween(String value1, String value2) { + addCriterion("display_name not between", value1, value2, "displayName"); + return (Criteria) this; + } + + public Criteria andModelIsNull() { + addCriterion("model is null"); + return (Criteria) this; + } + + public Criteria andModelIsNotNull() { + addCriterion("model is not null"); + return (Criteria) this; + } + + public Criteria andModelEqualTo(String value) { + addCriterion("model =", value, "model"); + return (Criteria) this; + } + + public Criteria andModelNotEqualTo(String value) { + addCriterion("model <>", value, "model"); + return (Criteria) this; + } + + public Criteria andModelGreaterThan(String value) { + addCriterion("model >", value, "model"); + return (Criteria) this; + } + + public Criteria andModelGreaterThanOrEqualTo(String value) { + addCriterion("model >=", value, "model"); + return (Criteria) this; + } + + public Criteria andModelLessThan(String value) { + addCriterion("model <", value, "model"); + return (Criteria) this; + } + + public Criteria andModelLessThanOrEqualTo(String value) { + addCriterion("model <=", value, "model"); + return (Criteria) this; + } + + public Criteria andModelLike(String value) { + addCriterion("model like", value, "model"); + return (Criteria) this; + } + + public Criteria andModelNotLike(String value) { + addCriterion("model not like", value, "model"); + return (Criteria) this; + } + + public Criteria andModelIn(List values) { + addCriterion("model in", values, "model"); + return (Criteria) this; + } + + public Criteria andModelNotIn(List values) { + addCriterion("model not in", values, "model"); + return (Criteria) this; + } + + public Criteria andModelBetween(String value1, String value2) { + addCriterion("model between", value1, value2, "model"); + return (Criteria) this; + } + + public Criteria andModelNotBetween(String value1, String value2) { + addCriterion("model not between", value1, value2, "model"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionIsNull() { + addCriterion("essential_info_version is null"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionIsNotNull() { + addCriterion("essential_info_version is not null"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionEqualTo(String value) { + addCriterion("essential_info_version =", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionNotEqualTo(String value) { + addCriterion("essential_info_version <>", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionGreaterThan(String value) { + addCriterion("essential_info_version >", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionGreaterThanOrEqualTo(String value) { + addCriterion("essential_info_version >=", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionLessThan(String value) { + addCriterion("essential_info_version <", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionLessThanOrEqualTo(String value) { + addCriterion("essential_info_version <=", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionLike(String value) { + addCriterion("essential_info_version like", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionNotLike(String value) { + addCriterion("essential_info_version not like", value, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionIn(List values) { + addCriterion("essential_info_version in", values, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionNotIn(List values) { + addCriterion("essential_info_version not in", values, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionBetween(String value1, String value2) { + addCriterion("essential_info_version between", value1, value2, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andEssentialInfoVersionNotBetween(String value1, String value2) { + addCriterion("essential_info_version not between", value1, value2, "essentialInfoVersion"); + return (Criteria) this; + } + + public Criteria andHasPanIsNull() { + addCriterion("has_pan is null"); + return (Criteria) this; + } + + public Criteria andHasPanIsNotNull() { + addCriterion("has_pan is not null"); + return (Criteria) this; + } + + public Criteria andHasPanEqualTo(Byte value) { + addCriterion("has_pan =", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanNotEqualTo(Byte value) { + addCriterion("has_pan <>", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanGreaterThan(Byte value) { + addCriterion("has_pan >", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanGreaterThanOrEqualTo(Byte value) { + addCriterion("has_pan >=", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanLessThan(Byte value) { + addCriterion("has_pan <", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanLessThanOrEqualTo(Byte value) { + addCriterion("has_pan <=", value, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanIn(List values) { + addCriterion("has_pan in", values, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanNotIn(List values) { + addCriterion("has_pan not in", values, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanBetween(Byte value1, Byte value2) { + addCriterion("has_pan between", value1, value2, "hasPan"); + return (Criteria) this; + } + + public Criteria andHasPanNotBetween(Byte value1, Byte value2) { + addCriterion("has_pan not between", value1, value2, "hasPan"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIsNull() { + addCriterion("bs_manufacturer is null"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIsNotNull() { + addCriterion("bs_manufacturer is not null"); + return (Criteria) this; + } + + public Criteria andBsManufacturerEqualTo(String value) { + addCriterion("bs_manufacturer =", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotEqualTo(String value) { + addCriterion("bs_manufacturer <>", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerGreaterThan(String value) { + addCriterion("bs_manufacturer >", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerGreaterThanOrEqualTo(String value) { + addCriterion("bs_manufacturer >=", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLessThan(String value) { + addCriterion("bs_manufacturer <", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLessThanOrEqualTo(String value) { + addCriterion("bs_manufacturer <=", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerLike(String value) { + addCriterion("bs_manufacturer like", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotLike(String value) { + addCriterion("bs_manufacturer not like", value, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerIn(List values) { + addCriterion("bs_manufacturer in", values, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotIn(List values) { + addCriterion("bs_manufacturer not in", values, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerBetween(String value1, String value2) { + addCriterion("bs_manufacturer between", value1, value2, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsManufacturerNotBetween(String value1, String value2) { + addCriterion("bs_manufacturer not between", value1, value2, "bsManufacturer"); + return (Criteria) this; + } + + public Criteria andBsProductionDateIsNull() { + addCriterion("bs_production_date is null"); + return (Criteria) this; + } + + public Criteria andBsProductionDateIsNotNull() { + addCriterion("bs_production_date is not null"); + return (Criteria) this; + } + + public Criteria andBsProductionDateEqualTo(Date value) { + addCriterionForJDBCDate("bs_production_date =", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateNotEqualTo(Date value) { + addCriterionForJDBCDate("bs_production_date <>", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateGreaterThan(Date value) { + addCriterionForJDBCDate("bs_production_date >", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("bs_production_date >=", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateLessThan(Date value) { + addCriterionForJDBCDate("bs_production_date <", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("bs_production_date <=", value, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateIn(List values) { + addCriterionForJDBCDate("bs_production_date in", values, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateNotIn(List values) { + addCriterionForJDBCDate("bs_production_date not in", values, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateBetween(Date value1, Date value2) { + addCriterionForJDBCDate("bs_production_date between", value1, value2, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsProductionDateNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("bs_production_date not between", value1, value2, "bsProductionDate"); + return (Criteria) this; + } + + public Criteria andBsIdentifierIsNull() { + addCriterion("bs_identifier is null"); + return (Criteria) this; + } + + public Criteria andBsIdentifierIsNotNull() { + addCriterion("bs_identifier is not null"); + return (Criteria) this; + } + + public Criteria andBsIdentifierEqualTo(String value) { + addCriterion("bs_identifier =", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierNotEqualTo(String value) { + addCriterion("bs_identifier <>", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierGreaterThan(String value) { + addCriterion("bs_identifier >", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("bs_identifier >=", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierLessThan(String value) { + addCriterion("bs_identifier <", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierLessThanOrEqualTo(String value) { + addCriterion("bs_identifier <=", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierLike(String value) { + addCriterion("bs_identifier like", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierNotLike(String value) { + addCriterion("bs_identifier not like", value, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierIn(List values) { + addCriterion("bs_identifier in", values, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierNotIn(List values) { + addCriterion("bs_identifier not in", values, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierBetween(String value1, String value2) { + addCriterion("bs_identifier between", value1, value2, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andBsIdentifierNotBetween(String value1, String value2) { + addCriterion("bs_identifier not between", value1, value2, "bsIdentifier"); + return (Criteria) this; + } + + public Criteria andLatitudeIsNull() { + addCriterion("latitude is null"); + return (Criteria) this; + } + + public Criteria andLatitudeIsNotNull() { + addCriterion("latitude is not null"); + return (Criteria) this; + } + + public Criteria andLatitudeEqualTo(Double value) { + addCriterion("latitude =", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotEqualTo(Double value) { + addCriterion("latitude <>", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeGreaterThan(Double value) { + addCriterion("latitude >", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeGreaterThanOrEqualTo(Double value) { + addCriterion("latitude >=", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeLessThan(Double value) { + addCriterion("latitude <", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeLessThanOrEqualTo(Double value) { + addCriterion("latitude <=", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeIn(List values) { + addCriterion("latitude in", values, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotIn(List values) { + addCriterion("latitude not in", values, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeBetween(Double value1, Double value2) { + addCriterion("latitude between", value1, value2, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotBetween(Double value1, Double value2) { + addCriterion("latitude not between", value1, value2, "latitude"); + return (Criteria) this; + } + + public Criteria andLongitudeIsNull() { + addCriterion("longitude is null"); + return (Criteria) this; + } + + public Criteria andLongitudeIsNotNull() { + addCriterion("longitude is not null"); + return (Criteria) this; + } + + public Criteria andLongitudeEqualTo(Double value) { + addCriterion("longitude =", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotEqualTo(Double value) { + addCriterion("longitude <>", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeGreaterThan(Double value) { + addCriterion("longitude >", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeGreaterThanOrEqualTo(Double value) { + addCriterion("longitude >=", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeLessThan(Double value) { + addCriterion("longitude <", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeLessThanOrEqualTo(Double value) { + addCriterion("longitude <=", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeIn(List values) { + addCriterion("longitude in", values, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotIn(List values) { + addCriterion("longitude not in", values, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeBetween(Double value1, Double value2) { + addCriterion("longitude between", value1, value2, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotBetween(Double value1, Double value2) { + addCriterion("longitude not between", value1, value2, "longitude"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andSimIsNull() { + addCriterion("sim is null"); + return (Criteria) this; + } + + public Criteria andSimIsNotNull() { + addCriterion("sim is not null"); + return (Criteria) this; + } + + public Criteria andSimEqualTo(String value) { + addCriterion("sim =", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimNotEqualTo(String value) { + addCriterion("sim <>", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimGreaterThan(String value) { + addCriterion("sim >", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimGreaterThanOrEqualTo(String value) { + addCriterion("sim >=", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimLessThan(String value) { + addCriterion("sim <", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimLessThanOrEqualTo(String value) { + addCriterion("sim <=", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimLike(String value) { + addCriterion("sim like", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimNotLike(String value) { + addCriterion("sim not like", value, "sim"); + return (Criteria) this; + } + + public Criteria andSimIn(List values) { + addCriterion("sim in", values, "sim"); + return (Criteria) this; + } + + public Criteria andSimNotIn(List values) { + addCriterion("sim not in", values, "sim"); + return (Criteria) this; + } + + public Criteria andSimBetween(String value1, String value2) { + addCriterion("sim between", value1, value2, "sim"); + return (Criteria) this; + } + + public Criteria andSimNotBetween(String value1, String value2) { + addCriterion("sim not between", value1, value2, "sim"); + return (Criteria) this; + } + + public Criteria andWorkingDateIsNull() { + addCriterion("working_date is null"); + return (Criteria) this; + } + + public Criteria andWorkingDateIsNotNull() { + addCriterion("working_date is not null"); + return (Criteria) this; + } + + public Criteria andWorkingDateEqualTo(Date value) { + addCriterionForJDBCDate("working_date =", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateNotEqualTo(Date value) { + addCriterionForJDBCDate("working_date <>", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateGreaterThan(Date value) { + addCriterionForJDBCDate("working_date >", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateGreaterThanOrEqualTo(Date value) { + addCriterionForJDBCDate("working_date >=", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateLessThan(Date value) { + addCriterionForJDBCDate("working_date <", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateLessThanOrEqualTo(Date value) { + addCriterionForJDBCDate("working_date <=", value, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateIn(List values) { + addCriterionForJDBCDate("working_date in", values, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateNotIn(List values) { + addCriterionForJDBCDate("working_date not in", values, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateBetween(Date value1, Date value2) { + addCriterionForJDBCDate("working_date between", value1, value2, "workingDate"); + return (Criteria) this; + } + + public Criteria andWorkingDateNotBetween(Date value1, Date value2) { + addCriterionForJDBCDate("working_date not between", value1, value2, "workingDate"); + return (Criteria) this; + } + + public Criteria andNetTypeIsNull() { + addCriterion("net_type is null"); + return (Criteria) this; + } + + public Criteria andNetTypeIsNotNull() { + addCriterion("net_type is not null"); + return (Criteria) this; + } + + public Criteria andNetTypeEqualTo(Integer value) { + addCriterion("net_type =", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeNotEqualTo(Integer value) { + addCriterion("net_type <>", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeGreaterThan(Integer value) { + addCriterion("net_type >", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("net_type >=", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeLessThan(Integer value) { + addCriterion("net_type <", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeLessThanOrEqualTo(Integer value) { + addCriterion("net_type <=", value, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeIn(List values) { + addCriterion("net_type in", values, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeNotIn(List values) { + addCriterion("net_type not in", values, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeBetween(Integer value1, Integer value2) { + addCriterion("net_type between", value1, value2, "netType"); + return (Criteria) this; + } + + public Criteria andNetTypeNotBetween(Integer value1, Integer value2) { + addCriterion("net_type not between", value1, value2, "netType"); + return (Criteria) this; + } + + public Criteria andIsfavorIsNull() { + addCriterion("isfavor is null"); + return (Criteria) this; + } + + public Criteria andIsfavorIsNotNull() { + addCriterion("isfavor is not null"); + return (Criteria) this; + } + + public Criteria andIsfavorEqualTo(Integer value) { + addCriterion("isfavor =", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorNotEqualTo(Integer value) { + addCriterion("isfavor <>", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorGreaterThan(Integer value) { + addCriterion("isfavor >", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorGreaterThanOrEqualTo(Integer value) { + addCriterion("isfavor >=", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorLessThan(Integer value) { + addCriterion("isfavor <", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorLessThanOrEqualTo(Integer value) { + addCriterion("isfavor <=", value, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorIn(List values) { + addCriterion("isfavor in", values, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorNotIn(List values) { + addCriterion("isfavor not in", values, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorBetween(Integer value1, Integer value2) { + addCriterion("isfavor between", value1, value2, "isfavor"); + return (Criteria) this; + } + + public Criteria andIsfavorNotBetween(Integer value1, Integer value2) { + addCriterion("isfavor not between", value1, value2, "isfavor"); + return (Criteria) this; + } + + public Criteria andProtocolIsNull() { + addCriterion("protocol is null"); + return (Criteria) this; + } + + public Criteria andProtocolIsNotNull() { + addCriterion("protocol is not null"); + return (Criteria) this; + } + + public Criteria andProtocolEqualTo(Integer value) { + addCriterion("protocol =", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolNotEqualTo(Integer value) { + addCriterion("protocol <>", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolGreaterThan(Integer value) { + addCriterion("protocol >", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolGreaterThanOrEqualTo(Integer value) { + addCriterion("protocol >=", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolLessThan(Integer value) { + addCriterion("protocol <", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolLessThanOrEqualTo(Integer value) { + addCriterion("protocol <=", value, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolIn(List values) { + addCriterion("protocol in", values, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolNotIn(List values) { + addCriterion("protocol not in", values, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolBetween(Integer value1, Integer value2) { + addCriterion("protocol between", value1, value2, "protocol"); + return (Criteria) this; + } + + public Criteria andProtocolNotBetween(Integer value1, Integer value2) { + addCriterion("protocol not between", value1, value2, "protocol"); + return (Criteria) this; + } + + public Criteria andPhaseIsNull() { + addCriterion("phase is null"); + return (Criteria) this; + } + + public Criteria andPhaseIsNotNull() { + addCriterion("phase is not null"); + return (Criteria) this; + } + + public Criteria andPhaseEqualTo(String value) { + addCriterion("phase =", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseNotEqualTo(String value) { + addCriterion("phase <>", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseGreaterThan(String value) { + addCriterion("phase >", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseGreaterThanOrEqualTo(String value) { + addCriterion("phase >=", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseLessThan(String value) { + addCriterion("phase <", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseLessThanOrEqualTo(String value) { + addCriterion("phase <=", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseLike(String value) { + addCriterion("phase like", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseNotLike(String value) { + addCriterion("phase not like", value, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseIn(List values) { + addCriterion("phase in", values, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseNotIn(List values) { + addCriterion("phase not in", values, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseBetween(String value1, String value2) { + addCriterion("phase between", value1, value2, "phase"); + return (Criteria) this; + } + + public Criteria andPhaseNotBetween(String value1, String value2) { + addCriterion("phase not between", value1, value2, "phase"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeIsNull() { + addCriterion("equipment_type is null"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeIsNotNull() { + addCriterion("equipment_type is not null"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeEqualTo(String value) { + addCriterion("equipment_type =", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeNotEqualTo(String value) { + addCriterion("equipment_type <>", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeGreaterThan(String value) { + addCriterion("equipment_type >", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeGreaterThanOrEqualTo(String value) { + addCriterion("equipment_type >=", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeLessThan(String value) { + addCriterion("equipment_type <", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeLessThanOrEqualTo(String value) { + addCriterion("equipment_type <=", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeLike(String value) { + addCriterion("equipment_type like", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeNotLike(String value) { + addCriterion("equipment_type not like", value, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeIn(List values) { + addCriterion("equipment_type in", values, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeNotIn(List values) { + addCriterion("equipment_type not in", values, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeBetween(String value1, String value2) { + addCriterion("equipment_type between", value1, value2, "equipmentType"); + return (Criteria) this; + } + + public Criteria andEquipmentTypeNotBetween(String value1, String value2) { + addCriterion("equipment_type not between", value1, value2, "equipmentType"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Towers.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Towers.java index 6a092be..cd1ed8f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Towers.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Towers.java @@ -1,20 +1,39 @@ package com.shxy.xymanager_common.entity; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "杆塔", description = "杆塔") public class Towers implements Serializable { + @ApiModelProperty(value = "杆塔编号", example = "123456") private Integer id; + + @ApiModelProperty(value = "杆塔名称", example = "AAAA") private String name; + private Integer lineId; + private Integer order; + private Integer status; + private String address; + private Date createTime; + private Date updateTime; + @ApiModelProperty(value = "杆塔信息", example = "123456") + private List list = new ArrayList<>(); + } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersBak.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersBak.java new file mode 100644 index 0000000..45a3a26 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersBak.java @@ -0,0 +1,88 @@ +package com.shxy.xymanager_common.entity; + +import java.io.Serializable; +import java.util.Date; + +public class TowersBak implements Serializable { + private Integer id; + + private String name; + + private Integer lineId; + + private Date createTime; + + private Date updateTime; + + private Integer status; + + private Integer order; + + private String address; + + private static final long serialVersionUID = 1L; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public Integer getLineId() { + return lineId; + } + + public void setLineId(Integer lineId) { + this.lineId = lineId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getOrder() { + return order; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address == null ? null : address.trim(); + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersExample.java new file mode 100644 index 0000000..10a9cb8 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TowersExample.java @@ -0,0 +1,701 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class TowersExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TowersExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Integer value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Integer value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Integer value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Integer value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Integer value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Integer value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Integer value1, Integer value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Integer value1, Integer value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andLineIdIsNull() { + addCriterion("line_id is null"); + return (Criteria) this; + } + + public Criteria andLineIdIsNotNull() { + addCriterion("line_id is not null"); + return (Criteria) this; + } + + public Criteria andLineIdEqualTo(Integer value) { + addCriterion("line_id =", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotEqualTo(Integer value) { + addCriterion("line_id <>", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdGreaterThan(Integer value) { + addCriterion("line_id >", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdGreaterThanOrEqualTo(Integer value) { + addCriterion("line_id >=", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdLessThan(Integer value) { + addCriterion("line_id <", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdLessThanOrEqualTo(Integer value) { + addCriterion("line_id <=", value, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdIn(List values) { + addCriterion("line_id in", values, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotIn(List values) { + addCriterion("line_id not in", values, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdBetween(Integer value1, Integer value2) { + addCriterion("line_id between", value1, value2, "lineId"); + return (Criteria) this; + } + + public Criteria andLineIdNotBetween(Integer value1, Integer value2) { + addCriterion("line_id not between", value1, value2, "lineId"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("status is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("status is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(Integer value) { + addCriterion("status =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(Integer value) { + addCriterion("status <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(Integer value) { + addCriterion("status >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("status >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(Integer value) { + addCriterion("status <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(Integer value) { + addCriterion("status <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("status in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("status not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(Integer value1, Integer value2) { + addCriterion("status between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(Integer value1, Integer value2) { + addCriterion("status not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andOrderIsNull() { + addCriterion("order is null"); + return (Criteria) this; + } + + public Criteria andOrderIsNotNull() { + addCriterion("order is not null"); + return (Criteria) this; + } + + public Criteria andOrderEqualTo(Integer value) { + addCriterion("order =", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderNotEqualTo(Integer value) { + addCriterion("order <>", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderGreaterThan(Integer value) { + addCriterion("order >", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderGreaterThanOrEqualTo(Integer value) { + addCriterion("order >=", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderLessThan(Integer value) { + addCriterion("order <", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderLessThanOrEqualTo(Integer value) { + addCriterion("order <=", value, "order"); + return (Criteria) this; + } + + public Criteria andOrderIn(List values) { + addCriterion("order in", values, "order"); + return (Criteria) this; + } + + public Criteria andOrderNotIn(List values) { + addCriterion("order not in", values, "order"); + return (Criteria) this; + } + + public Criteria andOrderBetween(Integer value1, Integer value2) { + addCriterion("order between", value1, value2, "order"); + return (Criteria) this; + } + + public Criteria andOrderNotBetween(Integer value1, Integer value2) { + addCriterion("order not between", value1, value2, "order"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java index cbe3d9b..6d58254 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java @@ -1,5 +1,6 @@ package com.shxy.xymanager_common.model; +import com.shxy.xymanager_common.entity.DyLevel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,74 +16,6 @@ import java.util.List; public class PermissionDyLineTreeListModel implements Serializable { @ApiModelProperty(value = "电压列表", example = "[]") - private List list; + private List list; - @Data - public static class DyListBean { - @ApiModelProperty(value = "电压编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "电压名称", example = "AAAA") - private String name; - - @ApiModelProperty(value = "电压大小", example = "AAAA") - private Integer dyValue; - - @ApiModelProperty(value = "线路列表", example = "[]") - private List list; - } - - @Data - public static class LineBean { - - @ApiModelProperty(value = "线路编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "线路名称", example = "AAAA") - private String name; - - @ApiModelProperty(value = "单位", example = "123456") - private String bsManufacturer; - - @ApiModelProperty(value = "装置信息", example = "123456") - private List list; - - } - - @Data - public static class TerminalBean { - - @ApiModelProperty(value = "装置编号", example = "123456") - private Integer id; - - @ApiModelProperty(value = "杆塔编号", example = "123456") - private Integer towerid; - - @ApiModelProperty(value = "图像监测装置 ID（17 位编码）", example = "12345678") - private String cmdid; - - @ApiModelProperty(value = "装置名称", example = "名称名称") - private String equipname; - - @ApiModelProperty(value = "杆塔显示名", example = "名称名称") - private String name; - - @ApiModelProperty(value = "杆塔地址", example = "名称名称") - private String address; - - @ApiModelProperty(value = "规约", example = "规约") - private Integer protocol; - - @ApiModelProperty(value = "装置显示名", example = "名称名称") - private String displayname; - - @ApiModelProperty(value = "装置型号", example = "型号型号") - private String model; - - - - - - - } } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelBakDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelBakDao.java new file mode 100644 index 0000000..1f1c0db --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelBakDao.java @@ -0,0 +1,31 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.DyLevel; +import com.shxy.xymanager_common.entity.DyLevelBak; +import com.shxy.xymanager_common.entity.DyLevelExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DyLevelBakDao { + long countByExample(DyLevelExample example); + + int deleteByExample(DyLevelExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(DyLevelBak record); + + int insertSelective(DyLevel record); + + List selectByExample(DyLevelExample example); + + DyLevelBak selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") DyLevel record, @Param("example") DyLevelExample example); + + int updateByExample(@Param("record") DyLevel record, @Param("example") DyLevelExample example); + + int updateByPrimaryKeySelective(DyLevelBak record); + + int updateByPrimaryKey(DyLevelBak record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index f2390f4..e5c2430 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -5,12 +5,16 @@ import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto; import com.shxy.xymanager_common.dto.DyLineAndTerminalWithHeartDto; import com.shxy.xymanager_common.dto.DyLineAndTowertDto; import com.shxy.xymanager_common.entity.DyLevel; +import com.shxy.xymanager_common.entity.DyLevelBak; +import com.shxy.xymanager_common.entity.DyLevelExample; import org.apache.ibatis.annotations.Param; import java.util.List; public interface DyLevelDao { + List selectByExample(DyLevelExample example); + List selectDyAndLineAndTowerAnTermList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("termid") Integer termid, @Param("search") String search, @Param("status") Integer status); List selectDyAndLineAndTowerList(@Param("dyid") Integer dyid, @Param("lineid") Integer lineid, @Param("towerid") Integer towerid, @Param("status") Integer status); @@ -34,4 +38,6 @@ public interface DyLevelDao { int updateByPrimaryKeySelective(DyLevel record); int updateByPrimaryKey(DyLevel record); + + } \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesBakDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesBakDao.java new file mode 100644 index 0000000..883dcb9 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesBakDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.LinesBak; +import com.shxy.xymanager_common.entity.LinesExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface LinesBakDao { + long countByExample(LinesExample example); + + int deleteByExample(LinesExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(LinesBak record); + + int insertSelective(LinesBak record); + + List selectByExample(LinesExample example); + + LinesBak selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") LinesBak record, @Param("example") LinesExample example); + + int updateByExample(@Param("record") LinesBak record, @Param("example") LinesExample example); + + int updateByPrimaryKeySelective(LinesBak record); + + int updateByPrimaryKey(LinesBak record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java index db44846..2403239 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/LinesDao.java @@ -1,8 +1,8 @@ package com.shxy.xymanager_dao.dao; -import cn.hutool.core.util.StrUtil; import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.entity.Lines; +import com.shxy.xymanager_common.entity.LinesExample; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -10,6 +10,8 @@ import java.util.List; public interface LinesDao { + List selectByExample(LinesExample example); + List selectAll(@Param("status") Integer status, @Param("search") String search); int insertList(@Param("list") List record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsBakDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsBakDao.java new file mode 100644 index 0000000..e22d136 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsBakDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TerminalsBak; +import com.shxy.xymanager_common.entity.TerminalsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TerminalsBakDao { + long countByExample(TerminalsExample example); + + int deleteByExample(TerminalsExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TerminalsBak record); + + int insertSelective(TerminalsBak record); + + List selectByExample(TerminalsExample example); + + TerminalsBak selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TerminalsBak record, @Param("example") TerminalsExample example); + + int updateByExample(@Param("record") TerminalsBak record, @Param("example") TerminalsExample example); + + int updateByPrimaryKeySelective(TerminalsBak record); + + int updateByPrimaryKey(TerminalsBak record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java index 88591c1..3aa6551 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.*; import com.shxy.xymanager_common.entity.Terminals; +import com.shxy.xymanager_common.entity.TerminalsExample; import com.shxy.xymanager_common.vo.RelateTerminalListRuleIdVo; import com.shxy.xymanager_common.vo.TerminalIdUpdateVo; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,8 @@ import java.util.List; public interface TerminalsDao { + List selectByExample(TerminalsExample example); + List selectAll(@Param("status") Integer status); List selectTermAndPosition(@Param("status") Integer status); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java index f4e14b1..ededa8d 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java @@ -2,6 +2,7 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.TowerDto; import com.shxy.xymanager_common.entity.Towers; +import com.shxy.xymanager_common.entity.TowersExample; import org.apache.ibatis.annotations.Param; import java.util.Date; @@ -10,6 +11,8 @@ import java.util.List; public interface TowerDao { + List selectByExample(TowersExample example); + int addTower(@Param("list") List towersLst, @Param("status") Integer status, @Param("date") Date date); List selectAll(@Param("status") Integer status,@Param("search") String search); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowersBakDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowersBakDao.java new file mode 100644 index 0000000..c82f04f --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowersBakDao.java @@ -0,0 +1,30 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.TowersBak; +import com.shxy.xymanager_common.entity.TowersExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface TowersBakDao { + long countByExample(TowersExample example); + + int deleteByExample(TowersExample example); + + int deleteByPrimaryKey(Integer id); + + int insert(TowersBak record); + + int insertSelective(TowersBak record); + + List selectByExample(TowersExample example); + + TowersBak selectByPrimaryKey(Integer id); + + int updateByExampleSelective(@Param("record") TowersBak record, @Param("example") TowersExample example); + + int updateByExample(@Param("record") TowersBak record, @Param("example") TowersExample example); + + int updateByPrimaryKeySelective(TowersBak record); + + int updateByPrimaryKey(TowersBak record); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index eac69da..a7ee1a6 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -53,13 +53,19 @@ - - - - - - - + + +
+ + + + +
@@ -103,13 +109,12 @@ - - - - - - - + + + + + + @@ -128,13 +133,11 @@ - - - - - - - + + + + + @@ -296,13 +299,13 @@ - - -
+ + + + + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelBakDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelBakDao.xml new file mode 100644 index 0000000..a1b4f00 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/DyLevelBakDao.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, dy_value, status, create_time, update_time + + + + + delete from dy_level + where id = #{id,jdbcType=INTEGER} + + + delete from dy_level + + + + + + insert into dy_level (id, name, dy_value, + status, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{dyValue,jdbcType=INTEGER}, + #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into dy_level + + + id, + + + name, + + + dy_value, + + + status, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{dyValue,jdbcType=INTEGER}, + + + #{status,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update dy_level + + + id = #{record.id,jdbcType=INTEGER}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + dy_value = #{record.dyValue,jdbcType=INTEGER}, + + + status = #{record.status,jdbcType=INTEGER}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update dy_level + set id = #{record.id,jdbcType=INTEGER}, + name = #{record.name,jdbcType=VARCHAR}, + dy_value = #{record.dyValue,jdbcType=INTEGER}, + status = #{record.status,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update dy_level + + + name = #{name,jdbcType=VARCHAR}, + + + dy_value = #{dyValue,jdbcType=INTEGER}, + + + status = #{status,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update dy_level + set name = #{name,jdbcType=VARCHAR}, + dy_value = #{dyValue,jdbcType=INTEGER}, + status = #{status,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index e84de77..3a714ba 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -10,73 +10,104 @@ + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -84,30 +115,44 @@ - - - - - - - - - + + + + + + + + + id, name, dy_value, status, create_time, update_time + @@ -200,6 +245,7 @@ d.has_pan as has_pan, d.phase as phase, d.equipment_type as equipment_type, + d.dev_type as dev_type, d.isfavor as isfavor, e.last_heartbeat as last_heartbeat from ((((dy_level a left join `lines` b on a.id = b.dy_level_id ) diff --git a/xymanager_dao/src/main/resources/mappers/LinesBakDao.xml b/xymanager_dao/src/main/resources/mappers/LinesBakDao.xml new file mode 100644 index 0000000..1de15fd --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/LinesBakDao.xml @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, name, bs_manufacturer, dy_level_id, status, create_time, update_time + + + + + delete from lines + where id = #{id,jdbcType=INTEGER} + + + delete from lines + + + + + + insert into lines (id, name, bs_manufacturer, + dy_level_id, status, create_time, + update_time) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{bsManufacturer,jdbcType=VARCHAR}, + #{dyLevelId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, + #{updateTime,jdbcType=TIMESTAMP}) + + + insert into lines + + + id, + + + name, + + + bs_manufacturer, + + + dy_level_id, + + + status, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{bsManufacturer,jdbcType=VARCHAR}, + + + #{dyLevelId,jdbcType=INTEGER}, + + + #{status,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update lines + + + id = #{record.id,jdbcType=INTEGER}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR}, + + + dy_level_id = #{record.dyLevelId,jdbcType=INTEGER}, + + + status = #{record.status,jdbcType=INTEGER}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update lines + set id = #{record.id,jdbcType=INTEGER}, + name = #{record.name,jdbcType=VARCHAR}, + bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR}, + dy_level_id = #{record.dyLevelId,jdbcType=INTEGER}, + status = #{record.status,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update lines + + + name = #{name,jdbcType=VARCHAR}, + + + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + + + dy_level_id = #{dyLevelId,jdbcType=INTEGER}, + + + status = #{status,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update lines + set name = #{name,jdbcType=VARCHAR}, + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + dy_level_id = #{dyLevelId,jdbcType=INTEGER}, + status = #{status,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/LinesDao.xml b/xymanager_dao/src/main/resources/mappers/LinesDao.xml index fd363a8..030a94f 100644 --- a/xymanager_dao/src/main/resources/mappers/LinesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/LinesDao.xml @@ -10,7 +10,35 @@ - + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + @@ -21,8 +49,23 @@ - id, name, bs_manufacturer, dy_level_id + id, name, bs_manufacturer, dy_level_id, status, create_time, update_time + + + select + + distinct + + + from terminals + + + + + order by ${orderByClause} + + + + + delete from terminals + where id = #{id,jdbcType=INTEGER} + + + delete from terminals + + + + + + insert into terminals (id, line_id, tower_id, + cmdid, status, org_id, + iccid, protocol, cellphone, + equip_name, display_name, model, + essential_info_version, has_pan, bs_manufacturer, + bs_production_date, bs_identifier, latitude, + longitude, create_time, update_time + ) + values (#{id,jdbcType=INTEGER}, #{lineId,jdbcType=INTEGER}, #{towerId,jdbcType=INTEGER}, + #{cmdid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{orgId,jdbcType=SMALLINT}, + #{iccid,jdbcType=VARCHAR}, #{protocol,jdbcType=INTEGER}, #{cellphone,jdbcType=VARCHAR}, + #{equipName,jdbcType=VARCHAR}, #{displayName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, + #{essentialInfoVersion,jdbcType=VARCHAR}, #{hasPan,jdbcType=TINYINT}, #{bsManufacturer,jdbcType=VARCHAR}, + #{bsProductionDate,jdbcType=DATE}, #{bsIdentifier,jdbcType=VARCHAR}, #{latitude,jdbcType=DOUBLE}, + #{longitude,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into terminals + + + id, + + + line_id, + + + tower_id, + + + cmdid, + + + status, + + + org_id, + + + iccid, + + + protocol, + + + cellphone, + + + equip_name, + + + display_name, + + + model, + + + essential_info_version, + + + has_pan, + + + bs_manufacturer, + + + bs_production_date, + + + bs_identifier, + + + latitude, + + + longitude, + + + create_time, + + + update_time, + + + + + #{id,jdbcType=INTEGER}, + + + #{lineId,jdbcType=INTEGER}, + + + #{towerId,jdbcType=INTEGER}, + + + #{cmdid,jdbcType=VARCHAR}, + + + #{status,jdbcType=INTEGER}, + + + #{orgId,jdbcType=SMALLINT}, + + + #{iccid,jdbcType=VARCHAR}, + + + #{protocol,jdbcType=INTEGER}, + + + #{cellphone,jdbcType=VARCHAR}, + + + #{equipName,jdbcType=VARCHAR}, + + + #{displayName,jdbcType=VARCHAR}, + + + #{model,jdbcType=VARCHAR}, + + + #{essentialInfoVersion,jdbcType=VARCHAR}, + + + #{hasPan,jdbcType=TINYINT}, + + + #{bsManufacturer,jdbcType=VARCHAR}, + + + #{bsProductionDate,jdbcType=DATE}, + + + #{bsIdentifier,jdbcType=VARCHAR}, + + + #{latitude,jdbcType=DOUBLE}, + + + #{longitude,jdbcType=DOUBLE}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update terminals + + + id = #{record.id,jdbcType=INTEGER}, + + + line_id = #{record.lineId,jdbcType=INTEGER}, + + + tower_id = #{record.towerId,jdbcType=INTEGER}, + + + cmdid = #{record.cmdid,jdbcType=VARCHAR}, + + + status = #{record.status,jdbcType=INTEGER}, + + + org_id = #{record.orgId,jdbcType=SMALLINT}, + + + iccid = #{record.iccid,jdbcType=VARCHAR}, + + + protocol = #{record.protocol,jdbcType=INTEGER}, + + + cellphone = #{record.cellphone,jdbcType=VARCHAR}, + + + equip_name = #{record.equipName,jdbcType=VARCHAR}, + + + display_name = #{record.displayName,jdbcType=VARCHAR}, + + + model = #{record.model,jdbcType=VARCHAR}, + + + essential_info_version = #{record.essentialInfoVersion,jdbcType=VARCHAR}, + + + has_pan = #{record.hasPan,jdbcType=TINYINT}, + + + bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR}, + + + bs_production_date = #{record.bsProductionDate,jdbcType=DATE}, + + + bs_identifier = #{record.bsIdentifier,jdbcType=VARCHAR}, + + + latitude = #{record.latitude,jdbcType=DOUBLE}, + + + longitude = #{record.longitude,jdbcType=DOUBLE}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update terminals + set id = #{record.id,jdbcType=INTEGER}, + line_id = #{record.lineId,jdbcType=INTEGER}, + tower_id = #{record.towerId,jdbcType=INTEGER}, + cmdid = #{record.cmdid,jdbcType=VARCHAR}, + status = #{record.status,jdbcType=INTEGER}, + org_id = #{record.orgId,jdbcType=SMALLINT}, + iccid = #{record.iccid,jdbcType=VARCHAR}, + protocol = #{record.protocol,jdbcType=INTEGER}, + cellphone = #{record.cellphone,jdbcType=VARCHAR}, + equip_name = #{record.equipName,jdbcType=VARCHAR}, + display_name = #{record.displayName,jdbcType=VARCHAR}, + model = #{record.model,jdbcType=VARCHAR}, + essential_info_version = #{record.essentialInfoVersion,jdbcType=VARCHAR}, + has_pan = #{record.hasPan,jdbcType=TINYINT}, + bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR}, + bs_production_date = #{record.bsProductionDate,jdbcType=DATE}, + bs_identifier = #{record.bsIdentifier,jdbcType=VARCHAR}, + latitude = #{record.latitude,jdbcType=DOUBLE}, + longitude = #{record.longitude,jdbcType=DOUBLE}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update terminals + + + line_id = #{lineId,jdbcType=INTEGER}, + + + tower_id = #{towerId,jdbcType=INTEGER}, + + + cmdid = #{cmdid,jdbcType=VARCHAR}, + + + status = #{status,jdbcType=INTEGER}, + + + org_id = #{orgId,jdbcType=SMALLINT}, + + + iccid = #{iccid,jdbcType=VARCHAR}, + + + protocol = #{protocol,jdbcType=INTEGER}, + + + cellphone = #{cellphone,jdbcType=VARCHAR}, + + + equip_name = #{equipName,jdbcType=VARCHAR}, + + + display_name = #{displayName,jdbcType=VARCHAR}, + + + model = #{model,jdbcType=VARCHAR}, + + + essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR}, + + + has_pan = #{hasPan,jdbcType=TINYINT}, + + + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + + + bs_production_date = #{bsProductionDate,jdbcType=DATE}, + + + bs_identifier = #{bsIdentifier,jdbcType=VARCHAR}, + + + latitude = #{latitude,jdbcType=DOUBLE}, + + + longitude = #{longitude,jdbcType=DOUBLE}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update terminals + set line_id = #{lineId,jdbcType=INTEGER}, + tower_id = #{towerId,jdbcType=INTEGER}, + cmdid = #{cmdid,jdbcType=VARCHAR}, + status = #{status,jdbcType=INTEGER}, + org_id = #{orgId,jdbcType=SMALLINT}, + iccid = #{iccid,jdbcType=VARCHAR}, + protocol = #{protocol,jdbcType=INTEGER}, + cellphone = #{cellphone,jdbcType=VARCHAR}, + equip_name = #{equipName,jdbcType=VARCHAR}, + display_name = #{displayName,jdbcType=VARCHAR}, + model = #{model,jdbcType=VARCHAR}, + essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR}, + has_pan = #{hasPan,jdbcType=TINYINT}, + bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR}, + bs_production_date = #{bsProductionDate,jdbcType=DATE}, + bs_identifier = #{bsIdentifier,jdbcType=VARCHAR}, + latitude = #{latitude,jdbcType=DOUBLE}, + longitude = #{longitude,jdbcType=DOUBLE}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 885e0af..2d17411 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -22,10 +22,39 @@ + - + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + @@ -94,14 +123,26 @@ - id , line_id,tower_id,cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan, bs_manufacturer, bs_production_date, bs_identifier, latitude, longitude, create_time, update_time,sim,working_date,net_type - + + select + + distinct + + + from towers + + + + + order by ${orderByClause} + + + select + + distinct + + + from towers + + + + + order by ${orderByClause} + + + + + delete from towers + where id = #{id,jdbcType=INTEGER} + + + delete from towers + + + + + + insert into towers (id, name, line_id, + create_time, update_time, status, + order) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{lineId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, + #{order,jdbcType=INTEGER}) + + + insert into towers + + + id, + + + name, + + + line_id, + + + create_time, + + + update_time, + + + status, + + + order, + + + + + #{id,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{lineId,jdbcType=INTEGER}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{status,jdbcType=INTEGER}, + + + #{order,jdbcType=INTEGER}, + + + + + + update towers + + + id = #{record.id,jdbcType=INTEGER}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + line_id = #{record.lineId,jdbcType=INTEGER}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + status = #{record.status,jdbcType=INTEGER}, + + + order = #{record.order,jdbcType=INTEGER}, + + + + + + + + update towers + set id = #{record.id,jdbcType=INTEGER}, + name = #{record.name,jdbcType=VARCHAR}, + line_id = #{record.lineId,jdbcType=INTEGER}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + status = #{record.status,jdbcType=INTEGER}, + order = #{record.order,jdbcType=INTEGER} + + + + + + update towers + + + name = #{name,jdbcType=VARCHAR}, + + + line_id = #{lineId,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + status = #{status,jdbcType=INTEGER}, + + + order = #{order,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + update towers + set name = #{name,jdbcType=VARCHAR}, + line_id = #{lineId,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + status = #{status,jdbcType=INTEGER}, + order = #{order,jdbcType=INTEGER} + where id = #{id,jdbcType=INTEGER} + + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 822e97c..dc251bb 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -40,6 +40,18 @@ public class DyLevelServiceImpl implements DyLevelService { @Autowired DyLevelDao dyLevelDao; + @Autowired + DyLevelBakDao dyLevelBakDao; + + @Autowired + LinesBakDao linesBakDao; + + @Autowired + TowersBakDao towersBakDao; + + @Autowired + TerminalsBakDao terminalsBakDao; + @Autowired TerminalChannelMapperDao terminalChannelMapperDao; @@ -88,7 +100,6 @@ public class DyLevelServiceImpl implements DyLevelService { Asserts.fail("权限解析错误"); e.printStackTrace(); } - ArrayList favorList = new ArrayList<>(); ArrayList favoridlist = new ArrayList<>(); List terminalFavs = terminalFavsDao.selectByUid(uid); @@ -153,10 +164,7 @@ public class DyLevelServiceImpl implements DyLevelService { bean.setHasPan(terminalsWithHeart.getHasPan()); bean.setPhase(terminalsWithHeart.getPhase()); bean.setEquipmentType(terminalsWithHeart.getEquipmentType()); - - // Integer isfavor = terminalsWithHeart.getIsfavor(); - boolean contains = favoridlist.contains(id); if (contains) { bean.setIsfavor(CommonStatus.EFFECTIVE.value()); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java index 2eb3602..52f75f6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java @@ -6,24 +6,22 @@ import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.dto.DyLineAndTerminalWithHeartDto; import com.shxy.xymanager_common.dto.LineAndTerminalWithHeartDto; import com.shxy.xymanager_common.dto.TerminalsWithHeart; -import com.shxy.xymanager_common.entity.TbPermission; -import com.shxy.xymanager_common.entity.TbPermissionExample; -import com.shxy.xymanager_common.entity.TbRole; -import com.shxy.xymanager_common.entity.TbRoleExample; +import com.shxy.xymanager_common.entity.*; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.enums.PermissionDetailEnum; import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.exception.Asserts; import com.shxy.xymanager_common.model.PermissionDyLineTreeListModel; -import com.shxy.xymanager_dao.dao.DyLevelDao; -import com.shxy.xymanager_dao.dao.TbPermissionMapper; -import com.shxy.xymanager_dao.dao.TbRoleMapper; +import com.shxy.xymanager_common.util.XyNumberUtils; +import com.shxy.xymanager_dao.dao.*; import com.shxy.xymanager_service.service.RoleService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -41,9 +39,18 @@ public class RoleServiceImpl implements RoleService { @Resource TbPermissionMapper permissionMapper; - @Resource + @Autowired DyLevelDao dyLevelDao; + @Autowired + LinesDao linesDao; + + @Autowired + TowerDao towerDao; + + @Autowired + TerminalsDao terminalsDao; + @Override public List listAll() { TbRoleExample example = new TbRoleExample(); @@ -166,55 +173,39 @@ public class RoleServiceImpl implements RoleService { public ServiceBody getPermissionTree() { PermissionDyLineTreeListModel model = new PermissionDyLineTreeListModel(); List list = dyLevelDao.selectPermissionListTreeList(); - boolean empty = CollectionUtil.isEmpty(list); + List dyLevels = dyLevelDao.selectByExample(new DyLevelExample()); + List lines = linesDao.selectByExample(new LinesExample()); + List towers = towerDao.selectByExample(new TowersExample()); + List terminals = terminalsDao.selectByExample(new TerminalsExample()); + + boolean empty = CollectionUtil.isEmpty(dyLevels); if (empty) { model.setList(new ArrayList<>()); } else { - ArrayList dyListBeans = new ArrayList<>(); - for (int i = 0; i < list.size(); i++) { - DyLineAndTerminalWithHeartDto dyDto = list.get(i); - List linelist = dyDto.getList(); - if (CollectionUtil.isEmpty(linelist)) { - continue; - } - PermissionDyLineTreeListModel.DyListBean dyModel = new PermissionDyLineTreeListModel.DyListBean(); - dyModel.setId(dyDto.getId()); - dyModel.setDyValue(dyDto.getDyValue()); - dyModel.setName(dyDto.getName()); - ArrayList lineBeans = new ArrayList<>(); - for (int j = 0; j < linelist.size(); j++) { - LineAndTerminalWithHeartDto lineDto = linelist.get(j); - List termlist = lineDto.getList(); - if (CollectionUtil.isEmpty(termlist)) { - continue; + model.setList(dyLevels); + for (DyLevel dyLevel : dyLevels) { + Integer dyid = dyLevel.getId(); + for (Lines line : lines) { + Integer linedyLevelId = line.getDyLevelId(); + if (XyNumberUtils.compare(dyid, linedyLevelId) == 0) { + dyLevel.getList().add(line); } - PermissionDyLineTreeListModel.LineBean lineBean = new PermissionDyLineTreeListModel.LineBean(); - lineBean.setId(lineDto.getId()); - lineBean.setName(lineDto.getName()); - lineBean.setBsManufacturer(lineDto.getBsManufacturer()); - - ArrayList beanlist = new ArrayList<>(); - for (int k = 0; k < termlist.size(); k++) { - TerminalsWithHeart terminalsWithHeart = termlist.get(k); - - PermissionDyLineTreeListModel.TerminalBean bean = new PermissionDyLineTreeListModel.TerminalBean(); - bean.setId(terminalsWithHeart.getId()); - bean.setAddress(terminalsWithHeart.getAddress()); - bean.setCmdid(terminalsWithHeart.getCmdid()); - bean.setDisplayname(terminalsWithHeart.getDisplayname()); - bean.setEquipname(terminalsWithHeart.getEquipname()); - bean.setModel(terminalsWithHeart.getModel()); - bean.setName(terminalsWithHeart.getName()); - bean.setTowerid(terminalsWithHeart.getTowerid()); - beanlist.add(bean); + for (Towers tower : towers) { + Integer towerlineId = tower.getLineId(); + Integer towerId = tower.getId(); + if (XyNumberUtils.compare(towerlineId, towerId) == 0) { + line.getList().add(tower); + } + for (Terminals term : terminals) { + Integer termtowerid = term.getTowerid(); + if (XyNumberUtils.compare(termtowerid, towerId) == 0) { + tower.getList().add(term); + } + } } - lineBean.setList(beanlist); - lineBeans.add(lineBean); } - dyModel.setList(lineBeans); - dyListBeans.add(dyModel); } - model.setList(dyListBeans); + } return Asserts.success(model);