.

pom.xml

@@ -40,7 +40,6 @@
             <artifactId>mybatis-plus-generator</artifactId>
             <version>3.5.1</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>

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

@@ -22,6 +22,7 @@ public class DataController {
 
     /**
      * 检测后数据
+     *
      * @param teData
      * @return
      */
@@ -32,8 +33,8 @@ public class DataController {
         if (inum < 0) {
             return "fail";
         }
-        if(inum == 0){ //打点两次完毕 计算体积
-        	teDataService.calculateVolume(teData.getTaskID());
+        if (inum == 0) { //打点两次完毕 计算体积
+            teDataService.calculateVolume(teData.getTaskID());
         }
         return "success";
     }
@@ -46,7 +47,7 @@ public class DataController {
     public void scanning(@RequestParam(value = "height", defaultValue = "35") double height,
                          @RequestParam(value = "diameter ", defaultValue = "12") double diameter) {
 
-        logger.info("{},{}",height,diameter);
-        teDataService.scanTask(diameter,height);
+        logger.info("scanning height{},diameter{}", height, diameter);
+        teDataService.scanTask(diameter, height);
     }
 }

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

@@ -2,7 +2,6 @@ package com.szls.nstths.controller;
 
 
 import com.szls.nstths.mapper.UserMapper;
-import com.szls.nstths.service.TeDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +17,7 @@ public class UserController {
     private static final Logger logger = LoggerFactory.getLogger(UserController.class);
 
     private UserMapper userMapper;
+
     @Autowired
     public void setUserMapper(UserMapper userMapper) {
         this.userMapper = userMapper;

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

@@ -9,8 +9,6 @@ import lombok.Data;
 @Data
 @TableName("re_msg")
 public class ReMsg {
-    @TableId(type = IdType.AUTO, value = "id")
-    private Long id;
     /**
      * code=0, msg='操作成功'
      * code=1, msg='设备正忙'
@@ -20,4 +18,6 @@ public class ReMsg {
     String code;
     String msg;
     String data;
+    @TableId(type = IdType.AUTO, value = "id")
+    private Long id;
 }

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

@@ -13,7 +13,7 @@ import java.util.Date;
 public class STask {
     @TableId(type = IdType.AUTO, value = "id")
     private Long id;
-    private String describe;
+    private String depict;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date ctime;
 }

src/main/java/com/szls/nstths/mapper/ReMsgMapper.java

@@ -0,0 +1,10 @@
+package com.szls.nstths.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.szls.nstths.entity.ReMsg;
+import org.springframework.stereotype.Component;
+
+@Component(value = "reMsgMapper")
+public interface ReMsgMapper extends BaseMapper<ReMsg> {
+
+}

src/main/java/com/szls/nstths/mapper/STaskMapper.java

@@ -2,7 +2,6 @@ package com.szls.nstths.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.szls.nstths.entity.STask;
-import com.szls.nstths.entity.TeData;
 import org.springframework.stereotype.Component;
 
 @Component(value = "sTaskMapper")

src/main/java/com/szls/nstths/mapper/TeDataMapper.java

@@ -2,7 +2,6 @@ package com.szls.nstths.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.szls.nstths.entity.TeData;
-import com.szls.nstths.entity.User;
 import org.springframework.stereotype.Component;
 
 @Component(value = "teDataMapper")

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

@@ -1,6 +1,5 @@
 package com.szls.nstths.service;
 
-import com.szls.nstths.entity.ReMsg;
 import com.szls.nstths.entity.TeData;
 import org.springframework.stereotype.Service;
 
@@ -11,35 +10,37 @@ import org.springframework.stereotype.Service;
  * 1. equipmentTestingIsReady
  * 2. equipmentTestingStart
  * 3. equipmentTestingEnd
- *
+ * <p>
  * equipmentTestingContinue
  * equipmentTestingResult
  */
 
-@Service(value = "teDataService")
-public interface TeDataService {
 
+public interface TeDataService {
 
 
     /**
      * 第一次待打点
-     * @param height 
-     * @param diameter 
+     *
+     * @param high
+     * @param diameter
      */
-    public void scanTask(double diameter, double high);
+    void scanTask(double diameter, double high);
 
     /**
      * 第二次待打点
+     *
      * @param teData
      * @return 数据库影响条数
      */
-    public int scanTask(TeData teData);
-    
+    int scanTask(TeData teData);
+
 
     /**
      * 计算体积
+     *
      * @param taskID
      */
-	public void calculateVolume(String taskID);
+    void calculateVolume(String taskID);
 
 }

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

@@ -1,22 +1,22 @@
 package com.szls.nstths.service.impl;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.jupiter.api.Test;
-
 public class Algorithm {
 
-	
-	/**
-	 * 打点要发送的角度
-	 * @param diameter
-	 * @param high
-	 * @return
-	 */
-	public static String getAveragePosition(double diameter, double high) {
+
+    /**
+     * 打点要发送的角度
+     *
+     * @param diameter
+     * @param high
+     * @return
+     */
+    public static String getAveragePosition(double diameter, double high) {
         StringBuffer sb = new StringBuffer();
 
         double x1 = 0;
@@ -105,21 +105,22 @@ public class Algorithm {
         //System.out.println(sb);
         System.out.println(sb);
         return sb.toString();
-    
-	}
-	
-	
-	/**
-	 * 计算  以粮面为基准面的高
-	 * @param list
-	 * @return
-	 */
-	public static double zHeight(String rotationxy,double diameter, double high) {
-        
-		List<Double> zList = new ArrayList<Double>();
-		
+
+    }
+
+
+    /**
+     * 计算  以粮面为基准面的高
+     *
+     * @param rotationxy
+     * @return
+     */
+    public static double zHeight(String rotationxy, double diameter, double high) {
+
+        List<Double> zList = new ArrayList<Double>();
+
         // logger.info("zHeight - list",list);
-		double AC = high;
+        double AC = high;
         double B1C = 0;//设备和粮面点之间的距离
         double A1B1 = 0;//粮面到设备的水平距离
         double z = 0; //实际点的坐标的z轴
@@ -128,17 +129,17 @@ public class Algorithm {
         double verticalAngle = 0;//垂直角度
         double levelAngle = 0;//水平角度
         double realHypotenuse = 0;//返回的距离
-        
-		
-		//  "18,7,17.88 - 19,6,28.88 - 17,4,39.88"  水平角度，垂直角度，返回距离 - 
-		String[] split = rotationxy.split("-");
-		for (int i = 0; i < split.length; i++) {
-			String[] split1 = split[i].split(",");
-			levelAngle = Double.parseDouble(split1[0]);
-			verticalAngle = Double.parseDouble(split1[1]);
-			realHypotenuse = Double.parseDouble(split1[2]);
-			
-			//将垂直的角度转化为弧度
+
+
+        //  "18,7,17.88 - 19,6,28.88 - 17,4,39.88"  水平角度，垂直角度，返回距离 -
+        String[] split = rotationxy.split("-");
+        for (int i = 0; i < split.length; i++) {
+            String[] split1 = split[i].split(",");
+            levelAngle = Double.parseDouble(split1[0]);
+            verticalAngle = Double.parseDouble(split1[1]);
+            realHypotenuse = Double.parseDouble(split1[2]);
+
+            //将垂直的角度转化为弧度
             double verticalAngleRadians = Math.toRadians(verticalAngle);
             String verticalAngleS = String.format("%.2f%n", Math.sin(verticalAngleRadians));
             double sinc = new Double(verticalAngleS);
@@ -149,14 +150,14 @@ public class Algorithm {
 
             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));
@@ -169,9 +170,9 @@ public class Algorithm {
 
                 zList.add(z);
             }
-		}
-		
-		zMax = Collections.max(zList);
+        }
+
+        zMax = Collections.max(zList);
         zHigh = AC - zMax;
         return zHigh;
 		
@@ -199,9 +200,9 @@ public class Algorithm {
             double sinLevelc = new Double(sinLevel);
 
             *//**
-             * 对比实际的A1B1与打到墙上时最大的这个边进行比较 如果A1B1小于这个最大边则可取
-             * 如果A1B1大于或等于这个最大的边 则打到了墙上 舍去
-             *//*
+         * 对比实际的A1B1与打到墙上时最大的这个边进行比较 如果A1B1小于这个最大边则可取
+         * 如果A1B1大于或等于这个最大的边 则打到了墙上 舍去
+         *//*
             //打到墙上 最大的边
             double maxLength = sinLevelc * diameter;
 
@@ -223,15 +224,14 @@ public class Algorithm {
         return zHigh;
 */
     }
-	
-	
-	
-	/**
+
+
+    /**
      * 计算体积
      *
      * @param zList 粮面高集合(z值的集合)
      */
-    public static double calculateVolume(List<Double> zList,double diameter,double h1,double h2) {
+    public static double calculateVolume(List<Double> zList, double diameter, double h1, double h2) {
 
         //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的最小值
@@ -257,8 +257,19 @@ public class Algorithm {
         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();
+        BigDecimal bdv = BigDecimal.valueOf(vv);
+        //double v = bdv.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        double v = bdv.setScale(2, RoundingMode.HALF_UP).doubleValue();
         return v;
     }
+
+
+    public static void main(String[] args) {
+
+        BigDecimal bdv = BigDecimal.valueOf(12.125323);
+        //BigDecimal bdv = new BigDecimal(vv);
+        //double v = bdv.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+        double v = bdv.setScale(2, RoundingMode.HALF_UP).doubleValue();
+        System.out.println("v = " + v);
+    }
 }

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

@@ -4,16 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.szls.nstths.entity.ReMsg;
 import com.szls.nstths.entity.STask;
 import com.szls.nstths.entity.TeData;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@Service(value = "teDataService")
 public class TeDataServiceImpl implements TeDataService {
 
     static String base_url = "http://local.wxlxit.com:61001/";
@@ -24,6 +27,13 @@ public class TeDataServiceImpl implements TeDataService {
     static double h2 = 3; //h2 水平地面到圆锥尖的高
     private STaskMapper sTaskMapper;
     private TeDataMapper teDataMapper;
+    private ReMsgMapper reMsgMapper;
+
+    public static void main(String[] args) {
+        String str = "18,7,17.88-19,6,28.88-17,4,39.88";
+
+        str.split("-");
+    }
 
     @Autowired
     public void setsTaskMapper(STaskMapper sTaskMapper) {
@@ -35,6 +45,11 @@ public class TeDataServiceImpl implements TeDataService {
         this.teDataMapper = teDataMapper;
     }
 
+    @Autowired
+    public void setReMsgMapper(ReMsgMapper reMsgMapper) {
+        this.reMsgMapper = reMsgMapper;
+    }
+
     /**
      * todo
      * http://local.wxlxit.com:61001/
@@ -46,11 +61,11 @@ public class TeDataServiceImpl implements TeDataService {
     @Override
     public void scanTask(double diameter, double high) {
 
-    	
+
         STask task = new STask();
         Date date = new Date();
         task.setCtime(date);
-        task.setDescribe("test");
+        task.setDepict("test");
         sTaskMapper.insert(task);
 
         TeData teData = new TeData();
@@ -70,24 +85,24 @@ public class TeDataServiceImpl implements TeDataService {
 
     @Override
     public int scanTask(TeData teData) {
-    	//只运行 发送一次。
+        //只运行 发送一次。
         if (flag) {
-	        teData.getEquipmentID();
-	        teData.getTaskID();
-	
-	        //todo 第二次待打点
-	        
-	        //计算以粮面为基准面的高
-	        double zHeight = Algorithm.zHeight(teData.getRotationxy(),diameter, high);
-	        //打点
-	        String rotationxy = Algorithm.getAveragePosition(diameter, zHeight);
-	        teData.setRotationxy(rotationxy);
-	        int inum = teDataMapper.insert(teData);
-	
-	        postHelper(teData);
-	        flag = false;
-	
-	        return inum;
+            teData.getEquipmentID();
+            teData.getTaskID();
+
+            //todo 第二次待打点
+
+            //计算以粮面为基准面的高
+            double zHeight = Algorithm.zHeight(teData.getRotationxy(), diameter, high);
+            //打点
+            String rotationxy = Algorithm.getAveragePosition(diameter, zHeight);
+            teData.setRotationxy(rotationxy);
+            int inum = teDataMapper.insert(teData);
+
+            postHelper(teData);
+            flag = false;
+
+            return inum;
         }
         return 0;
     }
@@ -95,43 +110,39 @@ public class TeDataServiceImpl implements TeDataService {
     public ReMsg postHelper(TeData teData) {
         RestTemplate restTemplate = new RestTemplate();
         ReMsg reMsg1 = restTemplate.postForObject(base_url + "equipmentTestingIsReady", teData, ReMsg.class);
+        //reMsgMapper.insert(reMsg1);
+
         if (reMsg1 != null) {
-            if (reMsg1.getCode().equals("0")) {
+            if ("0".equals(reMsg1.getCode())) {
                 ReMsg reMsg2 = restTemplate.postForObject(base_url + "equipmentTestingStart", teData, ReMsg.class);
+                reMsgMapper.insert(reMsg2);
                 return reMsg2;
             }
         }
         return null;
     }
 
-    
     @Override
-	public void calculateVolume(String taskID) {
-		// TODO Auto-generated method stub
-		List<Double> zList = new ArrayList<Double>();
-		String[] split = null;
-		
-		QueryWrapper<TeData> queryWrapper = new QueryWrapper<>();
+    public void calculateVolume(String taskID) {
+        // TODO Auto-generated method stub
+        List<Double> zList = new ArrayList<Double>();
+        String[] split = null;
+
+        QueryWrapper<TeData> queryWrapper = new QueryWrapper<>();
 
         List<TeData> teDataList = null;
         queryWrapper.eq("taskID", taskID);
         teDataList = teDataMapper.selectList(queryWrapper);
-		for (TeData teData : teDataList) {
-			split = teData.getRotationxy().split("-");
-			for (int i = 0; i < split.length; i++) {
-				String[] split1 = split[i].split(",");
-				//split1[2]  是返回的距离
-				zList.add(Double.parseDouble(split1[2]));
-			}
-		}
-		double v = Algorithm.calculateVolume(zList,diameter,h1,h2); //体积
-		
-	}
-    
-    public static void main(String[] args) {
-        String str = "18,7,17.88-19,6,28.88-17,4,39.88";
+        for (TeData teData : teDataList) {
+            split = teData.getRotationxy().split("-");
+            for (int i = 0; i < split.length; i++) {
+                String[] split1 = split[i].split(",");
+                //split1[2]  是返回的距离
+                zList.add(Double.parseDouble(split1[2]));
+            }
+        }
+        double v = Algorithm.calculateVolume(zList, diameter, h1, h2); //体积
 
-        str.split("-");
     }
 
 }

src/main/resources/static/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>admin</title>
+</head>
+<body>
+<a href="http://127.0.0.1:7077/scanning">本地默认扫描</a>
+
+<a href="http://112.51.248.191:7077/scanning">远程默认扫描</a>
+</body>
+</html>

src/test/java/com/szls/nstths/NstthsApplicationTests.java

@@ -3,7 +3,6 @@ package com.szls.nstths;
 import com.baomidou.mybatisplus.generator.FastAutoGenerator;
 import com.baomidou.mybatisplus.generator.config.OutputFile;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.Collections;

src/test/java/com/szls/nstths/SampleTest.java

@@ -2,7 +2,6 @@ package com.szls.nstths;
 
 import com.szls.nstths.entity.User;
 import com.szls.nstths.mapper.UserMapper;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;