http://jira.mfd.msk:8088/browse/CLS-75 added companyInfo GET method
This commit is contained in:
parent
8633081e6d
commit
56f027c313
2 changed files with 32 additions and 14 deletions
|
|
@ -8,25 +8,38 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import ru.clearing.classes.statics.data.company.Company;
|
||||||
import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
|
import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
|
||||||
import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyInfoUpdateAction;
|
import ru.spcex.clearing.backendapi.controller.request.cud.company.CompanyInfoUpdateAction;
|
||||||
import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
|
import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
|
||||||
import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
|
import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
|
||||||
|
import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
|
||||||
|
import ru.spcex.clearing.backendapi.meta.GetResponseFactory;
|
||||||
import ru.spcex.clearing.backendapi.service.IOperator;
|
import ru.spcex.clearing.backendapi.service.IOperator;
|
||||||
import ru.spcex.clearing.backendapi.service.IStateLoader;
|
import ru.spcex.clearing.backendapi.service.IStateLoader;
|
||||||
|
import ru.spcex.clearing.imdg.IMDGDistributedNames;
|
||||||
import ru.spcex.clearing.platform.messaging.domain.Consts;
|
import ru.spcex.clearing.platform.messaging.domain.Consts;
|
||||||
|
import ru.spcex.platform.imdg.api.Imdg;
|
||||||
|
import ru.spcex.platform.imdg.api.ImdgProvider;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
@RequestMapping("/company-infos")
|
@RequestMapping("/company-infos")
|
||||||
public class EditCompanyInfoController extends AbstractQueueController {
|
public class EditCompanyInfoController extends AbstractQueueController {
|
||||||
private final IStateLoader stateLoader;
|
private final IStateLoader stateLoader;
|
||||||
|
private final Imdg<Company> companyImdg;
|
||||||
|
private final GetResponseFactory responseFactory;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader) {
|
public EditCompanyInfoController(IOperator operator, IStateLoader stateLoader, ImdgProvider imdgProvider, GetResponseFactory responseFactory) {
|
||||||
super(operator);
|
super(operator);
|
||||||
this.stateLoader = stateLoader;
|
this.stateLoader = stateLoader;
|
||||||
|
this.companyImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_Company, Company.class);
|
||||||
|
this.responseFactory = responseFactory;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(value = "update company info.")
|
@ApiOperation(value = "update company info.")
|
||||||
|
|
@ -42,15 +55,20 @@ public class EditCompanyInfoController extends AbstractQueueController {
|
||||||
return processRequest(Consts.DESTINATION_COMPANY_INFO_UPDATE, companyInfoUpdateAction);
|
return processRequest(Consts.DESTINATION_COMPANY_INFO_UPDATE, companyInfoUpdateAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
//todo
|
@ApiOperation(value = "get all CompanyInfo's.")
|
||||||
// @ApiOperation(value = "get all CompanyInfo's.")
|
@ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
|
||||||
// @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CompanyBackendInfoGetAll.class)})
|
@RequestMapping(method = RequestMethod.GET)
|
||||||
// @RequestMapping(method = RequestMethod.GET)
|
@ResponseBody
|
||||||
// @ResponseBody
|
public CommonGetAllResponse getAll() {
|
||||||
// public CompanyBackendInfoGetAll getAll() {
|
Collection<Map<String, Object>> all = new ArrayList<>();
|
||||||
// Collection<CompanyInfo> all = stateLoader.getAll(IMDGDistributedNames.Map_Company, CompanyInfo.class);
|
Collection<Company> companies = companyImdg.getAllValues();
|
||||||
// CompanyBackendGetAll response = new CompanyBackendGetAll();
|
for (Company company : companies) {
|
||||||
// response.fromEntity(all);
|
if (company.getProfile() != null) { // пока возвращает "пустой" CompanyInfo если его нет для Company
|
||||||
// return response;
|
all.add(responseFactory.responseFromObject(company.getProfile()));
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
CommonGetAllResponse response = new CommonGetAllResponse();
|
||||||
|
response.fromEntity(all);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,8 +39,8 @@ public class CommonGetAllResponse extends BasicSpcexResponse {
|
||||||
|
|
||||||
public void fromEntity(Collection<Map<String, Object>> anyObjectFields) {
|
public void fromEntity(Collection<Map<String, Object>> anyObjectFields) {
|
||||||
var payload = this.getPayload();
|
var payload = this.getPayload();
|
||||||
for (Map<String, Object> moneyMarketSecurity : anyObjectFields) {
|
for (Map<String, Object> allObjFields : anyObjectFields) {
|
||||||
payload.getItems().add(moneyMarketSecurity);
|
payload.getItems().add(allObjFields);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Add table
Reference in a new issue