.

src/main/java/com/szls/nstths/NstthsApplication.java

@@ -3,7 +3,9 @@ package com.szls.nstths;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
 
+@EnableAsync
 @SpringBootApplication
 @MapperScan("com.szls.nstths.mapper")
 public class NstthsApplication {

src/main/java/com/szls/nstths/controller/DataController.java

@@ -29,13 +29,11 @@ public class DataController {
     @PostMapping("/equipmentTestingEnd")
     public String equipmentTesting(@RequestBody TeData teData) {
         logger.info("{}", teData);
-        int inum = teDataService.scanTask(teData);
+        int inum = teDataService.saveTeData(teData);
         if (inum < 0) {
             return "fail";
         }
-        if (inum == 0) { //打点两次完毕 计算体积
-            teDataService.calculateVolume(teData.getTaskID());
-        }
+        teDataService.scanTask(teData);
         return "success";
     }
 

src/main/java/com/szls/nstths/controller/UserController.java

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.concurrent.Callable;
 
 @RestController
 public class UserController {
@@ -30,5 +31,4 @@ public class UserController {
 
         return String.format("Hello %s!", name);
     }
-
 }

src/main/java/com/szls/nstths/entity/TeData.java

@@ -25,4 +25,6 @@ public class TeData {
     private Date etime;
     private String rotationxy;
 
+    @TableField(exist = false)
+    private Date currenttime;
 }

src/main/java/com/szls/nstths/service/TeDataService.java

@@ -24,8 +24,9 @@ public interface TeDataService {
      *
      * @param high
      * @param diameter
+     * @return 数据库影响条数
      */
-    void scanTask(double diameter, double high);
+    int scanTask(double diameter, double high);
 
     /**
      * 第二次待打点
@@ -33,9 +34,9 @@ public interface TeDataService {
      * @param teData
      * @return 数据库影响条数
      */
-    int scanTask(TeData teData);
-
+    void scanTask(TeData teData);
 
+    int  saveTeData(TeData teData);
     /**
      * 计算体积
      *

src/main/java/com/szls/nstths/service/impl/Algorithm.java

@@ -86,7 +86,7 @@ public class Algorithm {
                 sb.append(Math.round(level_angle));
                 sb.append(",");
                 sb.append(Math.round(vertical_angle));
-                sb.append("-");
+                sb.append(";");
                 // sb.append("\n");
             }
         }
@@ -103,7 +103,7 @@ public class Algorithm {
         // sb.append("\n");
         //System.out.println(Math.round(level_step)+","+Math.round(vertical_step)+"");
         //System.out.println(sb);
-        System.out.println(sb);
+        //System.out.println(sb);
         return sb.toString();
 
     }
@@ -132,7 +132,7 @@ public class Algorithm {
 
 
         //  "18,7,17.88 - 19,6,28.88 - 17,4,39.88"  水平角度，垂直角度，返回距离 -
-        String[] split = rotationxy.split("-");
+        String[] split = rotationxy.split(";");
         for (int i = 0; i < split.length; i++) {
             String[] split1 = split[i].split(",");
             levelAngle = Double.parseDouble(split1[0]);

src/main/java/com/szls/nstths/service/impl/TeDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.szls.nstths.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.szls.nstths.controller.DataController;
 import com.szls.nstths.entity.ReMsg;
 import com.szls.nstths.entity.STask;
 import com.szls.nstths.entity.TeData;
@@ -8,10 +9,14 @@ import com.szls.nstths.mapper.ReMsgMapper;
 import com.szls.nstths.mapper.STaskMapper;
 import com.szls.nstths.mapper.TeDataMapper;
 import com.szls.nstths.service.TeDataService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -19,6 +24,8 @@ import java.util.List;
 @Service(value = "teDataService")
 public class TeDataServiceImpl implements TeDataService {
 
+    private static final Logger logger = LoggerFactory.getLogger(TeDataServiceImpl.class);
+
     static String base_url = "http://local.wxlxit.com:61001/";
     static boolean flag = true;
     static double diameter = 0; //直径
@@ -57,11 +64,9 @@ public class TeDataServiceImpl implements TeDataService {
      * 2. equipmentTestingStart
      * 3. equipmentTestingEnd
      */
-
     @Override
-    public void scanTask(double diameter, double high) {
-
-
+    public int scanTask(double diameter, double high) {
+        logger.info("scanTask {},{}",diameter,high);
         STask task = new STask();
         Date date = new Date();
         task.setCtime(date);
@@ -76,19 +81,28 @@ public class TeDataServiceImpl implements TeDataService {
         //todo 第一次待打点
         String rotationxy = Algorithm.getAveragePosition(diameter, high);
         teData.setRotationxy(rotationxy);
-        teDataMapper.insert(teData);
+        int inum = teDataMapper.insert(teData);
+
+        logger.info("scanTask sTaskMapper teDataMapper {},{}",task,teData);
 
         postHelper(teData);
         //equipmentTestingEnd
         flag = true;
-    }
 
+        return inum;
+    }
+    @Async
     @Override
-    public int scanTask(TeData teData) {
+    public void scanTask(TeData teData) {
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         //只运行 发送一次。
         if (flag) {
-            teData.getEquipmentID();
-            teData.getTaskID();
+            //teData.getEquipmentID();
+            //teData.getTaskID();
 
             //todo 第二次待打点
 
@@ -97,28 +111,42 @@ public class TeDataServiceImpl implements TeDataService {
             //打点
             String rotationxy = Algorithm.getAveragePosition(diameter, zHeight);
             teData.setRotationxy(rotationxy);
-            int inum = teDataMapper.insert(teData);
 
             postHelper(teData);
-            flag = false;
 
-            return inum;
+            flag = false;
+        } else { //打点两次完毕 计算体积
+            this.calculateVolume(teData.getTaskID());
         }
-        return 0;
+
+    }
+
+    @Override
+    public int saveTeData(TeData teData) {
+        int inum = teDataMapper.insert(teData);
+        return inum;
     }
 
     public ReMsg postHelper(TeData teData) {
+
+        logger.info("in ...... postHelper teData{}",teData);
+
         RestTemplate restTemplate = new RestTemplate();
+        teData.setCurrenttime(new Date());
         ReMsg reMsg1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReMsg.class);
         //reMsgMapper.insert(reMsg1);
+        logger.info("postHelper reMsg1 {}",reMsg1);
 
         if (reMsg1 != null) {
             if ("0".equals(reMsg1.getCode())) {
                 ReMsg reMsg2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReMsg.class);
+                logger.info("postHelper reMsg2 {}",reMsg2);
                 reMsgMapper.insert(reMsg2);
                 return reMsg2;
             }
         }
+        logger.info("postHelper post task_ {}",teData);
+
         return null;
     }
 
@@ -134,7 +162,7 @@ public class TeDataServiceImpl implements TeDataService {
         queryWrapper.eq("taskID", taskID);
         teDataList = teDataMapper.selectList(queryWrapper);
         for (TeData teData : teDataList) {
-            split = teData.getRotationxy().split("-");
+            split = teData.getRotationxy().split(";");
             for (int i = 0; i < split.length; i++) {
                 String[] split1 = split[i].split(",");
                 //split1[2]  是返回的距离

src/main/resources/application.yml

@@ -6,13 +6,13 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
     password: 123456
-    url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
-    #url: jdbc:mysql://192.168.1.123:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
+    #url: jdbc:mysql://36.134.100.155:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
+    url: jdbc:mysql://192.168.1.123:3306/nstths?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT
     hikari:
       minimum-idle: 5
-      maximum-pool-size: 10
+      maximum-pool-size: 20
       idle-timeout: 30000
-      max-lifetime: 0
+      max-lifetime: 1800000
       connection-timeout: 60000
       validation-timeout: 3000
       connection-test-query: select 1

src/main/resources/static/nstths.sh

@@ -0,0 +1,17 @@
+port=7077
+#根据端口号查询对应的pid
+pid=$(netstat -nlp | grep :$port | awk '{print $7}' | awk -F"/" '{ print $1 }');
+
+#杀掉对应的进程，如果pid不存在，则不执行
+if [  -n  "$pid"  ];  then
+    kill  -9  $pid;
+fi
+
+source /etc/profile
+nohup java -jar /home/nstths/nstths-0.0.1-SNAPSHOT.jar >/home/nstths/catalina.out  2>&1 &
+
+sleep 20
+
+tail -f /home/nstths/catalina.out
+
+exit 0