From f5432e77f687c1efb8c1f488c9032f73616efb23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 09:02:56 +0800
Subject: [PATCH] 2
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs | 43 +++++++++++++++++++------------------------
1 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
index 8d564bd4..1ebb01c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/Controller/WorkPlanController.cs
@@ -1,10 +1,9 @@
using Ao.Lang;
-using AutoMapper.Internal.Mappers;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
+using CMS.Framework.AspNetCore.Users;
using CMS.Plugin.PipeLineLems.Application.Contracts.Dtos.WorkPlan;
using CMS.Plugin.PipeLineLems.Application.Contracts.Services;
-using CMS.Plugin.PipeLineLems.Application.Implements;
-using CMS.Plugin.PipeLineLems.Domain.WorkPlan;
+using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
@@ -27,27 +26,16 @@
public class WorkPlanController : ControllerBase
{
private readonly IWorkPlanAppService _workPlanAppService;
-
-
- /// <summary>
- /// 鑾峰彇鐢熶骇璁″垝.
- /// </summary>
- /// <param name="input">鏍囪瘑绗�.</param>
- /// <returns></returns>
- [HttpPost]
- [Route("GetWorkPlanByAps")]
- public virtual async Task<MesOrderResponse> CreateWorkPlanByApsAsync([FromBody] List<WorkPlanInput> input)
- {
- return await _workPlanAppService.CreatebyApsAsync(input);
- }
+ private readonly ICurrentUser _currentUser;
/// <summary>
/// Initializes a new instance of the <see cref="WorkPlanController"/> class.
/// </summary>
/// <param name="workPlanAppService">The workPlan application service.</param>
- public WorkPlanController(IWorkPlanAppService workPlanAppService)
+ public WorkPlanController(IWorkPlanAppService workPlanAppService, ICurrentUser currentUser)
{
_workPlanAppService = workPlanAppService;
+ _currentUser = currentUser;
}
/// <summary>
@@ -79,7 +67,7 @@
/// </summary>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
public virtual Task<WorkPlanDto> CreateAsync(WorkPlanCreateDto input)
{
@@ -92,7 +80,7 @@
/// <param name="id">鏍囪瘑绗�.</param>
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPut]
[Route("{id}")]
public virtual Task<WorkPlanDto> UpdateAsync(Guid id, WorkPlanUpdateDto input)
@@ -105,7 +93,7 @@
/// </summary>
/// <param name="ids">Id闆嗗悎.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpPost]
[Route("Clone")]
public virtual Task<List<WorkPlanDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
@@ -118,7 +106,7 @@
/// </summary>
/// <param name="id">鏍囪瘑绗�.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
[Route("{id}")]
public virtual Task DeleteAsync(Guid id)
@@ -131,7 +119,7 @@
/// </summary>
/// <param name="ids">The ids.</param>
/// <returns></returns>
- //[Authorize]
+ [Authorize]
[HttpDelete]
public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
{
@@ -163,6 +151,14 @@
await file.CopyToAsync(stream);
stream.Seek(0L, SeekOrigin.Begin);
+ var userAccount = _currentUser.UserAccount;
+ var userId = _currentUser.UserId;
+ MyCurrentUser myCurrentUser = new MyCurrentUser()
+ {
+ UserAccount = _currentUser.UserAccount,
+ UserId = _currentUser.UserId
+ };
+
var sheetNames = stream.GetSheetNames();
var workPlanRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WorkPlansImportModel.WorkPlanImportModel>(stream, sheetName: "閰嶇疆").ToList() : new();
@@ -171,11 +167,10 @@
throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸");
}
-
await _workPlanAppService.ImportAsync(new WorkPlansImportModel
{
WorkPlans = workPlanRows,
- });
+ }, userId, userAccount);
return Ok();
}
--
Gitblit v1.9.3