admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

优化代码

Browse Source
This commit is contained in:
ChenYi 2025-04-17 09:10:01 +08:00
parent cadb69f4b9
commit 4737c5b53d
1 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/JiShe.CollectBus.Application/RedisDataCache/RedisDataCacheService.cs
View File

@ -7,6 +7,7 @@ using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.FreeRedisProvider; using JiShe.CollectBus.FreeRedisProvider;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
@ -121,7 +122,7 @@ namespace JiShe.CollectBus.RedisDataCache
await semaphore.WaitAsync(); await semaphore.WaitAsync();
_ = Task.Run(() => _ = Task.Run(() =>
{ {
using (var pipe = Instance.StartPipe()) using (var pipe = Instance.StartPipe())
{ {
foreach (var item in batch) foreach (var item in batch)
@ -363,7 +364,7 @@ namespace JiShe.CollectBus.RedisDataCache
where T : DeviceCacheBasicModel where T : DeviceCacheBasicModel
{ {
throw new Exception(); throw new Exception();
} }
/// <summary> /// <summary>
/// 通过ZSET索引获取数据 /// 通过ZSET索引获取数据
@ -385,79 +386,81 @@ namespace JiShe.CollectBus.RedisDataCache
bool descending = true) bool descending = true)
where T : DeviceCacheBasicModel where T : DeviceCacheBasicModel
{ {
// 参数校验 // 参数校验增强
if (string.IsNullOrWhiteSpace(redisHashCacheKey) || if (string.IsNullOrWhiteSpace(redisHashCacheKey) || string.IsNullOrWhiteSpace(redisZSetScoresIndexCacheKey))
string.IsNullOrWhiteSpace(redisZSetScoresIndexCacheKey))
{ {
_logger.LogError("参数异常: HashKey或ZSetKey为空"); _logger.LogError($"{nameof(GetAllPagedData)} 参数异常，-101");
return null; return null;
} }
if (pageSize < 1 || pageSize > 10000) if (pageSize < 1 || pageSize > 10000)
throw new ArgumentException("分页大小应在1-10000之间"); {
_logger.LogError($"{nameof(GetAllPagedData)} 分页大小应在1-10000之间，-102");
return null;
}
var luaScript = @" var luaScript = @"
local command = ARGV[1] local command = ARGV[1]
local range_start = ARGV[2] local range_start = ARGV[2]
local range_end = ARGV[3] local range_end = ARGV[3]
local limit = tonumber(ARGV[4]) local limit = tonumber(ARGV[4])
local last_score = ARGV[5] local last_score = ARGV[5]
local last_member = ARGV[6] local last_member = ARGV[6]
-- 获取原始数据 -- 获取原始数据
local members local members
if command == 'ZRANGEBYSCORE' then if command == 'ZRANGEBYSCORE' then
members = redis.call(command, KEYS[1], range_start, range_end, 'WITHSCORES', 'LIMIT', 0, limit * 2) members = redis.call(command, KEYS[1], range_start, range_end, 'WITHSCORES', 'LIMIT', 0, limit * 2)
else else
members = redis.call('ZREVRANGEBYSCORE', KEYS[1], range_start, range_end, 'WITHSCORES', 'LIMIT', 0, limit * 2) members = redis.call('ZREVRANGEBYSCORE', KEYS[1], range_start, range_end, 'WITHSCORES', 'LIMIT', 0, limit * 2)
end end
-- 过滤数据 -- 过滤数据
local filtered_members = {} local filtered_members = {}
local count = 0 local count = 0
for i = 1, #members, 2 do for i = 1, #members, 2 do
local member = members[i] local member = members[i]
local score = members[i+1] local score = members[i+1]
local include = true local include = true
if last_score ~= '' and last_member ~= '' then if last_score ~= '' and last_member ~= '' then
if command == 'ZRANGEBYSCORE' then if command == 'ZRANGEBYSCORE' then
-- 升序：score > last_score 或 (score == last_score 且 member > last_member) -- 升序：score > last_score 或 (score == last_score 且 member > last_member)
if score == last_score then if score == last_score then
include = member > last_member include = member > last_member
else else
include = tonumber(score) > tonumber(last_score) include = tonumber(score) > tonumber(last_score)
end end
else else
-- 降序：score < last_score 或 (score == last_score 且 member < last_member) -- 降序：score < last_score 或 (score == last_score 且 member < last_member)
if score == last_score then if score == last_score then
include = member < last_member include = member < last_member
else else
include = tonumber(score) < tonumber(last_score) include = tonumber(score) < tonumber(last_score)
end end
end end
end end
if include then if include then
table.insert(filtered_members, member) table.insert(filtered_members, member)
table.insert(filtered_members, score) table.insert(filtered_members, score)
count = count + 1 count = count + 1
if count >= limit then if count >= limit then
break break
end end
end end
end end
-- 提取有效数据 -- 提取有效数据
local result_members, result_scores = {}, {} local result_members, result_scores = {}, {}
for i=1,#filtered_members,2 do for i=1,#filtered_members,2 do
table.insert(result_members, filtered_members[i]) table.insert(result_members, filtered_members[i])
table.insert(result_scores, filtered_members[i+1]) table.insert(result_scores, filtered_members[i+1])
end end
if #result_members == 0 then return {0,{},{},{}} end if #result_members == 0 then return {0,{},{},{}} end
-- 获取Hash数据 -- 获取Hash数据
local hash_data = redis.call('HMGET', KEYS[2], unpack(result_members)) local hash_data = redis.call('HMGET', KEYS[2], unpack(result_members))
return {#result_members, result_members, result_scores, hash_data}"; return {#result_members, result_members, result_scores, hash_data}";
// 调整范围构造逻辑（移除排他符号） // 调整范围构造逻辑（移除排他符号）
string rangeStart, rangeEnd; string rangeStart, rangeEnd;
@ -504,7 +507,7 @@ return {#result_members, result_members, result_scores, hash_data}";
var hasNext = validItems.Count > pageSize; var hasNext = validItems.Count > pageSize;
var actualItems = hasNext ? validItems.Take(pageSize) : validItems; var actualItems = hasNext ? validItems.Take(pageSize) : validItems;
// 修正分页锚点索引 //分页锚点索引
decimal? nextScore = null; decimal? nextScore = null;
string nextMember = null; string nextMember = null;
if (hasNext && actualItems.Any()) if (hasNext && actualItems.Any())
@ -522,7 +525,7 @@ return {#result_members, result_members, result_scores, hash_data}";
NextMember = nextMember, NextMember = nextMember,
TotalCount = await GetTotalCount(redisZSetScoresIndexCacheKey), TotalCount = await GetTotalCount(redisZSetScoresIndexCacheKey),
PageSize = pageSize, PageSize = pageSize,
}; };
} }
///// <summary> ///// <summary>