DOVER-GLOBAL\11047086 1 vuosi sitten
vanhempi
commit
8e193e8219

BIN
.vs/smartfueltool/DesignTimeBuild/.dtbcache.v2


+ 10 - 1
src/MS.Services/Account/AccountService.cs

@@ -673,13 +673,22 @@ select
                              .Where(item => uniqueSet.Contains(item))
                              .ToList();
         }
+        public Task ClearhashValues(string key)
+        {
+            List<string> hashValues = redisExample.GetHashKeysByPattern(key);//EmployeeCard:*
+            foreach (var value in hashValues)
+            {
+                redisExample.DeleteData(value);
+            }
+            return   Task.CompletedTask; ;
+        }
         public Task AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date)
         {
            // AddgroupedAccountIdTotal(buid, date);
             AddCardSummary(buid, date);
             DateTime dateTime = DateTime.Parse(date);
             DateTime firstDayOfNextMonth = dateTime.AddMonths(1).AddDays(-dateTime.Day);
-            var enddate = firstDayOfNextMonth.ToString("yyyy-MM-dd");
+            var enddate = firstDayOfNextMonth.ToString("yyyy-MM-dd 23:59:59");
             string sql = string.Format(@"
      
                     SELECT ai.belong_to, trx.account_id, trx.card_no, ci.holder, count(*) as trx_count, sum(trx.volume) as volume, sum(trx.amount) as amount,

+ 2 - 0
src/MS.Services/Account/IAccountService.cs

@@ -19,5 +19,7 @@ namespace MS.Services
         /// </summary>
         /// <returns></returns>
         Task<IEnumerable<string>> GetBuids();
+
+        Task ClearhashValues(string key);
     }
 }

+ 8 - 0
src/MS.WebApi/Controllers/AccountController.cs

@@ -55,5 +55,13 @@ namespace MS.WebApi.Controllers
              await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid,date);
             return true;
         }
+        [Route("ClearhashValues")]
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<bool> ClearhashValues(string key)
+        {
+            await _accountService.ClearhashValues(key);
+            return true;
+        }
     }
 }

+ 20 - 0
src/MS.WebCore/Core/RedisExample.cs

@@ -3,6 +3,7 @@ using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Text;
 
 namespace MS.WebCore.Core
@@ -33,6 +34,11 @@ namespace MS.WebCore.Core
             redisDb.HashDelete(key, field);
             //redisDb.KeyDelete(key);
         }
+        public void DeleteData(string key)
+        {
+            redisDb.KeyDelete(key);
+            //redisDb.KeyDelete(key);
+        }
         public  bool HashKeyExists(string hashKey, string fieldKey)
         {
             return redisDb.HashExists(hashKey, fieldKey);
@@ -150,5 +156,19 @@ namespace MS.WebCore.Core
 
             return result;
         }
+        public List<string> GetHashKeysByPattern(string pattern)
+        {
+            List<string> keys = new List<string>();
+
+            // 使用服务器的 EndPoint 获取服务器的键
+            EndPoint[] endPoints = redisDb.Multiplexer.GetEndPoints();
+            foreach (EndPoint endPoint in endPoints)
+            {
+                IServer server = redisDb.Multiplexer.GetServer(endPoint);
+                keys.AddRange(server.Keys(pattern: pattern, database: redisDb.Database).Select(key => (string)key));
+            }
+
+            return keys;
+        }
     }
 }

+ 4 - 0
src/QuartzSettings/logs/logs.txt

@@ -1419,3 +1419,7 @@
 {"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T07:00:31.0717171+08:00","EndDate":"2024-04-27T07:03:01.3128589+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T07:30:16.0628136+08:00","EndDate":"2024-04-27T07:32:46.2578084+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
 {"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T07:30:31.0928726+08:00","EndDate":"2024-04-27T07:33:01.2768466+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T09:25:56.9004618+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T09:27:47.07255+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T09:35:28.3890506+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T10:04:59.8427941+08:00","EndDate":"2024-04-27T10:06:45.2237022+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}