diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 8ce317b..ba429e3 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -163,9 +163,7 @@ namespace TaskManager.Controllers { foreach (var sub in sublist) { - string querystr = $"select * from {sub.TableName} where TaskId='{sub.TaskId}' and WriteState=0 and ReadState=1 order by uid";//任务表 - var entites = _jobDbContext.Database.GetDbConnection().Query(querystr);//明细表 if (entites.Any()) { diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs index b2d0f2d..99bad50 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs @@ -215,6 +215,7 @@ namespace TaskManager.Controllers } catch (Exception ex) { + await _logger.AddError(ex.Message, TaskName, taskId, DateTime.Now.ToString("yyyyMMdd")); await transaction.RollbackAsync(); } diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index 9c593a7..6f91ad9 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -302,34 +302,7 @@ namespace TaskManager.Controllers pageList.Add(entity); allData.Add(itm); } - - - - //if (readedcount > 0) - //{ - // var listrows = pageResponse.Data.Rows.Where(p => !ids.Contains(p.Id)); - // foreach (var itm in pageResponse.Data.Rows) - // { - // T entity = new T(); - // entity.InjectFrom(itm); - - - // entity.CreationTime = DateTime.Now; - // pageList.Add(entity); - // allData.Add(itm); - // } - //} - //else - //{ - // foreach (var itm in pageResponse.Data.Rows) - // { - // T entity = new T(); - // entity.InjectFrom(itm); - // entity.CreationTime = DateTime.Now; - // pageList.Add(entity); - // allData.Add(itm); - // } - //} + if (pageList.Any()) { await InsertDataAsync(pageList); diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index 84e325f..f84372c 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -125,17 +125,6 @@ namespace TaskManager.Controllers private string GenerateSign(string method, string path, string appKey, string appSecret, string timestamp, string nonce, string jsonBody) { - //var options = new JsonSerializerOptions - //{ - // WriteIndented = true, // 格式化缩进,方便阅读 - // Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All) - //}; - - //byte[] utf8Bytes = JsonSerializer.SerializeToUtf8Bytes(jsonBody, options); - //// 转成字符串(若需要字符串形式,可按需操作,不过直接传字节更高效) - //string jsonStr = Encoding.UTF8.GetString(utf8Bytes); - - string paramStr = $"method={method.ToUpper()}&path={path}&appKey={appKey}&appSecret={appSecret}×tamp={timestamp}&nonce={nonce}&jsonBody={jsonBody}"; return ComputeSHA512(paramStr);