the new service . manager

Change thread to monitor

add other

pom.xml

@@ -9,8 +9,8 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.sjls</groupId>
-    <artifactId>Nstthh</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>nstthh</artifactId>
+    <version>0.1</version>
     <name>Nstthh</name>
     <description>Nstthh</description>
     <properties>
@@ -74,6 +74,13 @@
             <artifactId>hutool-all</artifactId>
             <version>5.7.17</version>
         </dependency>
+        <!--
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

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

@@ -26,8 +26,8 @@ public class NstthhApplication {
     public static void main(String[] args) throws TooManyListenersException, IOException, InterruptedException {
         SpringApplication.run(NstthhApplication.class, args);
         //start();
-    }
 
+    }
     public static void start() throws TooManyListenersException, IOException, InterruptedException {
         String port = "/dev/tty.usbserial-14130";//   /dev/ttyUSB0
 

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

@@ -10,6 +10,7 @@ import gnu.io.NRSerialPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -53,14 +54,21 @@ public class HardwareAdmin {
 
     @RequestMapping("")
     public String index(Model model) {
-        model.addAttribute("scantaskList", scantaskService.getScantask());
-
-        //model.addAttribute("sendData", communicationService.getSendData(""));
-        //model.addAttribute("grain", communicationService.getGrain());
-        // model.addAttribute("receiveData", communicationService.getReceiveData());
+//        model.addAttribute("scantaskList", scantaskService.getScantask());
+//        Page<Scantask> pageS = scantaskService.getScantaskPage(0,10,"creatTime");
+//        model.addAttribute("scantaskList", pageS);
+//        logger.info("total{}",pageS.getTotalElements());
+        model.addAttribute("total", scantaskService.getScantaskCount());
         return "index";
     }
 
+    @RequestMapping("/scantask_d")
+    @ResponseBody
+    public Page<Scantask> scantask_d(int pageIndex) {
+        //logger.info("scantask_d {}", pageIndex);
+        return scantaskService.getScantaskPage(pageIndex-1, 10);
+    }
+
     @RequestMapping("/admin")
     public String admin(Model model) {
         Set<String> set = NRSerialPort.getAvailableSerialPorts();
@@ -102,9 +110,10 @@ public class HardwareAdmin {
     /**
      * 连串口
      *
-     * @param port
+     * @param port /dev/ttyUSB0
      * @return
      */
+
     @GetMapping("/scom")
     @ResponseBody
     public boolean scom(String port) {

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

@@ -2,7 +2,15 @@ package com.sjls.nstthh.controller;
 
 
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 public class WarehouseAdmin {
+
+    @RequestMapping("/sync-warehouse")
+    public String warehouse(Model model) {
+
+        return "warehouse";
+    }
 }

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

@@ -16,6 +16,8 @@ public class Scantask {
 
     private Date creatTime;
 
+    //任务是否结束
+    private boolean isOver;
 
     @ManyToOne
     @JoinColumn(name = "warehouse_id")

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

@@ -6,7 +6,11 @@ import java.util.Date;
 
 @Data
 public class SyncV2xyz {
+    //第一次打点平均值 与 第二次打点平均值 再平均。
     private double volume;
+    // 两次扫描，所有点，平均。
+    private double volume_2all;
+
     private String xyz;
     private Date startTime;
 }

src/main/java/com/sjls/nstthh/repository/ScantaskRepository.java

@@ -5,8 +5,11 @@ import com.sjls.nstthh.entity.Scantask;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ScantaskRepository extends JpaRepository<Scantask, Long> {
+    List<Scantask> findByIsOver(boolean isOver);
 
 
 }

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

@@ -30,7 +30,17 @@ public class CommConfig {
     @PostConstruct
     public void init() {
 
+        // TODO: 2022/1/15
+        logger.info("...... todo init sPorts and connect ...... ");
+//        if (CommConfig.serialPort == null) {
+//            Set<String> set =  NRSerialPort.getAvailableSerialPorts();
+//            for (String s : set) {
+//                if(s.equals("/dev/ttyUSB0")){
+//                    CommConfig.serialPort = new NRSerialPort("/dev/ttyUSB0", 9600);
+//                    boolean b = serialPort.connect();
+//                    logger.info("init connect serialPort {} ", b);
+//                }
+//            }
+//        }
     }
-
-
 }

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

@@ -18,8 +18,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.beans.Transient;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 
@@ -31,7 +31,8 @@ import java.util.List;
 public class CommunicationService {
 
     private static final Logger logger = LoggerFactory.getLogger(CommunicationService.class);
-    public volatile static List receiveList = Collections.synchronizedList(new ArrayList<SendData>());
+    //public volatile static List receiveList = Collections.synchronizedList(new ArrayList<SendData>());
+    public volatile static List receiveList = new ArrayList<SendData>();
 
     private SendDataRepository sendDataRepository;
     private ReceiveDataRepository receiveDataRepository;
@@ -126,10 +127,24 @@ public class CommunicationService {
      * @param receiveDataList
      * @return
      */
+    @Transient
     public List saveReceiveData(List receiveDataList) {
-        return receiveDataRepository.saveAll(receiveDataList);
+        return receiveDataRepository.saveAllAndFlush(receiveDataList);
     }
 
+    public synchronized void Pretreatment(Scantask scantask, String str_receive_head, String currentSendStr, String 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 anglezy = str_receive.substring(38, 46);//角度
+
+        String distance = str_receive.substring(46, 54);//截取距离
+    }
     /**
      * 验证  打点后的数据 ？是否crc 并组装到list
      *
@@ -138,7 +153,7 @@ public class CommunicationService {
      * @param str_receive
      * @return
      */
-    public synchronized boolean determineRstrPersistence(Scantask scantask, String str_receive_head, String currentSendStr, String str_receive) {
+    public  boolean determineRstrPersistence(Scantask scantask, 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);
@@ -153,7 +168,7 @@ public class CommunicationService {
         String distance = str_receive.substring(46, 54);//截取距离
 
         //发送串 角度+设备 与 返回串 角度+设备 比较。
-        if (currentSendStr_zy.endsWith(anglezy) && currentSendStr_deviceid.endsWith(deviceid)) {
+        if (currentSendStr_zy.equals(anglezy) && currentSendStr_deviceid.equals(deviceid)) {
             // 68220185000000E08812345678031101B50102029B029B0000048600FF7B123456781C7016
             String str_all = str_receive.replaceAll(str_receive_head, "");
             //返回串的待验证串
@@ -164,7 +179,7 @@ public class CommunicationService {
             //crc+高低位 返回串验证
             String str_crc = StrSplicingAssistant.displacementHighLow(StrSplicingAssistant.CRC16Right(str_needCrc));
 
-            if (str_crc.endsWith(str_needCrc_receive)) {
+            if (str_crc.equals(str_needCrc_receive)) {
                 // 根据发送与接收角度，得到返回的数据 ，并crc验证通过
                 ReceiveData receiveData = new ReceiveData();
                 receiveData.setReceiveStr(str_receive);
@@ -183,13 +198,15 @@ public class CommunicationService {
                 receiveData.setCantask(scantask);
                 receiveList.add(receiveData);
                 logger.info(receiveList.size() + ": _receive_str = " + anglezy + " | " + distance);
+
+                return true;
             } else {
                 logger.info(":  _send_str_anglezy _receive_str_anglezy, crc false {} {} ", str_crc, str_needCrc_receive);
             }
         } else {
             logger.info(": _send_str_anglezy _receive_str_anglezy, val false {},{} ", currentSendStr_zy, anglezy);
         }
-        return true;
+        return false;
     }
 
     /**

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

@@ -1,6 +1,8 @@
 package com.sjls.nstthh.service;
 
 import com.sjls.nstthh.entity.*;
+import com.sjls.nstthh.repository.ScantaskRepository;
+import com.sjls.nstthh.util.AlgAlgorithm;
 import com.sjls.nstthh.util.StrSplicingAssistant;
 import gnu.io.NRSerialPort;
 import gnu.io.SerialPortEvent;
@@ -11,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.beans.Transient;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -25,18 +28,26 @@ public class NRJavaSerialManager {
     private static final String str_init = "681C0105000000CD9612345678031101A5010205DC05DC00123456785FA816";
     private static final String str_heartbeat = "68140186000000E55A1234567803510112345678B1E216";
     private static final String str_receive_head = "68220185000000E088";
-    volatile static double high = 1;
+    volatile static double high = 31;
     volatile static double diameter = 12;
     volatile static double h1 = 6;
     volatile static double h2 = 3;
-    static String cloud_url = "http://112.51.248.191:9025/api/n-basic-edge/getEdgeData";
+    static String cloud_url = "http://192.168.1.216:9025/api/n-basic-edge/getEdgeData";
     private volatile static String currentSendStr = str_init;
-    private volatile static List<SendData> sendData = Collections.synchronizedList(new ArrayList<SendData>());
+    //private volatile static List<SendData> sendData = Collections.synchronizedList(new ArrayList<SendData>());
+    private volatile static List<SendData> sendData = new ArrayList<SendData>();
+
     private volatile static boolean isHeartbeat = false;
     private volatile static boolean isReceive = false;
     private volatile static boolean isSerialPortDisconnect = false;
     private static Scantask scantask;
     private static CommunicationService communicationService;
+    private static ScantaskRepository scantaskRepository;
+
+    @Autowired
+    public void setScantaskRepository(ScantaskRepository scantaskRepository) {
+        this.scantaskRepository = scantaskRepository;
+    }
 
     public static double getHigh() {
         return high;
@@ -78,9 +89,11 @@ public class NRJavaSerialManager {
         return true;
     }
 
+    @Transient
     public static void synctoCloudData() throws UnsupportedEncodingException {
 
         List<Grain> grainList = communicationService.getGrainData(scantask);
+        double realHypotenuse_avg = getVolumeAvg();
 
         double v = 0;
         String str = "";
@@ -92,31 +105,33 @@ public class NRJavaSerialManager {
         SyncV2xyz syncV2xyz = new SyncV2xyz();
         syncV2xyz.setXyz(URLEncoder.encode(str, "UTF-8"));
         syncV2xyz.setVolume(v / 2);
-
+        syncV2xyz.setVolume_2all(realHypotenuse_avg);
         syncV2xyz.setStartTime(scantask.getCreatTime());
 
-        logger.info("Grain -  {}", syncV2xyz);
+        //任务完成
+        scantask.setOver(true);
+        Scantask scantaskdb = scantaskRepository.saveAndFlush(scantask);
+        logger.info("Grain -  {},{}", scantaskdb, syncV2xyz);
 
         RestTemplate restTemplate = new RestTemplate();
-        restTemplate.postForObject(cloud_url, syncV2xyz, String.class);
+        try {
+            restTemplate.postForObject(cloud_url, syncV2xyz, String.class);
+        } catch (Exception e) {
+        }
     }
 
     /**
      * 两次打点数据 平均
      *
-     * @throws UnsupportedEncodingException
+     * @throws
      */
-    public static double getVolumeAvg() throws UnsupportedEncodingException {
+    public static double getVolumeAvg() {
+        //查询所有打点记录。
         List<ReceiveData> receiveDataList = communicationService.getReceiveData(scantask);
-        double realHypotenuse = 0;
-        double realHypotenuse_count = 0;
-        double realHypotenuse_avg = 0;
-
-        for (ReceiveData receiveData : receiveDataList) {
-            realHypotenuse += receiveData.getRealHypotenuse();
-            realHypotenuse_count++;
-        }
-        realHypotenuse_avg = realHypotenuse / realHypotenuse_count;
+        // 组装 zlist
+        List<Double> zDataList =  AlgAlgorithm.getZList(receiveDataList);
+        //算体积
+        double realHypotenuse_avg = AlgAlgorithm.calculateVolume(zDataList);
 
         return realHypotenuse_avg;
     }
@@ -138,12 +153,15 @@ public class NRJavaSerialManager {
      * @throws TooManyListenersException
      * @throws InterruptedException
      */
-    public void operation(NRSerialPort serialPort) throws IOException, TooManyListenersException, InterruptedException {
+    public void operation(NRSerialPort serialPort) throws IOException, InterruptedException {
 
         DataOutputStream outStream = null;
         if (serialPort != null && serialPort.isConnected()) {
             DataInputStream inStream = new DataInputStream(serialPort.getInputStream());
-            serialPort.addEventListener(new SerialReader(inStream));
+            try {
+                serialPort.addEventListener(new SerialReader(inStream));
+            } catch (TooManyListenersException e) {
+            }
             serialPort.notifyOnDataAvailable(true);
             outStream = new DataOutputStream(serialPort.getOutputStream());
 
@@ -151,9 +169,11 @@ public class NRJavaSerialManager {
         Thread t1 = new Thread(new SerialWriter(outStream), "t1_thread");
         t1.start();
         t1.join();
+        //wait10Seconds(5000);
         Thread t2 = new Thread(new SerialWriter(outStream), "t2_thread");
         t2.start();
         t2.join();
+        //wait10Seconds(5000);
         Thread t3 = new Thread(() -> {
             try {
                 synctoCloudData();
@@ -189,18 +209,31 @@ public class NRJavaSerialManager {
                     if (str_receive.length() == 10) {
                         str_receive_at += str_receive;
                     }
-                    //wait10Seconds(600);
-                    while (str_receive_at.length() == 74 && !isReceive) {
-                        //synSet.add(str_receive_at);
-                        if (!str_receive_at.contains("EEEEEEEE")) {
-                            // 判断返回串 正确与否，并组装 list for add。
-                            isReceive = communicationService.determineRstrPersistence(scantask, str_receive_head, currentSendStr, str_receive_at);
-                            //logger.info(" str_receive_at = {}, {} " ,str_receive_at,isReceive);
+
+                    if (str_receive_at.length() == 74 && !isReceive) {
+                        //logger.info(" 74 isReceive str_receive_at {} {} {} ", isHeartbeat, isReceive, str_receive_at);
+
+                        String currentSendStr_deviceid = currentSendStr.substring(18, 26);
+                        String currentSendStr_zy = currentSendStr.substring(38, 46);
+                        //当前接收的串，截取出角度，设备，距离。
+                        String deviceid = str_receive_at.substring(18, 26);//截取设备id
+                        String anglezy = str_receive_at.substring(38, 46);//角度
+                        //logger.info(" 74 isReceive currentSendStr_zy,anglezy {} {} {} ",currentSendStr_zy ,anglezy ,str_receive_at);
+
+                        //发送串 角度+设备 与 返回串 角度+设备 比较。
+                        if (currentSendStr_zy.equals(anglezy) && currentSendStr_deviceid.equals(deviceid)) {
+                            //synSet.add(str_receive_at);
+                            if (!str_receive_at.contains("EEEEEEEE")) {
+                                // 判断返回串 正确与否，并组装 list for add。
+                                isReceive = communicationService.determineRstrPersistence(scantask, str_receive_head, currentSendStr, str_receive_at);
+                                // logger.info(" while - str_receive_at = {}, {} ", str_receive_at, isReceive);
+                            }
+                            //isReceive = true;
+                            // break;
                         }
-                        isReceive = true;
-                        break;
                     }
                 }
+
             } catch (IOException e) {
                 e.printStackTrace();
                 return;
@@ -219,57 +252,65 @@ public class NRJavaSerialManager {
 
         public void run() {
             sendData = communicationService.creatToBeTested(scantask, diameter, high);
-            //sendData = communicationService.getSendData(scantask);
             while (sendData.size() > 0) {
                 break;
             }
-            logger.info(" wait for send point number testing ......" + sendData.size());
-
-            while (!Thread.interrupted()) {
-                try {
-//                    int rs1 = communicationService.receiveList.size();
-//                    logger.info("init dot  ......{} {} " ,rs1,communicationService.receiveList.size());
+            logger.info("1.15 -15 Beta version wait for send point number testing ......" + sendData.size());
 
-                    if (isHeartbeat && onlyOnce) {
-                        wait10Seconds(2000);
+            //没心跳的话，等待10次。
+            int count = 0;
+            while (true) {
+                if (isHeartbeat && onlyOnce || count == 10) {
+                    try {
                         outStream.write(StrSplicingAssistant.hexStrToByteArrs(str_init));
-                        onlyOnce = false;
-                        logger.info("init_send_str =" + str_init.substring(38, 46));
+                    } catch (IOException e) {
+                        e.printStackTrace();
                     }
-                    if (isHeartbeat && isReceive) {
-                        if (sendData.size() > 0) {
+                    onlyOnce = false;
+                    isReceive = false;
+                    logger.info("init_send_str =" + str_init.substring(38, 46));
+                    break;
+                }
+                count++;
+                wait10Seconds(2000);
+            }
+
+            while (!Thread.interrupted()) {
+                try {
+//                        if (!isReceive && onlyOnce) {
+//                            if (sendData != null && sendData.size() > 0)
+//                                outStream.write(StrSplicingAssistant.hexStrToByteArrs(String.valueOf(sendData.get(0))));
+//                            wait10Seconds(8000);
+//                            isReceive = true;
+//                        }
+                    if (isHeartbeat && isReceive || wait10Seconds(10000)) {
+                        if (sendData != null && sendData.size() > 0) {
                             Iterator<SendData> iterator = sendData.iterator();
                             if (iterator.hasNext()) {
-                                synchronized (this) {
-                                    currentSendStr = iterator.next().getSendStr();
-                                    outStream.write(StrSplicingAssistant.hexStrToByteArrs(currentSendStr));
-//                                    wait10Seconds(2000);
-//                                    if(rs1 == communicationService.receiveList.size()){
-//                                        logger.info("Second dot  ......{} {} " ,rs1,communicationService.receiveList.size());
-//                                        outStream.write(StrSplicingAssistant.hexStrToByteArrs(currentSendStr));
-//                                    }
-                                    iterator.remove();
-                                    isReceive = false;
-
-                                }
-                                //38,46 = 角度
+                                //synchronized (this) {
+                                currentSendStr = iterator.next().getSendStr();
+                                outStream.write(StrSplicingAssistant.hexStrToByteArrs(currentSendStr));
                                 logger.info("_send_str = {}", currentSendStr.substring(38, 46));
+                                iterator.remove();
+                                isReceive = false;
                             }
                         } else {
                             List receiveList_ = CommunicationService.receiveList;
                             // 组装的list 一次性save。
                             List receiveListDB_ = communicationService.saveReceiveData(receiveList_);
+                            wait10Seconds(2000);
                             if (receiveListDB_ != null && receiveListDB_.size() > 0) {
                                 isSerialPortDisconnect = true;
                                 logger.info(isSerialPortDisconnect + "_success _ :" + Thread.currentThread().getName());
                                 high = communicationService.againTestbyHighestPoint(scantask, receiveListDB_);
                                 isReceive = false;
+                                isHeartbeat = false;
                                 Thread.currentThread().interrupt();
                                 return;
                             }
                         }
                     }
-                    wait10Seconds(2000);
+                    wait10Seconds(6000);
                 } catch (IOException e) {
                     e.printStackTrace();
                     return;

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

@@ -8,16 +8,20 @@ import gnu.io.NRSerialPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
+import java.beans.Transient;
 import java.io.IOException;
 import java.util.List;
-import java.util.TooManyListenersException;
 
 @Service
 public class ScantaskService {
     private static final Logger logger = LoggerFactory.getLogger(ScantaskService.class);
 
+    private static long current_scantaskId = 0;
 
     private ScantaskRepository scantaskRepository;
     private NRJavaSerialManager nRJavaSerialManager;
@@ -39,22 +43,43 @@ public class ScantaskService {
         List<Scantask> list = scantaskRepository.findAll();
         return list;
     }
+    public long getScantaskCount() {
+        return scantaskRepository.count();
+    }
+
+    public Page<Scantask> getScantaskPage(int cpage, int size) {
+       // Page<Scantask> page = scantaskRepository.findAll(PageRequest.of(cpage, size, Sort.by(Sort.Order.desc("id"),Sort.Order.desc("creatTime"))));
+        Page<Scantask> page = scantaskRepository.findAll(PageRequest.of(cpage, size, Sort.Direction.DESC,"creatTime"));
 
-    public Scantask creatScanTask(NRSerialPort serialPort) throws TooManyListenersException, IOException, InterruptedException {
+        //logger.info("......{},{},{},{}",page.getContent(),page.getTotalElements(),page.getTotalPages(),page.getSize());
+        return page;
+    }
 
-//        Warehouse warehouse = new Warehouse();
-//        warehouse.setDiameter(1);
-//        warehouse.setHigh(1);
-        long id = new SnowflakeIdWorker(0, 0).nextId();
-        //String key = id + "a1001" + DateTime.now().getTime();
+    @Transient
+    public Scantask creatScanTask(NRSerialPort serialPort) throws  IOException, InterruptedException {
+        boolean flag = true;
+        if (current_scantaskId > 0) {
+            Scantask c_scantaskdb = scantaskRepository.getById(current_scantaskId);
+            if (c_scantaskdb.isOver()) {
+                flag = true;
+            } else {
+                logger.info("Wait for the last task to complete ......");
+                flag = false;
+            }
+        }
 
-        Scantask scantask = new Scantask();
+        Scantask scantaskdb = null;
+        if (flag) {
+            long id = new SnowflakeIdWorker(0, 0).nextId();
+            Scantask scantask = new Scantask();
+            scantask.setStkey(String.valueOf(id));
+            scantask.setCreatTime(DateTime.now());
+            scantaskdb = scantaskRepository.saveAndFlush(scantask);
+            current_scantaskId = scantaskdb.getId();
+            nRJavaSerialManager.setScantask(scantaskdb);
+            nRJavaSerialManager.operation(serialPort);
+        }
 
-        scantask.setStkey(String.valueOf(id));
-        scantask.setCreatTime(DateTime.now());
-        Scantask scantaskdb = scantaskRepository.save(scantask);
-        nRJavaSerialManager.setScantask(scantaskdb);
-        nRJavaSerialManager.operation(serialPort);
         return scantaskdb;
     }
 }

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

@@ -14,7 +14,9 @@ import java.util.List;
 public class AlgAlgorithm {
     private static final Logger logger = LoggerFactory.getLogger(AlgAlgorithm.class);
 
-    public volatile static List<Double> zList = Collections.synchronizedList(new ArrayList<Double>()); //粮面高的集合
+    //public volatile static List<Double> zList = Collections.synchronizedList(new ArrayList<Double>()); //粮面高的集合
+    public volatile static List<Double> zList = new ArrayList<Double>(); //粮面高的集合
+
     //圆筒仓的直径
     static double diameter = NRJavaSerialManager.getDiameter();
     //high 是设备到地面的高即AC
@@ -290,6 +292,64 @@ public class AlgAlgorithm {
     }
 
 
+    public static List<Double> getZList(List<ReceiveData> list) {
+        if (list == null && list.size() == 0) {
+            return zList;
+        }
+        // logger.info("zHeight - list",list);
+
+        double AC = high;
+        double B1C = 0;//设备和粮面点之间的距离
+        double A1B1 = 0;//粮面到设备的水平距离
+        double z = 0; //实际点的坐标的z轴
+        double zHigh = 0;//以粮面为基准面的高
+        double zMax = 0;//最高的点
+        double verticalAngle = 0;//垂直角度
+        double levelAngle = 0;//水平角度
+        double realHypotenuse = 0;//返回的距离
+        for (ReceiveData angleObject : list) {
+            verticalAngle = angleObject.getVerticalAngle();
+            levelAngle = angleObject.getLevelAngle();
+            realHypotenuse = angleObject.getRealHypotenuse();
+            //logger.info("zHeight - realHypotenuse {} ",realHypotenuse);
+
+            //将垂直的角度转化为弧度
+            double verticalAngleRadians = Math.toRadians(verticalAngle);
+            String verticalAngleS = String.format("%.2f%n", Math.sin(verticalAngleRadians));
+            double sinc = new Double(verticalAngleS);
+            //B1C = realHypotenuse;
+            A1B1 = realHypotenuse * sinc; //即 平面三角形的斜边
+
+            //logger.info("zHeight - A1B1 {} ",A1B1);
+
+            String sinLevel = String.format("%.2f%n", Math.sin(Math.abs(levelAngle)));
+            double sinLevelc = new Double(sinLevel);
+
+            /**
+             * 对比实际的A1B1与打到墙上时最大的这个边进行比较 如果A1B1小于这个最大边则可取
+             * 如果A1B1大于或等于这个最大的边 则打到了墙上 舍去
+             */
+            //打到墙上 最大的边
+            double maxLength = sinLevelc * diameter;
+
+            if (A1B1 < maxLength) {
+                //实际打在粮面上的点的坐标
+                String verticalAngleC = String.format("%.2f%n", Math.cos(verticalAngleRadians));
+                double cosc = new Double(verticalAngleC);
+                double A1C = realHypotenuse * cosc;
+                z = AC - A1C;
+
+
+                // logger.info("zHeight - z√√√√√√z z z z z {} ",z);
+
+                zList.add(z);
+            }
+        }
+
+        return zList;
+
+    }
+
     /**
      * 计算体积
      *

src/main/resources/application.yml

@@ -7,6 +7,16 @@ spring:
     password: 1qaz@WSX
     ## Edge-dongtian
     url: jdbc:mysql://101.36.160.140:21029/nstthh?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 10
+      idle-timeout: 30000
+      max-lifetime: 0
+      connection-timeout: 60000
+      validation-timeout: 3000
+      connection-test-query: select 1
+      auto-commit: true
+
   jpa:
     show-sql: false
     open-in-view: false

src/main/resources/templates/index.html

@@ -1,36 +1,81 @@
 <!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
+<html>
 <head>
     <link href="bootstrap.min.css" rel="stylesheet">
     <link href="bootstrap-theme.min.css" rel="stylesheet">
+    <link href="jquery.pagination.min.css" rel="stylesheet">
+
     <script src="jquery.min.js"></script>
     <script src="bootstrap.min.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function () {
+    <script src="jquery.jsontotable.min.js"></script>
+    <script src="jquery.pagination.min.js"></script>
 
-        });
-    </script>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
-    <title>admin</title>
+    <title>Nstthh_admin</title>
 </head>
 <body>
 <div class="container">
     <p class="lead">
-    <h1>Hi.Nstthh_admin</h1>
+    <h1>Hi.Nstthh_index</h1>
     </p>
     <hr/>
-    <table class="table table-hover">
-        <tr th:each="scantask:${scantaskList}">
-            <td th:text="${scantask.id}"></td>
-            <td th:text="${scantask.stkey}"></td>
-            <td th:text="${scantask.creatTime}"></td>
-        </tr>
-    </table>
-    <div class="panel panel-default">
-        <div class="panel-body">
-            /admin /sync-v2xyy/id
-        </div>
-    </div>
+
+
+    <div id="jsontotable"></div>
+    <div id="wrap"></div>
+    <span id="total" hidden th:text="${total}"></span>
+
+    <!--    <table class="table table-bordered table-hover">-->
+    <!--        <thead>-->
+    <!--        <tr>-->
+    <!--            <th>#</th>-->
+    <!--            <th>key</th>-->
+    <!--            <th>time</th>-->
+    <!--            <th>complete</th>-->
+    <!--        </tr>-->
+    <!--        </thead>-->
+    <!--        <tbody>-->
+    <!--        <tr th:each="scantask:${scantaskList}">-->
+    <!--            <td th:text="${scantask.id}"></td>-->
+    <!--            <td th:text="${scantask.stkey}"></td>-->
+    <!--            <td th:text="${scantask.creatTime}"></td>-->
+    <!--            <td th:text="${scantask.isOver}"></td>-->
+    <!--        </tr>-->
+    <!--        </tbody>-->
+    <!--    </table>-->
+    <button type="button" class="btn btn-info">/sync-v2xyy/id</button>
+    <button type="button" class="btn btn-info">/sync-warehouse</button>
 </div>
 </body>
-</html>
+</html>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var totalVal = $("#total").text();
+       // $.ajaxSettings.async = false;
+        $.get("/scantask_d?pageIndex=1", function (res) {
+            //alert(res.content);
+             //{ id: 'header', class: 'header-class', _data:['1', '2', '3'] }
+            //{"id":26,"stkey":"931981565586571264","creatTime":"2022-01-15T10:42:00.623+00:00","warehouse":null,"over":true}
+            $.jsontotable(res.content, {id: '#jsontotable', header: false, className: 'table table-hover'});
+        });
+        //$.ajaxSettings.async = true;
+        $("#wrap").pagination({
+            total: totalVal,  // 默认0
+            callback: function (no, pagination) {
+                $("#jsontotable").empty();
+                $.ajax({
+                    url: '/scantask_d',
+                    data: {
+                        pageIndex: no,
+                    },
+                    success: function (res) {
+                        //alert(res.content);
+                        $.jsontotable(res.content, {id: '#jsontotable',  header: false, className: 'table table-hover'});
+                        // 总数一般是动态的，调用setTotal更新
+                        pagination.setTotal(res.totalElements);
+                    }
+                })
+            }
+        })
+    });
+</script>

src/main/resources/templates/nstthh.html

@@ -58,7 +58,7 @@
         });
     </script>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
-    <title>admin</title>
+    <title>Nstthh_admin</title>
 </head>
 <body>
 <div class="container">

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

@@ -12,8 +12,17 @@ public class TestNstthh {
 
     public static void main(String[] args) throws IOException {
 
-        String str10 = send16strUseCom(1500, 1500);
-        System.out.println(str10);
+        //String str10 = send16strUseCom(1500, 1500);
+        //System.out.println(str10);
+
+//08770729 、072906E1、05DC05DC、048F04D7
+
+String ajStr = "05DC05DC";
+
+        int z = StrSplicingAssistant.hex16To10(ajStr.substring(0,4));
+        int y = StrSplicingAssistant.hex16To10(ajStr.substring(4,8));
+        String str10 = send16strUseCom(z, y);
+        System.out.println(ajStr +" = " + str10);
 
     }
 

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

@@ -0,0 +1,85 @@
+package com.sjls.nstthh;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+public class TestThread {
+    volatile static boolean isHeartbeat = true,onlyOnce=false, isReceive = false;
+    private volatile static List<String> sendData = Collections.synchronizedList(new ArrayList<String>());
+
+
+
+    public static void main(String[] args) {
+
+
+        Thread t1 = new Thread() {
+
+
+            public void run() {
+
+                while (true) {
+
+                        synchronized (this) {
+                            System.out.println("t1 = 1111111" + isReceive);
+                            isReceive = true;
+
+                        }
+
+
+                        wait10Seconds(1000);
+
+
+                }
+            }
+        };
+        t1.start();
+
+
+        Thread t2 = new Thread() {
+
+            public void run() {
+
+                while (!Thread.interrupted()) {
+
+//                    wait10Seconds(2000);
+//                    System.out.println("1111 = " + 111111);
+
+                    if (isHeartbeat && isReceive || wait10Seconds(10000)) {
+                        if (sendData.size() > 0) {
+                            Iterator<String> iterator = sendData.iterator();
+                            if (iterator.hasNext()) {
+
+                                synchronized (this) {
+                                    System.out.println("t2 = 2222" + isReceive);
+                                    iterator.remove();
+                                    isReceive = false;
+                                }
+
+                            }
+                        }
+                    } else {
+                        Thread.currentThread().interrupt();
+
+                    }
+
+                      wait10Seconds(2000);
+
+                }
+            }
+        };
+        t2.start();
+
+
+    }
+
+
+    public final static boolean wait10Seconds(long m) {
+        try {
+            Thread.sleep(m);
+        } catch (InterruptedException e) {
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,138 @@
+package com.sjls.nstthh;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+public class TestVolatile {
+
+
+    static volatile boolean isHeartbeat = false, isReceive = false;
+
+    private volatile static List<String> sendData = Collections.synchronizedList(new ArrayList<String>());
+
+    public static void main(String[] args) throws InterruptedException {
+        new Thread(new Runnable() {
+            public void run() {
+                while (true) {
+                    isHeartbeat = true;
+
+                    if (false) {
+
+
+                        isHeartbeat = true;
+                        //System.out.println("线程A 心跳");
+                        //System.out.println("3333");
+                        wait10Seconds(1000);
+
+                    } else {
+                        // System.out.println("3333");
+
+                        if (true && !isReceive) {
+                            System.out.println("线程A");
+                            wait10Seconds(1000);
+                            System.out.println("线程A111111");
+                            //wait10Seconds(6000);
+
+                            isReceive = true;
+                        }
+                    }
+
+
+                }
+            }
+        }).start();
+
+        Thread t2 = new Thread(new Runnable() {
+            boolean onlyOnce = true;
+
+            public void run() {
+                int count =0;
+                while (true){
+                    if(isHeartbeat&& onlyOnce||count==3){
+                        System.out.println("isHeartbeat = " + isHeartbeat);
+                        break;
+                    }
+                    System.out.println("yyyy = " + isHeartbeat);
+
+                    wait10Seconds(6000);
+                    count++;
+                }
+                System.out.println("zzzzzz = " + isHeartbeat);
+
+                sendData.add("a");
+                sendData.add("b");
+                sendData.add("c");
+                sendData.add("d");
+                sendData.add("e");
+                int i = 0;
+                while (!Thread.interrupted()) {
+                    i++;
+                    if (isHeartbeat && onlyOnce) {
+                        //wait10Seconds(2000);
+                        onlyOnce = false;
+                        isReceive = false;
+
+                        System.out.println(i + "线程B onlyOnce11111 = " + onlyOnce);
+                       // wait10Seconds(3000);
+
+                    } else {
+
+                       // System.out.println(i + "线程B onlyOnce22222 = " + onlyOnce);
+
+//                    if(!isReceive && !onlyOnce){
+//                        if (sendData != null && sendData.size() > 0) {
+//                         System.out.println("线程B1111" + sendData.get(0));
+//                        }
+//                        wait10Seconds(8000);
+//                        isReceive = true;
+//                    }
+                    if (isHeartbeat && isReceive ||    wait10Seconds(10000)) {
+                            if (sendData != null && sendData.size() > 0) {
+                                Iterator<String> iterator = sendData.iterator();
+                                if (iterator.hasNext()) {
+                                    iterator.next();
+                                    System.out.println("线程B" + sendData);
+                                    iterator.remove();
+                                    isReceive = false;
+                                }
+                            } else {
+                                Thread.currentThread().interrupt();
+                                isReceive = false;
+                                isHeartbeat = false;
+                                return;
+                            }
+
+
+                        }
+                    }
+                    wait10Seconds(2000);
+
+                }
+            }
+        });
+        t2.start();
+        t2.join();
+        wait10Seconds(10000);
+        Thread t3 = new Thread(new Runnable() {
+            public void run() {
+                for (int i = 0; i < 10; i++) {
+                    System.out.println("ttttt3333333 = " + 33333333);
+
+                }
+            }
+        });
+        t3.start();
+
+    }
+
+
+    public final static boolean wait10Seconds(long m) {
+        try {
+            Thread.sleep(m);
+        } catch (InterruptedException e) {
+        }
+        return true;
+    }
+}