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

dev #4

Merged
admin merged 158 commits from dev into master 2025-05-20 05:39:26 +00:00
Conversation 0 Commits 158 Files Changed 301 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ba0af3a12a - Show all commits

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs
View File

@ -87,7 +87,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
string deviceKey= $"{code}:{pn}"; string deviceKey= $"{code}:{pn}";
return await _imemoryCache.GetOrCreateAsync(deviceKey, async entry => return await _imemoryCache.GetOrCreateAsync(deviceKey, async entry =>
{ {
List<DeviceInfo> devices= await Instance.HGetAsync<List<DeviceInfo>>(redisCacheDeviceInfoHashKey, code); List<DeviceInfo> devices= await Instance.HGetAsync<List<DeviceInfo>>(redisCacheDeviceInfoHashKey, code) ?? new List<DeviceInfo>();
var data = devices.Where(s => s.MeteringCode == pn).FirstOrDefault(); var data = devices.Where(s => s.MeteringCode == pn).FirstOrDefault();
if (data != null) if (data != null)
entry.SetSlidingExpiration(TimeSpan.FromMinutes(5)); entry.SetSlidingExpiration(TimeSpan.FromMinutes(5));

1
web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
View File

@ -16,6 +16,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" /> <link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
<title>后端服务</title> <title>后端服务</title>
</head> </head>
<body> <body>