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

更新

master
赵新宇 1 week ago
parent
1970fa6b1e
commit
ce98981af6
4 changed files with 70 additions and 52 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. 9
      API/TaskManager.EntityFramework/IRepository/IRepository.cs
  2. 15
      API/TaskManager.EntityFramework/Repository/Repository.cs
  3. 1
      API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj
  4. 95
      API/Wood.Service/Controllers/TaskSubService.cs

9
API/TaskManager.EntityFramework/IRepository/IRepository.cs
View File

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using TaskManager.Entity; using TaskManager.Entity;
using TaskManager.EntityFramework.Repository; using TaskManager.EntityFramework.Repository;
using Wood.Util.Filters; using Wood.Util.Filters;
using Z.BulkOperations;
namespace TaskManager.EntityFramework namespace TaskManager.EntityFramework
{ {
@ -19,6 +20,14 @@ namespace TaskManager.EntityFramework
Task UpdateAsync(TEntity entity); Task UpdateAsync(TEntity entity);
Task DeleteAsync(long id); Task DeleteAsync(long id);
/// <summary>
/// 批量合拼
/// </summary>
/// <param name="entities"></param>
/// <returns></returns>
Task BlukMergeAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action);
Task BlukInsertAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action);
Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams); Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams);

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

@ -12,6 +12,7 @@ using TaskManager.Entity;
using TaskManager.EntityFramework; using TaskManager.EntityFramework;
using Wood.Util; using Wood.Util;
using Wood.Util.Filters; using Wood.Util.Filters;
using Z.BulkOperations;
namespace TaskManager.EntityFramework.Repository namespace TaskManager.EntityFramework.Repository
{ {
@ -66,6 +67,20 @@ namespace TaskManager.EntityFramework.Repository
} }
} }
public async Task BlukMergeAsync(List<TEntity> entities,Action<BulkOperation<TEntity>> action)
{
_context.BulkMerge(entities, action);
}
public async Task BlukInsertAsync(List<TEntity> entities, Action<BulkOperation<TEntity>> action)
{
_context.BulkInsert(entities, action);
}
public async Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams) public async Task<PagedResult<TEntity>> GetPagedAsync(PagingParams pagingParams)
{ {
return await _dbSet.AsNoTracking().ToPagedListAsync(pagingParams); return await _dbSet.AsNoTracking().ToPagedListAsync(pagingParams);

1
API/TaskManager.EntityFramework/TaskManager.EntityFramework.csproj
View File

@ -18,6 +18,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Z.EntityFramework.Extensions.EFCore" Version="8.103.8.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -27,7 +27,6 @@ namespace Wood.Service.Controllers
{ {
} }
//private async Task<PagedResult<T>> GetDataPagedAsync<T,TService,TDTO>(RequestInputBase input) //private async Task<PagedResult<T>> GetDataPagedAsync<T,TService,TDTO>(RequestInputBase input)
// where T : BaseEntity,new() // where T : BaseEntity,new()
// where TService :CheryRecurringJobInputPageController<T,TDTO> ,new() // where TService :CheryRecurringJobInputPageController<T,TDTO> ,new()
@ -54,17 +53,11 @@ namespace Wood.Service.Controllers
var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>(); var stockservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(stocktask); requestInputBase.Condition.Filters.Remove(stocktask);
var schedresult = await schedservice.GetDataPaged(requestInputBase); var stockresult = await stockservice.GetDataPaged(requestInputBase);
return Ok(schedresult.Value); return Ok(stockresult.Value);
//_builder.GetRequiredService(requestInputBase);
break;
case "SUPPLIER_PRO_SCHEDULING": case "SUPPLIER_PRO_SCHEDULING":
var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>(); var schedservice = _builder.GetRequiredService<CherySupplierProSchedulingService>();
@ -135,48 +128,48 @@ namespace Wood.Service.Controllers
var flawresult = await flawservice.GetDataPaged(requestInputBase); var flawresult = await flawservice.GetDataPaged(requestInputBase);
return Ok(flawresult.Value); return Ok(flawresult.Value);
case "SUPPLIER_PRO_ENVIRONMENT": //case "SUPPLIER_PRO_ENVIRONMENT":
var dataservice = _builder.GetRequiredService<envir>(); // var dataservice = _builder.GetRequiredService<envir>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase); // var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
var rateservice = _builder.GetRequiredService<>(); // var rateservice = _builder.GetRequiredService<>();
var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var tateresult = await dataservice.GetDataPaged(requestInputBase); // var tateresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
break; // break;
case "SUPPLIER_PRO_OEE_TIME_DETAILS": //case "SUPPLIER_PRO_OEE_TIME_DETAILS":
var detailservice = _builder.GetRequiredService<>(); // var detailservice = _builder.GetRequiredService<>();
var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var detailresult = await dataservice.GetDataPaged(requestInputBase); // var detailresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
break; // break;
case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
var dataservice = _builder.GetRequiredService<>(); // var dataservice = _builder.GetRequiredService<>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase); // var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
break; // break;
case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
var dataservice = _builder.GetRequiredService<CherySupplierProDataService>(); // var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase); // var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
break; // break;
case "SUPPLIER_PRO_PROCESS"://工艺 //case "SUPPLIER_PRO_PROCESS"://工艺
var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>(); // var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
requestInputBase.Condition.Filters.Remove(datatask); // requestInputBase.Condition.Filters.Remove(datatask);
var dataresult = await dataservice.GetDataPaged(requestInputBase); // var dataresult = await dataservice.GetDataPaged(requestInputBase);
return Ok(dataresult.Value); // return Ok(dataresult.Value);
break; // break;

Write Preview
Loading…
Cancel
Save