权限接口修改

dev
liuguijing 1 year ago
parent 4be1c7d249
commit bc22efb746

@ -54,7 +54,10 @@ public class TerminalsWithHeart implements Serializable {
private String equipmentType;
private Integer devType;
private Integer isfavor;
private static final long serialVersionUID = 1L;
}

@ -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<Lines> list = new ArrayList<>();
private static final long serialVersionUID = 1L;
}

@ -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;
}

@ -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<Criteria> oredCriteria;
public DyLevelExample() {
oredCriteria = new ArrayList<Criteria>();
}
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<Criteria> 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<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> 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<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> 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<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> 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<Integer> values) {
addCriterion("dy_value in", values, "dyValue");
return (Criteria) this;
}
public Criteria andDyValueNotIn(List<Integer> 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<Integer> values) {
addCriterion("status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> 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<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> 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<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> 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);
}
}
}

@ -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<Towers> list = new ArrayList<>();
private static final long serialVersionUID = 1L;
}

@ -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;
}

@ -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<Criteria> oredCriteria;
public LinesExample() {
oredCriteria = new ArrayList<Criteria>();
}
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<Criteria> 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<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> 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<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> 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<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> 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<String> values) {
addCriterion("bs_manufacturer in", values, "bsManufacturer");
return (Criteria) this;
}
public Criteria andBsManufacturerNotIn(List<String> 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<Integer> values) {
addCriterion("dy_level_id in", values, "dyLevelId");
return (Criteria) this;
}
public Criteria andDyLevelIdNotIn(List<Integer> 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<Integer> values) {
addCriterion("status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> 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<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> 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<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> 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<Float> values) {
addCriterion("tes in", values, "tes");
return (Criteria) this;
}
public Criteria andTesNotIn(List<Float> 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);
}
}
}

@ -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;

@ -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;

@ -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();
}
}

@ -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<Terminals> list = new ArrayList<>();
}

@ -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();
}
}

@ -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<Criteria> oredCriteria;
public TowersExample() {
oredCriteria = new ArrayList<Criteria>();
}
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<Criteria> 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<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> 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<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> 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<String> values) {
addCriterion("name in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> 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<Integer> values) {
addCriterion("line_id in", values, "lineId");
return (Criteria) this;
}
public Criteria andLineIdNotIn(List<Integer> 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<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> 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<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> 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<Integer> values) {
addCriterion("status in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> 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<Integer> values) {
addCriterion("order in", values, "order");
return (Criteria) this;
}
public Criteria andOrderNotIn(List<Integer> 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<String> values) {
addCriterion("address in", values, "address");
return (Criteria) this;
}
public Criteria andAddressNotIn(List<String> 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);
}
}
}

@ -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<DyListBean> list;
private List<DyLevel> 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<LineBean> 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<TerminalBean> list;
}
@Data
public static class TerminalBean {
@ApiModelProperty(value = "装置编号", example = "123456")
private Integer id;
@ApiModelProperty(value = "杆塔编号", example = "123456")
private Integer towerid;
@ApiModelProperty(value = "图像监测装置 ID17 位编码)", 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;
}
}

@ -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<DyLevelBak> 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);
}

@ -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<DyLevel> selectByExample(DyLevelExample example);
List<DyAndLineAndTowerAndTermDto> 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<DyLineAndTowertDto> 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);
}

@ -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<LinesBak> 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);
}

@ -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<Lines> selectByExample(LinesExample example);
List<LineAndDyNameDto> selectAll(@Param("status") Integer status, @Param("search") String search);
int insertList(@Param("list") List<Lines> record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update);

@ -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<TerminalsBak> 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);
}

@ -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<Terminals> selectByExample(TerminalsExample example);
List<Terminals> selectAll(@Param("status") Integer status);
List<TerminalsAndPositionDto> selectTermAndPosition(@Param("status") Integer status);

@ -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<Towers> selectByExample(TowersExample example);
int addTower(@Param("list") List<Towers> towersLst, @Param("status") Integer status, @Param("date") Date date);
List<TowerDto> selectAll(@Param("status") Integer status,@Param("search") String search);

