From c3fcbcdc62bf3280823f4408842787370eaa5219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Thu, 14 Jul 2022 11:47:28 +0900
Subject: [PATCH] .

---
 .../palnet/comn/collection/GPCollection.java  |  7 ---
 .../comn/collection/GPDatabaseCollection.java | 47 -------------------
 .../palnet/server/command/SocketCommand.java  |  9 ----
 3 files changed, 63 deletions(-)
 delete mode 100644 src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java

diff --git a/src/main/java/com/palnet/comn/collection/GPCollection.java b/src/main/java/com/palnet/comn/collection/GPCollection.java
index 31c5c92..ba936e6 100644
--- a/src/main/java/com/palnet/comn/collection/GPCollection.java
+++ b/src/main/java/com/palnet/comn/collection/GPCollection.java
@@ -21,10 +21,6 @@ import java.util.*;
 
 @Slf4j
 public class GPCollection {
-	private Logger logger = LoggerFactory.getLogger(getClass());
-	
-	private static Map<String , String> identKeys = Collections.synchronizedMap(new HashMap<String, String>()); // 기체의 식별 번호
-
 	private MessageProducer messageProducer;
 
 	public GPCollection() {
@@ -34,9 +30,7 @@ public class GPCollection {
 	// 받은 데이터 정보를 데이터구조에 맞게 저장 한다.
 	// 최초에 데이터를 수신한 경우 관제 ID , 관제시작 시간을 셋팅한다.
 	public void putData(List<GPModel> paramData) {
-		
 		List<GPHistoryModel> historyList;
-		GPModel model = new GPModel();
 
 		for(GPModel data : paramData) {
 			data.setServerRcvDt(DateUtils.getCurrentTime()); //서버에서 받은 시간 넣기
@@ -66,6 +60,5 @@ public class GPCollection {
 		BeanUtils.copyProperties(model, databaseModel);
 
 		messageProducer.sendToAppServerMessage(databaseModel);
-//		messageProducer.sendToClientMessage(model);
 	}
 }
diff --git a/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java b/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java
deleted file mode 100644
index 491331c..0000000
--- a/src/main/java/com/palnet/comn/collection/GPDatabaseCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//package com.palnet.comn.collection;
-//
-//import com.palnet.comn.model.GPDatabaseModel;
-//import com.palnet.comn.utils.BeanUtils;
-//import com.palnet.server.message.producer.MessageProducer;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//
-//import java.util.concurrent.ConcurrentLinkedQueue;
-//
-///**
-// * 전송된 원시데이터를 Database 에 넣기 위해 임시 저장해두는 Collection
-// * @author kang
-// *
-// */
-//public class GPDatabaseCollection {
-//
-//	private Logger logger = LoggerFactory.getLogger(getClass());
-//
-//	private static ConcurrentLinkedQueue<GPDatabaseModel> dataList = new ConcurrentLinkedQueue<GPDatabaseModel>();
-//	private MessageProducer messageProducer;
-//
-//	public void putData(GPDatabaseModel paramData) {
-//		dataList.add(paramData);
-//
-//	}
-//
-////	public void putListData(List<GPDatabaseModel> paramDataList) {
-////		dataList.addAll(paramDataList);
-////	}
-//
-//	public ConcurrentLinkedQueue<GPDatabaseModel> getData(){
-//
-//		return dataList;
-//	}
-//
-////	public static void main(String[] args) {
-////		ConcurrentLinkedQueue<String> qe = new ConcurrentLinkedQueue<String>();
-////
-////	}
-////
-//	public void messageSend(GPDatabaseModel model) {
-//		messageProducer = (MessageProducer) BeanUtils.getBean("kafkaProducer");
-//		messageProducer.send("sample-topic", model);
-//	}
-//
-//}
diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java
index f1435cd..36f0bca 100644
--- a/src/main/java/com/palnet/server/command/SocketCommand.java
+++ b/src/main/java/com/palnet/server/command/SocketCommand.java
@@ -58,7 +58,6 @@ public class SocketCommand {
 		}
 		
 		collection.putData(dataList);
-//		logger.debug("SIZE :: " +collection.getData().size() );
 	}
 	
 	
@@ -114,14 +113,6 @@ public class SocketCommand {
 				if(obj.get("sensorO3") != null) model.setSensorO3(Double.valueOf(obj.get("sensorO3").toString()));
 				if(obj.get("sensorDust") != null) model.setSensorDust(Double.valueOf(obj.get("sensorDust").toString()));
 
-				// TODO 환경 데이터 임의의 데이터로 수정 - 추후 제거(임시코드)
-//				if(model.getSensorCo() != null){
-//					model.setSensorCo(TempUtils.gradualData("co"));
-//					model.setSensorSo2(TempUtils.gradualData("so2"));
-//					model.setSensorNo2(TempUtils.gradualData("no2"));
-//					model.setSensorO3(TempUtils.gradualData("o3"));
-//					model.setSensorDust(TempUtils.gradualData("dust"));
-//				}
 				dataList.add(model);
 			}else {
 				logger.info("lat , lon No data ");