liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、增加对象存储初始模块

Browse Source 
2、优化出省流量统计展示。
This commit is contained in:
gaoyutao
2026-02-10 18:19:22 +08:00
parent 5b28479625
commit 8cc321bf14
18 changed files with 780 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmOutboundTrafficStatisticsController.java
+8 -3
View File
@@ -1,7 +1,8 @@
package com.tongran.rocketmq.controller;
import com.tongran.common.core.web.controller.BaseController;
import com.tongran.common.core.web.domain.AjaxResult;
import com.tongran.common.core.web.page.PageDomain;
import com.tongran.common.core.web.page.TableDataInfo;
import com.tongran.common.security.annotation.RequiresPermissions;
import com.tongran.rocketmq.domain.RmOutboundTrafficStatistics;
import com.tongran.rocketmq.service.IRmOutboundTrafficStatisticsService;
@@ -31,10 +32,14 @@ public class RmOutboundTrafficStatisticsController extends BaseController
* 查询出省流量统计列表
*/
@PostMapping("/list")
public AjaxResult list(@RequestBody RmOutboundTrafficStatistics rmOutboundTrafficStatistics)
public TableDataInfo list(@RequestBody RmOutboundTrafficStatistics rmOutboundTrafficStatistics)
{
PageDomain pageDomain = new PageDomain();
pageDomain.setPageNum(rmOutboundTrafficStatistics.getPageNum());
pageDomain.setPageSize(rmOutboundTrafficStatistics.getPageSize());
startPage(pageDomain);
List<RmOutboundTrafficStatistics> list = rmOutboundTrafficStatisticsService.selectRmOutboundTrafficStatisticsList(rmOutboundTrafficStatistics);
return success(list);
return getDataTable(list);
}
}
tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/RmOutboundTrafficStatistics.java
+8
View File
@@ -4,6 +4,8 @@ import com.tongran.common.core.annotation.Excel;
import com.tongran.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.math.BigDecimal;
/**
* 出省流量统计对象 rm_outbound_traffic_statistics
*
@@ -25,5 +27,11 @@ public class RmOutboundTrafficStatistics extends BaseEntity
/** 出省流量统计详情 */
@Excel(name = "出省流量统计详情")
private String description;
/** 总占比 */
private BigDecimal totalRate;
/** ipv4占比 */
private BigDecimal ipv4Rate;
/** ipv6占比 */
private BigDecimal ipv6Rate;
}
tongran-rocketmq/src/main/java/com/tongran/rocketmq/handler/MessageHandler.java
+3 -12
View File
@@ -43,7 +43,6 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.function.Consumer;
@@ -251,11 +250,6 @@ public class MessageHandler {
BigDecimal v4TotalRate = BigDecimal.ZERO;
BigDecimal v6TotalRate = BigDecimal.ZERO;
BigDecimal totalRate = BigDecimal.ZERO;
// 添加时间戳
content.append("时间：").append(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())).append("\n");
int insertPosition = content.length();
int insertPositionV6 = content.length();
// 处理IPv4统计
if (!ipTypeMap.get("IPv4").isEmpty()) {
content.append("##### V4 统计 ##### ##\n");
@@ -296,8 +290,6 @@ public class MessageHandler {
v4TotalRate = v4TotalRate.add(percentage);
}
// 在记录的位置插入总计信息
content.insert(insertPosition, "IPv4总计占比: " + v4TotalRate + "%\n");
insertPositionV6 += ("IPv4总计占比: " + v4TotalRate + "%\n").length(); // 更新插入位置
totalRate = totalRate.add(v4TotalRate);
}
@@ -340,12 +332,8 @@ public class MessageHandler {
content.append(entry.getKey()).append(": ").append(percentage).append("%\n");
v6TotalRate = v6TotalRate.add(percentage);
}
// 在更新后的位置插入IPv6总计
content.insert(insertPositionV6, "IPv6总计占比: " + v6TotalRate + "%\n");
totalRate = totalRate.add(v6TotalRate);
}
// 在更新后的位置插入IPv6总计
content.insert(insertPosition, "总占比: " + totalRate + "%\n");
// 添加总占比
RmResourceRegistrationRemote updateData = new RmResourceRegistrationRemote();
updateData.setClientId(message.getClientId());
@@ -353,6 +341,9 @@ public class MessageHandler {
remoteRevenueConfigService.innerUpdateRegist(updateData, SecurityConstants.INNER);
RmOutboundTrafficStatistics insertData = new RmOutboundTrafficStatistics();
insertData.setClientId(message.getClientId());
insertData.setTotalRate(totalRate);
insertData.setIpv4Rate(v4TotalRate);
insertData.setIpv6Rate(v6TotalRate);
insertData.setDescription(content.toString());
rmOutboundTrafficStatisticsService.insertRmOutboundTrafficStatistics(insertData);
// 查询告警阈值
tongran-rocketmq/src/main/resources/mapper/rocketmq/RmOutboundTrafficStatisticsMapper.xml
+24 -9
View File
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.tongran.rocketmq.mapper.RmOutboundTrafficStatisticsMapper">
<resultMap type="RmOutboundTrafficStatistics" id="RmOutboundTrafficStatisticsResult">
<result property="id" column="id" />
<result property="clientId" column="client_id" />
<result property="description" column="description" />
<result property="totalRate" column="total_rate" />
<result property="ipv4Rate" column="ipv4_rate" />
<result property="ipv6Rate" column="ipv6_rate" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="createBy" column="create_by" />
@@ -15,18 +18,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectRmOutboundTrafficStatisticsVo">
select id, client_id, description, create_time, update_time, create_by, update_by from rm_outbound_traffic_statistics
select id, client_id, description, total_rate, ipv4_rate, ipv6_rate, create_time, update_time, create_by, update_by from rm_outbound_traffic_statistics
</sql>
<select id="selectRmOutboundTrafficStatisticsList" parameterType="RmOutboundTrafficStatistics" resultMap="RmOutboundTrafficStatisticsResult">
<include refid="selectRmOutboundTrafficStatisticsVo"/>
<where>
<where>
<if test="clientId != null and clientId != ''"> and client_id = #{clientId}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="totalRate != null"> and total_rate = #{totalRate}</if>
<if test="ipv4Rate != null"> and ipv4_rate = #{ipv4Rate}</if>
<if test="ipv6Rate != null"> and ipv6_rate = #{ipv6Rate}</if>
</where>
order by create_time desc
</select>
<select id="selectRmOutboundTrafficStatisticsById" parameterType="Long" resultMap="RmOutboundTrafficStatisticsResult">
<include refid="selectRmOutboundTrafficStatisticsVo"/>
where id = #{id}
@@ -37,19 +43,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="clientId != null and clientId != ''">client_id,</if>
<if test="description != null">description,</if>
<if test="totalRate != null">total_rate,</if>
<if test="ipv4Rate != null">ipv4_rate,</if>
<if test="ipv6Rate != null">ipv6_rate,</if>
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="clientId != null and clientId != ''">#{clientId},</if>
<if test="description != null">#{description},</if>
<if test="totalRate != null">#{totalRate},</if>
<if test="ipv4Rate != null">#{ipv4Rate},</if>
<if test="ipv6Rate != null">#{ipv6Rate},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
</trim>
</trim>
</insert>
<update id="updateRmOutboundTrafficStatistics" parameterType="RmOutboundTrafficStatistics">
@@ -57,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="clientId != null and clientId != ''">client_id = #{clientId},</if>
<if test="description != null">description = #{description},</if>
<if test="totalRate != null">total_rate = #{totalRate},</if>
<if test="ipv4Rate != null">ipv4_rate = #{ipv4Rate},</if>
<if test="ipv6Rate != null">ipv6_rate = #{ipv6Rate},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@@ -70,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteRmOutboundTrafficStatisticsByIds" parameterType="String">
delete from rm_outbound_traffic_statistics where id in
delete from rm_outbound_traffic_statistics where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>