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

dev #2

Merged
admin merged 176 commits from dev into master 2025-04-18 01:31:49 +00:00
Conversation 0 Commits 176 Files Changed 427 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d25034fddd - Show all commits

3
src/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -704,6 +704,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
AFN = aFN, AFN = aFN,
Fn = fn, Fn = fn,
ItemCode = tempItem, ItemCode = tempItem,
TaskMark = CommonHelper.GetTaskMark((int)aFN, fn,ammeter.MeteringCode),
ManualOrNot = false, ManualOrNot = false,
Pn = ammeter.MeteringCode, Pn = ammeter.MeteringCode,
IssuedMessageId = GuidGenerator.Create().ToString(), IssuedMessageId = GuidGenerator.Create().ToString(),
@ -976,7 +977,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
#region 公共处理方法 #region 公共处理方法
/// <summary> /// <summary>
/// 批量获取缓存的表计信息 /// Lua脚本批量获取缓存的表计信息
/// </summary> /// </summary>
/// <typeparam name="T">表信息数据对象</typeparam> /// <typeparam name="T">表信息数据对象</typeparam>
/// <param name="redisKeys">采集频率对应的缓存Key集合</param> /// <param name="redisKeys">采集频率对应的缓存Key集合</param>

2
src/JiShe.CollectBus.Common/Helpers/CommonHelper.cs
View File

@ -770,7 +770,7 @@ namespace JiShe.CollectBus.Common.Helpers
/// <returns></returns> /// <returns></returns>
public static string GetTaskMark(int afn,int fn,int pn) public static string GetTaskMark(int afn,int fn,int pn)
{ {
return $"{afn}{fn}{pn}"; return $"{afn.ToString().PadLeft(2,'0')}{fn}{pn}";
} }
} }
} }