Browse Source

드론 식별정보 - 불필요한 항목 제거(배터리잔량, 이동거리)

master
노승철 2 years ago
parent
commit
e245a0109b
  1. 35
      src/main/java/com/palnet/server/command/SocketCommand.java

35
src/main/java/com/palnet/server/command/SocketCommand.java

@ -100,7 +100,6 @@ public class SocketCommand {
model.setTerminalRcvDt(obj.get("terminalRcvDt").toString().trim());
model.setSpeedType((String) obj.get("speedType"));
model.setElevType((String) obj.get("elevType"));
model.setMoveDistanceType((String) obj.get("moveDistanceType"));
model.setDronStatus((String) obj.get("dronStatus"));
if (obj.get("lat") != null) model.setLat(Double.valueOf(obj.get("lat").toString()));
@ -108,20 +107,6 @@ public class SocketCommand {
if (obj.get("elev") != null) model.setElev(Double.valueOf(obj.get("elev").toString()));
if (obj.get("speed") != null) model.setSpeed(Double.valueOf(obj.get("speed").toString()));
if (obj.get("heading") != null) model.setHeading(Double.valueOf(obj.get("heading").toString()));
if (obj.get("moveDistance") != null)
model.setMoveDistance(Double.valueOf(obj.get("moveDistance").toString()));
if (obj.get("betteryLevel") != null)
model.setBetteryLevel(Double.valueOf(obj.get("betteryLevel").toString()));
if (obj.get("betteryVoltage") != null)
model.setBetteryVoltage(Double.valueOf(obj.get("betteryVoltage").toString()));
// 환경 데이터 필드 추가
if (obj.get("sensorCo") != null) model.setSensorCo(Double.valueOf(obj.get("sensorCo").toString()));
if (obj.get("sensorSo2") != null) model.setSensorSo2(Double.valueOf(obj.get("sensorSo2").toString()));
if (obj.get("sensorNo2") != null) model.setSensorNo2(Double.valueOf(obj.get("sensorNo2").toString()));
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()));
// 서버 수신 시간 정보
model.setServerRcvDt(DateUtils.getCurrentTime());
@ -201,26 +186,6 @@ public class SocketCommand {
// STEP 3. 화면에 표출할 정보 WebSocket 전달
messageProducer.sendControlMessage(model);
// try {
// Socket socket = new Socket();
// SocketAddress address = new InetSocketAddress(
// env.getProperty("netty.websocket.host"),
// Integer.parseInt(env.getProperty("netty.websocket.port"))
// );
//
// socket.connect(address);
//
// String gpsJson = JsonUtils.toJson(model);
//
// OutputStream outputStream = socket.getOutputStream();
// outputStream.write(gpsJson.getBytes(StandardCharsets.UTF_8));
// outputStream.flush();
//
// socket.close();
// } catch (IOException e) {
// logger.error("");
// }
} else {
logger.error("좌표 정보가 존재하지 않습니다.");
throw new IllegalArgumentException("좌표 정보가 존재하지 않습니다.");

Loading…
Cancel
Save