diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java index 3adad84..e74300a 100644 --- a/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/filter/JwtRequestFilter.java @@ -41,8 +41,8 @@ public class JwtRequestFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { - logger.info("access request uri :: " + request.getRequestURI()); - logger.info("access remote host :: " + request.getRemoteHost()); +// logger.info("access request uri :: " + request.getRequestURI()); +// logger.info("access remote host :: " + request.getRemoteHost()); final String requestTokenHeader = request.getHeader("Authorization"); @@ -50,9 +50,9 @@ public class JwtRequestFilter extends OncePerRequestFilter { String jwtToken = null; // JWT Token is in the form "Bearer token". Remove Bearer word and get // only the Token - log.debug("=============================================================================="); - log.debug(requestTokenHeader); - log.debug("=============================================================================="); +// log.debug("=============================================================================="); +// log.debug(requestTokenHeader); +// log.debug("=============================================================================="); if (requestTokenHeader != null && requestTokenHeader.startsWith(JWT_PREFIX)) { jwtToken = requestTokenHeader.substring(7); @@ -64,11 +64,11 @@ public class JwtRequestFilter extends OncePerRequestFilter { log.warn("JWT Token has expired"); } } else { - logger.debug(">>>" + requestTokenHeader); - logger.warn("JWT Token is Error "); - logger.warn(">>>" + request.getRequestURI()); +// logger.debug(">>>" + requestTokenHeader); +// logger.warn("JWT Token is Error "); +// logger.warn("Request URI : "+ request.getRequestURI()); } - log.debug(">>>>>>>>>>" + username); +// log.debug(">>>>>>>>>>" + username); // Once we get the token validate it. if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 6db9be2..a808044 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -383,46 +383,63 @@ public class CtrCntrlService { public Map getId(String id, Double lat, Double lon) { Map result = new HashMap<>(); - /* 식별번호의 가장 최근 이력 불러오기 */ - CtrCntrlBas latestControl = cntrlBasRepository.findFirstByIdntfNumOrderByCreateDtDesc(id).orElse(null); + /** + * Caching 되어 있는 식별 번호 확인 + */ + String cacheControlId = shareContext.getIndtfKey(id); - boolean isControl = false; - - if(latestControl != null) { - CtrCntrlHstry latestHistory = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId()).orElse(null); - - if(latestHistory != null) { - long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date()); - log.info("DIFF MINUTE : {}", diffMinute); - - if("01".equals(latestControl.getEndTypeCd()) || diffMinute > 5) { - isControl = false; - } - if(!"01".equals(latestControl.getEndTypeCd()) && diffMinute < 5) { - isControl = true; - } - } else { - isControl = false; - } - - } else { - isControl = false; - } - - if(isControl) { - result.put("controlId", latestControl.getCntrlId()); - result.put("typeCd", "02"); - result.put("areaTrnsYn", "E"); - } else { + if(cacheControlId == null) { String controlID = UUID.randomUUID().toString(); - result.put("controlId", controlID); result.put("typeCd", "01"); result.put("areaTrnsYn", "N"); -// model.setControlStartDt(DateUtils.getCurrentTime()); - // 기체 식별번호의 관제 ID 저장 (single ton) + // 기체 식별번호의 관제 ID 저장 shareContext.putIdntfKey(id, controlID); + + /* 식별번호의 가장 최근 이력 불러오기 */ +// CtrCntrlBas latestControl = cntrlBasRepository.findFirstByIdntfNumOrderByCreateDtDesc(id).orElse(null); +// +// boolean isControl = false; +// +// if(latestControl != null) { +// CtrCntrlHstry latestHistory = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId()).orElse(null); +// +// if(latestHistory != null) { +// long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date()); +// log.info("DIFF MINUTE : {}", diffMinute); +// +// if("01".equals(latestControl.getEndTypeCd()) || diffMinute > 5) { +// isControl = false; +// } +// if(!"01".equals(latestControl.getEndTypeCd()) && diffMinute < 5) { +// isControl = true; +// } +// } else { +// isControl = false; +// } +// +// } else { +// isControl = false; +// } +// +// if(isControl) { +// result.put("controlId", latestControl.getCntrlId()); +// result.put("typeCd", "02"); +// result.put("areaTrnsYn", "E"); +// } else { +// String controlID = UUID.randomUUID().toString(); +// result.put("controlId", controlID); +// result.put("typeCd", "01"); +// result.put("areaTrnsYn", "N"); +// +// // 기체 식별번호의 관제 ID 저장 (single ton) +// shareContext.putIdntfKey(id, controlID); +// } + } else { + result.put("controlId", cacheControlId); + result.put("typeCd", "02"); + result.put("areaTrnsYn", "E"); } List planList = this.getFlightPlan(id);