From bbc0059f8f92bf498eb5fc174d612719dae74ad7 Mon Sep 17 00:00:00 2001 From: mahao Date: Thu, 13 Jul 2023 08:39:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=97=AE=E4=BD=BF=E7=94=A8Get=E3=80=81Post=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BQ/TB_RePartsRelationship_SERVICE.cs | 7 ++-- .../Entities/Boms/BomAppService.cs | 6 ++-- .../CodeSettingAppService.cs | 25 +++------------ .../Controls/CentralizedControlAppService.cs | 8 ++--- .../MaterialRelationshipAppService.cs | 32 ++++--------------- .../Entities/Materials/MaterialAppService.cs | 8 ++--- .../Entities/Prices/PriceListAppService.cs | 11 ++----- .../Entities/Prices/PriceListAppServiceBJ.cs | 7 ++-- 8 files changed, 25 insertions(+), 79 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs index 510f3358..030a409b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// 客户替换件关系 /// [AllowAnonymous] - [Route("api/settleaccount/TB_RePartsRelationship_SERVICE")] + [Route("api/settleaccount/[controller]/[action]")] public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase { /// @@ -48,7 +48,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// 导入 /// [HttpPost] - [Route("Import")] public async Task ImportAsync([FromForm] IFormFileCollection files) { ExportImporter _exportImporter = new ExportImporter(); @@ -94,7 +93,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// 导出 /// [HttpPost] - [Route("Export")] public async Task ExportAsync(RequestDto input) { string fileName = $"客户替换件关系_{Guid.NewGuid()}.xlsx"; @@ -114,8 +112,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] public async Task> GetListAsync(RequestDto input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs index d54a51e2..dd2bcfae 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Boms/BomAppService.cs @@ -23,7 +23,7 @@ namespace Win.Sfs.SettleAccount.Boms /// BOM /// [AllowAnonymous] - [Route("api/settleaccount/BomAppService")] + [Route("api/settleaccount/[controller]/[action]")] public class BomAppService : SettleAccountApplicationBase { /// @@ -50,7 +50,6 @@ namespace Win.Sfs.SettleAccount.Boms /// /// [HttpPost] - [Route("Export")] public virtual async Task ExportAsync(BomRequestDto input) { string _fileName = string.Format("BOM_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd")); @@ -81,8 +80,7 @@ namespace Win.Sfs.SettleAccount.Boms /// /// ȡб /// - [HttpPost] - [Route("list")] + [HttpGet] public async Task> GetListAsync(BomRequestDto input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CodeSettingTables/CodeSettingAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CodeSettingTables/CodeSettingAppService.cs index f175ca8b..1f2fcb96 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CodeSettingTables/CodeSettingAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CodeSettingTables/CodeSettingAppService.cs @@ -35,7 +35,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// [Authorize(SettleAccountPermissions.CodeSettings.Default)] - [Route("api/settleaccount/CodeSetting")] + [Route("api/settleaccount/[controller]/[action]")] public class CodeSettingAppService : SettleAccountApplicationBase, ICodeSettingAppService { private readonly ISettleAccountBranchEfCoreRepository _mapRepository; @@ -70,9 +70,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// 上传的文件(前端已经限制只能上传一个附件) /// [HttpPost] - [Route("ExcelImport-Map")] [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.CodeSettings.Create)] public async Task CodeSettingUploadExcelImportMap([FromForm] IFormFileCollection files) { @@ -107,9 +105,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// 上传的文件(前端已经限制只能上传一个附件) /// [HttpPost] - [Route("ExcelImport")] [DisableRequestSizeLimit] - [Authorize(SettleAccountPermissions.CodeSettings.Create)] public async Task CodeSettingUploadExcelImport([FromForm] IFormFileCollection files) { @@ -148,7 +144,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// ID /// 实体DTO [HttpGet] - [Route("{id}")] virtual public async Task GetAsync(Guid id) { var result = await _repository.GetAsync(id); @@ -184,8 +179,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// /// 请求条件 /// 实体DTO列表 - [HttpPost] - [Route("list")] + [HttpGet] virtual public async Task> GetListAsync(CodeSettingRequestDto input) { var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount, @@ -203,7 +197,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// /// 实体总数 [HttpGet] - [Route("count")] virtual public async Task GetTotalCountAsync(Guid branchId) { return await _repository.GetCountAsync(branchId); @@ -214,7 +207,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// /// 实体DTO列表 [HttpGet] - [Route("all")] virtual public async Task> GetAllAsync(Guid branchId) { var entities = await _repository.GetAllAsync(branchId, true); @@ -270,8 +262,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// 实体DTO [HttpPost] - [Route("")] - [Authorize(SettleAccountPermissions.CodeSettings.Create)] virtual public async Task CreateAsync(CodeSettingCreateDto input) { var _first = _repository.Where(p => p.Project == input.Project && p.Value==input.Value).FirstOrDefault(); @@ -305,7 +295,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables [HttpPost] - [Route("Export")] virtual public async Task ExportAsync(CodeSettingRequestDto input) { string _fileName = string.Format("通用代码设置_{0}.xlsx",DateTime.Now.ToString("yyyyMMdd")); @@ -339,9 +328,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// ID /// 修改实体DTO /// 实体DTO - [HttpPut] - [Route("{id}")] - [Authorize(SettleAccountPermissions.CodeSettings.Update)] + [HttpPost] virtual public async Task UpdateAsync(Guid id, CodeSettingUpdateDto input) { var _first = _repository.Where(p => p.Project == input.Project && p.Value == input.Value).FirstOrDefault(); @@ -364,9 +351,7 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// /// ID /// 无 - [HttpDelete] - [Route("{id}")] - [Authorize(SettleAccountPermissions.CodeSettings.Delete)] + [HttpPost] virtual public async Task DeleteAsync(Guid id) { var entity = await GetFromCacheAsync(id); @@ -380,8 +365,6 @@ namespace Win.Sfs.SettleAccount.Entities.CodeSettingTables /// IDs /// 是否执行成功 [HttpPost] - [Route("delete")] - [Authorize(SettleAccountPermissions.CodeSettings.Delete)] virtual public async Task DeleteListAsync(List ids) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs index 974f55a4..cb19ee9b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Controls/CentralizedControlAppService.cs @@ -18,7 +18,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls /// 期间设置 /// [AllowAnonymous] - [Route("api/settleaccount/CentralizedControl")] + [Route("api/settleaccount/[controller]/[action]")] public class CentralizedControlAppService : SettleAccountApplicationBase { /// @@ -45,7 +45,6 @@ namespace Win.Sfs.SettleAccount.Entities.Controls /// 导出 /// [HttpPost] - [Route("Export")] public async Task ExportAsync(CentralizedControlRequestDto input) { string fileName = $"期间设置_{Guid.NewGuid()}.xlsx"; @@ -65,8 +64,7 @@ namespace Win.Sfs.SettleAccount.Entities.Controls /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] public async Task> GetListAsync(CentralizedControlRequestDto input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); @@ -81,7 +79,6 @@ namespace Win.Sfs.SettleAccount.Entities.Controls /// 开启版本 /// [HttpPost] - [Route("open")] public async Task OpenVersion(List ids) { var entitys = await _repository.GetListAsync(p => ids.Contains(p.Id)); @@ -96,7 +93,6 @@ namespace Win.Sfs.SettleAccount.Entities.Controls /// 关闭版本 /// [HttpPost] - [Route("close")] public async Task ClosedVersion(List ids) { var entitys = await _repository.GetListAsync(p => ids.Contains(p.Id)); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs index f5935648..ab9c8b2c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs @@ -1,37 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using EFCore.BulkExtensions; -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Caching.Distributed; using Shouldly; -using Volo.Abp; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; using Volo.Abp.Application.Dtos; -using Volo.Abp.Application.Services; using Volo.Abp.Caching; -using Volo.Abp.Domain.Repositories; -using Volo.Abp.Guids; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Uow; using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; -using Win.Sfs.SettleAccount.Boms; using Win.Sfs.SettleAccount.CommonManagers; using Win.Sfs.SettleAccount.Constant; -using Win.Sfs.SettleAccount.Entities.Boms; -using Win.Sfs.SettleAccount.Entities.ImportMap; -using Win.Sfs.SettleAccount.Entities.MaterialRelationships; -using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.ExcelImporter; using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.SettleAccount.MaterialRelationships; -using Win.Sfs.Shared.CacheBase; using Win.Sfs.Shared.DtoBase; using Win.Sfs.Shared.RepositoryBase; -using Win.Utils; namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships { @@ -39,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships /// 客户零件关系 /// [AllowAnonymous] - [Route("api/settleaccount/MaterialRelationshipAppService")] + [Route("api/settleaccount/[controller]/[action]")] public class MaterialRelationshipAppService : SettleAccountApplicationBase { /// @@ -66,7 +51,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships /// 导入 /// [HttpPost] - [Route("Import")] public async Task ImportAsync([FromForm] IFormFileCollection files) { ExportImporter _exportImporter = new ExportImporter(); @@ -112,7 +96,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships /// 导出 /// [HttpPost] - [Route("Export")] public async Task ExportAsync(RequestDtoBase input) { string fileName = $"客户零件关系_{Guid.NewGuid()}.xlsx"; @@ -132,8 +115,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] public async Task> GetListAsync(RequestDtoBase input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs index 0d95ac09..466616c6 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Materials/MaterialAppService.cs @@ -18,7 +18,7 @@ namespace Win.Sfs.SettleAccount.Entities.Materials /// 物料主数据 /// [AllowAnonymous] - [Route("api/settleaccount/MaterialAppService")] + [Route("api/settleaccount/[controller]/[action]")] public class MaterialAppService : SettleAccountApplicationBase { /// @@ -45,8 +45,7 @@ namespace Win.Sfs.SettleAccount.Entities.Materials /// 导出 /// [HttpPost] - [Route("Export")] - public virtual async Task ExportAsync(MaterialRequestDto input) + public async Task ExportAsync(MaterialRequestDto input) { string _fileName = string.Format("物料主数据_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd")); var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, @@ -76,8 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.Materials /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] virtual public async Task> GetListAsync(MaterialRequestDto input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs index d15c82e2..558877c2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppService.cs @@ -23,8 +23,8 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 销售价格单 /// - [Route("api/SettleAccount/TB_PRICE_LIST_Service")] [AllowAnonymous] + [Route("api/settleaccount/[controller]/[action]")] public class PriceListAppService : ApplicationService { private readonly PriceListManager _priceListManager; @@ -59,7 +59,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 导入 /// [HttpPost] - [Route("Import")] public virtual async Task ImportAsync([FromForm] IFormFileCollection files, string version) { ExportImporter _exportImporter = new ExportImporter(); @@ -89,7 +88,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 导出 /// [HttpPost] - [Route("Export")] public virtual async Task ExportAsync(RequestDto input) { IExporter _csv = new CsvExporter(); @@ -125,8 +123,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] public virtual async Task> GetListAsync(RequestDto input) { var entitys = await _priceListManager.GetListAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); @@ -138,8 +135,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 删除 /// - [HttpDelete] - [Route("{id}")] + [HttpPost] virtual public async Task DeleteAsync(Guid id) { await _priceListManager.DeleteAsync(id); @@ -149,7 +145,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 批量删除 /// [HttpPost] - [Route("delete")] virtual public async Task DeleteListAsync(List ids) { return await _priceListManager.DeleteListAsync(ids); diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs index 105d4f5b..e6a307ba 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prices/PriceListAppServiceBJ.cs @@ -22,7 +22,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 备件价格 /// [AllowAnonymous] - [Route("api/SettleAccount/TB_PRICE_BJ_Service")] + [Route("api/settleaccount/[controller]/[action]")] public class PriceListAppServiceBJ : SettleAccountApplicationBase { private readonly INormalEfCoreRepository _repository; @@ -46,7 +46,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 导入 /// [HttpPost] - [Route("Import")] public async Task ImportAsync([FromForm] IFormFileCollection files, string version) { ExportImporter _exportImporter = new ExportImporter(); @@ -72,7 +71,6 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// 导出 /// [HttpPost] - [Route("Export")] public async Task ExportAsync(RequestDto input) { string fileName = $"备件价格_{Guid.NewGuid()}.xlsx"; @@ -92,8 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.Prices /// /// 获取列表 /// - [HttpPost] - [Route("list")] + [HttpGet] public async Task> GetListAsync(RequestDto input) { var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);