diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java index 746d5f5..a2eab60 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java @@ -48,6 +48,9 @@ public class TerminalsWithHeart implements Serializable { private BigInteger lastheartbeat; + private Integer protocol; + + private static final long serialVersionUID = 1L; -} \ No newline at end of file +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java index a01cdd6..7eaa2c6 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java @@ -76,6 +76,9 @@ public class DyLineTreeListModel implements Serializable { @ApiModelProperty(value = "杆塔地址", example = "名称名称") private String address; + @ApiModelProperty(value = "规约", example = "规约") + private Integer protocol; + @ApiModelProperty(value = "装置显示名", example = "名称名称") private String displayname; diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 9314a39..999a5e4 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -22,6 +22,7 @@ + @@ -191,6 +192,7 @@ d.equip_name as equip_name, d.display_name as display_name, d.model as model, + d.protocol as protocol, e.last_heartbeat as last_heartbeat from ((((dy_level a left join `lines` b on a.id = b.dy_level_id ) left join towers c on b.id = c.line_id ) diff --git a/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml index 7dc4477..288565d 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml @@ -33,6 +33,7 @@ + @@ -55,6 +56,7 @@ b.equip_name as equip_name, b.display_name as display_name, b.model as model, + b.protocol as protocol, a.last_heartbeat as last_heartbeat from terminal_status a, terminals b