Explorar o código

查询订单状态接口修改,春洲不用挂枪时间筛选

DOVER-GLOBAL\11047086 hai 1 ano
pai
achega
06d65c2f09

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


+ 4 - 0
src/MS.Entities/AccountingService_Models/AcctDto.cs

@@ -26,11 +26,15 @@ namespace MS.Entities.AccountingService_Models
         public long? recharge_total { get; set; }
         public long? account_type { get; set; }
         public long? card_balance { get; set; }
+       
         public long? account_deposite_balance { get; set; }
         public long? card_deposite_balance { get; set; }
 
 
         public long? card_recharge_total { get; set; }
+        public long? card_balance_update { get; set; }
+
+
     }
     public class RootObject
     {

+ 130 - 18
src/MS.Services/Account/AccountService.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using MS.Common.IDCode;
@@ -680,12 +681,39 @@ select
             {
                 redisExample.DeleteData(value);
             }
-            return   Task.CompletedTask; ;
+            return Task.CompletedTask; ;
         }
-        public Task AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date)
+        public void Getdate(string buid, string date, string Car)
         {
-           // AddgroupedAccountIdTotal(buid, date);
-            AddCardSummary(buid, date);
+            redisExample.AddToHash(buid, date, "1");
+        }
+        public void addredis(string buid)
+        {
+            List<KeyValuePair<string, string>> hashValues = redisExample.GetListValues(buid);
+            if (hashValues.Count > 0)
+            {
+                List<DateTime> dates = new List<DateTime>();
+                foreach (var kvp in hashValues)
+                {
+                    DateTime dateTime1 = DateTime.Parse(kvp.Key);
+                    dates.Add(dateTime1);
+                }
+                string date = dates.Max().ToString("yyyy-MM-dd");//
+                string maxDate = string.Empty;//
+                string value = hashValues.FirstOrDefault(x => x.Key == date).Value;
+
+
+                AddEmployeeCardMonthlySummaryToRedisAsync(buid, date, "0");
+                AddEmployeeCardMonthlySummaryToRedisAsync(buid, date, "1");
+                redisExample.AddToHash(buid, dates.Max().AddMonths(1).ToString("yyyy-MM-dd"), "2");
+            }
+        }
+        public Task AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date, string Car)
+        {
+            int cartype = GetCarType(buid, Car);
+            // AddgroupedAccountIdTotal(buid, date);
+            AddCardSummary(buid, date, Car);
+            string keyname = Car == "0" ? "UserCard": "EmployeeCard";
             DateTime dateTime = DateTime.Parse(date);
             DateTime firstDayOfNextMonth = dateTime.AddMonths(1).AddDays(-dateTime.Day);
             var enddate = firstDayOfNextMonth.ToString("yyyy-MM-dd 23:59:59");
@@ -701,7 +729,7 @@ select
             (array_agg(ci.balance ORDER BY trx.transaction_time DESC))[1] as card_balance,
             (array_agg(ai.offline_deposit_balance ORDER BY trx.transaction_time DESC))[1] as account_deposite_balance,
             (array_agg(ci.deposit_balance ORDER BY trx.transaction_time DESC))[1] as card_deposite_balance, 
-            (array_agg(ci.recharge_total ORDER BY trx.transaction_time DESC))[1] as card_recharge_total
+            (array_agg(ci.recharge_total ORDER BY trx.transaction_time DESC))[1] as card_recharge_total,0 as card_balance_update
             FROM public.offline_transaction_info trx 
             LEFT JOIN public.account_info ai ON ai.id = trx.account_info_id 
             LEFT JOIN public.card_info ci ON ci.id = trx.card_info_id 
@@ -709,11 +737,11 @@ select
            AND '{1}' <= trx.transaction_time AND trx.transaction_time <= '{2}'
             AND ci.holder is not null 
             AND ci.activation_date is not null 
-             AND ci.card_type IN (4)
+             AND ci.card_type IN ({3})
             AND ((trx.transaction_type = 10 AND trx.sub_transaction_type IN (0, 1)) OR trx.transaction_type = 1) 
             GROUP BY trx.account_id, trx.card_no, ai.belong_to, ci.holder, ci.card_type, ci.creation_date, ci.card_status
             ORDER BY trx.account_id DESC 
-", buid, date, enddate);
+", buid, date, enddate, cartype);
 
             var results = _AccountingContext.DbContext.acctDtos
                .FromSqlRaw(sql)
@@ -744,15 +772,42 @@ select
             AND trx.transaction_type IN (0, 5, 7, 8) 
             AND trx.recharge_type is not null 
             GROUP BY ci.account_id
-",buid, sqljoin, date, enddate);
+", buid, sqljoin, date, enddate);
             var accountRecharge = _AccountingContext.DbContext.accountRechargeTotals
               .FromSqlRaw(sql)
                 .ToList();
 
+
+            var car_ids = results
+    .Select(p => p.card_no)
+    .Distinct()
+    .ToList();
+            sqljoin = "";
+            for (var i = 0; i < car_ids.Count(); i++)
+            {
+                sqljoin += string.Format(@"'{0}',", car_ids[i]);
+            }
+            if (!string.IsNullOrEmpty(sqljoin))
+            {
+                sqljoin = sqljoin.Substring(0, sqljoin.Length - 1);
+            }
+            sql = string.Format(@"
+    SELECT trx.card_no as account_id, (array_agg(trx.card_balance ORDER BY trx.transaction_time DESC))[1] as amount 
+            FROM public.offline_transaction_info trx 
+            WHERE trx.business_unit_info_id IN ('{0}')
+            AND trx.card_no IN ({1})
+             AND '{2}' <= trx.transaction_time AND trx.transaction_time <= '{3}'
+            AND trx.transaction_type IN (1, 2, 3, 4, 7, 8, 10) 
+            GROUP BY trx.card_no
+", buid, sqljoin, date, enddate);
+            var carRecharge = _AccountingContext.DbContext.accountRechargeTotals
+          .FromSqlRaw(sql)
+            .ToList();
+
             //"149f3efa-28a0-4368-af6d-af65ca255ef0"   2020-09-15 14:17:22
             for (var i = 0; i < results.Count(); i++)
             {
-                string key = "EmployeeCard:" + buid + ":" + results[i].card_no + ":" + results[i].belong_to;//key
+                string key = keyname + ":" + buid + ":" + results[i].card_no + ":" + results[i].belong_to;//key
                 var hashkey = redisExample.HashKeyExists(key, date);
                 JsonSerializerSettings settings = new JsonSerializerSettings
                 {
@@ -764,6 +819,14 @@ select
                     Totals = accountRecharge.Where(a => a.account_id == results[i].account_id).FirstOrDefault()?.amount;
                 }
                 results[i].recharge_total = Totals;
+
+                long? card_balance_update = 0;
+                if (carRecharge != null && carRecharge.Count > 0)
+                {
+                    card_balance_update = carRecharge.Where(a => a.account_id == results[i].card_no).FirstOrDefault()?.amount;
+                }
+                results[i].card_balance_update = card_balance_update;
+
                 string resultsjson = JsonConvert.SerializeObject(results[i], settings);
                 string data = JsonConvert.SerializeObject(results[i]);
                 if (hashkey)
@@ -791,6 +854,7 @@ select
                         acctDto.volume = LongConversion(acctDto.volume) + LongConversion(results[i].volume);
                         acctDto.amount = LongConversion(acctDto.amount) + LongConversion(results[i].amount);
                         acctDto.recharge_total = Totals != null && Totals != 0 ? Totals : acctDto.recharge_total;
+                        acctDto.card_balance_update = card_balance_update != null && card_balance_update != 0 ? card_balance_update : acctDto.card_balance_update;
                         data = JsonConvert.SerializeObject(acctDto);
                     }
                 }
@@ -802,8 +866,10 @@ select
             }
             return Task.CompletedTask;
         }
