树状列表新增规约

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

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;
 

xymanager_dao/src/main/resources/mappers/DyLevelDao.xml

@@ -22,6 +22,7 @@
             <collection property="list" javaType="list" ofType="com.shxy.xymanager_common.dto.TerminalsWithHeart">
                 <result column="term_id" jdbcType="INTEGER" property="id"/>
                 <result column="tower_id" jdbcType="INTEGER" property="towerid"/>
+                <result column="protocol" jdbcType="INTEGER" property="protocol"/>
                 <result column="tower_name" jdbcType="VARCHAR" property="name"/>
                 <result column="address" jdbcType="VARCHAR" property="address"/>
                 <result column="cmdid" jdbcType="VARCHAR" property="cmdid"/>
@@ -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 )

xymanager_dao/src/main/resources/mappers/TerminalStatusDao.xml

@@ -33,6 +33,7 @@
         <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="protocol" jdbcType="INTEGER" property="protocol"/>
         <result column="last_heartbeat" jdbcType="BIGINT" property="lastheartbeat"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -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