zhibinlv
/
QRAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新后端恢复分页

master
赵新宇 2 weeks ago
parent
20af4419d8
commit
1678a8a515
7 changed files with 203 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs
  2. 2
      API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs
  3. 2
      API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs
  4. 70
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  5. 26
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  6. 2
      API/Wood.Service/Controllers/NormalBaseController.cs
  7. 248
      API/Wood.Service/Controllers/TaskConifgureController.cs

2
API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_EMPLOYEE_DT_DTO.cs
View File

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 人员资质信息 /// 人员资质信息
/// </summary> /// </summary>
public class SUPPLIER_EMPLOYEE_DT_DTO : BaseEntity_NoTask public class SUPPLIER_EMPLOYEE_DT_DTO
{ {
/// <summary> /// <summary>
/// 供应商代码 /// 供应商代码

2
API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_INFO_DT_DTO.cs
View File

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary> /// <summary>
/// 供应商基础信息 /// 供应商基础信息
/// </summary> /// </summary>
public class SUPPLIER_INFO_DT_DTO : BaseEntity_NoTask public class SUPPLIER_INFO_DT_DTO
{ {
/// <summary> /// <summary>
/// 供应商代码 /// 供应商代码

2
API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs
View File

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary> /// <summary>
/// 工艺装备 /// 工艺装备
/// </summary> /// </summary>
public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT : BaseEntity_NoTask public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT
{ {
/// <summary> /// <summary>
/// 供应商代码 /// 供应商代码

70
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
View File

@ -1,25 +1,31 @@
using System.Data; using Azure.Core;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using Azure.Core;
using Dapper; using Dapper;
using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Core.Extension;
using Magicodes.ExporterAndImporter.Excel; using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Omu.ValueInjecter;
using System.Data;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Security.Policy;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using TaskManager.Contracts.Dtos; using TaskManager.Contracts.Dtos;
using TaskManager.Entity; using TaskManager.Entity;
using TaskManager.EntityFramework; using TaskManager.EntityFramework;
using TaskManager.EntityFramework.Repository; using TaskManager.EntityFramework.Repository;
using static Dapper.SqlMapper;
namespace TaskManager.Controllers namespace TaskManager.Controllers
{ {
public class CheryRecurringJobInputPageController<T,OUTPUT> : RecurringJobBaseController where T : BaseEntity ,new() public class CheryRecurringJobInputPageController<T,TDTO> : RecurringJobBaseController
where T : BaseEntity ,new()
where TDTO:class,new()
{ {
protected readonly IRepository<T> _repository; protected readonly IRepository<T> _repository;
public CheryRecurringJobInputPageController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<T> repository) : base(httpClient, jobDbContext, log) public CheryRecurringJobInputPageController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<T> repository) : base(httpClient, jobDbContext, log)
@ -27,6 +33,32 @@ namespace TaskManager.Controllers
_repository = repository; _repository = repository;
} }
/// <summary>
/// 手工发送调用接口
/// </summary>
/// <param name="taskName">任务名称</param>
/// <param name="inputdate">请求日期</param>
/// <param name="client">客户(Chery)</param>
/// <returns></returns>
[HttpGet]
public virtual async Task CustomInvokeAsync(string taskName, string client)
{
var first = _jobDbContext.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName && p.Client == client);
if (first == null)
{
await _logger.AddError($"手工调用接口{taskName}任务没找到", taskName);
return;
}
Url = first.Url;
Path = first.Api;
TaskName = first.TaskName;
Client = client;
await SyncTaskSubTable(TaskName, Client);
}
protected override async Task DoExecutingAsync(string url, string path, string takName, string client) protected override async Task DoExecutingAsync(string url, string path, string takName, string client)
{ {
Url = url; Url = url;
@ -36,7 +68,7 @@ namespace TaskManager.Controllers
await SyncTaskSubTable(TaskName,Client); await SyncTaskSubTable(TaskName,Client);
} }
private async Task<QRReturnInfo> PostPageAsync(PagedRequest<T> t) private async Task<QRReturnInfo> PostPageAsync(PagedRequest<TDTO> t)
{ {
try try
{ {
@ -108,13 +140,11 @@ namespace TaskManager.Controllers
private async Task SyncTaskSubTable(string taskName, string client) private async Task SyncTaskSubTable(string taskName, string client)
{ {
if (string.IsNullOrEmpty(taskName) || string.IsNullOrEmpty(client)) if (string.IsNullOrEmpty(taskName) || string.IsNullOrEmpty(client))
{ {
await _logger.AddError("任务名称或客户端不能为空",taskName); await _logger.AddError("任务名称或客户端不能为空",taskName);
return; return;
} }
var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client).ToList(); var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client).ToList();
int pageSize = 1000; int pageSize = 1000;
if (!sublist.Any()) if (!sublist.Any())
@ -129,20 +159,28 @@ namespace TaskManager.Controllers
var total = entites.Count(); var total = entites.Count();
int totalPages = (int)Math.Ceiling((double)total / pageSize); int totalPages = (int)Math.Ceiling((double)total / pageSize);
for (int i = 1; i <= totalPages; i++) for (int i = sub.SyncedPageCount; i <= totalPages; i++)
{ {
var records = entites.Skip((i - 1) * pageSize) var records = entites.Skip((i - 1) * pageSize)
.Take(pageSize).ToList(); .Take(pageSize).ToList();
#region dto转换作为参数发给
PagedRequest<T> pagedRequest = new PagedRequest<T>() List<TDTO> dtos = new List<TDTO>();
foreach (var itm in records)
{
TDTO dto = new TDTO();
dto.InjectFrom(itm);
dtos.Add(dto);
}
PagedRequest<TDTO> pagedRequest = new PagedRequest<TDTO>()
{ {
batchNo = GenerateRandomStringWith8EG(), batchNo = GenerateRandomStringWith8EG(),
total = entites.Count(), total = entites.Count(),
pageSize = pageSize, pageSize = pageSize,
list = records, list = dtos,
pageNum = i pageNum = i
}; };
#endregion
foreach (var itm in records) foreach (var itm in records)
{ {
itm.WriteState = true; itm.WriteState = true;
@ -237,7 +275,7 @@ namespace TaskManager.Controllers
Expression<Func<T, bool>> filter = null; Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
return new JsonResult(pagedResult); return Ok(pagedResult);
} }
[HttpGet] [HttpGet]

26
API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
View File

@ -7,6 +7,7 @@ using Magicodes.ExporterAndImporter.Excel;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.HttpResults;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@ -302,11 +303,26 @@ namespace TaskManager.Controllers
} }
} }
[NonAction] /// <summary>
public virtual async Task TestAsync(string url, string path, string taskName, string inputdate) /// 手工获取调用接口
/// </summary>
/// <param name="taskName">任务名称</param>
/// <param name="inputdate">请求日期</param>
/// <param name="client">客户(Chery)</param>
/// <returns></returns>
[HttpGet]
public virtual async Task CustomInvokeAsync(string taskName, string inputdate,string client)
{ {
Url = url; var first= _jobDbContext.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName && p.Client == client);
Path = path; if (first == null)
{
await _logger.AddError($"手工调用接口{taskName}没找到", taskName);
return;
}
Url =first.Url;
Path = first.Api;
TaskName = taskName; TaskName = taskName;
await FetchAllDataAsync(inputdate); await FetchAllDataAsync(inputdate);
} }
@ -408,7 +424,7 @@ namespace TaskManager.Controllers
Expression<Func<T, bool>> filter = null; Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
return new JsonResult(pagedResult); return Ok(pagedResult);
} }
/// <summary> /// <summary>

2
API/Wood.Service/Controllers/NormalBaseController.cs
View File

@ -130,7 +130,7 @@ namespace Wood.Service.Controllers
Expression<Func<T, bool>> filter = null; Expression<Func<T, bool>> filter = null;
var pagedResult = await _repository.GetPagedAsync(filter, pagingParams); var pagedResult = await _repository.GetPagedAsync(filter, pagingParams);
return new JsonResult(pagedResult); return Ok(pagedResult);
} }
/// <summary> /// <summary>

248
API/Wood.Service/Controllers/TaskConifgureController.cs
View File

@ -71,164 +71,164 @@ namespace TaskManager.Controllers
/// <summary> ///// <summary>
/// 执行铁定任务 ///// 执行铁定任务
/// </summary> ///// </summary>
/// <param name="taskName"></param> ///// <param name="taskName"></param>
/// <returns></returns> ///// <returns></returns>
[NonAction] //[NonAction]
public async Task testTask(string taskName) //public async Task testTask(string taskName)
{ //{
var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName); // var first = await _context.TaskConifgure.FirstOrDefaultAsync(p => p.TaskName == taskName);
var url = first.Url; // var url = first.Url;
var path = first.Api; // var path = first.Api;
var controller = _builder.GetRequiredService<SupplierProPlaningService>(); // var controller = _builder.GetRequiredService<SupplierProPlaningService>();
await controller.TestAsync(url, path, taskName, "2025-04-21"); // await controller.TestAsync(url, path, taskName, "2025-04-21");
} //}
[NonAction] //[NonAction]
public async Task TaskAllAsync(string date) //public async Task TaskAllAsync(string date)
{ //{
var tasks = _context.TaskConifgure.Where(p => p.IsAuto == true && !string.IsNullOrEmpty(p.Corn) // var tasks = _context.TaskConifgure.Where(p => p.IsAuto == true && !string.IsNullOrEmpty(p.Corn)
&& !string.IsNullOrEmpty(p.Api) && !string.IsNullOrEmpty(p.Url)).ToList(); // && !string.IsNullOrEmpty(p.Api) && !string.IsNullOrEmpty(p.Url)).ToList();
foreach (var task in tasks) // foreach (var task in tasks)
{ // {
try // try
{ // {
var url = task.Url; // var url = task.Url;
var path = task.Api; // var path = task.Api;
var taskname = task.TaskName; // var taskname = task.TaskName;
switch (task.TaskName) // switch (task.TaskName)
{ // {
//case "整车月度生产计划1": // //case "整车月度生产计划1":
// // 添加的代码块 // // // 添加的代码块
// var controller1 = _builder.GetRequiredService<SupplierProPlaningService>(); // // var controller1 = _builder.GetRequiredService<SupplierProPlaningService>();
// await controller1.TestAsync(url, path, taskname, "2025-05-29"); // // await controller1.TestAsync(url, path, taskname, "2025-05-29");
// break; // // break;
case "M+6月物料需求计划1": // case "M+6月物料需求计划1":
// 添加的代码块 // // 添加的代码块
var controller2 = _builder.GetRequiredService<CherySupplierMrpMonthService>(); // var controller2 = _builder.GetRequiredService<CherySupplierMrpMonthService>();
await controller2.TestAsync(url, path, taskname, "2025-05-29"); // await controller2.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "整车月度生产计划2": // case "整车月度生产计划2":
// 添加的代码块 // // 添加的代码块
var controller3 = _builder.GetRequiredService<SupplierProPlaningService>(); // var controller3 = _builder.GetRequiredService<SupplierProPlaningService>();
await controller3.TestAsync(url, path, taskname, "2025-05-29"); // await controller3.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "M+6月物料需求计划2": // case "M+6月物料需求计划2":
// 添加的代码块 // // 添加的代码块
var controller4 = _builder.GetRequiredService<CherySupplierMrpMonthService>(); // var controller4 = _builder.GetRequiredService<CherySupplierMrpMonthService>();
await controller4.TestAsync(url, path, taskname, "2025-05-29"); // await controller4.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "日物料需求计划": // case "日物料需求计划":
// 添加的代码块 // // 添加的代码块
var controller5 = _builder.GetRequiredService<CherySupplierMrpDataService>(); // var controller5 = _builder.GetRequiredService<CherySupplierMrpDataService>();
await controller5.TestAsync(url, path, taskname, "2025-05-29"); // await controller5.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "计划协议": // case "计划协议":
// 添加的代码块 // // 添加的代码块
var controller6 = _builder.GetRequiredService<CherySupplierSaWeekService>(); // var controller6 = _builder.GetRequiredService<CherySupplierSaWeekService>();
await controller6.TestAsync(url, path, taskname, "2025-05-29"); // await controller6.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "采购订单": // case "采购订单":
// 添加的代码块 // // 添加的代码块
var controller7 = _builder.GetRequiredService<CherySupplierPoService>(); // var controller7 = _builder.GetRequiredService<CherySupplierPoService>();
await controller7.TestAsync(url, path, taskname, "2025-05-29"); // await controller7.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "过焊装未过总装": // case "过焊装未过总装":
// 添加的代码块 // // 添加的代码块
var controller8 = _builder.GetRequiredService<CherySupplierPorHSCHEDULService>(); // var controller8 = _builder.GetRequiredService<CherySupplierPorHSCHEDULService>();
await controller8.TestAsync(url, path, taskname, "2025-05-29"); // await controller8.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "过涂装未过总装": // case "过涂装未过总装":
// 添加的代码块 // // 添加的代码块
var controller9 = _builder.GetRequiredService<CherySupplierProTSCHEDULService>(); // var controller9 = _builder.GetRequiredService<CherySupplierProTSCHEDULService>();
await controller9.TestAsync(url, path, taskname, "2025-05-29"); // await controller9.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "排序供货": // case "排序供货":
// 添加的代码块 // // 添加的代码块
var controller10 = _builder.GetRequiredService<CherySupplierProCSCHEDULService>(); // var controller10 = _builder.GetRequiredService<CherySupplierProCSCHEDULService>();
await controller10.TestAsync(url, path, taskname, "2025-05-29"); // await controller10.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "看板配送单": // case "看板配送单":
// 添加的代码块 // // 添加的代码块
var controller11 = _builder.GetRequiredService<CherySupplierDelStateService>(); // var controller11 = _builder.GetRequiredService<CherySupplierDelStateService>();
await controller11.TestAsync(url, path, taskname, "2025-05-29"); // await controller11.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "退货单": // case "退货单":
// 添加的代码块 // // 添加的代码块
var controller12 = _builder.GetRequiredService<CherySupplierReturnService>(); // var controller12 = _builder.GetRequiredService<CherySupplierReturnService>();
await controller12.TestAsync(url, path, taskname, "2025-05-29"); // await controller12.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "奇瑞RDC共享库存": // case "奇瑞RDC共享库存":
// 添加的代码块 // // 添加的代码块
var controller13 = _builder.GetRequiredService<SupplierInvDataService>(); // var controller13 = _builder.GetRequiredService<SupplierInvDataService>();
await controller13.TestAsync(url, path, taskname, "2025-05-29"); // await controller13.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "日MRP状态监控": // case "日MRP状态监控":
// 添加的代码块 // // 添加的代码块
var controller14 = _builder.GetRequiredService<CherySupplierMrpDataService>(); // var controller14 = _builder.GetRequiredService<CherySupplierMrpDataService>();
await controller14.TestAsync(url, path, taskname, "2025-05-29"); // await controller14.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "日MRP预警推移": // case "日MRP预警推移":
// 添加的代码块 // // 添加的代码块
var controller15 = _builder.GetRequiredService<CherySupplierMrpWarningService>(); // var controller15 = _builder.GetRequiredService<CherySupplierMrpWarningService>();
await controller15.TestAsync(url, path, taskname, "2025-05-29"); // await controller15.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "供应商共享库存-上午": // case "供应商共享库存-上午":
// 添加的代码块 // // 添加的代码块
var controller19 = _builder.GetRequiredService<CherySupplierSinvDataService>(); // var controller19 = _builder.GetRequiredService<CherySupplierSinvDataService>();
await controller19.TestAsync(url, path, taskname, "2025-05-29"); // await controller19.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
case "供应商共享库存-晚上": // case "供应商共享库存-晚上":
// 添加的代码块 // // 添加的代码块
var controller20 = _builder.GetRequiredService<CherySupplierSinvDataService>(); // var controller20 = _builder.GetRequiredService<CherySupplierSinvDataService>();
await controller20.TestAsync(url, path, taskname, "2025-05-29"); // await controller20.TestAsync(url, path, taskname, "2025-05-29");
break; // break;
} // }
} // }
catch // catch
{ // {
} // }
@ -241,8 +241,8 @@ namespace TaskManager.Controllers
} // }
} //}

Write Preview
Loading…
Cancel
Save