。。

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

@@ -39,13 +39,13 @@ public class DataController {
     /**
      *
      * @param height
-     * @param radius
+     * @param diameter 直径
      */
     @GetMapping("/scanning")
-    public void scanning(@RequestParam(value = "height", defaultValue = "12") String height,
-                         @RequestParam(value = "radius", defaultValue = "12") String radius) {
+    public void scanning(@RequestParam(value = "height", defaultValue = "35") double height,
+                         @RequestParam(value = "diameter ", defaultValue = "12") double diameter) {
 
-        logger.info("{},{}",height,radius);
-        teDataService.scanTask();
+        logger.info("{},{}",height,diameter);
+        teDataService.scanTask(diameter,height);
     }
 }

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

@@ -23,8 +23,10 @@ public interface TeDataService {
 
     /**
      * 第一次待打点
+     * @param height 
+     * @param diameter 
      */
-    public void scanTask();
+    public void scanTask(double diameter, double high);
 
     /**
      * 第二次待打点
@@ -32,5 +34,12 @@ public interface TeDataService {
      * @return 数据库影响条数
      */
     public int scanTask(TeData teData);
+    
+
+    /**
+     * 计算体积
+     * @param taskID
+     */
+	public void calculateVolume(String taskID);
 
 }

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

@@ -0,0 +1,264 @@
+package com.szls.nstths.service.impl;
+
+import java.math.BigDecimal;
+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) {
+        StringBuffer sb = new StringBuffer();
+
+        double x1 = 0;
+        double y1 = 0;
+        //打出来三角形的底边AB 实际是平面上点的斜边
+        double AB = 0; //理想状态
+        double x = 0;
+        double y = 0;
+        double BC = 0;
+        double vertical_angle = 0;//垂直的角度
+        double level_angle = 0;//水平的角度
+        /*double vertical_step = 0;//垂直的步长
+        double level_step = 0;//水平的步长
+*/
+        //根据直径判断半径是整数还是非整数 如果是非整数 则向下取整
+        double r = Math.floor(diameter / 2);  //最大的半径 即一共有多少个圆圈
+
+        //一共有多少个圆圈
+        int circleNumber = (int) r;
+
+        for (int i = 1; i <= circleNumber; i++) {
+            //每一个圆一共有多少个的点   此时的半径长就是i
+            int pointCount = (int) ((2 * Math.PI * i) / 1.57);
+
+            for (int j = 0; j < pointCount; j++) {
+
+                /**
+                 * 以其他点为圆心的圆  r是i degrees是以圆心为中心转动的角度 其坐标x1、y1则是
+                 */
+                double degrees = (360 / pointCount) * j;
+                //System.out.println(degrees+"度数");
+                double radians = Math.toRadians(degrees);//转化为弧度
+                String strx = String.format("%.2f%n", Math.cos(radians) * i);//计算横坐标的值
+                x1 = new Double(strx);
+                String stry = String.format("%.2f%n", Math.sin(radians) * i);//计算纵坐标的值
+                y1 = new Double(stry);
+
+                /**
+                 * 以设备为中心，把圆上的点分为上下两半，
+                 * 新的圆 是旧的圆向左平移了(diameter/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 + 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 = -(Math.toDegrees(Math.acos(high / BC)));
+
+                } else {//正向转
+                    level_angle = Math.toDegrees(Math.acos(y / AB));
+                    vertical_angle = Math.toDegrees(Math.acos(high / BC));
+
+                }
+
+                sb.append(Math.round(level_angle));
+                sb.append(",");
+                sb.append(Math.round(vertical_angle));
+                sb.append("-");
+                // sb.append("\n");
+            }
+        }
+
+        /**
+         * 追加一个圆筒仓中心的点，其坐标是(diameter/2,0) 水平转动90度 步长为2167
+         */
+        AB = diameter / 2;//垂直三角形的底边
+        BC = Math.sqrt(AB * AB + high * high);//垂直三角形的斜边
+        vertical_angle = Math.toDegrees(Math.acos(high / BC));
+        sb.append(90);
+        sb.append(",");
+        sb.append(Math.round(vertical_angle));
+        // sb.append("\n");
+        //System.out.println(Math.round(level_step)+","+Math.round(vertical_step)+"");
+        //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>();
+		
+        // 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;//返回的距离
+        
+		
+		//  "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);
+            //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);
+            }
+		}
+		
+		zMax = Collections.max(zList);
+        zHigh = AC - zMax;
+        return zHigh;
+		
+		
+		
+	/*	
+
+        
+        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);
+            }
+        }
+        zMax = Collections.max(zList);
+        zHigh = AC - zMax;
+        return zHigh;
+*/
+    }
+	
+	
+	
+	/**
+     * 计算体积
+     *
+     * @param zList 粮面高集合(z值的集合)
+     */
+    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的最小值
+
+        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();
+        return v;
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.szls.nstths.service.impl;
 
+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;
@@ -9,12 +10,18 @@ import com.szls.nstths.service.TeDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 public class TeDataServiceImpl implements TeDataService {
 
     static String base_url = "http://local.wxlxit.com:61001/";
     static boolean flag = true;
+    static double diameter = 0; //直径
+    static double high = 0; //圆筒仓的高(以地面为基准面)
+    static double h1 = 6; //h1 圆锥的高
+    static double h2 = 3; //h2 水平地面到圆锥尖的高
     private STaskMapper sTaskMapper;
     private TeDataMapper teDataMapper;
 
@@ -37,8 +44,9 @@ public class TeDataServiceImpl implements TeDataService {
      */
 
     @Override
-    public void scanTask() {
+    public void scanTask(double diameter, double high) {
 
+    	
         STask task = new STask();
         Date date = new Date();
         task.setCtime(date);
@@ -51,7 +59,8 @@ public class TeDataServiceImpl implements TeDataService {
         teData.setStime(date);
 
         //todo 第一次待打点
-        teData.setRotationxy("");
+        String rotationxy = Algorithm.getAveragePosition(diameter, high);
+        teData.setRotationxy(rotationxy);
         teDataMapper.insert(teData);
 
         postHelper(teData);
@@ -61,21 +70,26 @@ public class TeDataServiceImpl implements TeDataService {
 
     @Override
     public int scanTask(TeData teData) {
-
-        teData.getEquipmentID();
-        teData.getTaskID();
-
-        //todo 第二次待打点
-        teData.setRotationxy("");
-        int inum = teDataMapper.insert(teData);
-
-        //只运行 发送一次。
+    	//只运行 发送一次。
         if (flag) {
-            postHelper(teData);
-            flag = false;
+	        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 inum;
+        return 0;
     }
 
     public ReMsg postHelper(TeData teData) {
@@ -90,6 +104,30 @@ public class TeDataServiceImpl implements TeDataService {
         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<>();
+
+        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";