treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-373

Browse source
This commit is contained in:
etreschenkov 2023-06-28 18:52:36 +03:00
parent 33c9fd87e0
commit 0c1a02ba7f
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/service/GatewayService.java
View file

@ -25,7 +25,6 @@ import ru.spcex.clearing.platform.messaging.domain.cud.gateway.GatewayTaskReques
import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest; import ru.spcex.clearing.platform.messaging.domain.cud.utilities.LimExportedRequest;
import ru.spcex.clearing.platform.messaging.service.QueueConsumer; import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
import ru.spcex.clearing.platform.messaging.service.sender.KafkaSender;
import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.util.security.UserRoleVerification;
import ru.spcex.platform.enumeration.Section; import ru.spcex.platform.enumeration.Section;
import ru.spcex.platform.enumeration.Task; import ru.spcex.platform.enumeration.Task;
@ -47,7 +46,6 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
RestTemplate restTemplate, RestTemplate restTemplate,
UserRoleVerification userRoleVerification, UserRoleVerification userRoleVerification,
GatewayApiSettings gatewayApiSettings, GatewayApiSettings gatewayApiSettings,
KafkaSender kafkaSender,
@Qualifier("sentAssets") Map<Long, List<SentAsset>> sentAssets) { @Qualifier("sentAssets") Map<Long, List<SentAsset>> sentAssets) {
super(kafkaQueue, kafkaProducer); super(kafkaQueue, kafkaProducer);
this.restTemplate = restTemplate; this.restTemplate = restTemplate;
@ -90,7 +88,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class); ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class);
SuccessResponse bodyResponse = response.getBody(); SuccessResponse bodyResponse = response.getBody();
log.debug("LOCM task complete, success response : {}", bodyResponse); if (bodyResponse != null) {
log.debug("LOCM task complete, success response : {}", bodyResponse);
}
} }
public void requestOnLimit(BaseRequest<LimExportedRequest> userRequest) { public void requestOnLimit(BaseRequest<LimExportedRequest> userRequest) {
@ -108,7 +108,9 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
HttpEntity<OutboundRequest> request = makeDefaultRequest(outboundFondRequest); HttpEntity<OutboundRequest> request = makeDefaultRequest(outboundFondRequest);
ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class); ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, request, SuccessResponse.class);
SuccessResponse bodyResponse = response.getBody(); SuccessResponse bodyResponse = response.getBody();
log.debug("Limit request complete, success response: {}", bodyResponse); if (bodyResponse != null) {
log.debug("Limit request complete, success response: {}", bodyResponse);
}
} }
public void requestOnDemandSecurity(BaseRequest<GatewayTaskRequest> userRequest) { public void requestOnDemandSecurity(BaseRequest<GatewayTaskRequest> userRequest) {
@ -136,10 +138,14 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, requestFond, SuccessResponse.class); ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, requestFond, SuccessResponse.class);
SuccessResponse bodyResponse = response.getBody(); SuccessResponse bodyResponse = response.getBody();
log.debug("LOSC task 1/2 complete (FOND section), success response: {}", bodyResponse); if (bodyResponse != null) {
log.debug("LOSC task 1/2 complete (FOND section), success response: {}", bodyResponse);
}
response = restTemplate.exchange(url, HttpMethod.POST, requestMKR, SuccessResponse.class); response = restTemplate.exchange(url, HttpMethod.POST, requestMKR, SuccessResponse.class);
bodyResponse = response.getBody(); bodyResponse = response.getBody();
log.debug("LOSC task 2/2 complete (MKR section), success response: {}", bodyResponse); if (bodyResponse != null) {
log.debug("LOSC task 2/2 complete (MKR section), success response: {}", bodyResponse);
}
} }
public void requestOnAsset(BaseRequest<AssetOperationListRequest> request) { public void requestOnAsset(BaseRequest<AssetOperationListRequest> request) {
@ -167,9 +173,11 @@ public class GatewayService extends QueueConsumer implements InitializingBean {
String url = formingInboundUrl(inboundServerSettings.getPathLOCM()); String url = formingInboundUrl(inboundServerSettings.getPathLOCM());
HttpEntity<OutboundRequest> r = makeDefaultRequest(outboundRequest); HttpEntity<OutboundRequest> r = makeDefaultRequest(outboundRequest);
try { try {
ResponseEntity<Map> response = restTemplate.exchange(url, HttpMethod.POST, r, Map.class); ResponseEntity<SuccessResponse> response = restTemplate.exchange(url, HttpMethod.POST, r, SuccessResponse.class);
Map bodyResponse = response.getBody(); SuccessResponse bodyResponse = response.getBody();
log.debug("Response from service: {}", bodyResponse != null ? bodyResponse : "empty"); if (bodyResponse != null) {
log.debug("Response from service: {}", bodyResponse);
}
} catch (Throwable err) { } catch (Throwable err) {
log.error("Exchange error: {}", ExceptionUtils.getStackTrace(err)); log.error("Exchange error: {}", ExceptionUtils.getStackTrace(err));
} finally { } finally {