diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/SessionController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/SessionController.java index 6b9326c3b..25f00e8a0 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/SessionController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/misc/SessionController.java @@ -1,15 +1,22 @@ package ru.spcex.clearing.backendapi.controller.queue.misc; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; +import java.util.concurrent.ExecutionException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import ru.clearing.classes.statics.data.misc.Session; import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; +import ru.spcex.clearing.backendapi.controller.request.cud.session.ContinueSessionAction; +import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; +import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse; import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; import ru.spcex.clearing.backendapi.service.IOperator; import ru.spcex.clearing.backendapi.service.IStateLoader; @@ -17,6 +24,7 @@ import ru.spcex.clearing.imdg.IMDGDistributedNames; import java.util.Collection; import java.util.Map; +import ru.spcex.clearing.platform.messaging.domain.Consts; @Controller @RequestMapping("/sessions") @@ -39,4 +47,24 @@ public class SessionController extends AbstractQueueController { response.fromEntity(all); return response; } + + @ApiOperation(value = "Continue session") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public CudResponse repeatSession( + @ApiParam(value = "Параметры команды в JSON формате.", required = true) + @RequestBody ContinueSessionAction continueSessionAction) throws ExecutionException, InterruptedException { + return processRequest(Consts.REPEAT_SESSION, continueSessionAction); + } + + @ApiOperation(value = "Continue session") + @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) + @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + public CudResponse continueSession( + @ApiParam(value = "Параметры команды в JSON формате.", required = true) + @RequestBody ContinueSessionAction continueSessionAction) throws ExecutionException, InterruptedException { + return processRequest(Consts.CONTINUE_SESSION, continueSessionAction); + } } diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/session/SessionController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/session/SessionController.java deleted file mode 100644 index b63a8b86a..000000000 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/session/SessionController.java +++ /dev/null @@ -1,51 +0,0 @@ -package ru.spcex.clearing.backendapi.controller.queue.session; - -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; -import java.util.concurrent.ExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController; -import ru.spcex.clearing.backendapi.controller.request.cud.session.ContinueSessionAction; -import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse; -import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse; -import ru.spcex.clearing.backendapi.service.IOperator; -import ru.spcex.clearing.platform.messaging.domain.Consts; - -@Controller -@RequestMapping("/session") -public class SessionController extends AbstractQueueController { - protected final Logger log = LoggerFactory.getLogger(getClass()); - - public SessionController(IOperator operator) { - super(operator); - } - - @ApiOperation(value = "Continue session") - @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - public CudResponse repeatSession( - @ApiParam(value = "Параметры команды в JSON формате.", required = true) - @RequestBody ContinueSessionAction continueSessionAction) throws ExecutionException, InterruptedException { - return processRequest(Consts.REPEAT_SESSION, continueSessionAction); - } - - @ApiOperation(value = "Continue session") - @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)}) - @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - @ResponseBody - public CudResponse continueSession( - @ApiParam(value = "Параметры команды в JSON формате.", required = true) - @RequestBody ContinueSessionAction continueSessionAction) throws ExecutionException, InterruptedException { - return processRequest(Consts.CONTINUE_SESSION, continueSessionAction); - } -}