测试切入切出风速5

ruoyi-admin/src/test/java/com/ruoyi/JavaFunctionJobHandler.java

@@ -929,7 +929,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
                 } else if (map.get("MX006").getPointDatas().get(i).getValue() == 1.0) {
                     data0.setDoubleValue(6.0);
                 } else {
-                    System.out.println(wtId + data0.getTs() + "：di无对应状态！");
+//                    System.out.println(wtId + data0.getTs() + "：di无对应状态！");
                     data0.setDoubleValue(2.0);
                 }
             }

ruoyi-admin/src/test/java/com/ruoyi/ZhiBiaoCalculation.java

@@ -140,8 +140,16 @@ public class ZhiBiaoCalculation {
                 mapTurbineValues.forEach((k, v) -> {
                     sum.updateAndGet(v1 -> v1 + v);
                 });
-                double avgCutInWindSpeed = sum.get() / mapTurbineValues.size();
-                System.out.println(turbine.getTurbineId() + "切入平均风速" + avgCutInWindSpeed+ timeBegin);
+
+                double avgCutInWindSpeed;
+                //如果值为空则置0
+                if (sum.get() == 0) {
+                    avgCutInWindSpeed = 0;
+                } else {
+                    avgCutInWindSpeed = sum.get() / mapTurbineValues.size();
+                }
+
+                System.out.println(turbine.getTurbineId() + "切入平均风速" + avgCutInWindSpeed + "时间" + timeBegin);
             }
             //遍历map集合，取出每个风机的所有切出风速，算一个平均值
             HashMap<String, Double> mapTurbineValues2 = mapOut.get(turbine.getTurbineId());
@@ -159,8 +167,13 @@ public class ZhiBiaoCalculation {
                 mapTurbineValues2.forEach((k, v) -> {
                     sum.updateAndGet(v1 -> v1 + v);
                 });
-                double avgCutOutWindSpeed = sum.get() / mapTurbineValues2.size();
-                System.out.println(turbine.getTurbineId() + "切出平均风速" + avgCutOutWindSpeed + timeBegin);
+                double avgCutOutWindSpeed;
+                if (sum.get() == 0) {
+                    avgCutOutWindSpeed = 0;
+                } else {
+                    avgCutOutWindSpeed = sum.get() / mapTurbineValues2.size();
+                }
+                System.out.println(turbine.getTurbineId() + "切出平均风速" + avgCutOutWindSpeed + "时间" + timeBegin);
             }
         }
     }