tcjlj/flvx
1
0
Fork 0
mirror of https://github.com/Sagit-chu/flvx.git synced 2026-09-29 16:06:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复流量统计问题

Browse Source
This commit is contained in:
qaq
2025-06-26 16:38:17 +08:00
parent 3cb5eafe29
commit a5e7062c15
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
springboot-backend/src/main/java/com/admin/controller/FlowController.java
+16 -7
View File
@@ -53,6 +53,7 @@ public class FlowController extends BaseController {
// 用于同步相同用户和隧道的流量更新操作
private static final ConcurrentHashMap<String, Object> USER_LOCKS = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<String, Object> TUNNEL_LOCKS = new ConcurrentHashMap<>();
private static final ConcurrentHashMap<String, Object> FORWARD_LOCKS = new ConcurrentHashMap<>();
@RequestMapping("/test")
@@ -147,7 +148,6 @@ public class FlowController extends BaseController {
if (tunnel != null){
BigDecimal trafficRatio = tunnel.getTrafficRatio();
for (FlowDto flowDto : flowDataList) {
System.out.println(flowDto);
BigDecimal originalD = BigDecimal.valueOf(flowDto.getD());
BigDecimal originalU = BigDecimal.valueOf(flowDto.getU());
@@ -156,7 +156,6 @@ public class FlowController extends BaseController {
flowDto.setD(newD.longValue());
flowDto.setU(newU.longValue());
System.out.println(flowDto);
}
}
}
@@ -214,12 +213,15 @@ public class FlowController extends BaseController {
* 更新转发流量统计 - 使用原子操作避免并发问题
*/
private boolean updateForwardFlow(String forwardId, FlowStatistics flowStats) {
UpdateWrapper<Forward> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", forwardId);
updateWrapper.setSql("in_flow = in_flow + " + flowStats.getDownload());
updateWrapper.setSql("out_flow = out_flow + " + flowStats.getUpload());
// 对相同转发的流量更新进行同步，避免并发覆盖
synchronized (getForwardLock(forwardId)) {
UpdateWrapper<Forward> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", forwardId);
updateWrapper.setSql("in_flow = in_flow + " + flowStats.getDownload());
updateWrapper.setSql("out_flow = out_flow + " + flowStats.getUpload());
return forwardService.update(null, updateWrapper);
return forwardService.update(null, updateWrapper);
}
}
/**
@@ -498,6 +500,13 @@ public class FlowController extends BaseController {
return TUNNEL_LOCKS.computeIfAbsent(userTunnelId, k -> new Object());
}
/**
* 获取转发锁对象
*/
private Object getForwardLock(String forwardId) {
return FORWARD_LOCKS.computeIfAbsent(forwardId, k -> new Object());
}
/**
* 流量统计数据类
*/