@ -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<TowersBak> 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);
}

@ -53,13 +53,19 @@
</javaClientGenerator>
<!-- &lt;!&ndash; 列出要生成代码的所有表这里配置的是不生成Example文件 &ndash;&gt;-->
<!-- <table tableName="terminals"-->
<!-- domainObjectName="Terminals"-->
<!-- mapperName="TerminalsDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table tableName="terminals"
domainObjectName="TerminalsBak"
mapperName="TerminalsBakDao"
>
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
<table tableName="towers"
domainObjectName="TowersBak"
mapperName="TowersBakDao">
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
<!-- <table tableName="terminal_channels"-->
<!-- domainObjectName="TerminalChannels"-->
<!-- mapperName="TerminalChannelsDao"-->
@ -104,10 +110,9 @@
<!-- </table>-->
<!-- <table tableName="lines"-->
<!-- domainObjectName="Lines"-->
<!-- mapperName="LinesDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- domainObjectName="LinesBak"-->
<!-- mapperName="LinesBakDao"-->
<!-- >-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
@ -130,9 +135,7 @@
<!-- <table tableName="dy_level"-->
<!-- domainObjectName="DyLevel"-->
<!-- mapperName="DyLevelDao"-->
<!-- enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"-->
<!-- enableSelectByExample="false" selectByExampleQueryId="false">-->
<!-- mapperName="DyLevelDao">-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
@ -296,13 +299,13 @@
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
<table
tableName="terminal_favs"
domainObjectName="TerminalFavs"
mapperName="TerminalFavsDao"
>
<!-- <property name="useActualColumnNames" value="false"/>-->
</table>
<!-- <table-->
<!-- tableName="terminal_favs"-->
<!-- domainObjectName="TerminalFavs"-->
<!-- mapperName="TerminalFavsDao"-->
<!-- >-->
<!-- &lt;!&ndash; <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
<!-- </table>-->
</context>
</generatorConfiguration>

@ -0,0 +1,228 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.DyLevelBakDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.DyLevelBak">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="dy_value" jdbcType="INTEGER" property="dyValue" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, dy_value, status, create_time, update_time
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.DyLevelExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from dy_level
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from dy_level
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from dy_level
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.DyLevelExample">
delete from dy_level
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.DyLevel">
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>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.DyLevel">
insert into dy_level
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="dyValue != null">
dy_value,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="dyValue != null">
#{dyValue,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.shxy.xymanager_common.entity.DyLevelExample" resultType="java.lang.Long">
select count(*) from dy_level
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update dy_level
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.dyValue != null">
dy_value = #{record.dyValue,jdbcType=INTEGER},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=INTEGER},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.DyLevel">
update dy_level
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="dyValue != null">
dy_value = #{dyValue,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.DyLevel">
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}
</update>
</mapper>

