the new service . manager

Change thread to monitor

add other

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

@@ -1,8 +1,26 @@
 package com.sjls.nstthh.controller;
 
 
-import org.springframework.stereotype.Controller;
+import com.sjls.nstthh.entity.Equipment;
+import com.sjls.nstthh.service.CommunicationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
-@Controller
+@RestController
 public class EquipmentAdmin {
+
+    private CommunicationService communicationService;
+
+    @Autowired
+    public void setCommunicationService(CommunicationService communicationService) {
+        this.communicationService = communicationService;
+    }
+
+    @GetMapping("/seq")
+    @ResponseBody
+    public void seq(Equipment equipment) {
+    }
+
 }

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

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Set;
 import java.util.TooManyListenersException;
 
@@ -33,6 +34,13 @@ public class HardwareAdmin {
     private CommunicationService communicationService;
     private ScantaskService scantaskService;
 
+    private NRJavaSerialManager nRJavaSerialManager;
+
+    @Autowired
+    public void setnRJavaSerialManager(NRJavaSerialManager nRJavaSerialManager) {
+        this.nRJavaSerialManager = nRJavaSerialManager;
+    }
+
     @Autowired
     public void setCommunicationService(CommunicationService communicationService) {
         this.communicationService = communicationService;
@@ -101,7 +109,7 @@ public class HardwareAdmin {
     @ResponseBody
     public boolean scom(String port) {
         boolean b = false;
-        if (!StrUtil.isEmpty(port)) {
+        if (!StrUtil.isEmpty(port) && CommConfig.serialPort == null) {
             CommConfig.serialPort = new NRSerialPort(port, 9600);
             serialPort = CommConfig.serialPort;
             b = serialPort.connect();
@@ -118,10 +126,11 @@ public class HardwareAdmin {
     public void ccom() {
         try {
             if (serialPort != null) {
-                //serialPort.disconnect();
-                CommConfig.serialPort.disconnect();
+                serialPort.disconnect();
+                //CommConfig.serialPort.disconnect();
+                CommConfig.serialPort = null;
                 serialPort = null;
-                logger.info("close serialPort {}", serialPort);
+                logger.info("close serialPort {} , {}", CommConfig.serialPort, serialPort);
             }
         } catch (Exception e) {
             //e.printStackTrace();
@@ -133,8 +142,12 @@ public class HardwareAdmin {
 
     @GetMapping("/sync-v2xyy")
     @ResponseBody
-    public void v2xyy() {
-        NRJavaSerialManager.synctoCloudData();
+    public void v2xyy(Long id) throws UnsupportedEncodingException {
+        Scantask scantask = new Scantask();
+        scantask.setId(5L);
+        //nRJavaSerialManager.setCommunicationService(communicationService);
+        nRJavaSerialManager.setScantask(scantask);
+        nRJavaSerialManager.synctoCloudData();
     }
 }
 

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

@@ -12,6 +12,8 @@ public class Grain {
     @GeneratedValue(strategy = GenerationType.IDENTITY)//自增
     private Long id;
 
+    /*2次之后*/
+    private double grainVolume_t;
 
     private double grainVolume;
     private double grainDensity;

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

@@ -0,0 +1,12 @@
+package com.sjls.nstthh.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SyncV2xyz {
+    private double volume;
+    private String xyz;
+    private Date startTime;
+}

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

@@ -0,0 +1,12 @@
+package com.sjls.nstthh.repository;
+
+
+import com.sjls.nstthh.entity.Equipment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface EquipmentRepository extends JpaRepository<Equipment, Long> {
+
+
+}

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

@@ -5,8 +5,11 @@ import com.sjls.nstthh.entity.ReceiveData;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface ReceiveDataRepository extends JpaRepository<ReceiveData, Long> {
+    List<ReceiveData> findByCantask_id(long cantask_id);
 
 
 }

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

@@ -7,6 +7,7 @@ import com.sjls.nstthh.entity.Grain;
 import com.sjls.nstthh.entity.ReceiveData;
 import com.sjls.nstthh.entity.Scantask;
 import com.sjls.nstthh.entity.SendData;
+import com.sjls.nstthh.repository.EquipmentRepository;
 import com.sjls.nstthh.repository.GrainRepository;
 import com.sjls.nstthh.repository.ReceiveDataRepository;
 import com.sjls.nstthh.repository.SendDataRepository;
@@ -17,7 +18,6 @@ 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;
@@ -36,6 +36,7 @@ public class CommunicationService {
     private SendDataRepository sendDataRepository;
     private ReceiveDataRepository receiveDataRepository;
     private GrainRepository grainRepository;
+    private EquipmentRepository equipmentRepository;
 
     /**
      * 16进制 str
@@ -80,6 +81,11 @@ public class CommunicationService {
         this.grainRepository = grainRepository;
     }
 
+    @Autowired
+    public void setEquipmentRepository(EquipmentRepository equipmentRepository) {
+        this.equipmentRepository = equipmentRepository;
+    }
+
     /**
      * 发送的
      *
@@ -101,6 +107,10 @@ public class CommunicationService {
         return receiveDataRepository.findAll();
     }
 
+    public List<ReceiveData> getReceiveData(Scantask scantask) {
+        return receiveDataRepository.findByCantask_id(scantask.getId());
+    }
+
     /**
      * 粮食信息
      *
@@ -178,7 +188,6 @@ public class CommunicationService {
             }
         } else {
             logger.info(": _send_str_anglezy _receive_str_anglezy, val false {},{} ", currentSendStr_zy, anglezy);
-
         }
         return true;
     }
@@ -219,7 +228,7 @@ public class CommunicationService {
      * @param diameter
      * @param high
      */
-    @Transient
+    //@Transient
     public List<SendData> creatToBeTested(Scantask scantask, double diameter, double high) {
 
         //sendDataRepository.deleteAll();

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

@@ -1,8 +1,6 @@
 package com.sjls.nstthh.service;
 
-import com.sjls.nstthh.entity.Grain;
-import com.sjls.nstthh.entity.Scantask;
-import com.sjls.nstthh.entity.SendData;
+import com.sjls.nstthh.entity.*;
 import com.sjls.nstthh.util.StrSplicingAssistant;
 import gnu.io.NRSerialPort;
 import gnu.io.SerialPortEvent;
@@ -16,6 +14,8 @@ import org.springframework.web.client.RestTemplate;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.*;
 
 @Component
@@ -29,7 +29,7 @@ public class NRJavaSerialManager {
     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/n-basic-edge/getEdgeData/{volume}/{xyz}/{startTime}";
+    static String cloud_url = "http://112.51.248.191: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 boolean isHeartbeat = false;
@@ -38,13 +38,6 @@ public class NRJavaSerialManager {
     private static Scantask scantask;
     private static CommunicationService communicationService;
 
-    public NRJavaSerialManager() {
-    }
-
-    public NRJavaSerialManager(Scantask st) {
-        this.scantask = st;
-    }
-
     public static double getHigh() {
         return high;
     }
@@ -77,7 +70,7 @@ public class NRJavaSerialManager {
         NRJavaSerialManager.h2 = h2;
     }
 
-    public final synchronized static boolean wait10Seconds(long m) {
+    public final static boolean wait10Seconds(long m) {
         try {
             Thread.sleep(m);
         } catch (InterruptedException e) {
@@ -85,17 +78,51 @@ public class NRJavaSerialManager {
         return true;
     }
 
-    public static void synctoCloudData() {
+    public static void synctoCloudData() throws UnsupportedEncodingException {
+
         List<Grain> grainList = communicationService.getGrainData(scantask);
+
         double v = 0;
         String str = "";
         for (Grain grain : grainList) {
             v += grain.getGrainVolume();
             str += grain.getXyz();
         }
+
+        SyncV2xyz syncV2xyz = new SyncV2xyz();
+        syncV2xyz.setXyz(URLEncoder.encode(str, "UTF-8"));
+        syncV2xyz.setVolume(v / 2);
+
+        syncV2xyz.setStartTime(scantask.getCreatTime());
+
+        logger.info("Grain -  {}", syncV2xyz);
+
         RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getForObject(cloud_url, String.class, v / 2, str, scantask.getCreatTime());
-        logger.info("Grain - v,str {} {} ", cloud_url, v / 2);
+        restTemplate.postForObject(cloud_url, syncV2xyz, String.class);
+    }
+
+    /**
+     * 两次打点数据 平均
+     *
+     * @throws UnsupportedEncodingException
+     */
+    public static double getVolumeAvg() throws UnsupportedEncodingException {
+        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;
+
+        return realHypotenuse_avg;
+    }
+
+    public void setScantask(Scantask scantask) {
+        NRJavaSerialManager.scantask = scantask;
     }
 
     @Autowired
@@ -128,7 +155,11 @@ public class NRJavaSerialManager {
         t2.start();
         t2.join();
         Thread t3 = new Thread(() -> {
-            synctoCloudData();
+            try {
+                synctoCloudData();
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
         });
         t3.start();
     }
@@ -158,7 +189,7 @@ 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")) {
@@ -200,8 +231,8 @@ public class NRJavaSerialManager {
 //                    logger.info("init dot  ......{} {} " ,rs1,communicationService.receiveList.size());
 
                     if (isHeartbeat && onlyOnce) {
-                        outStream.write(StrSplicingAssistant.hexStrToByteArrs(str_init));
                         wait10Seconds(2000);
+                        outStream.write(StrSplicingAssistant.hexStrToByteArrs(str_init));
                         onlyOnce = false;
                         logger.info("init_send_str =" + str_init.substring(38, 46));
                     }

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

@@ -1,5 +1,6 @@
 package com.sjls.nstthh.service;
 
+import cn.hutool.core.date.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +42,16 @@ public class SaticScheduleTask {
         //}
 
         // /dev/ttyUSB0     /dev/tty.usbserial-14130
-        if (CommConfig.serialPort != null && CommConfig.serialPort.isConnected())
+        //todo 手动连接串口
+
+        if (CommConfig.serialPort != null && CommConfig.serialPort.isConnected()) {
+            logger.info("{} :定时扫描任务开启......", DateUtil.now());
             scantaskService.creatScanTask(CommConfig.serialPort);
+            logger.info("{} :定时扫描任务结束......", DateUtil.now());
+
+        } else {
+            logger.info("{} :定时扫描任务未开启，手动链接串口......", DateUtil.now());
+        }
 
         //System.err.println("执行静态定时任务时间: " + LocalDateTime.now());
     }

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

@@ -20,12 +20,18 @@ public class ScantaskService {
 
 
     private ScantaskRepository scantaskRepository;
+    private NRJavaSerialManager nRJavaSerialManager;
 
     @Autowired
     public void setScantaskRepository(ScantaskRepository scantaskRepository) {
         this.scantaskRepository = scantaskRepository;
     }
 
+    @Autowired
+    public void setnRJavaSerialManager(NRJavaSerialManager nRJavaSerialManager) {
+        this.nRJavaSerialManager = nRJavaSerialManager;
+    }
+
     /**
      * @return
      */
@@ -43,13 +49,12 @@ public class ScantaskService {
         //String key = id + "a1001" + DateTime.now().getTime();
 
         Scantask scantask = new Scantask();
-        scantask.setStkey(String.valueOf(id));
 
+        scantask.setStkey(String.valueOf(id));
         scantask.setCreatTime(DateTime.now());
         Scantask scantaskdb = scantaskRepository.save(scantask);
-
-        new NRJavaSerialManager(scantaskdb).operation(serialPort);
-
+        nRJavaSerialManager.setScantask(scantaskdb);
+        nRJavaSerialManager.operation(serialPort);
         return scantaskdb;
     }
 }

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

@@ -148,7 +148,8 @@ public class AlgAlgorithm {
         double x = 0; //实际点的坐标的x轴
         double y = 0; //实际点的坐标的y轴
         double z = 0; //实际点的坐标的z轴
-
+        int yy = 0;
+        int xx = 0;
         StringBuffer sb = new StringBuffer();
         sb.append("[");
 
@@ -204,7 +205,15 @@ public class AlgAlgorithm {
                 }
                 y = y + diameter / 2;
 
-                sb.append("[" + x + "," + y + "," + z + "],");
+
+                BigDecimal big_z = new BigDecimal(z);
+                z = big_z.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+
+                yy = (int) Math.round(y);
+                xx = (int) Math.round(x);
+
+                sb.append("[" + xx + "," + yy + "," + z + "],");
+                //sb.append("[" + x + "," + y + "," + z + "],");
             }
 
         }

src/main/resources/application.yml

@@ -4,9 +4,9 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    password: 123456
+    password: 1qaz@WSX
     ## Edge-dongtian
-    url: jdbc:mysql://192.168.40.74:3306/nstthh?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    url: jdbc:mysql://101.36.160.140:21029/nstthh?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
   jpa:
     show-sql: false
     open-in-view: false

src/main/resources/templates/index.html

@@ -24,13 +24,11 @@
             <td th:text="${scantask.id}"></td>
             <td th:text="${scantask.stkey}"></td>
             <td th:text="${scantask.creatTime}"></td>
-            <td th:text="${scantask.warehouse.id}"></td>
         </tr>
     </table>
     <div class="panel panel-default">
         <div class="panel-body">
-            port:8888
-            /admin /sync-v2xyy
+            /admin /sync-v2xyy/id
         </div>
     </div>
 </div>

src/main/resources/templates/nstthh.html

@@ -8,7 +8,6 @@
     <script type="text/javascript">
         $(document).ready(function () {
             $("#start_scanning").attr("disabled", true);
-
             $("#connect_equipment").click(function () {
                 $("#start_scanning").attr("disabled", false);
                 $("#connect_equipment").attr("disabled", true);
@@ -23,8 +22,11 @@
                         $('#connect_equipment').text('正在链接，请稍等！');
                     },
                     success: function (data, status) {
+                        //localStorage.setItem("serialIsConnected", data);
                         if (data) {
                             $("#connect_equipment").text("设备连接成功");
+                        } else {
+                            alert('未成功 或 重复连接');
                         }
                     }
                 });
@@ -86,6 +88,7 @@
                     <input class="form-control" id="h2" name="h2" placeholder="h2" type="text">
                 </div>
             </div>
+            <br/>
             <div class="row">
                 <div class="col-xs-12">
                     <input class="form-control" id="high" name="port" placeholder="高" type="text">