-        public Task AddCardSummary(string buid, string date)
+        public Task AddCardSummary(string buid, string date,string Car)
         {
+            string keyname = Car == "0" ? "UserCardSummary" : "CardSummary";
+            int cartype = GetCarType(buid,Car);
             DateTime dateTime = DateTime.Parse(date);
             DateTime firstDayOfNextMonth = dateTime.AddMonths(1).AddDays(-dateTime.Day);
             var enddate = firstDayOfNextMonth.ToString("yyyy-MM-dd 23:59:59");
@@ -815,12 +881,12 @@ SELECT ai.belong_to,sum(trx.amount) as amount,0 as volume FROM public.offline_tr
             LEFT JOIN public.card_info ci ON trx.card_info_id = ci.id
             LEFT JOIN public.account_info ai ON ai.id = trx.account_info_id 
             WHERE trx.business_unit_info_id IN ('{0}')
-             AND ci.card_type IN (4)
+             AND ci.card_type IN ({3})
           AND '{1}' <= trx.transaction_time AND trx.transaction_time <= '{2}'
             AND trx.transaction_type IN (0, 5, 7, 8) 
             AND trx.recharge_type is not null
             group by ai.belong_to 
-", buid, date, enddate);
+", buid, date, enddate, cartype);
             var rechargeTotalresults = _AccountingContext.DbContext.cardSummaries
                .FromSqlRaw(sql)
                  .ToList();
@@ -840,11 +906,11 @@ SELECT ai.belong_to,sum(trx.amount) as amount,0 as volume FROM public.offline_tr
             LEFT JOIN public.card_info ci ON trx.card_info_id = ci.id
             LEFT JOIN public.account_info ai ON ai.id = trx.account_info_id 
            WHERE trx.business_unit_info_id IN ('{0}')
-              AND ci.card_type IN (4)
+              AND ci.card_type IN ({3})
               AND '{1}' <= trx.transaction_time AND trx.transaction_time <= '{2}'
             AND ((trx.transaction_type = 10 AND trx.sub_transaction_type IN (0, 1)) OR trx.transaction_type  = 1)
             group by ai.belong_to
-", buid, date, enddate);
+", buid, date, enddate, cartype);
             var trxTotalResults = _AccountingContext.DbContext.cardSummaries
             .FromSqlRaw(sql)
               .ToList();
@@ -965,7 +1031,7 @@ SELECT ai.belong_to,sum(trx.amount) as amount,0 as volume FROM public.offline_tr
 
             foreach (var cardCollect in cards)
             {
-                string key = "CardSummary:" + buid + ":" + cardCollect.belong_to;//key
+                string key = keyname+":" + buid + ":" + cardCollect.belong_to;//key
                 var hashkey = redisExample.HashKeyExists(key, date);
                 string data = JsonConvert.SerializeObject(cardCollect);
                 if (hashkey)
@@ -993,7 +1059,7 @@ SELECT ai.belong_to,sum(trx.amount) as amount,0 as volume FROM public.offline_tr
                         CardCollect cardjson = JsonConvert.DeserializeObject<CardCollect>(rootObject.data);
                         cardjson.belong_to = cardCollect.belong_to;
                         //rootObject.accountBalanceTotal = LongConversion(rootObject.accountBalanceTotal) + LongConversion(cardCollect.accountBalanceTotal);
-                      long amountTotal = (LongConversion(cardjson.amountTotal) + LongConversion(cardCollect.amountTotal));
+                        long amountTotal = (LongConversion(cardjson.amountTotal) + LongConversion(cardCollect.amountTotal));
                         cardjson.amountTotal = amountTotal;//
                         long volumeTotal = (LongConversion(cardjson.volumeTotal) + LongConversion(cardCollect.volumeTotal));
                         cardjson.volumeTotal = volumeTotal;//
@@ -1109,13 +1175,59 @@ SELECT subquery.belong_to,subquery.accountId, count(*) count from (SELECT trx.ac
         /// <exception cref="NotImplementedException"></exception>
         public async Task<IEnumerable<string>> GetBuids()
         {
-            var businessUnitInfos =await _AccountingContext.GetRepository<BusinessUnitInfo>().GetAll()
+            var businessUnitInfos = await _AccountingContext.GetRepository<BusinessUnitInfo>().GetAll()
                 .Where(p => !p.BuName.Contains("集团")).Where(o => !o.BuName.Contains("公司")).ToListAsync();
-            if (businessUnitInfos!=null&&businessUnitInfos.Any()) {
+            if (businessUnitInfos != null && businessUnitInfos.Any())
+            {
                 return businessUnitInfos.Select(p => p.Id.ToString()).ToList();
             }
             return null;
         }
+        /// <summary>
+        /// 获取卡片类型    4 cpu卡,1感应卡
+        /// car 0 - 个人卡, 1 - 员工卡
+        /// </summary>
+        /// <param name="buid"></param>
+        /// <returns></returns>
+        public int GetCarType(string buid, string Car)
+        {
+            int i = 4;
+            if (buid == "fad023b9-333e-4a77-bea9-b07c95e5cad3"
+                || buid == "0c999874-3f3e-434c-8ee7-cd57bc34c33d"
+                || buid == "11902f5e-080a-4f04-9cd4-54ed139292a4"
+                || buid == "3d2122d2-fb89-415a-8310-4d5646804cc0"
+                  || buid == "3d2122d2-fb89-415a-8310-4d5646804cc0"
+                  || buid == "f8c634fd-a231-456f-bd36-c6ee856820bc"
+                  || buid == "db3b74ff-412c-45fb-9887-9b10aa179704"
+                     || buid == "3fc25937-c437-41a6-9a21-0ad387315c91"
+                        || buid == "df7033c4-ea67-48e3-ac4d-344ce22c6dda"
+                )
+            {
+                if (Car == "0")
+                {
+                    //个人卡
+                    i = 3;
+                }
+                else
+                {
+                    //员工卡
+                    i = 1;
+                }
+            }
+            else {
+                if (Car == "0")
+                {
+                    //个人卡
+                    i = 1;
+                }
+                else
+                {
+                    //员工卡
+                    i = 4;
+                }
+            }
+            return i;
+        }
     }
     public class CardCollect
     {

+ 3 - 1
src/MS.Services/Account/IAccountService.cs

@@ -11,7 +11,7 @@ namespace MS.Services
         Task<ExecuteResult<UserData>> Login(LoginViewModel viewModel);
         Task<ExecuteResult<UserData>> syncFromVersion(long versionNo,bool excludingCurrentBu, string specificHeader);
 
-        Task AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date);
+        Task AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date, string Car);
 
 
         /// <summary>
@@ -21,5 +21,7 @@ namespace MS.Services
         Task<IEnumerable<string>> GetBuids();
 
         Task ClearhashValues(string key);
+        void Getdate(string buid, string date, string Car);
+        void addredis(string buid);
     }
 }