@ -10,16 +10,46 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<resultMap id="LineAndTerminalMap" type="com.shxy.xymanager_common.dto.DyLineAndTerminalWithHeartDto">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="dyvalue" jdbcType="INTEGER" property="dyValue" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTerminalWithHeartDto">
<collection javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTerminalWithHeartDto" property="list">
<id column="line_id" jdbcType="INTEGER" property="id" />
<result column="line_name" jdbcType="VARCHAR" property="name" />
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer" />
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevel" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.TerminalsWithHeart">
<collection javaType="list" ofType="com.shxy.xymanager_common.dto.TerminalsWithHeart" property="list">
<result column="term_id" jdbcType="INTEGER" property="id" />
<result column="tower_id" jdbcType="INTEGER" property="towerid" />
<result column="protocol" jdbcType="INTEGER" property="protocol" />
@ -33,6 +63,7 @@
<result column="has_pan" jdbcType="INTEGER" property="hasPan" />
<result column="phase" jdbcType="VARCHAR" property="phase" />
<result column="equipment_type" jdbcType="VARCHAR" property="equipmentType" />
<result column="dev_type" jdbcType="VARCHAR" property="devType" />
<result column="isfavor" jdbcType="INTEGER" property="isfavor" />
</collection>
</collection>
@ -42,12 +73,12 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="dyvalue" jdbcType="INTEGER" property="dyValue" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTerminalNoHeartDto">
<collection javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTerminalNoHeartDto" property="list">
<id column="line_id" jdbcType="INTEGER" property="id" />
<result column="line_name" jdbcType="VARCHAR" property="name" />
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer" />
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevel" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals">
<collection javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals" property="list">
<result column="term_id" jdbcType="INTEGER" property="id" />
<result column="tower_id" jdbcType="INTEGER" property="towerid" />
<result column="protocol" jdbcType="INTEGER" property="protocol" />
@ -62,15 +93,15 @@
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="dyvalue" jdbcType="INTEGER" property="dyValue" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTowerAndTermDto">
<collection javaType="list" ofType="com.shxy.xymanager_common.dto.LineAndTowerAndTermDto" property="list">
<id column="line_id" jdbcType="INTEGER" property="id" />
<result column="line_name" jdbcType="VARCHAR" property="name" />
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer" />
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevel" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.TowerAndTermDto">
<collection javaType="list" ofType="com.shxy.xymanager_common.dto.TowerAndTermDto" property="list">
<result column="tower_id" jdbcType="INTEGER" property="id" />
<result column="tower_name" jdbcType="VARCHAR" property="name" />
<collection property="list" javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals">
<collection javaType="list" ofType="com.shxy.xymanager_common.entity.Terminals" property="list">
<result column="term_id" jdbcType="INTEGER" property="id" />
<result column="protocol" jdbcType="INTEGER" property="protocol" />
<result column="cmdid" jdbcType="VARCHAR" property="cmdid" />
@ -98,6 +129,20 @@
<sql id="Base_Column_List">
id, name, dy_value, status, create_time, update_time
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.DyLevelExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from dy_level
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
@ -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 )

@ -0,0 +1,244 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.LinesBakDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.LinesBak">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer" />
<result column="dy_level_id" jdbcType="INTEGER" property="dyLevelId" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, bs_manufacturer, dy_level_id, status, create_time, update_time
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.LinesExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from lines
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from lines
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from lines
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.LinesExample">
delete from lines
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.LinesBak">
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>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.LinesBak">
insert into lines
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="bsManufacturer != null">
bs_manufacturer,
</if>
<if test="dyLevelId != null">
dy_level_id,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="bsManufacturer != null">
#{bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="dyLevelId != null">
#{dyLevelId,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.shxy.xymanager_common.entity.LinesExample" resultType="java.lang.Long">
select count(*) from lines
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update lines
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.bsManufacturer != null">
bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="record.dyLevelId != null">
dy_level_id = #{record.dyLevelId,jdbcType=INTEGER},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=INTEGER},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.LinesBak">
update lines
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="bsManufacturer != null">
bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="dyLevelId != null">
dy_level_id = #{dyLevelId,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.LinesBak">
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}
</update>
</mapper>

@ -10,7 +10,35 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<resultMap id="LineAndDyNameMap" type="com.shxy.xymanager_common.dto.LineAndDyNameDto">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
@ -21,8 +49,23 @@
</resultMap>
<sql id="Base_Column_List">
id, name, bs_manufacturer, dy_level_id
id, name, bs_manufacturer, dy_level_id, status, create_time, update_time
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.LinesExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from lines
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectAll" resultMap="LineAndDyNameMap">
select
x.id as id,

