on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Исправления после ревью

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-08-07 09:29:31 +05:00
parent b3ed280d8f
commit e059221e32
6 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AsbCloudWebApi/Controllers/AuthController.cs
View File

@ -34,7 +34,7 @@ namespace AsbCloudWebApi.Controllers
/// <response code="200">новый токен</response> /// <response code="200">новый токен</response>
/// <response code="400">логин и пароль не подходят</response> /// <response code="400">логин и пароль не подходят</response>
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost("login")]
[SwaggerOperation(OperationId = "login")] [SwaggerOperation(OperationId = "login")]
[ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> LoginAsync([FromBody] AuthDto auth, CancellationToken token) public async Task<IActionResult> LoginAsync([FromBody] AuthDto auth, CancellationToken token)
@ -52,7 +52,7 @@ namespace AsbCloudWebApi.Controllers
/// </summary> /// </summary>
/// <returns code="200">новый токен</returns> /// <returns code="200">новый токен</returns>
[Authorize] [Authorize]
[HttpGet] [HttpGet("refresh")]
[ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> RefreshAsync(CancellationToken token) public async Task<IActionResult> RefreshAsync(CancellationToken token)
{ {
@ -70,7 +70,6 @@ namespace AsbCloudWebApi.Controllers
/// <param name="user">Информация о новом пользователе</param> /// <param name="user">Информация о новом пользователе</param>
/// <returns code="200">Ок</returns> /// <returns code="200">Ок</returns>
[HttpPost] [HttpPost]
[Route("registration")]
public IActionResult Register(UserRegistrationDto user) public IActionResult Register(UserRegistrationDto user)
{ {
var code = authService.Register(user); var code = authService.Register(user);
@ -92,7 +91,7 @@ namespace AsbCloudWebApi.Controllers
/// </summary> /// </summary>
/// <returns code="200">Ок</returns> /// <returns code="200">Ок</returns>
[Authorize] [Authorize]
[HttpPut("{idUser}")] [HttpPut("{idUser}/ChangePassword")]
public IActionResult ChangePassword([FromRoute] int idUser, [FromBody] string newPassword) public IActionResult ChangePassword([FromRoute] int idUser, [FromBody] string newPassword)
{ {
var editorUserId = User.GetUserId(); var editorUserId = User.GetUserId();

1
AsbCloudWebApi/Controllers/AutoGeneratedDailyReportController.cs
View File

@ -40,7 +40,6 @@ public class AutoGeneratedDailyReportController : ControllerBase
/// <param name="cancellationToken"></param> /// <param name="cancellationToken"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("export/excel")]
[ProducesResponseType(typeof(PhysicalFileResult), (int)HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]
public async Task<IActionResult> ExportAsync([FromRoute] int idWell, public async Task<IActionResult> ExportAsync([FromRoute] int idWell,

2
AsbCloudWebApi/Controllers/DailyReportController.cs
View File

@ -161,7 +161,7 @@ namespace AsbCloudWebApi.Controllers
/// <param name="date"></param> /// <param name="date"></param>
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{date}/export/excel")] [HttpGet("{date}/excel")]
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]
public async Task<IActionResult> DownloadAsync(int idWell, DateOnly date, CancellationToken token) public async Task<IActionResult> DownloadAsync(int idWell, DateOnly date, CancellationToken token)

2
AsbCloudWebApi/Controllers/PlannedTrajectoryController.cs
View File

@ -60,7 +60,7 @@ namespace AsbCloudWebApi.Controllers
/// <param name="token"> Токен отмены задачи </param> /// <param name="token"> Токен отмены задачи </param>
/// <returns>Запрашиваемый файл</returns> /// <returns>Запрашиваемый файл</returns>
[HttpGet] [HttpGet]
[Route("export/excel")] [Route("export")]
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]
public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token) public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token)

2
AsbCloudWebApi/Controllers/ProcessMapController.cs
View File

@ -100,7 +100,7 @@ namespace AsbCloudWebApi.Controllers
/// /// <param name="token"></param> /// /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[Route("processMapReport/export/excel/{wellId}")] [Route("processMapReport/excel/{wellId}")]
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]
public async Task<IActionResult> GetReportFileAsync(int wellId, CancellationToken token) public async Task<IActionResult> GetReportFileAsync(int wellId, CancellationToken token)

2
AsbCloudWebApi/Controllers/SAUB/DetectedOperationController.cs
View File

@ -122,7 +122,7 @@ namespace AsbCloudWebApi.Controllers.SAUB
/// <param name="token"> Токен отмены задачи </param> /// <param name="token"> Токен отмены задачи </param>
/// <returns>Запрашиваемый файл</returns> /// <returns>Запрашиваемый файл</returns>
[HttpGet] [HttpGet]
[Route("export/excel")] [Route("export")]
[Permission] [Permission]
[ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")] [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK, "application/octet-stream")]
[ProducesResponseType(StatusCodes.Status204NoContent)] [ProducesResponseType(StatusCodes.Status204NoContent)]