the new service . manager

Change thread to monitor

add other

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

@@ -11,32 +11,36 @@ import java.util.Map;
 
 public class AlgAlgorithm {
 
+    /**
+     * 打点
+     *
+     * @param
+     */
+
+
+    public static void main(String[] args) {
+
+    }
 
     //圆筒仓的直径
-    static double diameter = 12;
+    //double diameter = 4;
     //AC 是设备到地面的高
-    double  high = 35;
+    //double  high = 35;
 
 
-    static double h1 = 6; //h1 圆锥的高
-    static double h2 = 3; // h2 水平地面到圆锥尖的高
-    public static List<Double> zNums = new ArrayList<Double>();
     /**
      * 算法 产生 待检测点。
      *
-     * @param high 高
+     * @param diameter 直径
+     * @param high     高
      * @return
      */
-    public static String getAveragePosition(double diameter,double high) {
+    public static String getAveragePosition(double diameter, double high) {
+
 
-        if(diameter==0){
-            diameter= diameter;
-        }
-        if(high==0){
-            high= high;
-        }
         StringBuffer sb = new StringBuffer();
 
+
         double x1 = 0;
         double y1 = 0;
         //打出来三角形的底边AB 实际是平面上点的斜边
@@ -109,6 +113,7 @@ public class AlgAlgorithm {
                 sb.append(Math.round(vertical_step));
                 sb.append(";");
                 // sb.append("\n");
+
             }
         }
 
@@ -125,19 +130,30 @@ public class AlgAlgorithm {
         // sb.append("\n");
         //System.out.println(Math.round(level_step)+","+Math.round(vertical_step)+"");
         //System.out.println(sb);
+
         return sb.toString();
     }
 
+    public List<Double> getzNums() {
+        return zNums;
+    }
+
+    public void setzNums(List<Double> zNums) {
+        this.zNums = zNums;
+    }
 
     /**
      * 激光测距 给三维
-     *
      * @param map
      * @return
      */
+    static List<Double> zNums = new ArrayList<Double>();
+
+
 
     public static String sxy(Map<Double, AngleObject> map) {
 
+
         double d = 30;//圆筒仓的直径
         double AC = 50;//AC是设备到地面的高
         double B1C = 0;//设备和粮面点之间的距离
@@ -155,6 +171,8 @@ public class AlgAlgorithm {
 //        map.put(3.0, angleObject);
 
         //list集合用于存放 z值
+
+
         for (Double verticalAngle : map.keySet()) {
             AngleObject angleObject1 = map.get(verticalAngle);
             //将垂直的角度转化为弧度
@@ -201,7 +219,6 @@ public class AlgAlgorithm {
                 y = y + d / 2;
 
                 sb.append("[" + x + "," + y + "," + z + "],");
-
                 zNums.add(z);
             }
         }
@@ -213,10 +230,11 @@ public class AlgAlgorithm {
 
     /**
      * 计算体积
-     * @param zList  粮面高集合
      */
     public static void calculateVolume(List<Double> zList) {
-
+        double d = 30; //直径
+        double h1 = 6; //h1 圆锥的高
+        double h2 = 3; // h2 水平地面到圆锥尖的高
         //z值的集合
 
         //17.1  18.3  19.2  18.3    20.1  16.4  19.8  16.7  19.0  18.9
@@ -239,9 +257,9 @@ public class AlgAlgorithm {
          * 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 v1 = 3.14 * (d / 2) * (d / 2) * (sum / zList.size());
+        double v2 = 3.14 * (d / 2) * (d / 2) * (zMin - h2 - h1);
+        double v3 = (3.14 * (d / 2) * (d / 2) * h1) / 3;
         double vv = v1 + v2 + v3;
         BigDecimal bdv = new BigDecimal(vv);
         double v = bdv.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();