mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dal): добавлен Shortcode "%СВЯЗИ-ПН%", добавлен метод GetAvailableShortcodesAsync для отображения доступных изменямеых частей в API

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-12-10 11:55:58 +10:00
parent 2f07ccd67c
commit 3a136f5bf4
12 changed files with 294 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.API/Controllers/V1/RobotTaskController.cs
View File

@@ -165,17 +165,17 @@ namespace PARR.API.Controllers.V1
var robotTaskTemplateResponse = mapper.Map<RobotTaskTemplateResponse>(task);
//TODO Вынести в отдельный метод ShortcodesService
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.FullDescription))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.FullDescription))
robotTaskTemplateResponse.FullDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.FullDescription, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.ShortDescription))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.ShortDescription))
robotTaskTemplateResponse.ShortDescription = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.ShortDescription, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.Solution))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.Solution))
robotTaskTemplateResponse.Solution = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.Solution, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.TnkName))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.TnkName))
robotTaskTemplateResponse.TnkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.TnkName, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.WorkName))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkName))
robotTaskTemplateResponse.WorkName = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkName, task!.Template!.UnitId, task!.Template!.JobId);
if (shortcodesService.isAnyShortcodes(robotTaskTemplateResponse.WorkGroup))
if (shortcodesService.IsAnyShortcodes(robotTaskTemplateResponse.WorkGroup))
robotTaskTemplateResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskTemplateResponse.WorkGroup, task!.Template!.UnitId, task!.Template!.JobId);
return Ok(new Response<RobotTaskTemplateResponse>(robotTaskTemplateResponse, true));
@@ -185,7 +185,7 @@ namespace PARR.API.Controllers.V1
//RobotTaskScheduleResponse
var robotTaskScheduleResponse = mapper.Map<RobotTaskScheduleResponse>(task);
if (shortcodesService.isAnyShortcodes(robotTaskScheduleResponse.WorkGroup))
if (shortcodesService.IsAnyShortcodes(robotTaskScheduleResponse.WorkGroup))
robotTaskScheduleResponse.WorkGroup = await shortcodesService.ApplyShortcodesAsync(robotTaskScheduleResponse.WorkGroup, task!.Template!.UnitId, task!.Template!.JobId);
return Ok(new Response<RobotTaskScheduleResponse>(robotTaskScheduleResponse, true));

53
PARR.API/Controllers/V1/ShortcodeController.cs Normal file
View File

@@ -0,0 +1,53 @@
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Constants;
using PARR.DAL.DomainServices.Interfaces;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Переменные составляющие полей объектов платформы автоматизации регламентных работ
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class ShortcodeController : BaseApiController
{
private readonly ILogger<ShortcodeController> logger;
private readonly IShortcodesService shortcodesService;
private readonly IMapper mapper;
public ShortcodeController(
ILogger<ShortcodeController> logger,
IShortcodesService shortcodesService,
IMapper mapper
)
{
this.logger = logger;
this.shortcodesService = shortcodesService;
this.mapper = mapper;
}
/// <summary>
/// Получить список всех переменных составляющих
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.Shortcode.GetAll)]
public async Task<IActionResult> GetAll()
{
var shortcodes = await shortcodesService.GetAvailableShortcodesAsync();
if (!shortcodes.Any())
return NoContent();
var response = mapper.Map<List<ShortcodeResponse>>(shortcodes);
return Ok(new Response<List<ShortcodeResponse>>(response, true));
}
}
}