单位的换算

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

@@ -26,7 +26,7 @@ public interface TeDataService {
      * @param diameter
      * @return 数据库影响条数
      */
-    int scanTask(double diameter, double high);
+    void scanTask(double diameter, double high);
 
     /**
      * 第二次待打点

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

@@ -83,10 +83,11 @@ public class Algorithm {
 
                 }
 
-                sb.append(Math.round(level_angle));
+                sb.append(Math.round(vertical_angle) * 51);
                 sb.append(",");
-                sb.append(Math.round(vertical_angle));
+                sb.append(Math.round(level_angle) * 51);
                 sb.append(";");
+
                 // sb.append("\n");
             }
         }
@@ -97,12 +98,9 @@ public class Algorithm {
         AB = diameter / 2;//垂直三角形的底边
         BC = Math.sqrt(AB * AB + high * high);//垂直三角形的斜边
         vertical_angle = Math.toDegrees(Math.acos(high / BC));
-        sb.append(90);
+        sb.append(Math.round(vertical_angle) * 51);
         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);
+        sb.append(90*51);
         //System.out.println(sb);
         return sb.toString();
 
@@ -129,16 +127,17 @@ public class Algorithm {
         double verticalAngle = 0;//垂直角度
         double levelAngle = 0;//水平角度
         double realHypotenuse = 0;//返回的距离
+        BigDecimal baseNumber = new BigDecimal(51);
 
-
-        //  "18,7,17.88 - 19,6,28.88 - 17,4,39.88"  水平角度，垂直角度，返回距离 -
+        //  "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(",");
-            levelAngle = Double.parseDouble(split1[0]);
-            verticalAngle = Double.parseDouble(split1[1]);
-            realHypotenuse = Double.parseDouble(split1[2]);
-
+            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));
@@ -266,10 +265,12 @@ public class Algorithm {
 
     public static void main(String[] args) {
 
-        BigDecimal bdv = BigDecimal.valueOf(12.125323);
+       /* 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);
+        System.out.println("v = " + v);*/
+    	String a = Algorithm.getAveragePosition(8,12);
+    	System.out.println(a);
     }
 }

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

@@ -26,10 +26,10 @@ public class TeDataServiceImpl implements TeDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(TeDataServiceImpl.class);
 
-    static String base_url = "http://local.wxlxit.com:61001/";
+    static String base_url = "http://192.168.0.61:4017/";
     static boolean flag = true;
-    static double diameter = 0; //直径
-    static double high = 0; //圆筒仓的高(以地面为基准面)
+    static double diameter = 8; //直径
+    static double high = 12; //圆筒仓的高(以地面为基准面)
     static double h1 = 6; //h1 圆锥的高
     static double h2 = 3; //h2 水平地面到圆锥尖的高
     private STaskMapper sTaskMapper;
@@ -65,7 +65,7 @@ public class TeDataServiceImpl implements TeDataService {
      * 3. equipmentTestingEnd
      */
     @Override
-    public int scanTask(double diameter, double high) {
+    public void scanTask(double diameter, double high) {
         logger.info("scanTask {},{}",diameter,high);
         STask task = new STask();
         Date date = new Date();
@@ -81,7 +81,7 @@ public class TeDataServiceImpl implements TeDataService {
         //todo 第一次待打点
         String rotationxy = Algorithm.getAveragePosition(diameter, high);
         teData.setRotationxy(rotationxy);
-        int inum = teDataMapper.insert(teData);
+        //int inum = teDataMapper.insert(teData);
 
         logger.info("scanTask sTaskMapper teDataMapper {},{}",task,teData);
 
@@ -89,7 +89,6 @@ public class TeDataServiceImpl implements TeDataService {
         //equipmentTestingEnd
         flag = true;
 
-        return inum;
     }
     @Async
     @Override
@@ -107,7 +106,9 @@ public class TeDataServiceImpl implements TeDataService {
             //todo 第二次待打点
 
             //计算以粮面为基准面的高
+        	System.out.println("直径和高是:"+diameter+"****"+high);
             double zHeight = Algorithm.zHeight(teData.getRotationxy(), diameter, high);
+            System.out.println("以粮面为基准面的高是:"+zHeight+"diameter直径是:"+diameter);
             //打点
             String rotationxy = Algorithm.getAveragePosition(diameter, zHeight);
             teData.setRotationxy(rotationxy);
@@ -166,7 +167,7 @@ public class TeDataServiceImpl implements TeDataService {
             for (int i = 0; i < split.length; i++) {
                 String[] split1 = split[i].split(",");
                 //split1[2]  是返回的距离
-                zList.add(Double.parseDouble(split1[2]));
+                zList.add(Double.parseDouble(split1[2]) / 1000); //距离转化为米
             }
         }
         double v = Algorithm.calculateVolume(zList, diameter, h1, h2); //体积