비행 종료 처리

src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java

@@ -23,9 +23,6 @@ public class CtrCntrlBas implements Serializable {
 	@Column(name="CNTRL_ID")
 	private String cntrlId;
 	
-	@Column(name="OBJECT_ID")
-	private String objectId;
-	
 	@Column(name="AVRG_SPEED")
 	private Double avrgSpeed = 0.0;
 

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<CtrCntrlBas, String>{
 
+    @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);
 	
 }

src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java

@@ -38,34 +38,22 @@ public class CtrCntrlJpaService {
 		if (optional.isPresent()) {
 			logger.debug(ErrorCode.DATA_DUPLICATE.toString());
 			return null;
-//			throw new CustomException(ErrorCode.DATA_DUPLICATE);
 		}
 		
 		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());
 		

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();
 

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();