对接血氧数据

src/main/java/com/ccsens/pelma_analyse/service/PelmaDataAccept.java

@@ -1,5 +1,5 @@
 package com.ccsens.pelma_analyse.service;
 
 public interface PelmaDataAccept {
-    public void handle(String data);
+    public void handle(byte[] data);
 }

src/main/java/com/ccsens/pelma_analyse/service/impl/PelmaDataAcceptImpl.java

@@ -9,19 +9,18 @@ import java.util.HashMap;
 
 public class PelmaDataAcceptImpl implements PelmaDataAccept {
     @Override
-    public void handle(String accept_str) {
+    public void handle(byte[] accept_str) {
-        accept_str = accept_str.replace(" ", "");
+        String accept_str2 = SerialTool.byteArrayToHexString(accept_str);
+        accept_str2 = accept_str2.replace(" ", "");
 
-        String send_data = accept_str.substring(6, accept_str.length() - 2);
+        String type = accept_str2.substring(6, 10);
-
+        String device = accept_str2.substring(10, 12);
-//        String device = accept_str.substring(6, accept_str.length() - 2);
+        String send_data = accept_str2.substring(12, accept_str2.length() - 4);
-
-//        String type = accept_str.substring(6, accept_str.length() - 2);
 
         HashMap<String, String> map = new HashMap<>();
+        map.put("type", type);
+        map.put("device", device);
         map.put("send_data", send_data);
-        map.put("device", "1");
-        map.put("type", "1");
 
         RestTemplate restTemplate = new RestTemplate();
 

src/main/java/com/ccsens/pelma_analyse/service/impl/SerialServiceImpl.java

@@ -62,7 +62,7 @@ public class SerialServiceImpl implements SerialService {
             //上报数据
 //            sendData(openSerial);
             //测试足底
-            sendPelmaData(openSerial);
+//            sendPelmaData(openSerial);
         } catch (Exception e) {
             System.out.println(e.getMessage());
         }
@@ -222,7 +222,7 @@ public class SerialServiceImpl implements SerialService {
             if (res_ack != null ){
                 try {
                     PelmaDataAcceptImpl pelmaDataAccept = new PelmaDataAcceptImpl();
-                    pelmaDataAccept.handle(res_ack);
+//                    pelmaDataAccept.handle(res_ack);
 //                    String send_data = res_ack.substring(6, res_ack.length() - 2);
 //                    RestTemplate restTemplate = new RestTemplate();
 //                    System.out.println(send_data);

src/main/java/com/ccsens/pelma_analyse/util/netty/SocketHandler.java

@@ -32,11 +32,11 @@ public class SocketHandler extends ChannelInboundHandlerAdapter {
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
         // 由于我们配置的是 字节数组 编解码器，所以这里取到的用户发来的数据是 byte数组
         byte[] data = (byte[]) msg;
-        String accept_str = new String(data);
+//        String accept_str = new String(data);
-        log.info("收到消息: " + accept_str);
+        log.info("收到消息: " + data);
 
         PelmaDataAccept pelmaDataAccept = new PelmaDataAcceptImpl();
-        pelmaDataAccept.handle(accept_str);
+        pelmaDataAccept.handle(data);
         // 给其他人转发消息
 //        for (Channel client : clients) {
 //            if (!client.equals(ctx.channel())) {

src/main/resources/application.yml

@@ -4,13 +4,13 @@ spring:
 server:
   port: 8080
 
-service_url_analyse: "http://127.0.0.1:8001"
+service_url_analyse: "http://127.0.0.1:8000"
 netty:
-  port: 8011
+  port: 8081
   bossThread: 1
 
 #串口号
 serial:
   com_num: 1
   com_num_limit: 10
-  white_list: 616162626364,616162626365,616162626366,616162626367,616162626368
+  white_list: 616162626364,616162626365,616162626366,616162626367,616162626368