diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java index 7089b22..79f9cd0 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/EpsInitialTrafficData.java @@ -128,6 +128,26 @@ public class EpsInitialTrafficData extends BaseEntity { private String totalOutSpeed; /** 监控看板id */ private Long monitorId; + /** IPv4接收流量 */ + private String ipv4InSpeed; + /** IPv4发送流量 */ + private String ipv4OutSpeed; + + /** IPv6接收流量 */ + private String ipv6InSpeed; + + /** IPv6发送流量 */ + private String ipv6OutSpeed; + /** IPv4接收总流量 */ + private String totalIpv4InSpeed; + /** IPv4发送总流量 */ + private String totalIpv4OutSpeed; + /** IPv6接收总流量 */ + private String totalIpv6InSpeed; + /** IPv6发送总流量 */ + private String totalIpv6OutSpeed; + /** IPv6 */ + private String ipV6; } \ No newline at end of file diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml index 86438ca..7013bb2 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/EpsInitialTrafficDataMapper.xml @@ -32,11 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by VARCHAR(50) COMMENT '创建人', update_by VARCHAR(50) COMMENT '修改人', client_id VARCHAR(255) COMMENT '设备唯一标识', + ipv4_in_speed VARCHAR(50) COMMENT 'IPv4接收流量', + ipv4_out_speed VARCHAR(50) COMMENT 'IPv4发送流量', + ipv6_in_speed VARCHAR(50) COMMENT 'IPv6接收流量', + ipv6_out_speed VARCHAR(50) COMMENT 'IPv6发送流量', + total_ipv4_in_speed VARCHAR(50) COMMENT 'IPv4接收总流量', + total_ipv4_out_speed VARCHAR(50) COMMENT 'IPv4发送总流量', + total_ipv6_in_speed VARCHAR(50) COMMENT 'IPv6接收总流量', + total_ipv6_out_speed VARCHAR(50) COMMENT 'IPv6发送总流量', + ipV6 VARCHAR(50) COMMENT 'IPv6地址', PRIMARY KEY (id), UNIQUE KEY uk_client_mac_name_time (client_id, mac, name, create_time), - INDEX idx_name_time (`name`,create_time), - INDEX idx_revenue_method (revenue_method), - INDEX idx_service_sn (service_sn) + INDEX idx_name_time (`name`,create_time) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='EPS设备流量初始数据表'; @@ -61,6 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by VARCHAR(50) COMMENT '创建人', update_by VARCHAR(50) COMMENT '修改人', client_id VARCHAR(255) COMMENT '设备唯一标识', + ipv4_in_speed VARCHAR(50) COMMENT 'IPv4接收流量', + ipv4_out_speed VARCHAR(50) COMMENT 'IPv4发送流量', + ipv6_in_speed VARCHAR(50) COMMENT 'IPv6接收流量', + ipv6_out_speed VARCHAR(50) COMMENT 'IPv6发送流量', + total_ipv4_in_speed VARCHAR(50) COMMENT 'IPv4接收总流量', + total_ipv4_out_speed VARCHAR(50) COMMENT 'IPv4发送总流量', + total_ipv6_in_speed VARCHAR(50) COMMENT 'IPv6接收总流量', + total_ipv6_out_speed VARCHAR(50) COMMENT 'IPv6发送总流量', + ipV6 VARCHAR(50) COMMENT 'IPv6地址', PRIMARY KEY (id), UNIQUE KEY uk_client_mac_name_time (client_id, mac, name, create_time), INDEX idx_name_time (`name`,create_time) @@ -178,7 +194,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" package_bandwidth, create_by, update_by, - client_id + client_id, + 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, + ipV6 ) VALUES ( #{name}, #{mac}, @@ -201,7 +226,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{packageBandwidth}, #{createBy}, #{updateBy}, - #{clientId} + #{clientId}, + #{ipv4InSpeed}, + #{ipv4OutSpeed}, + #{ipv6InSpeed}, + #{ipv6OutSpeed}, + #{totalIpv4InSpeed}, + #{totalIpv4OutSpeed}, + #{totalIpv6InSpeed}, + #{totalIpv6OutSpeed}, + #{ipV6} ) @@ -232,7 +266,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_by, update_by, - client_id + client_id, + 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, + ipV6 ) VALUES ( @@ -260,7 +303,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{data.updateTime,jdbcType=TIMESTAMP}, #{data.createBy,jdbcType=VARCHAR}, #{data.updateBy,jdbcType=VARCHAR}, - #{data.clientId,jdbcType=VARCHAR} + #{data.clientId,jdbcType=VARCHAR}, + #{data.ipv4InSpeed,jdbcType=VARCHAR}, + #{data.ipv4OutSpeed,jdbcType=VARCHAR}, + #{data.ipv6InSpeed,jdbcType=VARCHAR}, + #{data.ipv6OutSpeed,jdbcType=VARCHAR}, + #{data.totalIpv4InSpeed,jdbcType=VARCHAR}, + #{data.totalIpv4OutSpeed,jdbcType=VARCHAR}, + #{data.totalIpv6InSpeed,jdbcType=VARCHAR}, + #{data.totalIpv6OutSpeed,jdbcType=VARCHAR}, + #{data.ipV6,jdbcType=VARCHAR} ) @@ -280,6 +332,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" CAST(sum(ifnull(a.`out_speed`,0)) AS DECIMAL(20,0)) AS outSpeed, CAST(sum(ifnull(a.`total_in_speed`,0)) AS DECIMAL(20,0)) AS totalInSpeed, CAST(sum(ifnull(a.`total_out_speed`,0)) AS DECIMAL(20,0)) AS totalOutSpeed, + CAST(sum(ifnull(a.`ipv4_in_speed`,0)) AS DECIMAL(20,0)) AS ipv4InSpeed, + CAST(sum(ifnull(a.`ipv4_out_speed`,0)) AS DECIMAL(20,0)) AS ipv4OutSpeed, + CAST(sum(ifnull(a.`ipv6_in_speed`,0)) AS DECIMAL(20,0)) AS ipv6InSpeed, + CAST(sum(ifnull(a.`ipv6_out_speed`,0)) AS DECIMAL(20,0)) AS ipv6OutSpeed, + CAST(sum(ifnull(a.`total_ipv4_in_speed`,0)) AS DECIMAL(20,0)) AS totalIpv4InSpeed, + CAST(sum(ifnull(a.`total_ipv4_out_speed`,0)) AS DECIMAL(20,0)) AS totalIpv4OutSpeed, + CAST(sum(ifnull(a.`total_ipv6_in_speed`,0)) AS DECIMAL(20,0)) AS totalIpv6InSpeed, + CAST(sum(ifnull(a.`total_ipv6_out_speed`,0)) AS DECIMAL(20,0)) AS totalIpv6OutSpeed, a.`machine_flow` AS machineFlow, a.`speed` AS speed, a.`duplex` AS duplex, @@ -293,7 +353,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.update_time AS updateTime, a.create_by AS createBy, a.update_by AS updateBy, - a.client_id AS clientId + a.client_id AS clientId, + a.ipV6 AS ipV6 FROM ${tableName} a INNER JOIN rm_network_interface b ON a.client_id = b.client_id and a.mac=b.mac_address AND (b.bind_ip = 1 OR b.bind_ip = 3) @@ -342,7 +403,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time AS updateTime, create_by AS createBy, update_by AS updateBy, - client_id AS clientId + client_id AS clientId, + 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 AS ipV6 FROM ${tableName} @@ -362,6 +432,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT CAST(sum(ifnull(in_speed,0)) AS DECIMAL(20,0)) AS inSpeed, CAST(sum(ifnull(out_speed,0)) AS DECIMAL(20,0)) AS outSpeed, + CAST(sum(ifnull(ipv4_in_speed,0)) AS DECIMAL(20,0)) AS ipv4InSpeed, + CAST(sum(ifnull(ipv4_out_speed,0)) AS DECIMAL(20,0)) AS ipv4OutSpeed, + CAST(sum(ifnull(ipv6_in_speed,0)) AS DECIMAL(20,0)) AS ipv6InSpeed, + CAST(sum(ifnull(ipv6_out_speed,0)) AS DECIMAL(20,0)) AS ipv6OutSpeed, create_time AS createTime FROM ${tableName} diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java index 9896565..f96c086 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTrafficTemp.java @@ -39,6 +39,8 @@ public class InitialBandwidthTrafficTemp extends BaseEntity /** IPv4地址 */ @Excel(name = "IPv4地址") private String ipV4; + /** IPv6地址 */ + private String ipV6; /** 入站丢包率(%) */ @Excel(name = "入站丢包率(%)") diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java index 5fcc974..a2f0e3c 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmAgentManagement.java @@ -45,7 +45,7 @@ public class RmAgentManagement extends BaseEntity @Excel(name = "执行方式") private Integer method; - /** 定时更新时间(cron表达式) */ + /** 定时更新时间 */ @Excel(name = "定时更新时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date scheduledUpdateTime; diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java index 5b26576..1f3e317 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/snmp/scheduler/MultiSwitchCollectionScheduler.java @@ -619,7 +619,7 @@ public class MultiSwitchCollectionScheduler { Map> tasks = allSwitchTasks.remove(switchIp); if (tasks != null) { tasks.values().forEach(future -> future.cancel(false)); - log.info("停止交换机 {} 的所有采集任务{}", switchIp); + log.debug("停止交换机 {} 的所有采集任务{}", switchIp); } allSwitchConfigs.remove(switchIp); allSwitchCollectConfigs.remove(switchIp); diff --git a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml index d20ce9a..e854f3f 100644 --- a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml @@ -108,11 +108,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT INTO ${tableName} ( `name`, `mac`, `status`, `type`, ipV4, `in_dropped`, `out_dropped`, `in_speed`, `out_speed`, `total_in_speed`, `total_out_speed`, duplex, speed, - create_by, update_by, client_id, create_time + create_by, update_by, client_id, create_time, + 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, + ipV6 ) VALUES ( #{name}, #{mac}, #{status}, #{type}, #{ipV4}, #{inDropped}, #{outDropped}, #{inSpeed}, #{outSpeed}, #{totalInSpeed}, #{totalOutSpeed}, #{duplex}, #{speed}, - #{createBy}, #{updateBy}, #{clientId}, #{createTime} + #{createBy}, #{updateBy}, #{clientId}, #{createTime}, + #{ipv4InSpeed}, #{ipv4OutSpeed}, #{ipv6InSpeed}, #{ipv6OutSpeed}, + #{totalIpv4InSpeed}, #{totalIpv4OutSpeed}, #{totalIpv6InSpeed}, #{totalIpv6OutSpeed}, + #{ipV6} ) @@ -120,13 +126,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT IGNORE INTO ${tableName} ( `name`, `mac`, `status`, `type`, ipV4, `in_dropped`, `out_dropped`, `in_speed`, `out_speed`, `total_in_speed`, `total_out_speed`, duplex, speed, - create_by, update_by, client_id, create_time + create_by, update_by, client_id, create_time, + 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, + ipV6 ) VALUES ( #{item.name}, #{item.mac}, #{item.status}, #{item.type}, #{item.ipV4}, #{item.inDropped}, #{item.outDropped}, #{item.inSpeed}, #{item.outSpeed}, #{item.totalInSpeed}, #{item.totalOutSpeed}, #{item.duplex}, #{item.speed}, - #{item.createBy}, #{item.updateBy}, #{item.clientId}, #{item.createTime} + #{item.createBy}, #{item.updateBy}, #{item.clientId}, #{item.createTime}, + #{item.ipv4InSpeed}, #{item.ipv4OutSpeed}, #{item.ipv6InSpeed}, #{item.ipv6OutSpeed}, + #{item.totalIpv4InSpeed}, #{item.totalIpv4OutSpeed}, #{item.totalIpv6InSpeed}, #{item.totalIpv6OutSpeed}, + #{item.ipV6} ) @@ -134,7 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 + 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, + ipV6 from ${tableName} and client_id = #{clientId} diff --git a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml index 9630b04..1eb7587 100644 --- a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficTempMapper.xml @@ -24,10 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + - select id, name, mac, status, type, ipV4, in_dropped, out_dropped, in_speed, out_speed, speed, duplex, create_time, update_time, create_by, update_by, client_id, total_in_speed, total_out_speed from initial_bandwidth_traffic_temp + select id, name, mac, status, type, ipV4, in_dropped, out_dropped, in_speed, out_speed, speed, duplex, create_time, update_time, create_by, update_by, client_id, total_in_speed, total_out_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, ipV6 from initial_bandwidth_traffic_temp