diff --git a/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp b/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp index dc0eb2b..e954f51 100644 --- a/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp +++ b/WebContent/jsp/onl/transaction/tracking/trackingManDetail.jsp @@ -146,12 +146,12 @@ defaultEditGrid($('#'+gridName), columns, '', 'level', layoutData, 93, ['value']); } - function selectHttpLog(url, dayOfWeekNumber, guid, serviceProcessNumber){ + function selectHttpLog(url, prcsDate, guid, serviceProcessNumber){ $.ajax({ type : "GET", url:url, dataType:"json", - data:{cmd: 'DETAIL_HTTP_LOG', dayOfWeekNumber, guid, serviceProcessNumber }, + data:{cmd: 'DETAIL_HTTP_LOG', prcsDate, guid, serviceProcessNumber }, success:function(res){ $('#labelHttpMethod').text(res.httpMethod); $('#labelUrl').text(res.url); @@ -192,6 +192,7 @@ success:function(json){ var data = json; const logDayOfWeek = extractDayOfWeek(json.MSGDPSTYMS); + const prcsDate = json.MSGDPSTYMS.substring(0, 8); const isInboundPart = json.LOGPRCSSSERNO === '100' || json.LOGPRCSSSERNO === '400'; const isOutboundPart = json.LOGPRCSSSERNO === '200' || json.LOGPRCSSSERNO === '300'; const isInboundWithoutNet = !json.GSTATSYSADPTRBZWKGROUPNAME.includes('NET'); @@ -199,7 +200,7 @@ fullMessageData = json.FULLMESSAGEDATA; if((isInboundPart && isInboundWithoutNet) || (isOutboundPart && isOutboundWithoutNet)){ - selectHttpLog(url, logDayOfWeek, json.EAISVCSERNO.trim(), logPrcssSerno); + selectHttpLog(url, prcsDate, json.EAISVCSERNO.trim(), logPrcssSerno); }else{ $("#tab4Button").hide(); } diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingController.java b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingController.java index 4267116..7cb03c2 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingController.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingController.java @@ -454,11 +454,11 @@ public class DbTrackingController { @RequestMapping(value = "/onl/transaction/tracking/trackingMan.json", params = "cmd=DETAIL_HTTP_LOG") public ResponseEntity selectHttpAdapterExtraLog( - @RequestParam int dayOfWeekNumber, + @RequestParam String prcsDate, @RequestParam String guid, @RequestParam int serviceProcessNumber) { return ResponseEntity.ok(service.selectHttpAdapterExtraLog( - dayOfWeekNumber, guid, serviceProcessNumber)); + prcsDate, guid, serviceProcessNumber)); } @RequestMapping(value = "/onl/transaction/tracking/trackingMan.json", params = "cmd=DETAIL_8583") diff --git a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java index 26b0f6c..ad9aaa0 100644 --- a/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java +++ b/src/main/java/com/eactive/eai/rms/onl/transaction/tracking/DbTrackingService.java @@ -439,18 +439,23 @@ public class DbTrackingService extends BaseService { return map; } - public HttpAdapterExtraLogVo selectHttpAdapterExtraLog(int dayOfWeekNumber, + public HttpAdapterExtraLogVo selectHttpAdapterExtraLog(String prcsDate, String guid, int serviceProcessNumber) { - Optional optional = httpAdapterExtraLogService - .findById(new HttpAdapterExtraLogId( - dayOfWeekNumber, guid, - serviceProcessNumber)); + HttpAdapterExtraLogId httpAdapterExtraLogId = new HttpAdapterExtraLogId(); + httpAdapterExtraLogId.setPrcsDate(prcsDate); + httpAdapterExtraLogId.setGuid(guid); + httpAdapterExtraLogId.setServiceProcessNumber(serviceProcessNumber); - if (optional.isPresent()) { - return httpAdapterExtraLogMapper.toVo(optional.get()); - } + HttpAdapterExtraLog httpAdapterExtraLog = httpAdapterExtraLogService.getById(httpAdapterExtraLogId); +// Optional optional = httpAdapterExtraLogService +// .findById(new HttpAdapterExtraLogId( +// prcsDate, guid, serviceProcessNumber)); +// +// if (optional.isPresent()) { +// return httpAdapterExtraLogMapper.toVo(optional.get()); +// } - return null; + return httpAdapterExtraLogMapper.toVo(httpAdapterExtraLog); } public String resultByMessage(EAILogDetailSearch paramVo,