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 f5429d6c9..5d123699e 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 @@ -81,20 +81,20 @@ public class LauncherController extends AbstractQueueController { } launcherCommand.setTask(dictionaryName); launcherCommand.setUserId(user.getId()); - //пока здесь - saveLauncher(dictionaryName, user.getId()); +// //пока здесь +// saveLauncher(dictionaryName, user.getId()); //топики ограничиваются наличием в taskDictionary //подписываются на разные топики в разных модулях, см. ru.spcex.platform.enumeration.Task#topic return processRequest("launcher-" + dictionaryName, launcherCommand); } - private void saveLauncher(String taskCode, Long userId) { - Launcher launcherCommandHistory = new Launcher(); - launcherCommandHistory.setTask(taskCode); - launcherCommandHistory.setSenderId(userId); - launcherCommandHistory.setCreated(Instant.now()); - launcherImdg.insert(launcherCommandHistory); - } +// private void saveLauncher(String taskCode, Long userId) { +// Launcher launcherCommandHistory = new Launcher(); +// launcherCommandHistory.setTask(taskCode); +// launcherCommandHistory.setSenderId(userId); +// launcherCommandHistory.setCreated(Instant.now()); +// launcherImdg.insert(launcherCommandHistory); +// } @Autowired private IMessageResolver errorResolver; diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java index 76b301904..ce810d0e8 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java @@ -6,14 +6,16 @@ import io.swagger.annotations.ApiModelProperty; import ru.spcex.clearing.backendapi.domain.actions.IAction; import ru.spcex.clearing.backendapi.errors.BackEndError; import ru.spcex.clearing.platform.messaging.domain.ActionType; +import ru.spcex.clearing.platform.messaging.domain.cud.reports.ReportWithPeriodRequest; import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest; +import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.utils.enumeration.EnumMessage; import java.util.Collection; import java.util.Collections; import java.util.List; -public class LauncherNew implements IAction { +public class LauncherNew implements IAction { @ApiModelProperty(value = "Идентификатор единоличного исполнительного органа", example = "ABCD") @JsonProperty private String task; @@ -22,11 +24,17 @@ public class LauncherNew implements IAction { private Long userId; @Override - public LauncherCommandRequest toRequest() { - LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest(); - taskRunnerCommandRequest.setTaskName(task); - taskRunnerCommandRequest.setUserId(userId); - return taskRunnerCommandRequest; + public Object toRequest() { + if (Task.createReport_GREP.equalsByKey(task)) { + ReportWithPeriodRequest reportCommand = new ReportWithPeriodRequest(); + reportCommand.setReportId(task); + return reportCommand; + } else { + LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest(); + taskRunnerCommandRequest.setTaskName(task); + taskRunnerCommandRequest.setUserId(userId); + return taskRunnerCommandRequest; + } } @Override diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java index 78adaec08..021bbc884 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/QCommandExecutor.java @@ -42,7 +42,7 @@ public class QCommandExecutor extends QueueConsumer implements InitializingBean log.info("Init queue listener {}", getClass().getSimpleName()); callback(ReportWithPeriodRequest.class) .setConsumer(this::newReportWithPeriod) - .forDestination(Task.createReport.topic(), callbacks::put); + .forDestination(Task.createReport_GREP.topic(), callbacks::put); init(); } diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/MapUtil.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/MapUtil.java index e49ff0ca6..621868c9b 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/MapUtil.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/collector/MapUtil.java @@ -27,7 +27,7 @@ public class MapUtil { K key = indexFieldExtractor.apply(obj); V exist = index.put(key, obj); if (exist != null) { - throw new IllegalStateException(String.format("%s with id=%s,%s has duplicate key=\"{}\"", + throw new IllegalStateException(String.format("%s with id=%s,%s has duplicate key=\"%s\"", exist.getClass().getSimpleName(), exist.getId(), obj.getId(), key )); } diff --git a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java index 3d5a6ddcd..792cdbe0c 100644 --- a/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java +++ b/platform-parent/platform-enum/src/main/java/ru/spcex/platform/enumeration/Task.java @@ -15,7 +15,7 @@ public enum Task implements IEnumKey { createOrder("CORD"), createOrderConfirm("CORC"), getAllBalance("GALB"), - createReport("RPRT");// Создание отчёта (report-service) + createReport_GREP("GREP");// Создание отчёта (report-service) RPRT нескольких видов, этот GREP private final String key;