+ 15 - 12
src/MS.Services/PosTrxService/PosTrxService.cs

@@ -335,17 +335,8 @@ WHERE
             {
                 where += string.Format(@" and ptli.""FuelItemOriginalGrossAmount""  = '{0}'", FuelItemOriginalGrossAmount);
             }
-            if (FuelItemTransactionEndTime != null)
-            {
-                string sdate = FuelItemTransactionEndTime.Value.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss");
-                string edate = FuelItemTransactionEndTime.Value.AddSeconds(-2).ToString("yyyy-MM-dd HH:mm:ss");
-                where += string.Format(@" and ptli.""FuelItemTransactionEndTime"" >= '{0}' and ptli.""FuelItemTransactionEndTime"" <= '{1}'"
-, edate, sdate);
-            }
-            else
-            {
-                where += string.Format(@" and a.""CreatedDateTime"" >= '{0}'", _startTime);
-            }
+            
+       
 
             try
             {
@@ -353,7 +344,19 @@ WHERE
                       .Where(a => a.HardwareIdentity == sn).FirstOrDefault();
                 var buid = SiteDevices.AsSubjectOfBusinessUnitId;
 
-               var  nozzles = await _unitOfWork.GetRepository<PosTrxMops>().FromSql(string.Format(@"	select ptm.""ResultCode"" ,ptm.""ResultMessage""
+                if (FuelItemTransactionEndTime != null && buid != null &&  buid.ToString() != "5914f34a-b69d-42b9-9fd4-0b8f6fba715e")
+                {
+                    string sdate = FuelItemTransactionEndTime.Value.AddSeconds(1).ToString("yyyy-MM-dd HH:mm:ss");
+                    string edate = FuelItemTransactionEndTime.Value.AddSeconds(-2).ToString("yyyy-MM-dd HH:mm:ss");
+                    where += string.Format(@" and ptli.""FuelItemTransactionEndTime"" >= '{0}' and ptli.""FuelItemTransactionEndTime"" <= '{1}'"
+    , edate, sdate);
+                }
+                else
+                {
+                    where += string.Format(@" and a.""CreatedDateTime"" >= '{0}'", _startTime);
+                }
+
+                var  nozzles = await _unitOfWork.GetRepository<PosTrxMops>().FromSql(string.Format(@"	select ptm.""ResultCode"" ,ptm.""ResultMessage""
 from ""PosTrxes"" as a join ""PosTrxLineItems"" ptli on a.""Id"" = ptli.""PosTrxId"" 
 left join ""PosTrxMops"" ptm ON  a
 .""Id"" = ptm.""PosTrxId"" where ptli.""FuelItemFdcTransactionSeqNo""='{0}'

+ 65 - 6
src/MS.WebApi/Controllers/AccountController.cs

@@ -5,6 +5,7 @@ using MS.Component.Jwt.UserClaim;
 using MS.Models.ViewModel;
 using MS.Services;
 using MS.WebCore.Core;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Threading.Tasks;
 
@@ -37,22 +38,80 @@ namespace MS.WebApi.Controllers
         [Route("syncFromVersion")]
         [HttpPost]
         [AllowAnonymous]
-        public async Task<ExecuteResult<UserData>> syncFromVersion(long versionNo,bool excludingCurrentBu)
+        public async Task<ExecuteResult<UserData>> syncFromVersion(long versionNo, bool excludingCurrentBu)
         {
             var context = _httpContextAccessor.HttpContext;
             var allHeaders = context.Request.Headers; // 获取所有请求头
             var specificHeader = context.Request.Headers["DeviceSN"].ToString(); // 获取指定请求头
-        
+
             return await _accountService.syncFromVersion(versionNo, excludingCurrentBu, specificHeader);
         }
+        [Route("AddEmployeeCardMonthlySummaryToRedisNumberAsync")]
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<bool> AddEmployeeCardMonthlySummaryToRedisNumberAsync(string buid, string date, string Car, int number)
+        {
+            DateTime dateTime = DateTime.Parse(date);
+            for (int i = 0; i < number; i++)
+            {
+                dateTime = dateTime.AddMonths(i);
+                string time = dateTime.ToString("yyyy-MM-dd");
+                await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, time, Car);
+            }
+            //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date,  Car);
+            //for (int i = 0; i < 12; i++)
+            //{
+            //    dateTime = dateTime.AddMonths(i);
+            //    string time = dateTime.ToString("yyyy-MM-dd");
+            //    await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, time);
+            //}
+            return true;
+        }
         [Route("AddEmployeeCardMonthlySummaryToRedisAsync")]
         [HttpPost]
         [AllowAnonymous]
-        public async Task<bool> AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date)
+        public async Task<bool> AddEmployeeCardMonthlySummaryToRedisAsync(string buid, string date, string Car, int number)
         {
-            Guid ssss = Guid.NewGuid();
-
-             await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid,date);
+            await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date, Car);
+            //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date,  Car);
+            //for (int i = 0; i < 12; i++)
+            //{
+            //    dateTime = dateTime.AddMonths(i);
+            //    string time = dateTime.ToString("yyyy-MM-dd");
+            //    await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, time);
+            //}
+            return true;
+        }
+        [Route("AddEmployeeRedisAsync")]
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<bool> AddEmployeeRedisAsync(string buid, string date, string Car, int number)
+        {
+             _accountService.Getdate(buid, date, Car);
+         //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date, Car);
+            //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date,  Car);
+            //for (int i = 0; i < 12; i++)
+            //{
+            //    dateTime = dateTime.AddMonths(i);
+            //    string time = dateTime.ToString("yyyy-MM-dd");
+            //    await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, time);
+            //}
+            return true;
+        }
+        [Route("addredis")]
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<bool> addredis(string buid)
+        {
+            _accountService.addredis(buid);
+            //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date, Car);
+            //   await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, date,  Car);
+            //for (int i = 0; i < 12; i++)
+            //{
+            //    dateTime = dateTime.AddMonths(i);
+            //    string time = dateTime.ToString("yyyy-MM-dd");
+            //    await _accountService.AddEmployeeCardMonthlySummaryToRedisAsync(buid, time);
+            //}
             return true;
         }
         [Route("ClearhashValues")]

+ 5 - 1
src/MS.WebCore/Core/RedisExample.cs

@@ -12,10 +12,14 @@ namespace MS.WebCore.Core
     {
         private static ConnectionMultiplexer redisConnection;
         private static IDatabase redisDb;
+       // string connectionString = "localhost,password=DFS2024@,db=0,connectTimeout=5000";
+        string connectionString = "localhost,password=DFS2024@";
 
         public RedisExample()
         {
-            redisConnection = ConnectionMultiplexer.Connect("localhost");
+
+            redisConnection = ConnectionMultiplexer.Connect(connectionString);
+           // redisConnection = ConnectionMultiplexer.Connect("localhost");
             redisDb = redisConnection.GetDatabase();
         }
 

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

@@ -1423,3 +1423,92 @@
 {"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}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T10:16:12.458786+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T10:49:17.2880908+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T10:59:14.45187+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:00:25.6164058+08:00","EndDate":"2024-04-27T11:02:05.6457783+08:00","Msg":"The operation was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:00:40.6513048+08:00","EndDate":"2024-04-27T11:02:55.9504211+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:12:42.3147981+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:12:54.5187953+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:13:47.892696+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:15:08.6533753+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:19:14.7604071+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:30:16.0784301+08:00","EndDate":"2024-04-27T11:32:46.282264+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T11:30:31.0937315+08:00","EndDate":"2024-04-27T11:33:01.2987642+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T12:00:16.064224+08:00","EndDate":"2024-04-27T12:02:46.3151255+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T12:00:31.0931099+08:00","EndDate":"2024-04-27T12:03:01.3282099+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T12:30:16.0428857+08:00","EndDate":"2024-04-27T12:32:46.3026482+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T12:30:31.0692184+08:00","EndDate":"2024-04-27T12:33:01.3232004+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T13:00:16.0453585+08:00","EndDate":"2024-04-27T13:02:46.3124912+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T13:00:31.0680944+08:00","EndDate":"2024-04-27T13:03:01.3624894+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T13:30:16.0522887+08:00","EndDate":"2024-04-27T13:32:46.3045333+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T13:30:31.0687697+08:00","EndDate":"2024-04-27T13:33:01.3210119+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T14:00:16.074316+08:00","EndDate":"2024-04-27T14:02:46.4561372+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T14:00:31.1172154+08:00","EndDate":"2024-04-27T14:03:01.4788947+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T14:30:16.03135+08:00","EndDate":"2024-04-27T14:32:46.2672515+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T14:30:31.0505026+08:00","EndDate":"2024-04-27T14:33:01.2939675+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T15:00:16.0624877+08:00","EndDate":"2024-04-27T15:02:46.3316843+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T15:00:31.0853448+08:00","EndDate":"2024-04-27T15:03:01.3828723+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T15:30:16.0911824+08:00","EndDate":"2024-04-27T15:32:53.5444733+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T15:30:31.1346579+08:00","EndDate":"2024-04-27T15:33:08.5652273+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T16:00:16.1077664+08:00","EndDate":"2024-04-27T16:02:46.6268007+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T16:00:31.1468583+08:00","EndDate":"2024-04-27T16:03:01.6491125+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T16:30:16.0997384+08:00","EndDate":"2024-04-27T16:32:46.4443022+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T16:30:31.1515234+08:00","EndDate":"2024-04-27T16:33:01.4827812+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T16:59:55.017423+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:00:16.1924265+08:00","EndDate":"2024-04-27T17:01:56.2515805+08:00","Msg":"The operation was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:00:31.2153916+08:00","EndDate":"2024-04-27T17:03:01.666146+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:11:04.2091131+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:14:03.1628358+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:30:16.0780137+08:00","EndDate":"2024-04-27T17:32:46.5659302+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T17:30:31.1357733+08:00","EndDate":"2024-04-27T17:33:01.580228+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T18:00:31.0740727+08:00","EndDate":"2024-04-27T18:03:01.4450773+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T18:00:16.0421966+08:00","EndDate":"2024-04-27T18:03:16.4939308+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T18:30:16.0783786+08:00","EndDate":"2024-04-27T18:32:46.4489548+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T18:30:31.1218746+08:00","EndDate":"2024-04-27T18:33:01.4630243+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T19:00:16.0601973+08:00","EndDate":"2024-04-27T19:02:46.4439089+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T19:00:31.1066436+08:00","EndDate":"2024-04-27T19:03:01.5135198+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T19:30:16.0641621+08:00","EndDate":"2024-04-27T19:32:46.5672776+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T19:30:31.090085+08:00","EndDate":"2024-04-27T19:33:01.593977+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T20:00:16.0990655+08:00","EndDate":"2024-04-27T20:02:46.409553+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T20:00:31.1212297+08:00","EndDate":"2024-04-27T20:03:01.4200827+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T21:04:47.5097583+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T21:30:16.1110496+08:00","EndDate":"2024-04-27T21:32:46.9901012+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T21:30:31.1604548+08:00","EndDate":"2024-04-27T21:33:02.0162149+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T22:00:16.099508+08:00","EndDate":"2024-04-27T22:02:46.4424466+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T22:00:31.1205458+08:00","EndDate":"2024-04-27T22:03:01.4685954+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T22:30:16.2589198+08:00","EndDate":"2024-04-27T22:32:46.6876149+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T22:30:31.2736065+08:00","EndDate":"2024-04-27T22:33:01.7411536+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:19:17.2397041+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:30:16.2942959+08:00","EndDate":"2024-04-27T23:32:46.6798696+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:30:31.3204017+08:00","EndDate":"2024-04-27T23:33:01.698955+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:42:32.8887594+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:44:36.0908873+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-27T23:49:28.4117613+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:15:55.0794113+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:30:16.1056717+08:00","EndDate":"2024-04-28T01:32:46.4943968+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:30:31.1678293+08:00","EndDate":"2024-04-28T01:33:01.5210185+08:00","Msg":"A task was canceled.","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:54:24.1985989+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":null,"EndDate":null,"Msg":"任务新建,未启动,状态为:0","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:55:40.934723+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-28T01:55:40.9721579+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:56:09.447467+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-28T01:56:09.4770497+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T01:56:56.5736061+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-28T01:56:56.6080274+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T02:10:18.8960866+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-28T02:10:18.9271918+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-28T02:16:01.8133068+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-28T02:16:01.8418957+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T01:54:14.8090541+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T01:54:14.843713+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T02:03:10.0310542+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T02:03:10.0635815+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T02:06:38.8827644+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T02:06:38.9097635+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T02:08:04.4837184+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T02:08:04.5121556+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T02:10:22.2862187+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T02:10:22.3139324+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"测试","GroupName":"测试","BeginDate":"2024-04-29T02:16:41.4946391+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}
+{"TaskName":"111","GroupName":"111","BeginDate":"2024-04-29T02:16:41.5287563+08:00","EndDate":null,"Msg":"任务初始化启动成功:6","id":0,"timeflag":null,"changetime":null}

+ 1 - 1
src/QuartzSettings/task_job.json

@@ -1 +1 @@
-[{"TaskName":"测试","GroupName":"测试","Interval":"1-2 0/30 * * * ? ","ApiUrl":"http://localhost:8721/api/membershipGroup/UpdateAsync","Describe":null,"LastRunTime":"2023-05-30T11:00:50","Status":6,"TaskType":2,"ApiRequestType":"POST","ApiAuthKey":null,"ApiAuthValue":null,"ApiParameter":null,"DllClassName":null,"DllActionName":null,"id":1,"timeflag":null,"changetime":null}]
+[{"TaskName":"测试","GroupName":"测试","Interval":"1-2 0/30 * * * ? ","ApiUrl":"http://localhost:8721/api/membershipGroup/UpdateAsync","Describe":null,"LastRunTime":"2023-05-30T11:00:50","Status":6,"TaskType":2,"ApiRequestType":"POST","ApiAuthKey":null,"ApiAuthValue":null,"ApiParameter":null,"DllClassName":null,"DllActionName":null,"id":1,"timeflag":null,"changetime":null},{"TaskName":"111","GroupName":"111","Interval":"0 0 0/1 * * ? ","ApiUrl":"http://localhost:8721/api/Account/AddEmployeeRedisAsync?buid=c75b2e74-d51e-42ae-bc89-2d39312c9c30&date=2020-09-01&Car=0","Describe":null,"LastRunTime":"2024-04-28T01:56:19","Status":6,"TaskType":2,"ApiRequestType":"GET","ApiAuthKey":null,"ApiAuthValue":null,"ApiParameter":null,"DllClassName":null,"DllActionName":null,"id":2,"timeflag":null,"changetime":null}]