diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java index 5987b94..f46dd29 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java @@ -4,11 +4,10 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.entity.DyLevel; import com.shxy.xymanager_common.entity.TbPermission; import com.shxy.xymanager_common.entity.TbRole; import com.shxy.xymanager_common.exception.ApiException; -import com.shxy.xymanager_common.model.DyLineTreeListModel; -import com.shxy.xymanager_common.model.PermissionDyLineTreeListModel; import com.shxy.xymanager_common.model.PermissionModel; import com.shxy.xymanager_service.service.RoleService; @@ -81,8 +80,8 @@ public class RoleController extends BaseController { @GetMapping("getPermissionTree") @ApiOperation("查询权限树状图") - public ResponseReult getPermissionTree() { - ServiceBody serviceBody = service.getPermissionTree(); + public ResponseReult> getPermissionTree() { + ServiceBody> serviceBody = service.getPermissionTree(); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java index c9dd0b5..1fcb3a3 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java @@ -1,7 +1,6 @@ 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; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatusExample.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatusExample.java new file mode 100644 index 0000000..5cac124 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalStatusExample.java @@ -0,0 +1,1530 @@ +package com.shxy.xymanager_common.entity; + +import java.util.ArrayList; +import java.util.List; + +public class TerminalStatusExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public TerminalStatusExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andTermIdIsNull() { + addCriterion("term_id is null"); + return (Criteria) this; + } + + public Criteria andTermIdIsNotNull() { + addCriterion("term_id is not null"); + return (Criteria) this; + } + + public Criteria andTermIdEqualTo(Integer value) { + addCriterion("term_id =", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotEqualTo(Integer value) { + addCriterion("term_id <>", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThan(Integer value) { + addCriterion("term_id >", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdGreaterThanOrEqualTo(Integer value) { + addCriterion("term_id >=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThan(Integer value) { + addCriterion("term_id <", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdLessThanOrEqualTo(Integer value) { + addCriterion("term_id <=", value, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdIn(List values) { + addCriterion("term_id in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotIn(List values) { + addCriterion("term_id not in", values, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdBetween(Integer value1, Integer value2) { + addCriterion("term_id between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andTermIdNotBetween(Integer value1, Integer value2) { + addCriterion("term_id not between", value1, value2, "termId"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIsNull() { + addCriterion("last_heartbeat is null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIsNotNull() { + addCriterion("last_heartbeat is not null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatEqualTo(Long value) { + addCriterion("last_heartbeat =", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotEqualTo(Long value) { + addCriterion("last_heartbeat <>", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatGreaterThan(Long value) { + addCriterion("last_heartbeat >", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatGreaterThanOrEqualTo(Long value) { + addCriterion("last_heartbeat >=", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatLessThan(Long value) { + addCriterion("last_heartbeat <", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatLessThanOrEqualTo(Long value) { + addCriterion("last_heartbeat <=", value, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIn(List values) { + addCriterion("last_heartbeat in", values, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotIn(List values) { + addCriterion("last_heartbeat not in", values, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatBetween(Long value1, Long value2) { + addCriterion("last_heartbeat between", value1, value2, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatNotBetween(Long value1, Long value2) { + addCriterion("last_heartbeat not between", value1, value2, "lastHeartbeat"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpIsNull() { + addCriterion("last_heartbeat_ip is null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpIsNotNull() { + addCriterion("last_heartbeat_ip is not null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpEqualTo(String value) { + addCriterion("last_heartbeat_ip =", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpNotEqualTo(String value) { + addCriterion("last_heartbeat_ip <>", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpGreaterThan(String value) { + addCriterion("last_heartbeat_ip >", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpGreaterThanOrEqualTo(String value) { + addCriterion("last_heartbeat_ip >=", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpLessThan(String value) { + addCriterion("last_heartbeat_ip <", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpLessThanOrEqualTo(String value) { + addCriterion("last_heartbeat_ip <=", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpLike(String value) { + addCriterion("last_heartbeat_ip like", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpNotLike(String value) { + addCriterion("last_heartbeat_ip not like", value, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpIn(List values) { + addCriterion("last_heartbeat_ip in", values, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpNotIn(List values) { + addCriterion("last_heartbeat_ip not in", values, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpBetween(String value1, String value2) { + addCriterion("last_heartbeat_ip between", value1, value2, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatIpNotBetween(String value1, String value2) { + addCriterion("last_heartbeat_ip not between", value1, value2, "lastHeartbeatIp"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortIsNull() { + addCriterion("last_heartbeat_port is null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortIsNotNull() { + addCriterion("last_heartbeat_port is not null"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortEqualTo(Short value) { + addCriterion("last_heartbeat_port =", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortNotEqualTo(Short value) { + addCriterion("last_heartbeat_port <>", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortGreaterThan(Short value) { + addCriterion("last_heartbeat_port >", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortGreaterThanOrEqualTo(Short value) { + addCriterion("last_heartbeat_port >=", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortLessThan(Short value) { + addCriterion("last_heartbeat_port <", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortLessThanOrEqualTo(Short value) { + addCriterion("last_heartbeat_port <=", value, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortIn(List values) { + addCriterion("last_heartbeat_port in", values, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortNotIn(List values) { + addCriterion("last_heartbeat_port not in", values, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortBetween(Short value1, Short value2) { + addCriterion("last_heartbeat_port between", value1, value2, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastHeartbeatPortNotBetween(Short value1, Short value2) { + addCriterion("last_heartbeat_port not between", value1, value2, "lastHeartbeatPort"); + return (Criteria) this; + } + + public Criteria andLastFrameNoIsNull() { + addCriterion("last_frame_no is null"); + return (Criteria) this; + } + + public Criteria andLastFrameNoIsNotNull() { + addCriterion("last_frame_no is not null"); + return (Criteria) this; + } + + public Criteria andLastFrameNoEqualTo(Short value) { + addCriterion("last_frame_no =", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoNotEqualTo(Short value) { + addCriterion("last_frame_no <>", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoGreaterThan(Short value) { + addCriterion("last_frame_no >", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoGreaterThanOrEqualTo(Short value) { + addCriterion("last_frame_no >=", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoLessThan(Short value) { + addCriterion("last_frame_no <", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoLessThanOrEqualTo(Short value) { + addCriterion("last_frame_no <=", value, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoIn(List values) { + addCriterion("last_frame_no in", values, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoNotIn(List values) { + addCriterion("last_frame_no not in", values, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoBetween(Short value1, Short value2) { + addCriterion("last_frame_no between", value1, value2, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andLastFrameNoNotBetween(Short value1, Short value2) { + addCriterion("last_frame_no not between", value1, value2, "lastFrameNo"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageIsNull() { + addCriterion("battery_voltage is null"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageIsNotNull() { + addCriterion("battery_voltage is not null"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageEqualTo(Float value) { + addCriterion("battery_voltage =", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageNotEqualTo(Float value) { + addCriterion("battery_voltage <>", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageGreaterThan(Float value) { + addCriterion("battery_voltage >", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageGreaterThanOrEqualTo(Float value) { + addCriterion("battery_voltage >=", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageLessThan(Float value) { + addCriterion("battery_voltage <", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageLessThanOrEqualTo(Float value) { + addCriterion("battery_voltage <=", value, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageIn(List values) { + addCriterion("battery_voltage in", values, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageNotIn(List values) { + addCriterion("battery_voltage not in", values, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageBetween(Float value1, Float value2) { + addCriterion("battery_voltage between", value1, value2, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andBatteryVoltageNotBetween(Float value1, Float value2) { + addCriterion("battery_voltage not between", value1, value2, "batteryVoltage"); + return (Criteria) this; + } + + public Criteria andOpTemperatureIsNull() { + addCriterion("op_temperature is null"); + return (Criteria) this; + } + + public Criteria andOpTemperatureIsNotNull() { + addCriterion("op_temperature is not null"); + return (Criteria) this; + } + + public Criteria andOpTemperatureEqualTo(Float value) { + addCriterion("op_temperature =", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureNotEqualTo(Float value) { + addCriterion("op_temperature <>", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureGreaterThan(Float value) { + addCriterion("op_temperature >", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureGreaterThanOrEqualTo(Float value) { + addCriterion("op_temperature >=", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureLessThan(Float value) { + addCriterion("op_temperature <", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureLessThanOrEqualTo(Float value) { + addCriterion("op_temperature <=", value, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureIn(List values) { + addCriterion("op_temperature in", values, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureNotIn(List values) { + addCriterion("op_temperature not in", values, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureBetween(Float value1, Float value2) { + addCriterion("op_temperature between", value1, value2, "opTemperature"); + return (Criteria) this; + } + + public Criteria andOpTemperatureNotBetween(Float value1, Float value2) { + addCriterion("op_temperature not between", value1, value2, "opTemperature"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityIsNull() { + addCriterion("battery_capacity is null"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityIsNotNull() { + addCriterion("battery_capacity is not null"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityEqualTo(Float value) { + addCriterion("battery_capacity =", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityNotEqualTo(Float value) { + addCriterion("battery_capacity <>", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityGreaterThan(Float value) { + addCriterion("battery_capacity >", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityGreaterThanOrEqualTo(Float value) { + addCriterion("battery_capacity >=", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityLessThan(Float value) { + addCriterion("battery_capacity <", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityLessThanOrEqualTo(Float value) { + addCriterion("battery_capacity <=", value, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityIn(List values) { + addCriterion("battery_capacity in", values, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityNotIn(List values) { + addCriterion("battery_capacity not in", values, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityBetween(Float value1, Float value2) { + addCriterion("battery_capacity between", value1, value2, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andBatteryCapacityNotBetween(Float value1, Float value2) { + addCriterion("battery_capacity not between", value1, value2, "batteryCapacity"); + return (Criteria) this; + } + + public Criteria andFloatingChargeIsNull() { + addCriterion("floating_charge is null"); + return (Criteria) this; + } + + public Criteria andFloatingChargeIsNotNull() { + addCriterion("floating_charge is not null"); + return (Criteria) this; + } + + public Criteria andFloatingChargeEqualTo(Byte value) { + addCriterion("floating_charge =", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeNotEqualTo(Byte value) { + addCriterion("floating_charge <>", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeGreaterThan(Byte value) { + addCriterion("floating_charge >", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeGreaterThanOrEqualTo(Byte value) { + addCriterion("floating_charge >=", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeLessThan(Byte value) { + addCriterion("floating_charge <", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeLessThanOrEqualTo(Byte value) { + addCriterion("floating_charge <=", value, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeIn(List values) { + addCriterion("floating_charge in", values, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeNotIn(List values) { + addCriterion("floating_charge not in", values, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeBetween(Byte value1, Byte value2) { + addCriterion("floating_charge between", value1, value2, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andFloatingChargeNotBetween(Byte value1, Byte value2) { + addCriterion("floating_charge not between", value1, value2, "floatingCharge"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeIsNull() { + addCriterion("total_working_time is null"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeIsNotNull() { + addCriterion("total_working_time is not null"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeEqualTo(Integer value) { + addCriterion("total_working_time =", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeNotEqualTo(Integer value) { + addCriterion("total_working_time <>", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeGreaterThan(Integer value) { + addCriterion("total_working_time >", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeGreaterThanOrEqualTo(Integer value) { + addCriterion("total_working_time >=", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeLessThan(Integer value) { + addCriterion("total_working_time <", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeLessThanOrEqualTo(Integer value) { + addCriterion("total_working_time <=", value, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeIn(List values) { + addCriterion("total_working_time in", values, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeNotIn(List values) { + addCriterion("total_working_time not in", values, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeBetween(Integer value1, Integer value2) { + addCriterion("total_working_time between", value1, value2, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andTotalWorkingTimeNotBetween(Integer value1, Integer value2) { + addCriterion("total_working_time not between", value1, value2, "totalWorkingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeIsNull() { + addCriterion("working_time is null"); + return (Criteria) this; + } + + public Criteria andWorkingTimeIsNotNull() { + addCriterion("working_time is not null"); + return (Criteria) this; + } + + public Criteria andWorkingTimeEqualTo(Integer value) { + addCriterion("working_time =", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeNotEqualTo(Integer value) { + addCriterion("working_time <>", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeGreaterThan(Integer value) { + addCriterion("working_time >", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeGreaterThanOrEqualTo(Integer value) { + addCriterion("working_time >=", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeLessThan(Integer value) { + addCriterion("working_time <", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeLessThanOrEqualTo(Integer value) { + addCriterion("working_time <=", value, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeIn(List values) { + addCriterion("working_time in", values, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeNotIn(List values) { + addCriterion("working_time not in", values, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeBetween(Integer value1, Integer value2) { + addCriterion("working_time between", value1, value2, "workingTime"); + return (Criteria) this; + } + + public Criteria andWorkingTimeNotBetween(Integer value1, Integer value2) { + addCriterion("working_time not between", value1, value2, "workingTime"); + return (Criteria) this; + } + + public Criteria andConnectionStateIsNull() { + addCriterion("connection_state is null"); + return (Criteria) this; + } + + public Criteria andConnectionStateIsNotNull() { + addCriterion("connection_state is not null"); + return (Criteria) this; + } + + public Criteria andConnectionStateEqualTo(Byte value) { + addCriterion("connection_state =", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateNotEqualTo(Byte value) { + addCriterion("connection_state <>", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateGreaterThan(Byte value) { + addCriterion("connection_state >", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateGreaterThanOrEqualTo(Byte value) { + addCriterion("connection_state >=", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateLessThan(Byte value) { + addCriterion("connection_state <", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateLessThanOrEqualTo(Byte value) { + addCriterion("connection_state <=", value, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateIn(List values) { + addCriterion("connection_state in", values, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateNotIn(List values) { + addCriterion("connection_state not in", values, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateBetween(Byte value1, Byte value2) { + addCriterion("connection_state between", value1, value2, "connectionState"); + return (Criteria) this; + } + + public Criteria andConnectionStateNotBetween(Byte value1, Byte value2) { + addCriterion("connection_state not between", value1, value2, "connectionState"); + return (Criteria) this; + } + + public Criteria andSendFlowIsNull() { + addCriterion("send_flow is null"); + return (Criteria) this; + } + + public Criteria andSendFlowIsNotNull() { + addCriterion("send_flow is not null"); + return (Criteria) this; + } + + public Criteria andSendFlowEqualTo(Integer value) { + addCriterion("send_flow =", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowNotEqualTo(Integer value) { + addCriterion("send_flow <>", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowGreaterThan(Integer value) { + addCriterion("send_flow >", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowGreaterThanOrEqualTo(Integer value) { + addCriterion("send_flow >=", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowLessThan(Integer value) { + addCriterion("send_flow <", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowLessThanOrEqualTo(Integer value) { + addCriterion("send_flow <=", value, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowIn(List values) { + addCriterion("send_flow in", values, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowNotIn(List values) { + addCriterion("send_flow not in", values, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowBetween(Integer value1, Integer value2) { + addCriterion("send_flow between", value1, value2, "sendFlow"); + return (Criteria) this; + } + + public Criteria andSendFlowNotBetween(Integer value1, Integer value2) { + addCriterion("send_flow not between", value1, value2, "sendFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowIsNull() { + addCriterion("recv_flow is null"); + return (Criteria) this; + } + + public Criteria andRecvFlowIsNotNull() { + addCriterion("recv_flow is not null"); + return (Criteria) this; + } + + public Criteria andRecvFlowEqualTo(Integer value) { + addCriterion("recv_flow =", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowNotEqualTo(Integer value) { + addCriterion("recv_flow <>", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowGreaterThan(Integer value) { + addCriterion("recv_flow >", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowGreaterThanOrEqualTo(Integer value) { + addCriterion("recv_flow >=", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowLessThan(Integer value) { + addCriterion("recv_flow <", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowLessThanOrEqualTo(Integer value) { + addCriterion("recv_flow <=", value, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowIn(List values) { + addCriterion("recv_flow in", values, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowNotIn(List values) { + addCriterion("recv_flow not in", values, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowBetween(Integer value1, Integer value2) { + addCriterion("recv_flow between", value1, value2, "recvFlow"); + return (Criteria) this; + } + + public Criteria andRecvFlowNotBetween(Integer value1, Integer value2) { + addCriterion("recv_flow not between", value1, value2, "recvFlow"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeIsNull() { + addCriterion("ws_update_time is null"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeIsNotNull() { + addCriterion("ws_update_time is not null"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeEqualTo(Long value) { + addCriterion("ws_update_time =", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeNotEqualTo(Long value) { + addCriterion("ws_update_time <>", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeGreaterThan(Long value) { + addCriterion("ws_update_time >", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("ws_update_time >=", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeLessThan(Long value) { + addCriterion("ws_update_time <", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeLessThanOrEqualTo(Long value) { + addCriterion("ws_update_time <=", value, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeIn(List values) { + addCriterion("ws_update_time in", values, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeNotIn(List values) { + addCriterion("ws_update_time not in", values, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeBetween(Long value1, Long value2) { + addCriterion("ws_update_time between", value1, value2, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andWsUpdateTimeNotBetween(Long value1, Long value2) { + addCriterion("ws_update_time not between", value1, value2, "wsUpdateTime"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gIsNull() { + addCriterion("signal_strength_4g is null"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gIsNotNull() { + addCriterion("signal_strength_4g is not null"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gEqualTo(Byte value) { + addCriterion("signal_strength_4g =", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gNotEqualTo(Byte value) { + addCriterion("signal_strength_4g <>", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gGreaterThan(Byte value) { + addCriterion("signal_strength_4g >", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gGreaterThanOrEqualTo(Byte value) { + addCriterion("signal_strength_4g >=", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gLessThan(Byte value) { + addCriterion("signal_strength_4g <", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gLessThanOrEqualTo(Byte value) { + addCriterion("signal_strength_4g <=", value, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gIn(List values) { + addCriterion("signal_strength_4g in", values, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gNotIn(List values) { + addCriterion("signal_strength_4g not in", values, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gBetween(Byte value1, Byte value2) { + addCriterion("signal_strength_4g between", value1, value2, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength4gNotBetween(Byte value1, Byte value2) { + addCriterion("signal_strength_4g not between", value1, value2, "signalStrength4g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gIsNull() { + addCriterion("signal_strength_2g is null"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gIsNotNull() { + addCriterion("signal_strength_2g is not null"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gEqualTo(Byte value) { + addCriterion("signal_strength_2g =", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gNotEqualTo(Byte value) { + addCriterion("signal_strength_2g <>", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gGreaterThan(Byte value) { + addCriterion("signal_strength_2g >", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gGreaterThanOrEqualTo(Byte value) { + addCriterion("signal_strength_2g >=", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gLessThan(Byte value) { + addCriterion("signal_strength_2g <", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gLessThanOrEqualTo(Byte value) { + addCriterion("signal_strength_2g <=", value, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gIn(List values) { + addCriterion("signal_strength_2g in", values, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gNotIn(List values) { + addCriterion("signal_strength_2g not in", values, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gBetween(Byte value1, Byte value2) { + addCriterion("signal_strength_2g between", value1, value2, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andSignalStrength2gNotBetween(Byte value1, Byte value2) { + addCriterion("signal_strength_2g not between", value1, value2, "signalStrength2g"); + return (Criteria) this; + } + + public Criteria andRemainingRamIsNull() { + addCriterion("remaining_ram is null"); + return (Criteria) this; + } + + public Criteria andRemainingRamIsNotNull() { + addCriterion("remaining_ram is not null"); + return (Criteria) this; + } + + public Criteria andRemainingRamEqualTo(Short value) { + addCriterion("remaining_ram =", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamNotEqualTo(Short value) { + addCriterion("remaining_ram <>", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamGreaterThan(Short value) { + addCriterion("remaining_ram >", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamGreaterThanOrEqualTo(Short value) { + addCriterion("remaining_ram >=", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamLessThan(Short value) { + addCriterion("remaining_ram <", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamLessThanOrEqualTo(Short value) { + addCriterion("remaining_ram <=", value, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamIn(List values) { + addCriterion("remaining_ram in", values, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamNotIn(List values) { + addCriterion("remaining_ram not in", values, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamBetween(Short value1, Short value2) { + addCriterion("remaining_ram between", value1, value2, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRamNotBetween(Short value1, Short value2) { + addCriterion("remaining_ram not between", value1, value2, "remainingRam"); + return (Criteria) this; + } + + public Criteria andRemainingRomIsNull() { + addCriterion("remaining_rom is null"); + return (Criteria) this; + } + + public Criteria andRemainingRomIsNotNull() { + addCriterion("remaining_rom is not null"); + return (Criteria) this; + } + + public Criteria andRemainingRomEqualTo(Short value) { + addCriterion("remaining_rom =", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomNotEqualTo(Short value) { + addCriterion("remaining_rom <>", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomGreaterThan(Short value) { + addCriterion("remaining_rom >", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomGreaterThanOrEqualTo(Short value) { + addCriterion("remaining_rom >=", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomLessThan(Short value) { + addCriterion("remaining_rom <", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomLessThanOrEqualTo(Short value) { + addCriterion("remaining_rom <=", value, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomIn(List values) { + addCriterion("remaining_rom in", values, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomNotIn(List values) { + addCriterion("remaining_rom not in", values, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomBetween(Short value1, Short value2) { + addCriterion("remaining_rom between", value1, value2, "remainingRom"); + return (Criteria) this; + } + + public Criteria andRemainingRomNotBetween(Short value1, Short value2) { + addCriterion("remaining_rom not between", value1, value2, "remainingRom"); + return (Criteria) this; + } + + public Criteria andBootTimeIsNull() { + addCriterion("boot_time is null"); + return (Criteria) this; + } + + public Criteria andBootTimeIsNotNull() { + addCriterion("boot_time is not null"); + return (Criteria) this; + } + + public Criteria andBootTimeEqualTo(Long value) { + addCriterion("boot_time =", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeNotEqualTo(Long value) { + addCriterion("boot_time <>", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeGreaterThan(Long value) { + addCriterion("boot_time >", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeGreaterThanOrEqualTo(Long value) { + addCriterion("boot_time >=", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeLessThan(Long value) { + addCriterion("boot_time <", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeLessThanOrEqualTo(Long value) { + addCriterion("boot_time <=", value, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeIn(List values) { + addCriterion("boot_time in", values, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeNotIn(List values) { + addCriterion("boot_time not in", values, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeBetween(Long value1, Long value2) { + addCriterion("boot_time between", value1, value2, "bootTime"); + return (Criteria) this; + } + + public Criteria andBootTimeNotBetween(Long value1, Long value2) { + addCriterion("boot_time not between", value1, value2, "bootTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeIsNull() { + addCriterion("rs_update_time is null"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeIsNotNull() { + addCriterion("rs_update_time is not null"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeEqualTo(Long value) { + addCriterion("rs_update_time =", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeNotEqualTo(Long value) { + addCriterion("rs_update_time <>", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeGreaterThan(Long value) { + addCriterion("rs_update_time >", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("rs_update_time >=", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeLessThan(Long value) { + addCriterion("rs_update_time <", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeLessThanOrEqualTo(Long value) { + addCriterion("rs_update_time <=", value, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeIn(List values) { + addCriterion("rs_update_time in", values, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeNotIn(List values) { + addCriterion("rs_update_time not in", values, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeBetween(Long value1, Long value2) { + addCriterion("rs_update_time between", value1, value2, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andRsUpdateTimeNotBetween(Long value1, Long value2) { + addCriterion("rs_update_time not between", value1, value2, "rsUpdateTime"); + return (Criteria) this; + } + + public Criteria andGpsStatusIsNull() { + addCriterion("gps_status is null"); + return (Criteria) this; + } + + public Criteria andGpsStatusIsNotNull() { + addCriterion("gps_status is not null"); + return (Criteria) this; + } + + public Criteria andGpsStatusEqualTo(Integer value) { + addCriterion("gps_status =", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusNotEqualTo(Integer value) { + addCriterion("gps_status <>", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusGreaterThan(Integer value) { + addCriterion("gps_status >", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("gps_status >=", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusLessThan(Integer value) { + addCriterion("gps_status <", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusLessThanOrEqualTo(Integer value) { + addCriterion("gps_status <=", value, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusIn(List values) { + addCriterion("gps_status in", values, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusNotIn(List values) { + addCriterion("gps_status not in", values, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusBetween(Integer value1, Integer value2) { + addCriterion("gps_status between", value1, value2, "gpsStatus"); + return (Criteria) this; + } + + public Criteria andGpsStatusNotBetween(Integer value1, Integer value2) { + addCriterion("gps_status not between", value1, value2, "gpsStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java index c9d90db..e3c3bb6 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java @@ -68,6 +68,10 @@ public class Terminals implements Serializable { /*展示名字 等价与displayname 用于方便*/ private String name; + public String getName() { + return cmdid; + } + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/PermissionDetailEnum.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/PermissionDetailEnum.java index 4c9db2e..7a9f899 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/PermissionDetailEnum.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/enums/PermissionDetailEnum.java @@ -8,7 +8,7 @@ package com.shxy.xymanager_common.enums; * @author 晶晶 */ public enum PermissionDetailEnum { - DY("DY", 1), LINE("LINE", 2),TOWER("TOWER", 3); + DY("DY", 1), LINE("LINE", 2),TOWER("TOWER", 3),TERM("TERM", 4); private String name; private Integer value; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java deleted file mode 100644 index 6d58254..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/PermissionDyLineTreeListModel.java +++ /dev/null @@ -1,21 +0,0 @@ -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; - -import java.io.Serializable; -import java.util.List; - -/** - * 权限电压线路树状图列表 - */ -@Data -@ApiModel(value = "权限电压线路树状图列表", description = "权限电压线路树状图列表") -public class PermissionDyLineTreeListModel implements Serializable { - - @ApiModelProperty(value = "电压列表", example = "[]") - private List list; - -} diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index 11a0273..aea29df 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -30,8 +30,6 @@ public interface DyLevelDao { List selectListTreeList( @Param("status") Integer status,@Param("list") List list); - List selectPermissionListTreeList(); - List selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status); int updateByPrimaryKeySelective(DyLevel record); diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java index e01d4da..9cc1c4e 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalStatusDao.java @@ -2,24 +2,35 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.dto.TerminalsWithHeart; import com.shxy.xymanager_common.entity.TerminalStatus; +import com.shxy.xymanager_common.entity.TerminalStatusExample; import org.apache.ibatis.annotations.Param; import java.util.List; public interface TerminalStatusDao { + + TerminalsWithHeart selectByCmdId(@Param("cmdid") String cmdid); + + TerminalStatus selectByPrimaryKey(Integer termId); + + long countByExample(TerminalStatusExample example); + + int deleteByExample(TerminalStatusExample example); + int deleteByPrimaryKey(Integer termId); int insert(TerminalStatus record); int insertSelective(TerminalStatus record); - List selectAll(); + List selectByExample(TerminalStatusExample example); - TerminalStatus selectByPrimaryKey(Integer termId); + int updateByExampleSelective(@Param("record") TerminalStatus record, @Param("example") TerminalStatusExample example); - TerminalsWithHeart selectByCmdId(@Param("cmdid") String cmdid); + int updateByExample(@Param("record") TerminalStatus record, @Param("example") TerminalStatusExample example); int updateByPrimaryKeySelective(TerminalStatus record); int updateByPrimaryKey(TerminalStatus record); + } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/generatorConfig.xml b/xymanager_dao/src/main/resources/generatorConfig.xml index a7ee1a6..ec8e623 100644 --- a/xymanager_dao/src/main/resources/generatorConfig.xml +++ b/xymanager_dao/src/main/resources/generatorConfig.xml @@ -53,19 +53,19 @@ - - -
+ + + + + + - - -
+ + + + + @@ -101,13 +101,12 @@ - - - - - - - + + +
diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 3a714ba..3c998c0 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -84,7 +84,7 @@ - + @@ -314,25 +314,6 @@ - - - select - - from terminal_status - where term_id = #{termId,jdbcType=INTEGER} - - select b.id as term_id, b.tower_id as tower_id, @@ -62,199 +116,375 @@ terminals b where a.term_id = b.id and b.cmdid = #{cmdid} - - - - - - + + + delete from terminal_status where term_id = #{termId,jdbcType=INTEGER} - - insert into terminal_status (term_id, last_heartbeat, last_frame_no, - battery_voltage, op_temperature, battery_capacity, - floating_charge, total_working_time, working_time, - connection_state, signal_strength_4g, signal_strength_2g, - remaining_ram, remaining_rom, start_time, - update_time) - values (#{termId,jdbcType=INTEGER}, #{lastHeartbeat,jdbcType=TIMESTAMP}, #{lastFrameNo,jdbcType=SMALLINT}, - #{batteryVoltage,jdbcType=REAL}, #{opTemperature,jdbcType=REAL}, #{batteryCapacity,jdbcType=REAL}, - #{floatingCharge,jdbcType=TINYINT}, #{totalWorkingTime,jdbcType=INTEGER}, #{workingTime,jdbcType=INTEGER}, - #{connectionState,jdbcType=TINYINT}, #{signalStrength4g,jdbcType=TINYINT}, #{signalStrength2g,jdbcType=TINYINT}, - #{remainingRam,jdbcType=TINYINT}, #{remainingRom,jdbcType=TINYINT}, #{startTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) + + delete from terminal_status + + + + + + insert into terminal_status (term_id, last_heartbeat, last_heartbeat_ip, + last_heartbeat_port, last_frame_no, battery_voltage, + op_temperature, battery_capacity, floating_charge, + total_working_time, working_time, connection_state, + send_flow, recv_flow, ws_update_time, + signal_strength_4g, signal_strength_2g, remaining_ram, + remaining_rom, boot_time, rs_update_time, + gps_status) + values (#{termId,jdbcType=INTEGER}, #{lastHeartbeat,jdbcType=BIGINT}, #{lastHeartbeatIp,jdbcType=VARCHAR}, + #{lastHeartbeatPort,jdbcType=SMALLINT}, #{lastFrameNo,jdbcType=SMALLINT}, #{batteryVoltage,jdbcType=REAL}, + #{opTemperature,jdbcType=REAL}, #{batteryCapacity,jdbcType=REAL}, #{floatingCharge,jdbcType=TINYINT}, + #{totalWorkingTime,jdbcType=INTEGER}, #{workingTime,jdbcType=INTEGER}, #{connectionState,jdbcType=TINYINT}, + #{sendFlow,jdbcType=INTEGER}, #{recvFlow,jdbcType=INTEGER}, #{wsUpdateTime,jdbcType=BIGINT}, + #{signalStrength4g,jdbcType=TINYINT}, #{signalStrength2g,jdbcType=TINYINT}, #{remainingRam,jdbcType=SMALLINT}, + #{remainingRom,jdbcType=SMALLINT}, #{bootTime,jdbcType=BIGINT}, #{rsUpdateTime,jdbcType=BIGINT}, + #{gpsStatus,jdbcType=INTEGER}) + + + insert into terminal_status + + + term_id, + + + last_heartbeat, + + + last_heartbeat_ip, + + + last_heartbeat_port, + + + last_frame_no, + + + battery_voltage, + + + op_temperature, + + + battery_capacity, + + + floating_charge, + + + total_working_time, + + + working_time, + + + connection_state, + + + send_flow, + + + recv_flow, + + + ws_update_time, + + + signal_strength_4g, + + + signal_strength_2g, + + + remaining_ram, + + + remaining_rom, + + + boot_time, + + + rs_update_time, + + + gps_status, + + + + + #{termId,jdbcType=INTEGER}, + + + #{lastHeartbeat,jdbcType=BIGINT}, + + + #{lastHeartbeatIp,jdbcType=VARCHAR}, + + + #{lastHeartbeatPort,jdbcType=SMALLINT}, + + + #{lastFrameNo,jdbcType=SMALLINT}, + + + #{batteryVoltage,jdbcType=REAL}, + + + #{opTemperature,jdbcType=REAL}, + + + #{batteryCapacity,jdbcType=REAL}, + + + #{floatingCharge,jdbcType=TINYINT}, + + + #{totalWorkingTime,jdbcType=INTEGER}, + + + #{workingTime,jdbcType=INTEGER}, + + + #{connectionState,jdbcType=TINYINT}, + + + #{sendFlow,jdbcType=INTEGER}, + + + #{recvFlow,jdbcType=INTEGER}, + + + #{wsUpdateTime,jdbcType=BIGINT}, + + + #{signalStrength4g,jdbcType=TINYINT}, + + + #{signalStrength2g,jdbcType=TINYINT}, + + + #{remainingRam,jdbcType=SMALLINT}, + + + #{remainingRom,jdbcType=SMALLINT}, + + + #{bootTime,jdbcType=BIGINT}, + + + #{rsUpdateTime,jdbcType=BIGINT}, + + + #{gpsStatus,jdbcType=INTEGER}, + + - - insert into terminal_status - - - term_id, - - - last_heartbeat, - - - last_frame_no, - - - battery_voltage, - - - op_temperature, - - - battery_capacity, - - - floating_charge, - - - total_working_time, - - - working_time, - - - connection_state, - - - signal_strength_4g, - - - signal_strength_2g, - - - remaining_ram, - - - remaining_rom, - - - start_time, - - - update_time, - - - - - #{termId,jdbcType=INTEGER}, - - - #{lastHeartbeat,jdbcType=TIMESTAMP}, - - - #{lastFrameNo,jdbcType=SMALLINT}, - - - #{batteryVoltage,jdbcType=REAL}, - - - #{opTemperature,jdbcType=REAL}, - - - #{batteryCapacity,jdbcType=REAL}, - - - #{floatingCharge,jdbcType=TINYINT}, - - - #{totalWorkingTime,jdbcType=INTEGER}, - - - #{workingTime,jdbcType=INTEGER}, - - - #{connectionState,jdbcType=TINYINT}, - - - #{signalStrength4g,jdbcType=TINYINT}, - - - #{signalStrength2g,jdbcType=TINYINT}, - - - #{remainingRam,jdbcType=TINYINT}, - - - #{remainingRom,jdbcType=TINYINT}, - - - #{startTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update terminal_status - - - last_heartbeat = #{lastHeartbeat,jdbcType=TIMESTAMP}, - - - last_frame_no = #{lastFrameNo,jdbcType=SMALLINT}, - - - battery_voltage = #{batteryVoltage,jdbcType=REAL}, - - - op_temperature = #{opTemperature,jdbcType=REAL}, - - - battery_capacity = #{batteryCapacity,jdbcType=REAL}, - - - floating_charge = #{floatingCharge,jdbcType=TINYINT}, - - - total_working_time = #{totalWorkingTime,jdbcType=INTEGER}, - - - working_time = #{workingTime,jdbcType=INTEGER}, - - - gps_status = #{gpsStatus}, - - - connection_state = #{connectionState,jdbcType=TINYINT}, - - - signal_strength_4g = #{signalStrength4g,jdbcType=TINYINT}, - - - signal_strength_2g = #{signalStrength2g,jdbcType=TINYINT}, - - - remaining_ram = #{remainingRam,jdbcType=TINYINT}, - - - remaining_rom = #{remainingRom,jdbcType=TINYINT}, - - - boot_time = #{bootTime,jdbcType=TIMESTAMP}, - - - rs_update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where term_id = #{termId,jdbcType=INTEGER} - - + + + update terminal_status + + + term_id = #{record.termId,jdbcType=INTEGER}, + + + last_heartbeat = #{record.lastHeartbeat,jdbcType=BIGINT}, + + + last_heartbeat_ip = #{record.lastHeartbeatIp,jdbcType=VARCHAR}, + + + last_heartbeat_port = #{record.lastHeartbeatPort,jdbcType=SMALLINT}, + + + last_frame_no = #{record.lastFrameNo,jdbcType=SMALLINT}, + + + battery_voltage = #{record.batteryVoltage,jdbcType=REAL}, + + + op_temperature = #{record.opTemperature,jdbcType=REAL}, + + + battery_capacity = #{record.batteryCapacity,jdbcType=REAL}, + + + floating_charge = #{record.floatingCharge,jdbcType=TINYINT}, + + + total_working_time = #{record.totalWorkingTime,jdbcType=INTEGER}, + + + working_time = #{record.workingTime,jdbcType=INTEGER}, + + + connection_state = #{record.connectionState,jdbcType=TINYINT}, + + + send_flow = #{record.sendFlow,jdbcType=INTEGER}, + + + recv_flow = #{record.recvFlow,jdbcType=INTEGER}, + + + ws_update_time = #{record.wsUpdateTime,jdbcType=BIGINT}, + + + signal_strength_4g = #{record.signalStrength4g,jdbcType=TINYINT}, + + + signal_strength_2g = #{record.signalStrength2g,jdbcType=TINYINT}, + + + remaining_ram = #{record.remainingRam,jdbcType=SMALLINT}, + + + remaining_rom = #{record.remainingRom,jdbcType=SMALLINT}, + + + boot_time = #{record.bootTime,jdbcType=BIGINT}, + + + rs_update_time = #{record.rsUpdateTime,jdbcType=BIGINT}, + + + gps_status = #{record.gpsStatus,jdbcType=INTEGER}, + + + + + + + update terminal_status - set last_heartbeat = #{lastHeartbeat,jdbcType=TIMESTAMP}, + set term_id = #{record.termId,jdbcType=INTEGER}, + last_heartbeat = #{record.lastHeartbeat,jdbcType=BIGINT}, + last_heartbeat_ip = #{record.lastHeartbeatIp,jdbcType=VARCHAR}, + last_heartbeat_port = #{record.lastHeartbeatPort,jdbcType=SMALLINT}, + last_frame_no = #{record.lastFrameNo,jdbcType=SMALLINT}, + battery_voltage = #{record.batteryVoltage,jdbcType=REAL}, + op_temperature = #{record.opTemperature,jdbcType=REAL}, + battery_capacity = #{record.batteryCapacity,jdbcType=REAL}, + floating_charge = #{record.floatingCharge,jdbcType=TINYINT}, + total_working_time = #{record.totalWorkingTime,jdbcType=INTEGER}, + working_time = #{record.workingTime,jdbcType=INTEGER}, + connection_state = #{record.connectionState,jdbcType=TINYINT}, + send_flow = #{record.sendFlow,jdbcType=INTEGER}, + recv_flow = #{record.recvFlow,jdbcType=INTEGER}, + ws_update_time = #{record.wsUpdateTime,jdbcType=BIGINT}, + signal_strength_4g = #{record.signalStrength4g,jdbcType=TINYINT}, + signal_strength_2g = #{record.signalStrength2g,jdbcType=TINYINT}, + remaining_ram = #{record.remainingRam,jdbcType=SMALLINT}, + remaining_rom = #{record.remainingRom,jdbcType=SMALLINT}, + boot_time = #{record.bootTime,jdbcType=BIGINT}, + rs_update_time = #{record.rsUpdateTime,jdbcType=BIGINT}, + gps_status = #{record.gpsStatus,jdbcType=INTEGER} + + + + + + update terminal_status + + + last_heartbeat = #{lastHeartbeat,jdbcType=BIGINT}, + + + last_heartbeat_ip = #{lastHeartbeatIp,jdbcType=VARCHAR}, + + + last_heartbeat_port = #{lastHeartbeatPort,jdbcType=SMALLINT}, + + + last_frame_no = #{lastFrameNo,jdbcType=SMALLINT}, + + + battery_voltage = #{batteryVoltage,jdbcType=REAL}, + + + op_temperature = #{opTemperature,jdbcType=REAL}, + + + battery_capacity = #{batteryCapacity,jdbcType=REAL}, + + + floating_charge = #{floatingCharge,jdbcType=TINYINT}, + + + total_working_time = #{totalWorkingTime,jdbcType=INTEGER}, + + + working_time = #{workingTime,jdbcType=INTEGER}, + + + connection_state = #{connectionState,jdbcType=TINYINT}, + + + send_flow = #{sendFlow,jdbcType=INTEGER}, + + + recv_flow = #{recvFlow,jdbcType=INTEGER}, + + + ws_update_time = #{wsUpdateTime,jdbcType=BIGINT}, + + + signal_strength_4g = #{signalStrength4g,jdbcType=TINYINT}, + + + signal_strength_2g = #{signalStrength2g,jdbcType=TINYINT}, + + + remaining_ram = #{remainingRam,jdbcType=SMALLINT}, + + + remaining_rom = #{remainingRom,jdbcType=SMALLINT}, + + + boot_time = #{bootTime,jdbcType=BIGINT}, + + + rs_update_time = #{rsUpdateTime,jdbcType=BIGINT}, + + + gps_status = #{gpsStatus,jdbcType=INTEGER}, + + + where term_id = #{termId,jdbcType=INTEGER} + + + update terminal_status + set last_heartbeat = #{lastHeartbeat,jdbcType=BIGINT}, + last_heartbeat_ip = #{lastHeartbeatIp,jdbcType=VARCHAR}, + last_heartbeat_port = #{lastHeartbeatPort,jdbcType=SMALLINT}, last_frame_no = #{lastFrameNo,jdbcType=SMALLINT}, battery_voltage = #{batteryVoltage,jdbcType=REAL}, op_temperature = #{opTemperature,jdbcType=REAL}, @@ -263,12 +493,20 @@ total_working_time = #{totalWorkingTime,jdbcType=INTEGER}, working_time = #{workingTime,jdbcType=INTEGER}, connection_state = #{connectionState,jdbcType=TINYINT}, + send_flow = #{sendFlow,jdbcType=INTEGER}, + recv_flow = #{recvFlow,jdbcType=INTEGER}, + ws_update_time = #{wsUpdateTime,jdbcType=BIGINT}, signal_strength_4g = #{signalStrength4g,jdbcType=TINYINT}, signal_strength_2g = #{signalStrength2g,jdbcType=TINYINT}, - remaining_ram = #{remainingRam,jdbcType=TINYINT}, - remaining_rom = #{remainingRom,jdbcType=TINYINT}, - start_time = #{startTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} + remaining_ram = #{remainingRam,jdbcType=SMALLINT}, + remaining_rom = #{remainingRom,jdbcType=SMALLINT}, + boot_time = #{bootTime,jdbcType=BIGINT}, + rs_update_time = #{rsUpdateTime,jdbcType=BIGINT}, + gps_status = #{gpsStatus,jdbcType=INTEGER} where term_id = #{termId,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 4c26af4..dd5b1aa 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -40,6 +40,18 @@ public class DyLevelServiceImpl implements DyLevelService { @Autowired DyLevelDao dyLevelDao; + @Autowired + LinesDao linesDao; + + @Autowired + TowerDao towerDao; + + @Autowired + TerminalsDao terminalsDao; + + @Autowired + TerminalStatusDao terminalStatusDao; + @Autowired TerminalChannelMapperDao terminalChannelMapperDao; @@ -55,9 +67,6 @@ public class DyLevelServiceImpl implements DyLevelService { @Autowired TerminalFavsDao terminalFavsDao; - @Autowired - TerminalsDao terminalsDao; - @Autowired CacheService cacheService; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java index b9485a1..a8b64e6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java @@ -9,7 +9,6 @@ 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.*; import com.shxy.xymanager_service.service.RoleService; import lombok.extern.slf4j.Slf4j; @@ -18,7 +17,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -135,6 +133,9 @@ public class RoleServiceImpl implements RoleService { if (resourceType.intValue() == PermissionDetailEnum.TOWER.value()) { permissionDetail.getTowerpList().add(resourceId); } + if (resourceType.intValue() == PermissionDetailEnum.TERM.value()) { + permissionDetail.getTermpList().add(resourceId); + } } } } else { @@ -167,18 +168,12 @@ public class RoleServiceImpl implements RoleService { * 查询权限树状列表 * */ @Override - public ServiceBody getPermissionTree() { - PermissionDyLineTreeListModel model = new PermissionDyLineTreeListModel(); + public ServiceBody> getPermissionTree() { List dyLevels = dyLevelDao.selectByExample(new DyLevelExample()); List lines = linesDao.selectByExample(new LinesExample()); List towers = towerDao.selectByExample(new TowersExample()); List terminals = terminalsDao.selectByExample(new TerminalsExample()); - - boolean empty = CollectionUtil.isEmpty(dyLevels); - if (empty) { - model.setList(new ArrayList<>()); - } else { - model.setList(dyLevels); + if (CollectionUtil.isNotEmpty(dyLevels)) { HashMap dymap = new HashMap<>(); HashMap linemap = new HashMap<>(); HashMap towermap = new HashMap<>(); @@ -195,7 +190,6 @@ public class RoleServiceImpl implements RoleService { for (Terminals termitem : terminals) { termmap.put(termitem.getId(), termitem); } - for (Terminals termitem : terminals) { Integer towerid = termitem.getTowerid(); if (towerid != null) { @@ -203,10 +197,8 @@ public class RoleServiceImpl implements RoleService { if (BeanUtil.isNotEmpty(towers1)) { towers1.getList().add(termitem); } - } } - for (Towers titem : towers) { Integer lineId = titem.getLineId(); if (lineId != null) { @@ -216,7 +208,6 @@ public class RoleServiceImpl implements RoleService { } } } - for (Lines litem : lines) { Integer dyLevelId = litem.getDyLevelId(); if (dyLevelId != null) { @@ -226,11 +217,7 @@ public class RoleServiceImpl implements RoleService { } } } - - ArrayList dyLevellist = new ArrayList<>(dymap.values()); - model.setList(dyLevellist); } - return Asserts.success(model); - + return Asserts.success(dyLevels); } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java index 8a84ff9..32c8e0f 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/RoleService.java @@ -2,9 +2,9 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.PermissionDetail; import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.entity.DyLevel; import com.shxy.xymanager_common.entity.TbPermission; import com.shxy.xymanager_common.entity.TbRole; -import com.shxy.xymanager_common.model.PermissionDyLineTreeListModel; import java.util.List; @@ -24,6 +24,6 @@ public interface RoleService { void changePermission(Integer roleId, List list) throws Exception; - ServiceBody getPermissionTree() ; + ServiceBody> getPermissionTree() ; }