完善

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

@@ -9,6 +9,11 @@ import java.util.List;
 public class Algorithm {
 
 
+	/**
+	 * 定义常量  减速机传动比
+	 */
+	public static int basicData = 50;
+	
     /**
      * 打点要发送的角度
      *
@@ -83,9 +88,9 @@ public class Algorithm {
 
                 }
 
-                sb.append(Math.round(vertical_angle) * 51);
+                sb.append(Math.round(vertical_angle) * basicData);
                 sb.append(",");
-                sb.append(Math.round(level_angle) * 51);
+                sb.append(Math.round(level_angle) * basicData);
                 sb.append(";");
 
                 // sb.append("\n");
@@ -98,9 +103,9 @@ public class Algorithm {
         AB = diameter / 2;//垂直三角形的底边
         BC = Math.sqrt(AB * AB + high * high);//垂直三角形的斜边
         vertical_angle = Math.toDegrees(Math.acos(high / BC));
-        sb.append(Math.round(vertical_angle) * 51);
+        sb.append(Math.round(vertical_angle) * basicData);
         sb.append(",");
-        sb.append(90*51);
+        sb.append(90 * basicData);
         //System.out.println(sb);
         return sb.toString();
 
@@ -127,17 +132,17 @@ public class Algorithm {
         double verticalAngle = 0;//垂直角度
         double levelAngle = 0;//水平角度
         double realHypotenuse = 0;//返回的距离
-        BigDecimal baseNumber = new BigDecimal(51);
+        BigDecimal baseNumber = new BigDecimal(basicData);
 
         //  "18,7,17.88 - 19,6,28.88 - 17,4,39.88"  垂直角度，水平角度，返回距离 -
         String[] split = rotationxy.split(";");
         for (int i = 0; i < split.length; i++) {
-        	//System.out.println("split[i]是:"+split[i]);
+            //System.out.println("split[i]是:"+split[i]);
             String[] split1 = split[i].split(",");
-            verticalAngle = new BigDecimal(split1[0]).divide(baseNumber,0,RoundingMode.HALF_UP).doubleValue();
-            levelAngle = new BigDecimal(split1[1]).divide(baseNumber,0,RoundingMode.HALF_UP).doubleValue();
-            realHypotenuse = new BigDecimal(split1[2]).divide(new BigDecimal(1000),2,RoundingMode.HALF_UP).doubleValue(); //单位转化为米
-            
+            verticalAngle = new BigDecimal(split1[0]).divide(baseNumber, 0, RoundingMode.HALF_UP).doubleValue();
+            levelAngle = new BigDecimal(split1[1]).divide(baseNumber, 0, RoundingMode.HALF_UP).doubleValue();
+            realHypotenuse = new BigDecimal(split1[2]).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue(); //单位转化为米
+
             //将垂直的角度转化为弧度
             double verticalAngleRadians = Math.toRadians(verticalAngle);
             String verticalAngleS = String.format("%.2f%n", Math.sin(verticalAngleRadians));
@@ -167,7 +172,7 @@ public class Algorithm {
 
             }
         }
-         zHigh = Collections.min(zList);
+        zHigh = Collections.min(zList);
         return zHigh;
 		
 		
@@ -258,6 +263,69 @@ public class Algorithm {
     }
 
 
+    /**
+     * 有效的z的集合
+     */
+    public static List<Double> getValidZ(String rotationxy, double diameter, double high){
+    	List<Double> zList  = new ArrayList<Double>();
+    	
+        double AC = high;
+        //double B1C = 0;//设备和粮面点之间的距离
+        double A1B1 = 0;//粮面的点到设备的水平距离
+        double z = 0; //实际点的坐标的z轴
+        double verticalAngle = 0;//垂直角度
+        double levelAngle = 0;//水平角度
+        double realHypotenuse = 0;//返回的距离即设备和粮面间两点的距离
+        BigDecimal baseNumber = new BigDecimal(basicData);
+
+        //  "18,7,17.88 ; 19,6,28.88 ; 17,4,39.88"  垂直角度，水平角度，返回距离 ;
+        String[] split = rotationxy.split(";");
+        for (int i = 0; i < split.length; i++) {
+            //System.out.println("split[i]是:"+split[i]);
+            String[] split1 = split[i].split(",");
+            verticalAngle = new BigDecimal(split1[0]).divide(baseNumber, 0, RoundingMode.HALF_UP).doubleValue();
+            levelAngle = new BigDecimal(split1[1]).divide(baseNumber, 0, RoundingMode.HALF_UP).doubleValue();
+            realHypotenuse = new BigDecimal(split1[2]).divide(new BigDecimal(1000), 2, RoundingMode.HALF_UP).doubleValue(); //单位转化为米
+
+            //将垂直的角度转化为弧度
+            double verticalAngleRadians = Math.toRadians(verticalAngle);
+            //垂直角度的sin
+            String verticalAngleS = String.format("%.2f%n", Math.sin(verticalAngleRadians));
+            double sinVerticalAngle = new Double(verticalAngleS);
+            //垂直角度的cos
+            String verticalAngleC = String.format("%.2f%n", Math.cos(verticalAngleRadians));
+            double cosVerticalAngle = new Double(verticalAngleC);
+            
+            //竖直三角形的底边 即 平面三角形的斜边  sinVerticalAngle有可能是负值 
+            A1B1 = realHypotenuse * sinVerticalAngle; 
+
+            //将水平的角度转化为弧度
+            double levelAngleRadians = Math.toRadians(levelAngle);
+            //水平角度的sin
+            String sinLevel = String.format("%.2f%n", Math.sin(levelAngleRadians));
+            double sinLeveld = new Double(sinLevel);
+            //水平角度的cos
+            /*String cosLevel = String.format("%.2f%n", Math.cos(levelAngleRadians));
+            double cosLeveld = new Double(cosLevel);*/
+
+            /*
+             * 对比实际的A1B1与打到墙上时最大的这个边进行比较 如果A1B1小于这个最大边则可取
+             * 如果A1B1大于或等于这个最大的边 则打到了墙上 舍去
+             * */
+            //打到墙上 最大的边
+            double maxLength = sinLeveld * diameter;
+
+            if (Math.abs(A1B1)< Math.abs(maxLength)) {
+                //实际打在粮面上的点的坐标（此时是以设备为坐标系的原点 分为上下两部分）
+                double A1C = realHypotenuse * cosVerticalAngle;
+                z = AC - A1C;
+                zList.add(z);
+            }
+        }
+        return zList;
+    
+    }
+    
     public static void main(String[] args) {
 
        /* BigDecimal bdv = BigDecimal.valueOf(12.125323);

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

@@ -1,7 +1,6 @@
 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;
@@ -9,6 +8,7 @@ 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;
@@ -16,7 +16,6 @@ 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;
@@ -113,7 +112,8 @@ public class TeDataServiceImpl implements TeDataService {
             String rotationxy = Algorithm.getAveragePosition(diameter, zHeight);
             teData.setRotationxy(rotationxy);
             teData.setStime(new Date());//第二次开始的时间
-            //postHelper(teData);
+            
+            postHelper(teData);
 
             flag = false;
         } else { //打点两次完毕 计算体积
@@ -154,23 +154,29 @@ public class TeDataServiceImpl implements TeDataService {
     @Override
     public void calculateVolume(String taskID) {
         // TODO Auto-generated method stub
+    	StringBuffer sb = new StringBuffer();
+    	
         List<Double> zList = new ArrayList<Double>();
-        String[] split = null;
-
+        double v = 0;
         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]) / 1000); //距离转化为米
+        
+        if(teDataList.size()>0){
+        	for (TeData teData : teDataList) {
+        		sb.append(teData.getRotationxy()+";");
             }
+        	String rotationxy = sb.substring(0, sb.length()-1).toString();//发送的角度和返回的距离  150,50,90;200,-100,90;50,-50,90
+    		
+    		//获取有效的z值
+        	 zList = Algorithm.getValidZ(rotationxy, diameter, high);
+            
+    		//计算体积
+            v = Algorithm.calculateVolume(zList, diameter, h1, h2); //体积
         }
-        //double v = Algorithm.calculateVolume(zList, diameter, h1, h2); //体积
+        logger.info("体积是: {}",v);
 
     }