From fd22d89ecb6dbdec2f5a0e7b3c307971cebee83b Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 17 Aug 2023 11:13:10 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20OUTV=20=D1=80=D0=B0=D0=B7=D1=80?= =?UTF-8?q?=D0=B5=D1=88=D0=B8=D0=BB=20=D0=B4=D0=BB=D1=8F=20/launchers/spec?= =?UTF-8?q?ific?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/queue/scheduler/LauncherController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java index 00ef3b49f..0972526f5 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -29,6 +31,7 @@ import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.utils.enumeration.EnumMessage; +import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.enumeration.IMessageResolver; import java.util.Collection; @@ -38,6 +41,7 @@ import java.util.concurrent.ExecutionException; @Controller @RequestMapping("/launchers") public class LauncherController extends AbstractQueueController { + protected final Logger log = LoggerFactory.getLogger(getClass()); private final IStateLoader stateLoader; private final Imdg userImdg; private final Imdg taskDictionary; @@ -100,9 +104,9 @@ public class LauncherController extends AbstractQueueController { if (taskEnum == null) { throw new NotFound404Exception("task dictionary element with code '" + launcherNew.getTask() + "'"); } - if (!Task.startOfClearing.getKey().equals(taskEnum.getCode())) { - throw new IllegalStateException(String.format("Task %s not support request with body", taskEnum.getCode())); - } + if (!IEnumKey.contains(taskEnum.getCode(), Task.startOfClearing, Task.dbfExport_OUTV)) { + log.warn(String.format("Task %s not support request with body", taskEnum.getCode())); + } // else В мете эти модели с дополнительными параметрами (OUTV). Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); String username = KeycloakUtils.getUserNameFromAuthentication(authentication); User user = userImdg.getFirstObjectByFieldValues(Map.of("identifier", username));