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

提交更新

master
赵新宇 3 weeks ago
parent
12663282be
commit
018f4bd103
4 changed files with 113 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      API/TaskManager.Entity/Entity.cs
  2. 10
      API/TaskManager.EntityFramework/Repository/Repository.cs
  3. 2
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs
  4. 197
      API/Wood.Service/Controllers/TaskSubService.cs

11
API/TaskManager.Entity/Entity.cs
View File

@ -226,26 +226,30 @@ namespace TaskManager.Entity
public class TaskSub:BaseEntity
{
[ExporterHeader(DisplayName = "表名")]
[MaxLength(30)]
/// <summary>
/// 关联的数据表名称（如：订单表、用户表等，可为空）
/// </summary>
public string? TableName { get; set; }
[ExporterHeader(DisplayName = "任务名称")]
[MaxLength(30)]
/// <summary>
/// 任务名称（用于业务层面标识任务，如：数据同步任务、报表生成任务）
/// </summary>
public string? TaskName { get; set; }
[ExporterHeader(DisplayName = "同步总数量")]
/// <summary>
/// 数据总量（任务处理的数据条目数）
/// </summary>
public int DataCount { get; set; }
[ExporterHeader(DisplayName = "客户名")]
[MaxLength(30)]
/// <summary>
/// 发布给那个客户
/// </summary>
public string? Subscriber { get; set; }
[ExporterHeader(DisplayName = "失败次数")]
/// <summary>
/// 失败次数（任务执行失败的累计次数）
/// </summary>
@ -255,20 +259,24 @@ namespace TaskManager.Entity
/// 失败详情（记录失败原因、异常堆栈等信息，支持长文本）
/// </summary>
[ExporterHeader(DisplayName = "失败信息")]
[MaxLength(30)]
public string? FailedInfo { get; set; }
/// <summary>
/// 所属域（多租户场景下标识租户，如：租户A、租户B）
/// </summary>
[ExporterHeader(DisplayName = "域名")]
[MaxLength(30)]
public string? Domain { get; set; }
/// <summary>
/// 站点标识（多站点部署时标识所属站点，如：Site1、Site2）
/// </summary>
[ExporterHeader(DisplayName = "站点")]
[MaxLength(30)]
public string Site { get; set; }
[ExporterHeader(DisplayName = "创建用户")]
[MaxLength(30)]
/// <summary>
/// 从那个内部系统创建系统
/// </summary>
@ -284,6 +292,7 @@ namespace TaskManager.Entity
/// </summary>
public string? Remark { get; set; }
[ExporterHeader(DisplayName = "更新客户系统名")]
[MaxLength(30)]
/// <summary>
/// 最后更新人（记录任务最后修改者）
/// </summary>

10
API/TaskManager.EntityFramework/Repository/Repository.cs
View File

@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using Serilog;
using System;
using System.Collections.Generic;
@ -47,7 +48,14 @@ namespace TaskManager.EntityFramework.Repository
public async Task UpdateAsync(TEntity entity)
{
//product 已前台更新后
_context.Attach(entity);
_context.Entry(entity).State = EntityState.Modified;
_dbSet.Update(entity);
await _context.SaveChangesAsync();
}

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

@ -253,6 +253,8 @@ namespace TaskManager.Controllers
{
T entity = new T();
entity.InjectFrom(itm);
entity.CreationTime = DateTime.Now;
pageList.Add(entity);
allData.Add(itm);

197
API/Wood.Service/Controllers/TaskSubService.cs
View File

@ -51,36 +51,44 @@ namespace Wood.Service.Controllers
{
case "SUPPLIER_PRO_MATERIAL_STOCK":
var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(stocktask);
var schedresult = await schedservice.GetDataPaged(requestInputBase);
return Ok(schedresult.Value);
//_builder.GetRequiredService(requestInputBase);
//_builder.GetRequiredService(requestInputBase);
break;
case "SUPPLIER_PRO_SCHEDULING":
//RecurringJob.AddOrUpdate<>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var schedtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(schedtask);
var schedresult = await schedservice.GetDataPaged(requestInputBase);
return Ok(schedresult.Value);
case "SUPPLIER_INFO":
//RecurringJob.AddOrUpdate<>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var infoservice = _builder.GetRequiredService<CherySupplierInfoService>();
var infotask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(infotask);
var inforesult = await infoservice.GetDataPaged(requestInputBase);
return Ok(inforesult.Value);
case "SUPPLIER_EMPLOYEE"://人员资质信息
//RecurringJob.AddOrUpdate<SUPPLIER_EMPLOYEE_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var emplyeeservice = _builder.GetRequiredService<CherySupplierEmployeeService>();
var emplyeetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(emplyeetask);
var emplyeeresult = await emplyeeservice.GetDataPaged(requestInputBase);
return Ok(emplyeeresult.Value);
case "SUPPLIER_BOM"://BOM主数据
var bomservice = _builder.GetRequiredService<CherySupplierBomService>();
@ -91,104 +99,83 @@ namespace Wood.Service.Controllers
case "SUPPLIER_PRO_CPS"://过程控制项质量数据
//var service = _builder.GetRequiredService<CherySupplierBomService>();
//var task = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
//requestInputBase.Condition.Filters.Remove(task);
//var result = await service.GetDataPaged(requestInputBase);
//return Ok(result.Value);
var cpsservice = _builder.GetRequiredService<CherySupplierProCpsService>();
var cpstask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(cpstask);
var result = await cpsservice.GetDataPaged(requestInputBase);
return Ok(result.Value);
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_CPS_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
case "SUPPLIER_PRO_DATA":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_DATA_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
case "SUPPLIER_PRO_FIRST_PASSYIELD":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_FIRST_PASSYIELD_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var passyieldservice = _builder.GetRequiredService<CherySupplierProFirstPassyieldService>();
var passyieldtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(passyieldtask);
var passyieldresult = await passyieldservice.GetDataPaged(requestInputBase);
return Ok(passyieldresult.Value);
case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_STATION_FIRST_PASSYIELD_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var pasyservice = _builder.GetRequiredService<CherySupplierProStationFirstPassyieldService>();
var pasytask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(pasytask);
var pasyresult = await pasyservice.GetDataPaged(requestInputBase);
return Ok(pasyresult.Value);
case "SUPPLIER_PRO_FLAW":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_FLAW_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var flawservice = _builder.GetRequiredService<CherySupplierProFlawService>();
var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(flawtask);
var flawresult = await flawservice.GetDataPaged(requestInputBase);
return Ok(flawresult.Value);
case "SUPPLIER_PRO_ENVIRONMENT":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_ENVIRONMENT_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
break;
var dataservice = _builder.GetRequiredService<envir>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
var rateservice = _builder.GetRequiredService<>();
var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var tateresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
break;
case "SUPPLIER_PRO_OEE_TIME_DETAILS":
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_TIME_DETAILS_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
var detailservice = _builder.GetRequiredService<>();
var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var detailresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
break;
case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_MATERIAL_DATA_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
var dataservice = _builder.GetRequiredService<>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
break;
case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
//RecurringJob.AddOrUpdate<SUPPLIER_PRO_PROCESS_EQUIPMENT_CONTROLLER>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
break;
case "SUPPLIER_PRO_PROCESS"://工艺
//RecurringJob.AddOrUpdate<>(
// task.TaskName,
// x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
// task.Corn,
// TimeZoneInfo.Local
//);
var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value);
break;

Write Preview
Loading…
Cancel
Save