From 40eeacb16794f42bc9d22407f62bd48fc423b65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Mon, 25 Jul 2022 17:03:42 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=A2=85=EB=A3=8C=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/jpa/entity/CtrCntrlBas.java | 3 --- .../repository/ctr/CtrCntrlBasRepository.java | 6 ++++- .../jpa/service/ctr/CtrCntrlJpaService.java | 26 +++++-------------- .../biz/message/consumer/MessageConsumer.java | 2 +- .../biz/scheduler/ctr/CtrScheduler.java | 2 +- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java index ef8f6cf..60e16ed 100644 --- a/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java +++ b/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java @@ -22,9 +22,6 @@ public class CtrCntrlBas implements Serializable { @Id @Column(name="CNTRL_ID") private String cntrlId; - - @Column(name="OBJECT_ID") - private String objectId; @Column(name="AVRG_SPEED") private Double avrgSpeed = 0.0; diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java index d9a5365..fbb40b1 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java @@ -1,10 +1,12 @@ package com.palnet.biz.jpa.repository.ctr; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; import com.palnet.biz.jpa.entity.CtrCntrlBas; +import org.springframework.transaction.annotation.Transactional; import java.util.Date; @@ -12,9 +14,11 @@ import java.util.Date; @Repository public interface CtrCntrlBasRepository extends JpaRepository{ + @Modifying + @Transactional @Query("update CtrCntrlBas c " + "SET c.endTypeCd = :endTypeCd, c.cntrlEndDt = :cntrlEndDt " + "WHERE c.cntrlId = :cntrlId") - CtrCntrlBas updateCntrlEndType(String endTypeCd, Date cntrlEndDt, String cntrlId); + Integer updateCntrlEndType(String endTypeCd, Date cntrlEndDt, String cntrlId); } diff --git a/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java b/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java index 8c86c8a..769c946 100644 --- a/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java +++ b/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java @@ -37,35 +37,23 @@ public class CtrCntrlJpaService { Optional optional = ctrCntrlBasRepository.findById(data.getControlId()); if (optional.isPresent()) { logger.debug(ErrorCode.DATA_DUPLICATE.toString()); - return null; -// throw new CustomException(ErrorCode.DATA_DUPLICATE); + return null; } CtrCntrlBas entity = new CtrCntrlBas(); entity.setCntrlId(data.getControlId()); entity.setIdntfNum(data.getObjectId()); - if(StringUtils.isEmpty(data.getProdNumber())) { - entity.setObjectId("none"); - }else { - entity.setObjectId(data.getProdNumber()); - } - + +// if(StringUtils.isEmpty(data.getProdNumber())) { +// entity.setObjectId("none"); +// }else { +// entity.setObjectId(data.getProdNumber()); +// } entity.setObjectTypeCd(data.getObjectType()); entity.setStatusCd(data.getTypeCd()); entity.setProcStatusYn("N"); -// entity.setFlghtStDt(null); -// entity.setFlghtEndDt(null); entity.setCntrlStDt(DateUtils.stringToDatetime(data.getControlStartDt())); -// entity.setCntrlEndDt(DateUtils.stringToLocalDateTime(data.getControlEndDt())); -// entity.setTtlTime(null); -// entity.setTtlTimeType(null); -// entity.setTtlDstnc(null); -// entity.setTtlDstncType(null); -// entity.setAvrgSpeed(null); -// entity.setAvrgSpeedType(null); -// entity.setBttrCnsmptn(null); -// entity.setEndTypeCd(null); entity.setCreateDt(DateUtils.nowDate()); entity.setUpdateDt(DateUtils.nowDate()); 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 2376047..63a4125 100644 --- a/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java +++ b/src/main/java/com/palnet/biz/message/consumer/MessageConsumer.java @@ -27,7 +27,7 @@ public class MessageConsumer { } @RabbitHandler - @RabbitListener(queues = {"app.drone.queue"}) + @RabbitListener(queues = {"app.drone.queue"}, concurrency = "3") public void receivedDroneMessage(final String message) { GPDatabaseModel model = new GPDatabaseModel(); diff --git a/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java b/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java index 4fcd54e..c344350 100644 --- a/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java +++ b/src/main/java/com/palnet/biz/scheduler/ctr/CtrScheduler.java @@ -26,7 +26,7 @@ public class CtrScheduler { * 실행 시점 : 10초에 한번 * 실행 내용 : 특정시간 들어오지 않는 데이터 삭제 처리 */ - @Scheduled(fixedDelay = 1000 * 60 * 5) + @Scheduled(fixedDelay = 1000 * 60) public void removeCollection() { logger.debug("=================== {removeCollection} ===================== "); service.remove();