@ -0,0 +1,466 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.TerminalsBakDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TerminalsBak">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="line_id" jdbcType="INTEGER" property="lineId" />
<result column="tower_id" jdbcType="INTEGER" property="towerId" />
<result column="cmdid" jdbcType="VARCHAR" property="cmdid" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="org_id" jdbcType="SMALLINT" property="orgId" />
<result column="iccid" jdbcType="VARCHAR" property="iccid" />
<result column="protocol" jdbcType="INTEGER" property="protocol" />
<result column="cellphone" jdbcType="VARCHAR" property="cellphone" />
<result column="equip_name" jdbcType="VARCHAR" property="equipName" />
<result column="display_name" jdbcType="VARCHAR" property="displayName" />
<result column="model" jdbcType="VARCHAR" property="model" />
<result column="essential_info_version" jdbcType="VARCHAR" property="essentialInfoVersion" />
<result column="has_pan" jdbcType="TINYINT" property="hasPan" />
<result column="bs_manufacturer" jdbcType="VARCHAR" property="bsManufacturer" />
<result column="bs_production_date" jdbcType="DATE" property="bsProductionDate" />
<result column="bs_identifier" jdbcType="VARCHAR" property="bsIdentifier" />
<result column="latitude" jdbcType="DOUBLE" property="latitude" />
<result column="longitude" jdbcType="DOUBLE" property="longitude" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
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
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalsExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from terminals
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from terminals
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from terminals
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TerminalsExample">
delete from terminals
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TerminalsBak">
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>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TerminalsBak">
insert into terminals
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="lineId != null">
line_id,
</if>
<if test="towerId != null">
tower_id,
</if>
<if test="cmdid != null">
cmdid,
</if>
<if test="status != null">
status,
</if>
<if test="orgId != null">
org_id,
</if>
<if test="iccid != null">
iccid,
</if>
<if test="protocol != null">
protocol,
</if>
<if test="cellphone != null">
cellphone,
</if>
<if test="equipName != null">
equip_name,
</if>
<if test="displayName != null">
display_name,
</if>
<if test="model != null">
model,
</if>
<if test="essentialInfoVersion != null">
essential_info_version,
</if>
<if test="hasPan != null">
has_pan,
</if>
<if test="bsManufacturer != null">
bs_manufacturer,
</if>
<if test="bsProductionDate != null">
bs_production_date,
</if>
<if test="bsIdentifier != null">
bs_identifier,
</if>
<if test="latitude != null">
latitude,
</if>
<if test="longitude != null">
longitude,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="lineId != null">
#{lineId,jdbcType=INTEGER},
</if>
<if test="towerId != null">
#{towerId,jdbcType=INTEGER},
</if>
<if test="cmdid != null">
#{cmdid,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="orgId != null">
#{orgId,jdbcType=SMALLINT},
</if>
<if test="iccid != null">
#{iccid,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
#{protocol,jdbcType=INTEGER},
</if>
<if test="cellphone != null">
#{cellphone,jdbcType=VARCHAR},
</if>
<if test="equipName != null">
#{equipName,jdbcType=VARCHAR},
</if>
<if test="displayName != null">
#{displayName,jdbcType=VARCHAR},
</if>
<if test="model != null">
#{model,jdbcType=VARCHAR},
</if>
<if test="essentialInfoVersion != null">
#{essentialInfoVersion,jdbcType=VARCHAR},
</if>
<if test="hasPan != null">
#{hasPan,jdbcType=TINYINT},
</if>
<if test="bsManufacturer != null">
#{bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="bsProductionDate != null">
#{bsProductionDate,jdbcType=DATE},
</if>
<if test="bsIdentifier != null">
#{bsIdentifier,jdbcType=VARCHAR},
</if>
<if test="latitude != null">
#{latitude,jdbcType=DOUBLE},
</if>
<if test="longitude != null">
#{longitude,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TerminalsExample" resultType="java.lang.Long">
select count(*) from terminals
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update terminals
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.lineId != null">
line_id = #{record.lineId,jdbcType=INTEGER},
</if>
<if test="record.towerId != null">
tower_id = #{record.towerId,jdbcType=INTEGER},
</if>
<if test="record.cmdid != null">
cmdid = #{record.cmdid,jdbcType=VARCHAR},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=INTEGER},
</if>
<if test="record.orgId != null">
org_id = #{record.orgId,jdbcType=SMALLINT},
</if>
<if test="record.iccid != null">
iccid = #{record.iccid,jdbcType=VARCHAR},
</if>
<if test="record.protocol != null">
protocol = #{record.protocol,jdbcType=INTEGER},
</if>
<if test="record.cellphone != null">
cellphone = #{record.cellphone,jdbcType=VARCHAR},
</if>
<if test="record.equipName != null">
equip_name = #{record.equipName,jdbcType=VARCHAR},
</if>
<if test="record.displayName != null">
display_name = #{record.displayName,jdbcType=VARCHAR},
</if>
<if test="record.model != null">
model = #{record.model,jdbcType=VARCHAR},
</if>
<if test="record.essentialInfoVersion != null">
essential_info_version = #{record.essentialInfoVersion,jdbcType=VARCHAR},
</if>
<if test="record.hasPan != null">
has_pan = #{record.hasPan,jdbcType=TINYINT},
</if>
<if test="record.bsManufacturer != null">
bs_manufacturer = #{record.bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="record.bsProductionDate != null">
bs_production_date = #{record.bsProductionDate,jdbcType=DATE},
</if>
<if test="record.bsIdentifier != null">
bs_identifier = #{record.bsIdentifier,jdbcType=VARCHAR},
</if>
<if test="record.latitude != null">
latitude = #{record.latitude,jdbcType=DOUBLE},
</if>
<if test="record.longitude != null">
longitude = #{record.longitude,jdbcType=DOUBLE},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TerminalsBak">
update terminals
<set>
<if test="lineId != null">
line_id = #{lineId,jdbcType=INTEGER},
</if>
<if test="towerId != null">
tower_id = #{towerId,jdbcType=INTEGER},
</if>
<if test="cmdid != null">
cmdid = #{cmdid,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="orgId != null">
org_id = #{orgId,jdbcType=SMALLINT},
</if>
<if test="iccid != null">
iccid = #{iccid,jdbcType=VARCHAR},
</if>
<if test="protocol != null">
protocol = #{protocol,jdbcType=INTEGER},
</if>
<if test="cellphone != null">
cellphone = #{cellphone,jdbcType=VARCHAR},
</if>
<if test="equipName != null">
equip_name = #{equipName,jdbcType=VARCHAR},
</if>
<if test="displayName != null">
display_name = #{displayName,jdbcType=VARCHAR},
</if>
<if test="model != null">
model = #{model,jdbcType=VARCHAR},
</if>
<if test="essentialInfoVersion != null">
essential_info_version = #{essentialInfoVersion,jdbcType=VARCHAR},
</if>
<if test="hasPan != null">
has_pan = #{hasPan,jdbcType=TINYINT},
</if>
<if test="bsManufacturer != null">
bs_manufacturer = #{bsManufacturer,jdbcType=VARCHAR},
</if>
<if test="bsProductionDate != null">
bs_production_date = #{bsProductionDate,jdbcType=DATE},
</if>
<if test="bsIdentifier != null">
bs_identifier = #{bsIdentifier,jdbcType=VARCHAR},
</if>
<if test="latitude != null">
latitude = #{latitude,jdbcType=DOUBLE},
</if>
<if test="longitude != null">
longitude = #{longitude,jdbcType=DOUBLE},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TerminalsBak">
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}
</update>
</mapper>

