the new service . manager

Change thread to monitor

add other

README.md

@@ -1,4 +1,5 @@
-# IoT_2021 
+# IoT_2021
+
 ## nstthh 数量监测
 
     NRJavaSerialService usb-9600 

pom.xml

@@ -48,12 +48,17 @@
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
         </dependency>
-
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!--
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
+        -->
         <dependency>
             <groupId>com.neuronrobotics</groupId>
             <artifactId>nrjavaserial</artifactId>

src/main/java/com/sjls/nstthh/NstthhApplication.java

@@ -2,16 +2,32 @@ package com.sjls.nstthh;
 
 
 import com.sjls.nstthh.service.NRJavaSerialManager;
+import gnu.io.NRSerialPort;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.io.IOException;
+import java.util.TooManyListenersException;
+
 
 @SpringBootApplication
 public class NstthhApplication {
 
-    public static void main(String[] args) {
+    private static final Logger logger = LoggerFactory.getLogger(NstthhApplication.class);
+
+    public static NRSerialPort serialPort = null;
+
+    public static void main(String[] args) throws TooManyListenersException, IOException, InterruptedException {
         SpringApplication.run(NstthhApplication.class, args);
-        new NRJavaSerialManager().connect();
+
+        String port = "/dev/tty.usbserial-14130";
+        serialPort = new NRSerialPort(port, 9600);
+        boolean b = serialPort.connect();
+
+        new NRJavaSerialManager().operation(NstthhApplication.serialPort);
+
     }
 
 }

src/main/java/com/sjls/nstthh/controller/HardwareAdmin.java

@@ -1,12 +1,18 @@
 package com.sjls.nstthh.controller;
 
+import com.sjls.nstthh.NstthhApplication;
 import com.sjls.nstthh.mqtt.MsgWriter;
+import com.sjls.nstthh.service.CommunicationService;
+import com.sjls.nstthh.service.NRJavaSerialManager;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.TooManyListenersException;
 
 /**
  * smp admin
@@ -15,15 +21,15 @@ import javax.annotation.Resource;
 @Controller
 public class HardwareAdmin {
 
+    @Resource
+    private MsgWriter msgWriter;
+
     @RequestMapping("")
     @ResponseBody
     public String index() {
         return "Hi Nstthh";
     }
 
-    @Resource
-    private MsgWriter msgWriter;
-
     @RequestMapping(value = "/testmqtt")
     public void test_mqtt(String msg) {
         msgWriter.sendToMqtt(msg);
@@ -35,5 +41,24 @@ public class HardwareAdmin {
         return "nstthh";
     }
 
+
+
+    private CommunicationService communicationService;
+
+    @Autowired
+    public void setCommunicationService(CommunicationService communicationService) {
+        this.communicationService = communicationService;
+    }
+
+    @RequestMapping("/mtest")
+    public void mtest() throws TooManyListenersException, IOException, InterruptedException {
+
+        communicationService.creatToBeTested(16,35);
+
+
+
+
+        new NRJavaSerialManager().operationM(NstthhApplication.serialPort);
+    }
 }
 

src/main/java/com/sjls/nstthh/entity/AngleObject.java

@@ -0,0 +1,32 @@
+package com.sjls.nstthh.entity;
+
+public class AngleObject {
+
+    private double levelAngle;
+    private double verticalAngle;
+    private double realHypotenuse;
+
+    public double getLevelAngle() {
+        return levelAngle;
+    }
+
+    public void setLevelAngle(double levelAngle) {
+        this.levelAngle = levelAngle;
+    }
+
+    public double getVerticalAngle() {
+        return verticalAngle;
+    }
+
+    public void setVerticalAngle(double verticalAngle) {
+        this.verticalAngle = verticalAngle;
+    }
+
+    public double getRealHypotenuse() {
+        return realHypotenuse;
+    }
+
+    public void setRealHypotenuse(double realHypotenuse) {
+        this.realHypotenuse = realHypotenuse;
+    }
+}

src/main/java/com/sjls/nstthh/entity/Equipment.java

@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.util.Date;
 
 /**
  * dpj
@@ -29,4 +30,7 @@ public class Equipment {
 
     private String emAddress;
 
+    private Date creatTime;
+
+
 }

src/main/java/com/sjls/nstthh/entity/ReceiveData.java

@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.util.Date;
 
 @Data
 @Entity
@@ -20,4 +21,10 @@ public class ReceiveData {
 
     private String distance; //00000989
 
+    private Date creatTime;
+
+    private double levelAngle; //z
+    private double verticalAngle; //y
+    private double realHypotenuse; //d
+
 }

src/main/java/com/sjls/nstthh/entity/SendData.java

@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.util.Date;
 
 @Data
 @Entity
@@ -18,4 +19,5 @@ public class SendData {
 
     private String sendKey; //12345678;029B029B
 
-}
+    private Date creatTime;
+ }

src/main/java/com/sjls/nstthh/entity/Test.java

@@ -0,0 +1,15 @@
+package com.sjls.nstthh.entity;
+
+import cn.hutool.core.date.DateTime;
+
+public class Test {
+    public static void main(String[] args) {
+        String str222 = "68220185000000E08812345678031101B50102087707EA0000074B00FF79123456786B1B16";
+        String strrrrr = "68220185000000E08812345678031101B50102087707EA0000074B00FF79123456786B1B16";
+        System.out.println("strrrrr.equals(str222) = " + strrrrr.equals(str222));
+
+        System.out.println( DateTime.now());
+
+
+    }
+}

src/main/java/com/sjls/nstthh/mqtt/MqttSenderConfig.java

@@ -25,35 +25,28 @@ import org.springframework.messaging.MessageHandler;
 @Slf4j
 public class MqttSenderConfig {
 
+    /**
+     * 订阅的bean名称
+     */
+    public static final String CHANNEL_NAME_IN = "mqttInboundChannel";
+    /**
+     * 发布的bean名称
+     */
+    public static final String CHANNEL_NAME_OUT = "mqttOutboundChannel";
     private static final Logger LOGGER = LoggerFactory.getLogger(MqttSenderConfig.class);
-
     @Value("${spring.mqtt.username}")
     private String username;
-
     @Value("${spring.mqtt.password}")
     private String password;
-
     @Value("${spring.mqtt.url}")
     private String hostUrl;
-
     @Value("${spring.mqtt.publishclientid}")
     private String publishclientid;
-
     @Value("${spring.mqtt.subsribeclientid}")
     private String subsribeclientid;
-
     @Value("${spring.mqtt.default_topic}")
     private String defaultTopic;
 
-    /**
-     * 订阅的bean名称
-     */
-    public static final String CHANNEL_NAME_IN = "mqttInboundChannel";
-    /**
-     * 发布的bean名称
-     */
-    public static final String CHANNEL_NAME_OUT = "mqttOutboundChannel";
-
 //    @Autowired
 //    private MqttCallbackHandler mqttCallbackHandler;
 
@@ -120,7 +113,7 @@ public class MqttSenderConfig {
     public MessageProducer inbound() {
         // 可以同时消费（订阅）多个Topic
         MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(
-                subsribeclientid, mqttClientFactory(), new String[]{defaultTopic});
+                subsribeclientid, mqttClientFactory(), defaultTopic);
         adapter.setCompletionTimeout(5000);
         adapter.setConverter(new DefaultPahoMessageConverter());
         adapter.setQos(2);
@@ -145,15 +138,15 @@ public class MqttSenderConfig {
     public MessageHandler handler() {
         return new MessageHandler() {
             @Override
-            public void handleMessage(Message<?> message)  {
+            public void handleMessage(Message<?> message) {
                 try {
                     String topic = message.getHeaders().get("mqtt_receivedTopic").toString();
                     String qos = message.getHeaders().get("mqtt_receivedQos").toString();
                     String payload = message.getPayload().toString();
                     //mqttCallbackHandler.handle(topic,payload);
-                    LOGGER.info("主题："+topic);
-                    LOGGER.info("内容："+payload);
-                    LOGGER.info("级别："+qos);
+                    LOGGER.info("主题：" + topic);
+                    LOGGER.info("内容：" + payload);
+                    LOGGER.info("级别：" + qos);
                     //message.get
                 } catch (Exception e) {
                     LOGGER.error(e.getMessage(), e);

src/main/java/com/sjls/nstthh/mqtt/MsgWriter.java

@@ -10,7 +10,9 @@ import org.springframework.stereotype.Component;
 public interface MsgWriter {
 
     void sendToMqtt(String data);
-    void sendToMqtt(String payload,@Header(MqttHeaders.TOPIC) String topic);
+
+    void sendToMqtt(String payload, @Header(MqttHeaders.TOPIC) String topic);
+
     void sendToMqtt(@Header(MqttHeaders.TOPIC) String topic, @Header(MqttHeaders.QOS) int qos, String payload);
 
 }

src/main/java/com/sjls/nstthh/service/CommConfig.java

@@ -0,0 +1,31 @@
+package com.sjls.nstthh.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+
+@Configuration
+public class CommConfig {
+
+    private static final Logger logger = LoggerFactory.getLogger(CommConfig.class);
+
+
+    private CommunicationService communicationService;
+
+    @Autowired
+    public void setCommunicationService(CommunicationService communicationService) {
+        this.communicationService = communicationService;
+    }
+
+
+    @PostConstruct
+    public void init() {
+        //communicationService.addSendStr(35);
+    }
+
+
+}

src/main/java/com/sjls/nstthh/service/CommunicationService.java

@@ -1,10 +1,13 @@
 package com.sjls.nstthh.service;
 
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.sjls.nstthh.entity.ReceiveData;
 import com.sjls.nstthh.entity.SendData;
 import com.sjls.nstthh.repository.ReceiveDataRepository;
 import com.sjls.nstthh.repository.SendDataRepository;
+import com.sjls.nstthh.util.AlgAlgorithm;
 import com.sjls.nstthh.util.StrSplicingAssistant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,14 +26,10 @@ import java.util.List;
 public class CommunicationService {
 
     private static final Logger logger = LoggerFactory.getLogger(CommunicationService.class);
-
+    static List receiveList = new ArrayList();
     private SendDataRepository sendDataRepository;
-
     private ReceiveDataRepository receiveDataRepository;
 
-    static List receiveList = new ArrayList();
-
-
     @Autowired
     public void setSendDataRepository(SendDataRepository sendDataRepository) {
         this.sendDataRepository = sendDataRepository;
@@ -51,16 +50,24 @@ public class CommunicationService {
         return receiveDataRepository.saveAll(receiveDataList);
     }
 
-    public synchronized boolean determineRstrPersistence(String str_receive_head, String currentSendStr, String str_receive) {
-        //logger.info(" currentSendStr = " + currentSendStr + " str_receive= " + str_receive);
+
+    /**
+     * 验证  打点后的数据 ？是否crc 并组装到list
+     * @param str_receive_head
+     * @param currentSendStr
+     * @param str_receive
+     * @return
+     */
+    public boolean determineRstrPersistence(String str_receive_head, String currentSendStr, String str_receive) {
+        //logger.info(" determineRstrPersistence_currentSendStr = " + currentSendStr + " str_receive= " + str_receive);
         //当前发送的串，截取出角度。
         String currentSendStr_deviceid = currentSendStr.substring(18, 26);
         String currentSendStr_zy = currentSendStr.substring(38, 46);
 
         //当前接收的串，截取出角度，设备，距离。
         String deviceid = str_receive.substring(18, 26);//截取设备id
-        //String anglez = str_receive.substring(38, 42);//截取角度
-        //String angley = str_receive.substring(42, 46);//截取角度
+        String anglez = str_receive.substring(38, 42);//截取角度
+        String angley = str_receive.substring(42, 46);//截取角度
         String anglezy = str_receive.substring(38, 46);//角度
 
         String distance = str_receive.substring(46, 54);//截取距离
@@ -83,6 +90,7 @@ public class CommunicationService {
                 receiveData.setReceiveStr(str_receive);
                 receiveData.setReceiveKey(deviceid + anglezy);
                 receiveData.setDistance(distance);
+                receiveData.setCreatTime(DateTime.now());
                 //saveReceiveStr(receiveData);
                 receiveList.add(receiveData);
                 logger.info(receiveList.size() + ": _receive_str = " + anglezy + " | " + distance);
@@ -92,5 +100,61 @@ public class CommunicationService {
         return false;
     }
 
+    /**
+     * 创建 待打点 并 2db
+     * @param diameter
+     * @param high
+     */
+    public void creatToBeTested(double diameter,double high) {
+
+        sendDataRepository.deleteAll();
+
+        String str = AlgAlgorithm.getAveragePosition(diameter,high);
+        String[] strArr_z_y = str.split(";");
+        List<SendData> list2db = new ArrayList<SendData>();
+        for (int i = 0; i < strArr_z_y.length; i++) {
+            String[] strArr = strArr_z_y[i].split(",");
+            //System.out.println(Long.valueOf(strArr[0]));  System.out.println(Long.valueOf(strArr[1]));
+            String str10 = send16strUseCom(Long.valueOf(strArr[0]), Long.valueOf(strArr[1]));
+            //System.out.println("sendStr.add(\"" + str10 + "\");");
+            SendData SendData = new SendData();
+            SendData.setSendStr(str10);
+            String deviceid = str10.substring(18, 26);//截取设备id
+            String anglezy = str10.substring(38, 46);//角度
+            SendData.setSendKey(deviceid + anglezy);
+            SendData.setCreatTime(DateTime.now());
+            list2db.add(SendData);
+        }
+
+        sendDataRepository.saveAll(list2db);
+
+    }
+
+    /**
+     * 16进制 str
+     * @param z_val
+     * @param y_val
+     * @return
+     */
+    public static String send16strUseCom(long z_val, long y_val) {
+
+        // 第一个{}为 ：z，y 角度转为步长 16进制 每隔两位字符串串加空格
+        // 第二个{}为 ：sendStr_1_tmp串 crc验证后
+        String sendStr_0_tmp = "681C0105000000CD96";
+        String sendStr_1_tmp = "12345678031101A50102{}0012345678";
+        String sendStr_2_tmp = "{}16";
+//        String z = StrSplicingAssistant.hex10To16(StrSplicingAssistant.angleTransformationStep(z_val));
+//        String y = StrSplicingAssistant.hex10To16(StrSplicingAssistant.angleTransformationStep(y_val));
+        String z = StrSplicingAssistant.hex10To16(z_val);
+        String y = StrSplicingAssistant.hex10To16(y_val);
+        //16进制zy 替换 sendStr_1_tmp{}
+        String sendStr_1_v = StrUtil.format(sendStr_1_tmp, z + y);
+        //sendStr_1_v比特流CRC验证逆序并高低位置换后加空格格式化 替换 sendStr_2_tmp{}
+        String sendStr_2_v = StrUtil.format(sendStr_2_tmp, StrSplicingAssistant.displacementHighLow(StrSplicingAssistant.CRC16Right(sendStr_1_v)));
+
+        String sendstr_ = sendStr_0_tmp + sendStr_1_v + sendStr_2_v;
+        // System.out.print(sendstr_);
+        return sendstr_;
+    }
 
 }

src/main/java/com/sjls/nstthh/service/NRJavaSerialManager.java

@@ -1,6 +1,8 @@
 package com.sjls.nstthh.service;
 
+import com.sjls.nstthh.entity.AngleObject;
 import com.sjls.nstthh.entity.SendData;
+import com.sjls.nstthh.util.AlgAlgorithm;
 import com.sjls.nstthh.util.StrSplicingAssistant;
 import gnu.io.NRSerialPort;
 import gnu.io.SerialPortEvent;
@@ -13,21 +15,27 @@ import org.springframework.stereotype.Component;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.TooManyListenersException;
+import java.util.*;
 
 
 @Component
 public class NRJavaSerialManager {
     private static final Logger logger = LoggerFactory.getLogger(NRJavaSerialManager.class);
 
-    private static String str_init = "681C0105000000CD9612345678031101A5010205DC05DC00123456785FA816";
-    private static String str_heartbeat = "68140186000000E55A1234567803510112345678B1E216";
-    private static String str_receive_head = "68220185000000E088";
+    private static final String str_init = "681C0105000000CD9612345678031101A5010205DC05DC00123456785FA816";
+    private static final String str_heartbeat = "68140186000000E55A1234567803510112345678B1E216";
+    private static final String str_receive_head = "68220185000000E088";
 
     private volatile static String currentSendStr = str_init;
-    private volatile static String[] str_receive_at_arr = new String[2];
+
+    public static List<SendData> getSendStr() {
+        return sendStr;
+    }
+
+    public static void setSendStr(List<SendData> sendStr) {
+        NRJavaSerialManager.sendStr = sendStr;
+    }
+
     private volatile static List<SendData> sendStr = null;
 
     private volatile static boolean isHeartbeat = false;
@@ -36,45 +44,69 @@ public class NRJavaSerialManager {
 
     private static CommunicationService communicationService;
 
+    public final synchronized static boolean wait10Seconds(long m) {
+        try {
+            Thread.sleep(m);
+        } catch (InterruptedException e) {
+        }
+        return true;
+    }
+
     @Autowired
     public void setCommunicationService(CommunicationService communicationService) {
-        this.communicationService = communicationService;
-        sendStr = communicationService.getSendStr();
+        NRJavaSerialManager.communicationService = communicationService;
     }
 
-    public void connect() {
-        NRSerialPort serialPort = new NRSerialPort("/dev/tty.usbserial-14130", 9600);
-        serialPort.connect();
+    /**
+     * 启动时，打两次。
+     *
+     * @param serialPort
+     * @throws IOException
+     * @throws TooManyListenersException
+     * @throws InterruptedException
+     */
+    public void operation(NRSerialPort serialPort) throws IOException, TooManyListenersException, InterruptedException {
+        sendStr = communicationService.getSendStr();
 
+        while (sendStr.size() > 0) {
+            break;
+        }
         DataInputStream inStream = new DataInputStream(serialPort.getInputStream());
         DataOutputStream outStream = new DataOutputStream(serialPort.getOutputStream());
 
-        Thread t1 = new Thread(new SerialWriter(outStream));
-        t1.start();
+        serialPort.addEventListener(new SerialReader(inStream));
+        serialPort.notifyOnDataAvailable(true);
 
-        try {
-            serialPort.addEventListener(new SerialReader(inStream));
-            serialPort.notifyOnDataAvailable(true);
-        } catch (TooManyListenersException e1) {
-            e1.printStackTrace();
-        }
+        Thread t1 = new Thread(new SerialWriter(outStream), "t1");
+        t1.start();
+        t1.join();
+        Thread t2 = new Thread(new SerialWriter(outStream), "t2");
+        t2.start();
 
-        while (isSerialPortDisconnect) {
-            try {
-                t1.interrupt();
-                //t2.interrupt();
-                serialPort.notifyOnDataAvailable(false);
-                serialPort.disconnect();
-            } catch (Exception e1) {
-                e1.printStackTrace();
-            }
+    }
 
+    /**
+     * 定时任务，手动请求，打一次。
+     *
+     * @param serialPort
+     * @throws IOException
+     * @throws TooManyListenersException
+     * @throws InterruptedException
+     */
+    public void operationM(NRSerialPort serialPort) throws IOException, TooManyListenersException, InterruptedException {
+        while (sendStr.size() > 0) {
+            break;
         }
+        DataOutputStream outStream = new DataOutputStream(serialPort.getOutputStream());
+        Thread t1 = new Thread(new SerialWriter(outStream), "t1");
+        t1.start();
 
     }
 
+
     public static class SerialReader implements SerialPortEventListener {
-        private DataInputStream inStream;
+        private final DataInputStream inStream;
+        private String str_receive_at = "";
 
         public SerialReader(DataInputStream inStream) {
             this.inStream = inStream;
@@ -90,56 +122,51 @@ public class NRJavaSerialManager {
 
                 if (str_receive.equals(str_heartbeat)) {
                     isHeartbeat = true;
-                    //logger.info(" SerialReader.isHeartbeat; = " + str_receive);
                 } else {
                     if (str_receive.length() == 64) {
-                        str_receive_at_arr[0] = str_receive;
+                        str_receive_at = str_receive;
                     }
                     if (str_receive.length() == 10) {
-                        str_receive_at_arr[1] = str_receive;
+                        str_receive_at += str_receive;
                     }
 
-                    if (str_receive_at_arr[0] != null && str_receive_at_arr[1] != null) {
-                        String str_receive_at = str_receive_at_arr[0] + str_receive_at_arr[1];
-
-                        //logger.info(" SerialReader.isHeartbeat; = " + str_receive_at);
-
-                        if (str_receive_at.contains("EEEEEEEE")) {
-                            logger.info("测距失败 eeeeee------" + str_receive_at);
-                            isReceive = true;
-                        } else {
-                            logger.info(isReceive+" ggggggggg eeeeee------");
+                    while (str_receive_at.length() == 74) {
+                        logger.info("run SerialReader " + str_receive_at);
 
-                            // 判断返回串 正确与否，并组装 list for add。
-                            isReceive = communicationService.determineRstrPersistence(str_receive_head, currentSendStr, str_receive_at);
-                            if (!isReceive) {
-                                logger.info(" ggggggggg eeeeee------");
-
-                                wait10Seconds(2000);
+                        synchronized (this) {
+                            if (!str_receive_at.contains("EEEEEEEE")) {
+                                // 判断返回串 正确与否，并组装 list for add。
+                                isReceive = communicationService.determineRstrPersistence(str_receive_head, currentSendStr, str_receive_at);
+                            }else {
                                 isReceive = true;
                             }
+                            break;
                         }
                     }
+                    //wait10Seconds(5000);
+                    //isReceive = true;
                 }
             } catch (IOException e) {
                 e.printStackTrace();
+                return;
             }
         }
     }
 
     public static class SerialWriter implements Runnable {
-        private DataOutputStream outStream;
         //初始化设备位置，只一次。
         boolean onlyOnce = true;
+        private final DataOutputStream outStream;
 
         public SerialWriter(DataOutputStream outStream) {
             this.outStream = outStream;
         }
 
         public void run() {
-            logger.info(" wait for send point number ......" + sendStr.size());
+            logger.info("wait for send point number testing ......" + sendStr.size());
 
             while (!Thread.interrupted()) {
+                // logger.info("run SerialWriter 11111......" );
                 try {
                     if (isHeartbeat && onlyOnce) {
                         outStream.write(StrSplicingAssistant.hexStrToByteArrs(str_init));
@@ -159,34 +186,36 @@ public class NRJavaSerialManager {
                             }
                         } else {
                             List receiveList_ = CommunicationService.receiveList;
-                            //logger.info("success _发送:" + sendStr.size() + "_接收:" + receiveList_.size());
-                            //logger.info("success _发送:" + sendStr + "_接收:" + receiveList_);
-
-                            // 组装的list 一次性save。
+                             // 组装的list 一次性save。
                             List receiveListDB_ = communicationService.saveReceiveData(receiveList_);
-                            if (receiveListDB_ != null && receiveListDB_.size() > 0)
+                            if (receiveListDB_ != null && receiveListDB_.size() > 0) {
                                 isSerialPortDisconnect = true;
-                            logger.info(isSerialPortDisconnect + "_success _ 接收:" + receiveListDB_);
+                                logger.info(isSerialPortDisconnect + "_success _ :");
+                                //todo
+
+                                AngleObject angleObject = new AngleObject();
+
+
+                                Map map = new HashMap<Double,AngleObject>();
+
+
+                                AlgAlgorithm.sxy(map);
+
+
+                                AlgAlgorithm.calculateVolume( AlgAlgorithm.zNums);
+
+                                 Thread.currentThread().interrupt();
+                                break;
+                            }
                         }
                     }
-                    Thread.sleep(10000);
+                    Thread.sleep(2000);
                 } catch (IOException | InterruptedException e) {
                     e.printStackTrace();
+                    return;
                 }
             }
         }
 
     }
-
-    public final synchronized static boolean wait10Seconds(long m) {
-        try {
-            Thread.sleep(m);
-        } catch (InterruptedException e) {
-        }
-        return true;
-    }
-
-    public static void main(String[] args) {
-        new NRJavaSerialManager().connect();
-    }
 }

src/main/java/com/sjls/nstthh/service/SaticScheduleTask.java

@@ -0,0 +1,45 @@
+package com.sjls.nstthh.service;
+
+import com.sjls.nstthh.NstthhApplication;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+import java.io.IOException;
+import java.util.TooManyListenersException;
+
+@Configuration
+@EnableScheduling
+public class SaticScheduleTask {
+
+
+
+    private CommunicationService communicationService;
+
+    @Autowired
+    public void setCommunicationService(CommunicationService communicationService) {
+        this.communicationService = communicationService;
+    }
+
+    private static final Logger logger = LoggerFactory.getLogger(SaticScheduleTask.class);
+
+    //3.添加定时任务
+    // 每天的18点、21点都执行一次：0 0 09,18 * * ?
+    @Scheduled(cron = "0 0 14,18 * * ?")
+    //或直接指定时间间隔，例如：5秒
+    //@Scheduled(fixedRate=360000)
+    private void configureTasks() throws TooManyListenersException, IOException, InterruptedException {
+
+        //for (String s : NRSerialPort.getAvailableSerialPorts()) {
+        //logger.info(" Availible port: " + s);
+        //}
+
+        // /dev/ttyUSB0     /dev/tty.usbserial-14130
+        NRJavaSerialManager.setSendStr(communicationService.getSendStr());
+        new NRJavaSerialManager().operation(NstthhApplication.serialPort);
+        //System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
+    }
+}

src/main/java/com/sjls/nstthh/util/AlgAlgorithm.java

@@ -1,23 +1,42 @@
 package com.sjls.nstthh.util;
 
 
+import com.sjls.nstthh.entity.AngleObject;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class AlgAlgorithm {
 
+
+    //圆筒仓的直径
+    static double diameter = 12;
+    //AC 是设备到地面的高
+    double  high = 35;
+
+
+    static double h1 = 6; //h1 圆锥的高
+    static double h2 = 3; // h2 水平地面到圆锥尖的高
+    public static List<Double> zNums = new ArrayList<Double>();
     /**
-     * 打点
+     * 算法 产生 待检测点。
      *
-     * @param
+     * @param high 高
+     * @return
      */
+    public static String getAveragePosition(double diameter,double high) {
 
-    public static String getAveragePosition() {
-
-
+        if(diameter==0){
+            diameter= diameter;
+        }
+        if(high==0){
+            high= high;
+        }
         StringBuffer sb = new StringBuffer();
 
-        //圆筒仓的直径
-        double d = 12;
-        //AC 是设备到地面的高
-        double AC = 35;
         double x1 = 0;
         double y1 = 0;
         //打出来三角形的底边AB 实际是平面上点的斜边
@@ -31,7 +50,7 @@ public class AlgAlgorithm {
         double level_step = 0;//水平的步长
 
         //根据直径判断半径是整数还是非整数 如果是非整数 则向下取整
-        double r = Math.floor(d / 2);  //最大的半径 即一共有多少个圆圈
+        double r = Math.floor(diameter / 2);  //最大的半径 即一共有多少个圆圈
 
         //一共有多少个圆圈
         int circleNumber = (int) r;
@@ -55,30 +74,30 @@ public class AlgAlgorithm {
 
                 /**
                  * 以设备为中心，把圆上的点分为上下两半，
-                 * 新的圆 是旧的圆向左平移了(d/2-i)+i 个长度 得到的
+                 * 新的圆 是旧的圆向左平移了(diameter/2-i)+i 个长度 得到的
                  * (设备在新的圆的最左边上，设备是坐标系的原点)
                  * 所以 横坐标加上这个长度  纵坐标不变
                  */
 
                 //纵坐标 无论是处于上半部分还是下半部分 其纵坐标是不变的
-                x = x1 + (d / 2 - i) + i;
+                x = x1 + (diameter / 2 - i) + i;
                 y = y1;
                 //System.out.print("["+x+","+y+"]"+",");
                 //底面三角形的斜边
                 AB = Math.sqrt(x * x + y * y);
                 //垂直三角形的斜边
-                BC = Math.sqrt(AB * AB + AC * AC);
+                BC = Math.sqrt(AB * AB + high * high);
                 if (x == 0 && y == 0) {//圆 点
                     level_angle = 0;
                     vertical_angle = 0;
 
                 } else if (y < 0) {//反向转
                     level_angle = -Math.toDegrees(Math.acos(Math.abs(y) / AB));
-                    vertical_angle = -(90 - Math.toDegrees(Math.acos(AC / BC)));
+                    vertical_angle = -(90 - Math.toDegrees(Math.acos(high / BC)));
 
                 } else {//正向转
                     level_angle = Math.toDegrees(Math.acos(y / AB));
-                    vertical_angle = 90 - Math.toDegrees(Math.acos(AC / BC));
+                    vertical_angle = 90 - Math.toDegrees(Math.acos(high / BC));
 
                 }
                 //转为步长
@@ -90,16 +109,15 @@ public class AlgAlgorithm {
                 sb.append(Math.round(vertical_step));
                 sb.append(";");
                 // sb.append("\n");
-
             }
         }
 
         /**
-         * 追加一个圆筒仓中心的点，其坐标是(d/2,0) 水平转动90度 步长为2167
+         * 追加一个圆筒仓中心的点，其坐标是(diameter/2,0) 水平转动90度 步长为2167
          */
-        AB = d / 2;//垂直三角形的底边
-        BC = Math.sqrt(AB * AB + AC * AC);//垂直三角形的斜边
-        vertical_angle = 90 - Math.toDegrees(Math.acos(AC / BC));
+        AB = diameter / 2;//垂直三角形的底边
+        BC = Math.sqrt(AB * AB + high * high);//垂直三角形的斜边
+        vertical_angle = 90 - Math.toDegrees(Math.acos(high / BC));
         vertical_step = 1500 + vertical_angle / 0.135;
         sb.append(2167);
         sb.append(",");
@@ -107,7 +125,127 @@ public class AlgAlgorithm {
         // sb.append("\n");
         //System.out.println(Math.round(level_step)+","+Math.round(vertical_step)+"");
         //System.out.println(sb);
+        return sb.toString();
+    }
+
+
+    /**
+     * 激光测距 给三维
+     *
+     * @param map
+     * @return
+     */
+
+    public static String sxy(Map<Double, AngleObject> map) {
 
+        double d = 30;//圆筒仓的直径
+        double AC = 50;//AC是设备到地面的高
+        double B1C = 0;//设备和粮面点之间的距离
+        double A1B1 = 0;//粮面到设备的水平距离
+        double x = 0; //实际点的坐标的x轴
+        double y = 0; //实际点的坐标的y轴
+        double z = 0; //实际点的坐标的z轴
+
+        StringBuffer sb = new StringBuffer();
+        sb.append("[");
+
+//        AngleObject angleObject = new AngleObject();
+//        angleObject.setLevelAngle(62.0);
+//        angleObject.setRealHypotenuse(35.2);
+//        map.put(3.0, angleObject);
+
+        //list集合用于存放 z值
+        for (Double verticalAngle : map.keySet()) {
+            AngleObject angleObject1 = map.get(verticalAngle);
+            //将垂直的角度转化为弧度
+            double verticalAngleRadians = Math.toRadians(verticalAngle);
+            String verticalAngleS = String.format("%.2f%n", Math.sin(verticalAngleRadians));
+            double sinc = new Double(verticalAngleS);
+            B1C = angleObject1.getRealHypotenuse();
+            A1B1 = B1C * sinc; //即 平面三角形的斜边
+
+            String sinLevel = String.format("%.2f%n", Math.sin(Math.abs(angleObject1.getLevelAngle())));
+            double sinLevelc = new Double(sinLevel);
+
+            /**
+             * 对比实际的A1B1与打到墙上时最大的这个边进行比较 如果A1B1小于这个最大边则可取
+             * 如果A1B1大于或等于这个最大的边 则打到了墙上 舍去
+             */
+            //打到墙上 最大的边
+            double maxLength = sinLevelc * d;
+            if (A1B1 < maxLength) {
+                //实际打在粮面上的点的坐标
+                String verticalAngleC = String.format("%.2f%n", Math.cos(verticalAngleRadians));
+                double cosc = new Double(verticalAngleC);
+                double A1C = B1C * cosc;
+                z = AC - A1C;
+
+                //平面三角形中 已知斜边A1B1和一个角(水平转动的角 angleObject1.getLevelAngle()) 求两直角边
+                double LevelAngleRadians = Math.toRadians(Math.abs(angleObject1.getLevelAngle()));
+                String LevelAngleS = String.format("%.2f%n", Math.sin(LevelAngleRadians));
+                double sinc1 = new Double(LevelAngleS);
+                x = sinc1 * A1B1;
+
+                String LevelAngleC = String.format("%.2f%n", Math.cos(LevelAngleRadians));
+                double cosc1 = new Double(LevelAngleC);
+                y = cosc1 * A1B1;
+
+                //发送给三维的坐标 需要向上平移d/2个单位
+                if (angleObject1.getLevelAngle() > 0) {
+                    //点的坐标就是 (x,y,z)
+
+                } else if (angleObject1.getLevelAngle() < 0) {
+                    //点的坐标就是 (x,-y,z)
+                    y = -y;
+                }
+                y = y + d / 2;
+
+                sb.append("[" + x + "," + y + "," + z + "],");
+
+                zNums.add(z);
+            }
+        }
+
+        sb = sb.deleteCharAt(sb.length() - 1);
+        sb.append("]");
         return sb.toString();
     }
+
+    /**
+     * 计算体积
+     * @param zList  粮面高集合
+     */
+    public static void calculateVolume(List<Double> zList) {
+
+        //z值的集合
+
+        //17.1  18.3  19.2  18.3    20.1  16.4  19.8  16.7  19.0  18.9
+        Double zMin = Collections.min(zList); //z的最小值
+
+        double sum = 0;
+        double zHeigh = 0;//每一个z与最低点的z差值
+        for (int i = 0; i < zList.size(); i++) {
+            //sum = zList.get(i)+sum;
+            zHeigh = zList.get(i) - zMin;
+            sum += zHeigh;
+
+        }
+        /** v 是总体积
+         * v1 最上面的那一部分
+         * v2 是中间的圆柱
+         * v3 是 圆锥
+         *
+         * h1 圆锥的高
+         * h2 水平地面到圆锥尖的高
+         */
+
+        double v1 = 3.14 * (diameter / 2) * (diameter / 2) * (sum / zList.size());
+        double v2 = 3.14 * (diameter / 2) * (diameter / 2) * (zMin - h2 - h1);
+        double v3 = (3.14 * (diameter / 2) * (diameter / 2) * h1) / 3;
+        double vv = v1 + v2 + v3;
+        BigDecimal bdv = new BigDecimal(vv);
+        double v = bdv.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+
+    }
+
 }

src/main/java/com/sjls/nstthh/util/SaticScheduleTask.java

@@ -1,23 +0,0 @@
-package com.sjls.nstthh.util;
-
-import com.sjls.nstthh.service.NRJavaSerialManager;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@Configuration
-@EnableScheduling
-public class SaticScheduleTask {
-    //3.添加定时任务
-    // 每天的18点、21点都执行一次：0 0 09,18 * * ?
-    //@Scheduled(cron = "0 0 09,18 * * ?")
-    //或直接指定时间间隔，例如：5秒
-    //@Scheduled(fixedRate=5000)
-    private void configureTasks() {
-        // /dev/ttyUSB0
-        String port = "/dev/tty.usbserial-14130";
-
-        new NRJavaSerialManager().connect();
-
-        //System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
-    }
-}

src/main/java/com/sjls/nstthh/util/SnowflakeIdWorker.java

@@ -1,5 +1,6 @@
 package com.sjls.nstthh.util;
- /**
+
+/**
  * Twitter_Snowflake<br>
  * SnowFlake的结构如下(每部分用-分开):<br>
  * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
@@ -14,52 +15,82 @@ package com.sjls.nstthh.util;
 public class SnowflakeIdWorker {
 
     // ==============================Fields===========================================
-    /** 开始时间截 (2015-01-01) */
+    /**
+     * 开始时间截 (2015-01-01)
+     */
     private final long twepoch = 1420041600000L;
 
-    /** 机器id所占的位数 */
+    /**
+     * 机器id所占的位数
+     */
     private final long workerIdBits = 5L;
 
-    /** 数据标识id所占的位数 */
+    /**
+     * 数据标识id所占的位数
+     */
     private final long datacenterIdBits = 5L;
 
-    /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
+    /**
+     * 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数)
+     */
     private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
 
-    /** 支持的最大数据标识id，结果是31 */
+    /**
+     * 支持的最大数据标识id，结果是31
+     */
     private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
 
-    /** 序列在id中占的位数 */
+    /**
+     * 序列在id中占的位数
+     */
     private final long sequenceBits = 12L;
 
-    /** 机器ID向左移12位 */
+    /**
+     * 机器ID向左移12位
+     */
     private final long workerIdShift = sequenceBits;
 
-    /** 数据标识id向左移17位(12+5) */
+    /**
+     * 数据标识id向左移17位(12+5)
+     */
     private final long datacenterIdShift = sequenceBits + workerIdBits;
 
-    /** 时间截向左移22位(5+5+12) */
+    /**
+     * 时间截向左移22位(5+5+12)
+     */
     private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
 
-    /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
+    /**
+     * 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095)
+     */
     private final long sequenceMask = -1L ^ (-1L << sequenceBits);
 
-    /** 工作机器ID(0~31) */
-    private long workerId;
+    /**
+     * 工作机器ID(0~31)
+     */
+    private final long workerId;
 
-    /** 数据中心ID(0~31) */
-    private long datacenterId;
+    /**
+     * 数据中心ID(0~31)
+     */
+    private final long datacenterId;
 
-    /** 毫秒内序列(0~4095) */
+    /**
+     * 毫秒内序列(0~4095)
+     */
     private long sequence = 0L;
 
-    /** 上次生成ID的时间截 */
+    /**
+     * 上次生成ID的时间截
+     */
     private long lastTimestamp = -1L;
 
     //==============================Constructors=====================================
+
     /**
      * 构造函数
-     * @param workerId 工作ID (0~31)
+     *
+     * @param workerId     工作ID (0~31)
      * @param datacenterId 数据中心ID (0~31)
      */
     public SnowflakeIdWorker(long workerId, long datacenterId) {
@@ -74,8 +105,23 @@ public class SnowflakeIdWorker {
     }
 
     // ==============================Methods==========================================
+
+    /**
+     * 测试
+     */
+    public static void main(String[] args) {
+        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
+
+        for (int i = 0; i < 100; i++) {
+            long id = idWorker.nextId();
+            System.out.println(Long.toBinaryString(id));
+            System.out.println(id);
+        }
+    }
+
     /**
      * 获得下一个ID (该方法是线程安全的)
+     *
      * @return SnowflakeId
      */
     public synchronized long nextId() {
@@ -113,6 +159,7 @@ public class SnowflakeIdWorker {
 
     /**
      * 阻塞到下一个毫秒，直到获得新的时间戳
+     *
      * @param lastTimestamp 上次生成ID的时间截
      * @return 当前时间戳
      */
@@ -124,23 +171,14 @@ public class SnowflakeIdWorker {
         return timestamp;
     }
 
+    //==============================Test=============================================
+
     /**
      * 返回以毫秒为单位的当前时间
+     *
      * @return 当前时间(毫秒)
      */
     protected long timeGen() {
         return System.currentTimeMillis();
     }
-
-    //==============================Test=============================================
-    /** 测试 */
-    public static void main(String[] args) {
-        SnowflakeIdWorker idWorker = new SnowflakeIdWorker(0, 0);
-
-        for (int i = 0; i < 100; i++) {
-            long id = idWorker.nextId();
-            System.out.println(Long.toBinaryString(id));
-            System.out.println(id);
-        }
-    }
 }

src/main/java/com/sjls/nstthh/util/StrSplicingAssistant.java

@@ -2,9 +2,6 @@ package com.sjls.nstthh.util;
 
 public class StrSplicingAssistant {
 
-    private static final String hexString = "0123456789ABCDEF";
-
-
     /**
      * 逆序校验
      *
@@ -83,6 +80,7 @@ public class StrSplicingAssistant {
         }
         return sb.toString().trim().toUpperCase();
     }
+
     /*显示完美*/
     public static final String toHex(byte[] data, int off, int length) {
         // double size, two bytes (hex range) for one byte
@@ -99,6 +97,7 @@ public class StrSplicingAssistant {
         }
         return buf.toString().trim().toUpperCase();
     }
+
     /**
      * 10进制 转 16进制
      *
@@ -110,8 +109,6 @@ public class StrSplicingAssistant {
     }
 
 
-
-
     /**
      * 高低位转换 大写
      * 如“1A2B”转“2B1A”。

src/main/resources/application.yml

@@ -1,43 +1,24 @@
 server:
   port: 8080
-management:
-  endpoint:
-    shutdown:
-      enabled: true
-  endpoints:
-    web:
-      exposure:
-        include: shutdown
-# DataSource Config
 spring:
   datasource:
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:~/nstthh;AUTO_SERVER=TRUE
-    username: sa
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
     password: 123456
+    ## Edge-dongtian
+    url: jdbc:mysql://192.168.40.74:3306/nstthh?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
   jpa:
     show-sql: false
-    open-in-view: false
+    open-in-view : false
     hibernate:
       ddl-auto: update
-  h2:
-    console:
-      path: /h2-console
-      enabled: true
   thymeleaf:
     cache: false
-    mode: HTML5
-
+    mode: HTML
   mqtt:
-    #MQTT-服务端账号
     username: admin
-    #MQTT-服务端密码
     password: public
-    #MQTT-服务端地址
     url: tcp://192.168.50.169:1883
-    #MQTT-发布者clientid
     publishclientid: client_publish
-    #MQTT-接收者clientid
     subsribeclientid: client_subsribe
-    #MQTT-默认主题
     default_topic: test

src/main/resources/sh/app_boot.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+## java env
+#export JAVA_HOME=/usr/local/jdk/jdk1.8.0_101
+#export JRE_HOME=$JAVA_HOME/jre
+
+API_NAME=api
+JAR_NAME=$API_NAME\.jar
+#PID  代表是PID文件
+PID=$API_NAME\.pid
+
+#使用说明，用来提示输入参数
+usage() {
+    echo "Usage: sh 执行脚本.sh [start|stop|restart|status]"
+    exit 1
+}
+
+#检查程序是否在运行
+is_exist(){
+  pid=`ps -ef|grep $JAR_NAME|grep -v grep|awk '{print $2}' `
+  #如果不存在返回1，存在返回0
+  if [ -z "${pid}" ]; then
+   return 1
+  else
+    return 0
+  fi
+}
+
+#启动方法
+start(){
+  is_exist
+  if [ $? -eq "0" ]; then
+    echo ">>> ${JAR_NAME} is already running PID=${pid} <<<"
+  else
+    nohup $JRE_HOME/bin/java -Xms256m -Xmx512m -jar $JAR_NAME >/dev/null 2>&1 &
+    echo $! > $PID
+    echo ">>> start $JAR_NAME successed PID=$! <<<"
+   fi
+  }
+
+#停止方法
+stop(){
+  #is_exist
+  pidf=$(cat $PID)
+  #echo "$pidf"
+  echo ">>> api PID = $pidf begin kill $pidf <<<"
+  kill $pidf
+  rm -rf $PID
+  sleep 2
+  is_exist
+  if [ $? -eq "0" ]; then
+    echo ">>> api 2 PID = $pid begin kill -9 $pid  <<<"
+    kill -9  $pid
+    sleep 2
+    echo ">>> $JAR_NAME process stopped <<<"
+  else
+    echo ">>> ${JAR_NAME} is not running <<<"
+  fi
+}
+
+#输出运行状态
+status(){
+  is_exist
+  if [ $? -eq "0" ]; then
+    echo ">>> ${JAR_NAME} is running PID is ${pid} <<<"
+  else
+    echo ">>> ${JAR_NAME} is not running <<<"
+  fi
+}
+
+#重启
+restart(){
+  stop
+  start
+}
+
+#根据输入参数，选择执行对应方法，不输入则执行使用说明
+case "$1" in
+  "start")
+    start
+    ;;
+  "stop")
+    stop
+    ;;
+  "status")
+    status
+    ;;
+  "restart")
+    restart
+    ;;
+  *)
+    usage
+    ;;
+esac
+exit 0

src/main/resources/templates/nstthh.html

@@ -5,6 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-<div th:text="${message}" ></div>
+<div th:text="${message}"></div>
 </body>
 </html>

src/test/java/com/sjls/nstthh/RepositoryTest.java

@@ -1,16 +1,12 @@
 package com.sjls.nstthh;
 
 
-import com.sjls.nstthh.entity.SendData;
 import com.sjls.nstthh.repository.SendDataRepository;
-import com.sjls.nstthh.util.AlgAlgorithm;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static com.sjls.nstthh.TestNstthh.send16strUseCom;
-
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class RepositoryTest {
@@ -19,25 +15,8 @@ public class RepositoryTest {
     private SendDataRepository sendDataRepository;
 
     //@Test
-    public void addSendStr() {
-        String str = AlgAlgorithm.getAveragePosition();
-        String[] strArr_z_y = str.split(";");
-
-        for (int i = 0; i < strArr_z_y.length; i++) {
-
-            String[] strArr = strArr_z_y[i].split(",");
-
+    public void test() {
 
-            //System.out.println(Long.valueOf(strArr[0]));  System.out.println(Long.valueOf(strArr[1]));
-            String str10 = send16strUseCom(Long.valueOf(strArr[0]), Long.valueOf(strArr[1]));
-            System.out.println("sendStr.add(\"" + str10 + "\");");
-            SendData SendData = new SendData();
-            SendData.setSendStr(str10);
-            String deviceid = str10.substring(18, 26);//截取设备id
-            String anglezy = str10.substring(38, 46);//角度
-            SendData.setSendKey(deviceid + anglezy);
-            sendDataRepository.save(SendData);
-        }
     }
 
 

src/test/java/com/sjls/nstthh/TestNstthh.java

@@ -12,7 +12,7 @@ public class TestNstthh {
 
     public static void main(String[] args) throws IOException {
 
-        String str10 = send16strUseCom( 1500, 1500);
+        String str10 = send16strUseCom(1500, 1500);
         System.out.println(str10);
 
     }