Bladeren bron

修改消失/再现,队形转换、结束的udp发送逻辑和bug

allen 5 dagen geleden
bovenliggende
commit
5cde5c440f

+ 4 - 0
uavps-framework/src/main/java/com/uavps/framework/udp/TaskInfo.java

@@ -6,6 +6,10 @@ import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+/**
+ * @author allen
+ */
+
 public enum TaskInfo {
     // 枚举实例,包含初始化坐标和转化比率
     INSTANCE(0.0f, 0.0f, true, 1.0f);

+ 11 - 16
uavps-framework/src/main/java/com/uavps/framework/websocket/WebSocketServer.java

@@ -132,7 +132,7 @@ public class WebSocketServer {
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("RUN json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -150,16 +150,15 @@ public class WebSocketServer {
                 } else if (message.startsWith("TRANSFORMATION:")) {
 //                    closeUdpServer();
 
-                    String param = message.substring(15);
-                    String[] paramAry = param.split(",");
+                    String bizId = message.substring(15);
                     UavpsTask uavpsTask = new UavpsTask();
-                    uavpsTask.setBizId(Long.parseLong(paramAry[0]));
+                    uavpsTask.setBizId(Long.parseLong(bizId));
                     uavpsTask.setBizType(UavpsTask.CHANGE);
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("TRANSFORMATION json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -172,16 +171,14 @@ public class WebSocketServer {
                     UavpsTask uavpsTask = new UavpsTask();
                     uavpsTask.setBizId(Long.parseLong(paramAry[0]));
                     uavpsTask.setBizType(UavpsTask.DISAPPEAR);
-                    for (int i = 0; i <= paramAry.length; i++) {
-                        if (i != 0) {
-                            uavpsTask.getNumbers().add(Integer.parseInt(paramAry[i]));
-                        }
+                    for (String s : paramAry) {
+                        uavpsTask.getNumbers().add(Integer.parseInt(s));
                     }
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("DISAPPEAR json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -193,16 +190,14 @@ public class WebSocketServer {
                     UavpsTask uavpsTask = new UavpsTask();
                     uavpsTask.setBizId(Long.parseLong(paramAry[0]));
                     uavpsTask.setBizType(UavpsTask.SHOW);
-                    for (int i = 0; i <= paramAry.length; i++) {
-                        if (i != 0) {
-                            uavpsTask.getNumbers().add(Integer.parseInt(paramAry[i]));
-                        }
+                    for (String s : paramAry) {
+                        uavpsTask.getNumbers().add(Integer.parseInt(s));
                     }
                     ObjectMapper mapper = new ObjectMapper();
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("SHOW json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }
@@ -217,7 +212,7 @@ public class WebSocketServer {
                     String json = null;
                     try {
                         json = mapper.writeValueAsString(uavpsTask);
-                        logger.info("json :{}", json);
+                        logger.info("END json :{}", json);
                     } catch (Exception e) {
                         logger.error("WebSocketServer.onMessage to json error", e);
                     }