@ -22,10 +22,39 @@
<result column="longitude" jdbcType="DOUBLE" property="longitude"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="net_type" jdbcType="INTEGER" property="netType"/>
<result column="dev_type" jdbcType="INTEGER" property="devType"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<resultMap id="TermAndStatusMap" type="com.shxy.xymanager_common.dto.TerminalsAndStatusDto">
<id column="id" jdbcType="INTEGER" property="id"/>
<result column="line_id" jdbcType="INTEGER" property="lineid"/>
@ -94,14 +123,26 @@
</collection>
</resultMap>
<sql id="Base_Column_List">
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
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TerminalsExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from towers
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>

@ -11,11 +11,52 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, line_id,status,order
id, name, line_id, create_time, update_time, status, order
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TowersExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from towers
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectAll" resultType="com.shxy.xymanager_common.dto.TowerDto">
select
t.id as id,

@ -0,0 +1,244 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.shxy.xymanager_dao.dao.TowersBakDao">
<resultMap id="BaseResultMap" type="com.shxy.xymanager_common.entity.TowersBak">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="line_id" jdbcType="INTEGER" property="lineId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="order" jdbcType="INTEGER" property="order" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, name, line_id, create_time, update_time, status, order
</sql>
<select id="selectByExample" parameterType="com.shxy.xymanager_common.entity.TowersExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from towers
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from towers
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from towers
where id = #{id,jdbcType=INTEGER}
</delete>
<delete id="deleteByExample" parameterType="com.shxy.xymanager_common.entity.TowersExample">
delete from towers
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.shxy.xymanager_common.entity.TowersBak">
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>
<insert id="insertSelective" parameterType="com.shxy.xymanager_common.entity.TowersBak">
insert into towers
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
<if test="lineId != null">
line_id,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
<if test="status != null">
status,
</if>
<if test="order != null">
order,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="lineId != null">
#{lineId,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="order != null">
#{order,jdbcType=INTEGER},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.shxy.xymanager_common.entity.TowersExample" resultType="java.lang.Long">
select count(*) from towers
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update towers
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=INTEGER},
</if>
<if test="record.name != null">
name = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.lineId != null">
line_id = #{record.lineId,jdbcType=INTEGER},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.status != null">
status = #{record.status,jdbcType=INTEGER},
</if>
<if test="record.order != null">
order = #{record.order,jdbcType=INTEGER},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.shxy.xymanager_common.entity.TowersBak">
update towers
<set>
<if test="name != null">
name = #{name,jdbcType=VARCHAR},
</if>
<if test="lineId != null">
line_id = #{lineId,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="order != null">
order = #{order,jdbcType=INTEGER},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.shxy.xymanager_common.entity.TowersBak">
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}
</update>
</mapper>

