From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 04 6月 2025 17:42:13 +0800 Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo --- Weben_CMS专用代码生成器/Code/Templete/Controller模板.txt | 91 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 71 insertions(+), 20 deletions(-) diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt" index 20a3e30..4e3f2f1 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Controller\346\250\241\346\235\277.txt" @@ -1,7 +1,8 @@ -using Ao.Lang; using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; +using CMS.Framework.AspNetCore.Users; using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$; using CMS.Plugin.$NameSpacePath$.Application.Contracts.Services; +using CmsQueryExtensions.Entitys; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -24,20 +25,22 @@ public class $EntityName$Controller : ControllerBase { private readonly I$EntityName$AppService _$EntityInstanceName$AppService; + private readonly ICurrentUser _currentUser; /// <summary> /// Initializes a new instance of the <see cref="$EntityName$Controller"/> class. /// </summary> /// <param name="$EntityInstanceName$AppService">The $EntityInstanceName$ application service.</param> - public $EntityName$Controller(I$EntityName$AppService $EntityInstanceName$AppService) + public $EntityName$Controller(I$EntityName$AppService $EntityInstanceName$AppService, ICurrentUser currentUser) { _$EntityInstanceName$AppService = $EntityInstanceName$AppService; + _currentUser = currentUser; } /// <summary> /// 获取$ChinaComment$ /// </summary> - /// <param name="id">标识符.</param> + /// <param name="id">主键ID</param> /// <returns></returns> [HttpGet] [Route("{id}")] @@ -49,7 +52,7 @@ /// <summary> /// 分页获取$ChinaComment$的列表. /// </summary> - /// <param name="input">输入.</param> + /// <param name="input">查询参数</param> /// <returns></returns> [HttpGet] [Route("Page")] @@ -58,74 +61,117 @@ return _$EntityInstanceName$AppService.GetListAsync(input); } + /// <summary> + /// 根据条件获取$ChinaComment$ + /// </summary> + /// <param name="input">查询参数</param> + /// <returns></returns> + [HttpPost] + [Route("FindListByFilter")] + public virtual async Task<List<$EntityName$Dto>> FindListByFilterAsync([FromBody]Get$EntityName$Input input) + { + return await _$EntityInstanceName$AppService.FindListByFilterAsync(input); + } + /// <summary> + /// 根据条件获取单个$ChinaComment$ + /// </summary> + /// <param name="input">查询参数</param> + /// <returns></returns> + [HttpPost] + [Route("FindSingleByFilter")] + public virtual async Task<$EntityName$Dto> FindSingleByFilterAsync([FromBody]Get$EntityName$Input input) + { + + return await _$EntityInstanceName$AppService.FindSingleByFilterAsync(input); + } + /// <summary> /// 创建$ChinaComment$ /// </summary> - /// <param name="input">输入.</param> + /// <param name="input">创建参数</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPost] public virtual Task<$EntityName$Dto> CreateAsync($EntityName$CreateDto input) { + input.CreatorName = _currentUser.UserAccount;//创建人 return _$EntityInstanceName$AppService.CreateAsync(input); } /// <summary> /// 更新$ChinaComment$ /// </summary> - /// <param name="id">标识符.</param> - /// <param name="input">输入.</param> + /// <param name="id">主键ID</param> + /// <param name="input">更新参数</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPut] [Route("{id}")] public virtual Task<$EntityName$Dto> UpdateAsync(Guid id, $EntityName$UpdateDto input) { + input.LastModifierName = _currentUser.UserAccount;//修改人 return _$EntityInstanceName$AppService.UpdateAsync(id, input); } /// <summary> /// 克隆$ChinaComment$ /// </summary> - /// <param name="ids">Id集合.</param> + /// <param name="ids">Id集合</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpPost] [Route("Clone")] public virtual Task<List<$EntityName$Dto>> CloneAsync([FromBody] IEnumerable<Guid> ids) { - return _$EntityInstanceName$AppService.CloneAsync(ids); + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; + return _$EntityInstanceName$AppService.CloneAsync(ids, myCurrentUser); } /// <summary> /// 删除$ChinaComment$ /// </summary> - /// <param name="id">标识符.</param> + /// <param name="id">主键ID</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpDelete] [Route("{id}")] public virtual Task DeleteAsync(Guid id) { - return _$EntityInstanceName$AppService.DeleteAsync(id); + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; + //return _wmsMaterialAppService.DeleteAsync(id,myCurrentUser);//逻辑删除 + return _$EntityInstanceName$AppService.DeletePermanentlyAsync(id, myCurrentUser);//物理删除 } /// <summary> /// 批量删除$ChinaComment$ /// </summary> - /// <param name="ids">The ids.</param> + /// <param name="ids">主键ID集合</param> /// <returns></returns> - //[Authorize] + [Authorize] [HttpDelete] public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) { - return _$EntityInstanceName$AppService.DeleteManyAsync(ids); + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; + // return _wmsMaterialAppService.DeleteManyAsync(ids,myCurrentUser);//逻辑删除 + return _$EntityInstanceName$AppService.BatchDeletePermanentlyAsync(ids, myCurrentUser);//物理删除 } /// <summary> /// 调整排序$ChinaComment$ /// </summary> - /// <param name="id">标识符.</param> + /// <param name="id">主键ID</param> /// <returns></returns> [HttpPut] [Route("{id}/AdjustSort/{sort}")] @@ -155,10 +201,15 @@ throw new UserFriendlyException("请检查导入的表格"); } + MyCurrentUser myCurrentUser = new MyCurrentUser() + { + UserAccount = _currentUser.UserAccount, + UserId = _currentUser.UserId + }; await _$EntityInstanceName$AppService.ImportAsync(new $EntityName$sImportModel { $EntityName$s = $EntityInstanceName$Rows, - }); + },myCurrentUser); return Ok(); } -- Gitblit v1.9.3