From cf559d90bcbda69a09e290a66cd8aff2b3644aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Thu, 29 Sep 2022 17:06:36 +0900 Subject: [PATCH] =?UTF-8?q?drone=20history=20=EA=B5=AC=EB=B6=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/ctr/cntrl/service/CtrCntrlService.java | 2 -- .../message/service/impl/MessageServiceImpl.java | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 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 6d59340..c9896b6 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 @@ -116,7 +116,6 @@ public class CtrCntrlService { List areaList = query.detailArea(controlId); String stAreaNm = ""; -// log.debug(">>>>" + areaList ); for(CtrCntrlHstryArea data : areaList) { if(data.getActnType().equals("01")) { @@ -148,7 +147,6 @@ public class CtrCntrlService { result.setStAreaNm(stAreaNm); return result; - } /** diff --git a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java index c4faec3..d9504e9 100644 --- a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java @@ -132,11 +132,14 @@ public class MessageServiceImpl implements MessageService { ctrCntrlJpaService.insertCtrCntrlBas(dbModel); } - CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel); - - if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { - ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno()); - } + // Drone인 경우에만 history 생성 + if (model.getObjectId().indexOf("PALDRONE") > -1) { + CtrCntrlHstry ctrCntrlHstry = ctrCntrlJpaService.insertCtrCntrlHstry(dbModel); + + if(model.getTypeCd().equals("01") || model.getTypeCd().equals("99")) { + ctrCntrlJpaService.insertCtrCntrlHstryArea(dbModel, ctrCntrlHstry.getHstrySno()); + } + } } @Override