@ -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<DyLineTreeListModel.TerminalBean> favorList = new ArrayList<>();
ArrayList<Integer> favoridlist = new ArrayList<>();
List<TerminalFavs> 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());

@ -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<TbRole> listAll() {
TbRoleExample example = new TbRoleExample();
@ -166,55 +173,39 @@ public class RoleServiceImpl implements RoleService {
public ServiceBody<PermissionDyLineTreeListModel> getPermissionTree() {
PermissionDyLineTreeListModel model = new PermissionDyLineTreeListModel();
List<DyLineAndTerminalWithHeartDto> list = dyLevelDao.selectPermissionListTreeList();
boolean empty = CollectionUtil.isEmpty(list);
List<DyLevel> dyLevels = dyLevelDao.selectByExample(new DyLevelExample());
List<Lines> lines = linesDao.selectByExample(new LinesExample());
List<Towers> towers = towerDao.selectByExample(new TowersExample());
List<Terminals> terminals = terminalsDao.selectByExample(new TerminalsExample());
boolean empty = CollectionUtil.isEmpty(dyLevels);
if (empty) {
model.setList(new ArrayList<>());
} else {
ArrayList<PermissionDyLineTreeListModel.DyListBean> dyListBeans = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
DyLineAndTerminalWithHeartDto dyDto = list.get(i);
List<LineAndTerminalWithHeartDto> 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<PermissionDyLineTreeListModel.LineBean> lineBeans = new ArrayList<>();
for (int j = 0; j < linelist.size(); j++) {
LineAndTerminalWithHeartDto lineDto = linelist.get(j);
List<TerminalsWithHeart> termlist = lineDto.getList();
if (CollectionUtil.isEmpty(termlist)) {
continue;
}
PermissionDyLineTreeListModel.LineBean lineBean = new PermissionDyLineTreeListModel.LineBean();
lineBean.setId(lineDto.getId());
lineBean.setName(lineDto.getName());
lineBean.setBsManufacturer(lineDto.getBsManufacturer());
ArrayList<PermissionDyLineTreeListModel.TerminalBean> 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);
}
lineBean.setList(beanlist);
lineBeans.add(lineBean);
}
dyModel.setList(lineBeans);
dyListBeans.add(dyModel);
}
model.setList(dyListBeans);
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);
}
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);
}
}
}
}
}
}
return Asserts.success(model);

Loading…
Cancel
Save