相关接口增加ipv4、ipv6出入流量字段。

服务器管理列表新增字段和排序。
优化监控看板流量统计。

tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="clientId" column="client_id"/>
         <result property="speed" column="speed"/>
         <result property="duplex" column="duplex"/>
+
     </resultMap>
     <sql id="selectInitialBandwidthTrafficVo"> select id, name, mac, status, type, ipV4, in_dropped, out_dropped, in_speed, out_speed, create_time, update_time, create_by, update_by, client_id from initial_bandwidth_traffic </sql>
     <select id="selectInitialBandwidthTrafficList" parameterType="InitialBandwidthTraffic" resultMap="InitialBandwidthTrafficResult">
@@ -143,12 +144,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
 
-    <select id="getNetInterfaceDetailsMsg" parameterType="InitialBandwidthTraffic" resultMap="InitialBandwidthTrafficResult">
-        select id, `name`, mac, status, `type`, ipV4, in_dropped, out_dropped, in_speed, out_speed,
-        total_in_speed, total_out_speed, create_time, update_time, create_by, update_by,
-        client_id, duplex, speed,
-        ipv4_in_speed, ipv4_out_speed, ipv6_in_speed, ipv6_out_speed,
-        total_ipv4_in_speed, total_ipv4_out_speed, total_ipv6_in_speed, total_ipv6_out_speed,
+    <select id="getNetInterfaceDetailsMsg" parameterType="InitialBandwidthTraffic" resultType="InitialBandwidthTraffic">
+        select
+        id,
+        `name`,
+        mac,
+        status,
+        `type`,
+        ipV4,
+        in_dropped as inDropped,
+        out_dropped as outDropped,
+        in_speed as inSpeed,
+        out_speed as outSpeed,
+        total_in_speed as totalInSpeed,
+        total_out_speed as totalOutSpeed,
+        create_time as createTime,
+        update_time as updateTime,
+        create_by as createBy,
+        update_by as updateBy,
+        client_id as clientId,
+        duplex,
+        speed,
+        ipv4_in_speed as ipv4InSpeed,
+        ipv4_out_speed as ipv4OutSpeed,
+        ipv6_in_speed as ipv6InSpeed,
+        ipv6_out_speed as ipv6OutSpeed,
+        total_ipv4_in_speed as totalIpv4InSpeed,
+        total_ipv4_out_speed as totalIpv4OutSpeed,
+        total_ipv6_in_speed as totalIpv6InSpeed,
+        total_ipv6_out_speed as totalIpv6OutSpeed,
         ipV6
         from ${tableName}
         <where>
@@ -159,12 +183,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 1
     </select>
 
-    <select id="getNetTrafficList" parameterType="InitialBandwidthTraffic" resultMap="InitialBandwidthTrafficResult">
-        select id, `name`, mac, status, `type`, ipV4, in_dropped, out_dropped, in_speed, out_speed,
-        total_in_speed, total_out_speed, create_time, update_time, create_by, update_by,
-        client_id, duplex, speed,
-        ipv4_in_speed, ipv4_out_speed, ipv6_in_speed, ipv6_out_speed,
-        total_ipv4_in_speed, total_ipv4_out_speed, total_ipv6_in_speed, total_ipv6_out_speed,
+    <select id="getNetTrafficList" parameterType="InitialBandwidthTraffic" resultType="InitialBandwidthTraffic">
+        select
+        id,
+        `name`,
+        mac,
+        status,
+        `type`,
+        ipV4,
+        in_dropped as inDropped,
+        out_dropped as outDropped,
+        in_speed as inSpeed,
+        out_speed as outSpeed,
+        total_in_speed as totalInSpeed,
+        total_out_speed as totalOutSpeed,
+        create_time as createTime,
+        update_time as updateTime,
+        create_by as createBy,
+        update_by as updateBy,
+        client_id as clientId,
+        duplex,
+        speed,
+        ipv4_in_speed as ipv4InSpeed,
+        ipv4_out_speed as ipv4OutSpeed,
+        ipv6_in_speed as ipv6InSpeed,
+        ipv6_out_speed as ipv6OutSpeed,
+        total_ipv4_in_speed as totalIpv4InSpeed,
+        total_ipv4_out_speed as totalIpv4OutSpeed,
+        total_ipv6_in_speed as totalIpv6InSpeed,
+        total_ipv6_out_speed as totalIpv6OutSpeed,
         ipV6
         from ${tableName}
         <where>

tongran-rocketmq/src/main/resources/mapper/rocketmq/RmNetworkInterfaceMapper.xml

@@ -15,6 +15,7 @@
         <result property="macAddress"    column="mac_address"    />
         <result property="interfaceType"    column="interface_type"    />
         <result property="ipv4Address"    column="ipv4_address"    />
+        <result property="ipv6Address"    column="ipv6_address"    />
         <result property="gateway"    column="gateway"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -25,7 +26,7 @@
     </resultMap>
 
     <sql id="selectRmNetworkInterfaceVo">
-        select id, client_id, isp, province, city, public_ip, interface_name, mac_address, interface_type, ipv4_address, gateway, create_time, update_time, create_by, update_by, bind_ip, new_flag from rm_network_interface
+        select id, client_id, isp, province, city, public_ip, interface_name, mac_address, interface_type, ipv4_address, ipv6_address, gateway, create_time, update_time, create_by, update_by, bind_ip, new_flag from rm_network_interface
     </sql>
 
     <select id="selectRmNetworkInterfaceList" parameterType="RmNetworkInterface" resultMap="RmNetworkInterfaceResult">
@@ -70,6 +71,7 @@
             <if test="macAddress != null">mac_address,</if>
             <if test="interfaceType != null">interface_type,</if>
             <if test="ipv4Address != null">ipv4_address,</if>
+            <if test="ipv6Address != null">ipv6_address,</if>
             <if test="gateway != null">gateway,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -88,6 +90,7 @@
             <if test="macAddress != null">#{macAddress},</if>
             <if test="interfaceType != null">#{interfaceType},</if>
             <if test="ipv4Address != null">#{ipv4Address},</if>
+            <if test="ipv6Address != null">#{ipv6Address},</if>
             <if test="gateway != null">#{gateway},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -110,6 +113,7 @@
             <if test="macAddress != null">mac_address = #{macAddress},</if>
             <if test="interfaceType != null">interface_type = #{interfaceType},</if>
             <if test="ipv4Address != null">ipv4_address = #{ipv4Address},</if>
+            <if test="ipv6Address != null">ipv6_address = #{ipv6Address},</if>
             <if test="gateway != null">gateway = #{gateway},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -142,6 +146,7 @@
             <if test="macAddress != null">mac_address = #{macAddress},</if>
             <if test="interfaceType != null">interface_type = #{interfaceType},</if>
             <if test="ipv4Address != null">ipv4_address = #{ipv4Address},</if>
+            <if test="ipv6Address != null">ipv6_address = #{ipv6Address},</if>
             <if test="gateway != null">gateway = #{gateway},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>