bsm-lab
/
dfxagent
1
0
Fork 0
Code Issues 8 Pull Requests Packages Projects Releases Wiki Activity

postman 데이터가 있는 경우에만 전송하도록 수정

Browse Source 
postman, dropbox에 description 추가
main
semin.baek 8 months ago
parent c268cc2cbb
commit dd72251141
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/bsmlab/dfx/agent/config/AgentConfigDto.java
Unescape View File

@ -60,6 +60,7 @@ public class AgentConfigDto {
private String dataSourceId; private String dataSourceId;
private String sqlId; private String sqlId;
private String saveDirectoryRoot; private String saveDirectoryRoot;
private String description;
} }
@Data @Data
@ -77,6 +78,7 @@ public class AgentConfigDto {
private String recipientHostId; private String recipientHostId;
private String recipientDropBoxId; private String recipientDropBoxId;
private List<String> routingHostIdList; private List<String> routingHostIdList;
private String description;
} }
@Data @Data

44
src/main/java/com/bsmlab/dfx/agent/task/postman/PostmanSchedulerService.java
Unescape View File

@ -83,27 +83,29 @@ public class PostmanSchedulerService {
String response = null; String response = null;
try { try {
List<Map<String, Object>> dataMapList = sqlExecuteService.select(dataSourceId, sqlId, null); List<Map<String, Object>> dataMapList = sqlExecuteService.select(dataSourceId, sqlId, null);
String dataString = objectMapper.writeValueAsString(dataMapList); if(dataMapList != null && !dataMapList.isEmpty()) {
ReceiveMessageDto receiveMessageDto = ReceiveMessageDto.builder().senderHostId(senderHostId).senderTimestamp(senderTimestamp) String dataString = objectMapper.writeValueAsString(dataMapList);
.messageUuid(messageUuid).messageType(AgentConfigDto.MessageType.TRANSFER_DB_TO_DB) ReceiveMessageDto receiveMessageDto = ReceiveMessageDto.builder().senderHostId(senderHostId).senderTimestamp(senderTimestamp)
.recipientHostId(postman.getRecipientHostId()).recipientDropBoxId(postman.getRecipientDropBoxId()) .messageUuid(messageUuid).messageType(AgentConfigDto.MessageType.TRANSFER_DB_TO_DB)
.data(dataString).build(); .recipientHostId(postman.getRecipientHostId()).recipientDropBoxId(postman.getRecipientDropBoxId())
HttpHeaders httpHeaders = new HttpHeaders(); .data(dataString).build();
httpHeaders.setContentType(MediaType.APPLICATION_JSON); HttpHeaders httpHeaders = new HttpHeaders();
HttpEntity<ReceiveMessageDto> bodyEntity = new HttpEntity<>(receiveMessageDto, httpHeaders); httpHeaders.setContentType(MediaType.APPLICATION_JSON);
RestTemplate restTemplate = new RestTemplate(); HttpEntity<ReceiveMessageDto> bodyEntity = new HttpEntity<>(receiveMessageDto, httpHeaders);
String url = "http://" + knownAgent.getHostName() + ":" + knownAgent.getListenPort() + "/listen"; RestTemplate restTemplate = new RestTemplate();
log.debug("postman to {} send a message UUID {}", receiveMessageDto.getRecipientHostId(), receiveMessageDto.getMessageUuid()); String url = "http://" + knownAgent.getHostName() + ":" + knownAgent.getListenPort() + "/listen";
response = restTemplate.postForObject(url, bodyEntity, String.class); log.debug("postman to {} send a message UUID {}", receiveMessageDto.getRecipientHostId(), receiveMessageDto.getMessageUuid());
AckDto ackDto = objectMapper.readValue(response, new TypeReference<AckDto>() {}); response = restTemplate.postForObject(url, bodyEntity, String.class);
log.debug("postman received ack from {} ack: {}", receiveMessageDto.getRecipientHostId(), ackDto); AckDto ackDto = objectMapper.readValue(response, new TypeReference<AckDto>() {});
if(AckDto.ResultType.RECEIVE_SUCCESS != ackDto.getResult()) { log.debug("postman received ack from {} ack: {}", receiveMessageDto.getRecipientHostId(), ackDto);
log.warn("대상 agent {}[{}]에게 전송하였으나 상대방이 수신하지 못하였습니다. 응답: {} 응답메시지: {}" if(AckDto.ResultType.RECEIVE_SUCCESS != ackDto.getResult()) {
, knownAgent.getHostId(), knownAgent.getHostName(), ackDto.getResult(), ackDto.getResultText()); log.warn("대상 agent {}[{}]에게 전송하였으나 상대방이 수신하지 못하였습니다. 응답: {} 응답메시지: {}"
} , knownAgent.getHostId(), knownAgent.getHostName(), ackDto.getResult(), ackDto.getResultText());
else { }
String postProcessingSqlId = postman.getMessage().getPostProcessingSqlId(); else {
sqlExecuteService.update(dataSourceId, postProcessingSqlId, new HashMap<String, Object>()); String postProcessingSqlId = postman.getMessage().getPostProcessingSqlId();
sqlExecuteService.update(dataSourceId, postProcessingSqlId, new HashMap<String, Object>());
}
} }
} }
catch (JsonProcessingException e) { catch (JsonProcessingException e) {

Write Preview
Loading…
Cancel
Save