From 4f13507d1d84675f63f74b96d5c1ed472c8de52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 3 Nov 2022 11:55:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?warnlog=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctr/cntrl/service/CtrCntrlService.java | 54 +++++++++++-------- .../biz/message/consumer/MessageConsumer.java | 2 +- 2 files changed, 33 insertions(+), 23 deletions(-) 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 8cdfffd..7237165 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 @@ -244,27 +244,32 @@ public class CtrCntrlService { CtrCntrlBas control = cntrlBasRepository.findById(cntrlId).orElse(null); CtrCntrlHstry hisControl = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(cntrlId).orElse(null); - - if (hisControl != null) { - List flightPlan = this.getFlightPlan(control.getIdntfNum()); - - if (flightPlan != null && !flightPlan.isEmpty()) { - CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); - containsRq.setIdntfNum(control.getIdntfNum()); - containsRq.setLat(hisControl.getLat()); - containsRq.setLon(hisControl.getLon()); - containsRq.setPlanList(flightPlan); - - CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq); - model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning()); - } + List flightPlan = new ArrayList<>(); + if (hisControl != null && control != null) { + flightPlan = this.getFlightPlan(control.getIdntfNum()); + } else { + flightPlan = this.getFlightPlan(hisControl.getTrmnlId()); + } + if (flightPlan != null && !flightPlan.isEmpty()) { + CtrCntrlPlanContainsRq containsRq = new CtrCntrlPlanContainsRq(); + containsRq.setIdntfNum(control.getIdntfNum()); + containsRq.setLat(hisControl.getLat()); + containsRq.setLon(hisControl.getLon()); + containsRq.setPlanList(flightPlan); + + CtrCntrlPlanContainsRs ctrCntrlPlanContainsRs = this.checkPlanContains(containsRq); + model.setControlWarnCd(ctrCntrlPlanContainsRs.isWarning()); } if (model.isControlWarnCd()) { CtrCntrlWarnLog log = new CtrCntrlWarnLog(); - - log.setCntrlId(control.getCntrlId()); - log.setIdntfNum(control.getIdntfNum()); + if(control != null) { + log.setCntrlId(control.getCntrlId()); + log.setIdntfNum(control.getIdntfNum()); + } else { + log.setCntrlId(hisControl.getCntrlId()); + log.setIdntfNum(hisControl.getTrmnlId()); + } log.setOccurDt(hisControl.getSrvrRcvDt()); log.setLat(hisControl.getLat()); log.setLon(hisControl.getLon()); @@ -282,15 +287,20 @@ public class CtrCntrlService { model.setCreateDt(warnLog.getCreateDt()); model.setCreateUserId(warnLog.getCreateUserId()); } + if(control != null) { + model.setCntrlId(control.getCntrlId()); + model.setIdntfNum(control.getIdntfNum()); + model.setWarnCount(warnCount); + result.add(model); + return result; + } + model.setCntrlId(hisControl.getCntrlId()); + model.setIdntfNum(hisControl.getTrmnlId()); + model.setWarnCount(warnCount); - if(control.getCntrlId()!=null) model.setCntrlId(control.getCntrlId()); - if(control.getIdntfNum()!=null) model.setIdntfNum(control.getIdntfNum()); - if(warnCount!=null) model.setWarnCount(warnCount); - result.add(model); } - return result; } diff --git a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java index b6dfc5f..afb9004 100644 --- a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java @@ -33,7 +33,7 @@ public class MessageConsumer { GPModel model = objectMapper.readValue(message, GPModel.class); messageService.insert(model); // GPS 정보 DB 동기화 처리 -// channel.queueDeclare(message, true, false, false, null); + channel.basicAck(tag, false); } catch (RuntimeException e) { channel.basicReject(tag, false); From 17ac6d0a88e7d383f9999ab6dcd944170dbbe4d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Thu, 3 Nov 2022 17:37:38 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Rabbitmq=20-=20Channel.close=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/palnet/biz/message/consumer/MessageConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java index afb9004..d424eff 100644 --- a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java @@ -34,7 +34,7 @@ public class MessageConsumer { messageService.insert(model); // GPS 정보 DB 동기화 처리 - channel.basicAck(tag, false); +// channel.basicAck(tag, false); } catch (RuntimeException e) { channel.basicReject(tag, false); } From 583fa0d221e76a706becb6406180790972634882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=9A=B0?= <박재우@DESKTOP-EF7ECBO> Date: Fri, 4 Nov 2022 14:58:19 +0900 Subject: [PATCH 3/3] =?UTF-8?q?JwtTokenUtil=20-=20=EA=B0=80=EC=9E=85?= =?UTF-8?q?=ED=95=9C=20=EA=B7=B8=EB=A3=B9=EC=9D=B4=20=ED=95=98=EB=82=98?= =?UTF-8?q?=EB=8F=84=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20nullPoint?= =?UTF-8?q?Exception=20=EC=83=9D=EA=B8=B0=EB=8D=98=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/acnt/jwt/utils/JwtTokenUtil.java | 14 ++++++++------ .../repository/ctr/CtrCntrlQueryRepository.java | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java index a1b729f..3a6019d 100644 --- a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java @@ -140,12 +140,14 @@ public class JwtTokenUtil implements Serializable { Claims payload = getAllClaimsFromToken(token); List groupList = payload.get("group", ArrayList.class); List r = new ArrayList<>(); - - for(LinkedHashMap map : groupList){ - JwtGroupModel model = new JwtGroupModel(); - model.setGroupId(map.get("groupId")); - model.setGroupAuthCd(map.get("groupAuthCd")); - r.add(model); + + if(groupList!=null) { + for(LinkedHashMap map : groupList){ + JwtGroupModel model = new JwtGroupModel(); + model.setGroupId(map.get("groupId")); + model.setGroupAuthCd(map.get("groupAuthCd")); + r.add(model); + } } return r; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index fb77908..2db52f7 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1510,12 +1510,14 @@ public List listCntrlHstry(String id){ for(CtrCntrlGroupModel list : model) { - for(JwtGroupModel lists : groupAuth) { - if(list.getGroupId().equals(lists.getGroupId())) { - list.setGroupAuthCd(lists.getGroupAuthCd()); - break; - }else { - list.setGroupAuthCd(""); + if(groupAuth != null) { + for(JwtGroupModel lists : groupAuth) { + if(list.getGroupId().equals(lists.getGroupId())) { + list.setGroupAuthCd(lists.getGroupAuthCd()); + break; + }else { + list.setGroupAuthCd(""); + } } } }