diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java index 9b14ad1..5973407 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndLineAndChannelDto.java @@ -52,6 +52,16 @@ public class TerminalsAndLineAndChannelDto implements Serializable { private Short boderWidth; + private Short signalStrength4g; + + private Integer bootTime; + + private float batteryCapacity; + + private float batteryVoltage; + + private Integer lastHeartbeat; + private List list; private static final long serialVersionUID = 1L; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index f39ec0b..306b315 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -79,6 +79,21 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "经度", example = "213") private Double longitude; + @ApiModelProperty(value = "4G信号强度", example = "213") + private Short signalStrength4g; + + @ApiModelProperty(value = "装置上次启动时间", example = "213") + private Integer bootTime; + + @ApiModelProperty(value = "电池电量", example = "213") + private float batteryCapacity; + + @ApiModelProperty(value = "电源电压", example = "213") + private float batteryVoltage; + + @ApiModelProperty(value = "最后一次心跳时间", example = "213") + private Integer lastHeartbeat; + @ApiModelProperty(value = "通道编号和名称", example = "213") private List list; diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index d1c7908..89ffce9 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -40,6 +40,11 @@ + + + + + @@ -139,12 +144,18 @@ a.latitude as latitude, a.longitude as longitude, e.id as channel_id, - e.channel_name as channel_name + e.channel_name as channel_name, + ts.signal_strength_4g as signal_strength_4g, + ts.boot_time as boot_time, + ts.battery_capacity as battery_capacity, + ts.battery_voltage as battery_voltage, + ts.last_heartbeat as last_heartbeat from - ((((terminals a left join `lines` b on a.line_id = b.id ) + (((((terminals a left join `lines` b on a.line_id = b.id ) left join tower c on a.tower_id = c.id) left join terminal_channel_mapper d on a.id = d.term_id) left join terminal_channels e on d.channel_id = e.id) + left join terminal_status ts on ts.term_id = a.id) WHERE a.status = 1 order by a.create_time desc