diff --git a/src/main/java/com/palnet/comn/model/GPModel.java b/src/main/java/com/palnet/comn/model/GPModel.java index a4718a2..f56ded9 100644 --- a/src/main/java/com/palnet/comn/model/GPModel.java +++ b/src/main/java/com/palnet/comn/model/GPModel.java @@ -67,6 +67,6 @@ public class GPModel { private List postionHistory; // 비정상 상황 식별 코드 - private boolean controlWarnCd = true; // 정상: true, 비정상: 비정상 + private boolean controlWarnCd; } diff --git a/src/main/java/com/palnet/server/command/SocketCommand.java b/src/main/java/com/palnet/server/command/SocketCommand.java index 3296e6d..0280a2b 100644 --- a/src/main/java/com/palnet/server/command/SocketCommand.java +++ b/src/main/java/com/palnet/server/command/SocketCommand.java @@ -61,8 +61,8 @@ public class SocketCommand { dataList.add(model); } - collection.putData(dataList); - logger.debug("SIZE :: " +collection.getData().size() ); +// collection.putData(dataList); +// logger.debug("SIZE :: " +collection.getData().size() ); } @@ -134,8 +134,8 @@ public class SocketCommand { } } - collection.putData(dataList); - logger.debug("SIZE :: " +collection.getData().size() ); +// collection.putData(dataList); +// logger.debug("SIZE :: " +collection.getData().size() ); } diff --git a/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java b/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java index 9295997..ff1733a 100644 --- a/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java +++ b/src/main/java/com/palnet/server/task/ctr/CtrCntrlTask.java @@ -25,9 +25,9 @@ public class CtrCntrlTask implements Runnable{ try { // logger.info("=========== [Channel Size : " + cc.getAllChannels().size() + "]"); - cc.getAllChannels().stream().forEach(c -> { // 접속되어 있는 모든 사용자에게 전달 처리 - c.writeAndFlush(new TextWebSocketFrame(JsonUtils.toJson(service.getList()))); - }); +// cc.getAllChannels().stream().forEach(c -> { // 접속되어 있는 모든 사용자에게 전달 처리 +// c.writeAndFlush(new TextWebSocketFrame(JsonUtils.toJson(service.getList()))); +// }); }catch(Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java index e21510b..4d4f963 100644 --- a/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java +++ b/src/main/java/com/palnet/server/task/ctr/service/CtrCntrlTaskService.java @@ -39,75 +39,75 @@ public class CtrCntrlTaskService { */ public ArrayList getList(){ - Map cicData = cic.getData(); - ArrayList list = new ArrayList(); - CtrCntrlModel model; - GPModel dataInfo; - - for(Entry data : cicData.entrySet()) { -// List> historyList = new ArrayList>(); - model = new CtrCntrlModel(); -// dataInfo = new GroundPositionInfoModel(); - dataInfo = data.getValue(); - - model.setObjectId(dataInfo.getObjectId()); - model.setControlId(dataInfo.getControlId()); - model.setControlStartDt(dataInfo.getControlStartDt()); - model.setObjectTypeCd(dataInfo.getObjectType()); - model.setLat(dataInfo.getLat()); - model.setLng(dataInfo.getLng()); - model.setElevType(dataInfo.getElevType()); - model.setElev(dataInfo.getElev()); - model.setSpeedType(dataInfo.getSpeedType()); - model.setSpeed(dataInfo.getSpeed()); - model.setBetteryLevel(dataInfo.getBetteryLevel()); - model.setBetteryVoltage(dataInfo.getBetteryVoltage()); - model.setDronStatus(dataInfo.getDronStatus()); - model.setHeading(dataInfo.getHeading()); - model.setMoveDistance(dataInfo.getMoveDistance()); - model.setMoveDistanceType(dataInfo.getMoveDistanceType()); - - model.setServerRcvDt(dataInfo.getServerRcvDt()); - - // 환경 데이터 필드 추가 - model.setSensorCo(dataInfo.getSensorCo()); - model.setSensorSo2(dataInfo.getSensorSo2()); - model.setSensorNo2(dataInfo.getSensorNo2()); - model.setSensorO3(dataInfo.getSensorO3()); - model.setSensorDust(dataInfo.getSensorDust()); - - //마지막 5개 좌표를 넣기 -// if(dataInfo.getPostionHistory() != null) { -// int listSize = dataInfo.getPostionHistory().size(); -// int limitSize = 10; -// -// if(limitSize >= listSize) { -// limitSize = listSize; -// } -// List tempHistoryList = new ArrayList(); -// -// tempHistoryList = dataInfo.getPostionHistory().subList(listSize - limitSize , listSize); -// -// -// //뒤집기 -// Collections.reverse(tempHistoryList); -// -// for(GroundPositionHistoryModel historyData : tempHistoryList) { -// Map addDate = new HashMap(); -// addDate.put("lat", historyData.getLat()); -// addDate.put("lng", historyData.getLng()); -// -// historyList.add(addDate); -// } -// } -// model.setLastHistory(historyList); - list.add(model); - } - - //=== 정렬 처리 == - //기준 : 관제 시작일이 가장 느린순으로 상단에 올린다. - list.sort(Comparator.reverseOrder()); +// Map cicData = cic.getData(); +// +// CtrCntrlModel model; +// GPModel dataInfo; +// +// for(Entry data : cicData.entrySet()) { +//// List> historyList = new ArrayList>(); +// model = new CtrCntrlModel(); +//// dataInfo = new GroundPositionInfoModel(); +// dataInfo = data.getValue(); +// +// model.setObjectId(dataInfo.getObjectId()); +// model.setControlId(dataInfo.getControlId()); +// model.setControlStartDt(dataInfo.getControlStartDt()); +// model.setObjectTypeCd(dataInfo.getObjectType()); +// model.setLat(dataInfo.getLat()); +// model.setLng(dataInfo.getLng()); +// model.setElevType(dataInfo.getElevType()); +// model.setElev(dataInfo.getElev()); +// model.setSpeedType(dataInfo.getSpeedType()); +// model.setSpeed(dataInfo.getSpeed()); +// model.setBetteryLevel(dataInfo.getBetteryLevel()); +// model.setBetteryVoltage(dataInfo.getBetteryVoltage()); +// model.setDronStatus(dataInfo.getDronStatus()); +// model.setHeading(dataInfo.getHeading()); +// model.setMoveDistance(dataInfo.getMoveDistance()); +// model.setMoveDistanceType(dataInfo.getMoveDistanceType()); +// +// model.setServerRcvDt(dataInfo.getServerRcvDt()); +// +// // 환경 데이터 필드 추가 +// model.setSensorCo(dataInfo.getSensorCo()); +// model.setSensorSo2(dataInfo.getSensorSo2()); +// model.setSensorNo2(dataInfo.getSensorNo2()); +// model.setSensorO3(dataInfo.getSensorO3()); +// model.setSensorDust(dataInfo.getSensorDust()); +// +// //마지막 5개 좌표를 넣기 +//// if(dataInfo.getPostionHistory() != null) { +//// int listSize = dataInfo.getPostionHistory().size(); +//// int limitSize = 10; +//// +//// if(limitSize >= listSize) { +//// limitSize = listSize; +//// } +//// List tempHistoryList = new ArrayList(); +//// +//// tempHistoryList = dataInfo.getPostionHistory().subList(listSize - limitSize , listSize); +//// +//// +//// //뒤집기 +//// Collections.reverse(tempHistoryList); +//// +//// for(GroundPositionHistoryModel historyData : tempHistoryList) { +//// Map addDate = new HashMap(); +//// addDate.put("lat", historyData.getLat()); +//// addDate.put("lng", historyData.getLng()); +//// +//// historyList.add(addDate); +//// } +//// } +//// model.setLastHistory(historyList); +// list.add(model); +// } +// +// //=== 정렬 처리 == +// //기준 : 관제 시작일이 가장 느린순으로 상단에 올린다. +// list.sort(Comparator.reverseOrder()); return list; }