diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java index cc00f19eb..f3b7a523a 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/securities/SecurityController.java @@ -8,11 +8,15 @@ import org.springframework.stereotype.Controller; 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.instrument.issue.EquitySecurity; +import ru.clearing.classes.statics.data.instrument.issue.FixedIncomeSecurity; +import ru.clearing.classes.statics.data.security.MoneyMarketSecurity; import ru.clearing.classes.statics.data.security.Security; import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse; import ru.spcex.clearing.backendapi.service.IStateLoader; import ru.spcex.clearing.imdg.IMDGDistributedNames; +import java.util.ArrayList; import java.util.Collection; import java.util.Map; @@ -34,9 +38,16 @@ public class SecurityController { @RequestMapping(method = RequestMethod.GET) @ResponseBody public CommonGetAllResponse getAll() { - Collection> all = stateLoader.getAllMetaTransformSpecificClass( - IMDGDistributedNames.Map_MoneyMarketSecurity, - Security.class); + Collection> all = new ArrayList<>(); + all.addAll(stateLoader.getAllMetaTransformSpecificClass( + IMDGDistributedNames.Map_MoneyMarketSecurity, MoneyMarketSecurity.class + )); + all.addAll(stateLoader.getAllMetaTransformSpecificClass( + IMDGDistributedNames.Map_FixedIncomeSecurity, FixedIncomeSecurity.class + )); + all.addAll(stateLoader.getAllMetaTransformSpecificClass( + IMDGDistributedNames.Map_EquitySecurity, EquitySecurity.class + )); CommonGetAllResponse response = new CommonGetAllResponse(); response.fromEntity(all); return response;