|
@@ -135,10 +135,8 @@ public class ZhiBiaoCalculation {
|
|
|
if (mapTurbineValues != null) {
|
|
|
AtomicReference<Double> sum = new AtomicReference<>(0.0);
|
|
|
//遍历mapTurbineValues,V大于5的舍弃,剩余算平均值
|
|
|
- for (Map.Entry<String, Double> entry : mapTurbineValues.entrySet()) {
|
|
|
- String key = entry.getKey();
|
|
|
- Double value = entry.getValue();
|
|
|
- if (value > 5) {
|
|
|
+ for ( String key : mapTurbineValues.keySet()) {
|
|
|
+ if (mapTurbineValues.get(key) > 5) {
|
|
|
mapTurbineValues.remove(key);
|
|
|
}
|
|
|
}
|
|
@@ -163,10 +161,8 @@ public class ZhiBiaoCalculation {
|
|
|
if (mapTurbineValues2 != null) {
|
|
|
AtomicReference<Double> sum = new AtomicReference<>(0.0);
|
|
|
|
|
|
- for (Map.Entry<String, Double> entry : mapTurbineValues2.entrySet()) {
|
|
|
- String key = entry.getKey();
|
|
|
- Double value = entry.getValue();
|
|
|
- if (value > 5) {
|
|
|
+ for ( String key : mapTurbineValues2.keySet()) {
|
|
|
+ if (mapTurbineValues2.get(key) > 5) {
|
|
|
mapTurbineValues2.remove(key);
|
|
|
}
|
|
|
}
|
|
@@ -190,15 +186,16 @@ public class ZhiBiaoCalculation {
|
|
|
turbineInfoDayQueryWrapper.eq("turbine_id", turbine.getTurbineId());
|
|
|
turbineInfoDayQueryWrapper.eq("record_date", timeBegin.toJdkDate());
|
|
|
TurbineInfoDay one = turbineInfoDayService.getOne(turbineInfoDayQueryWrapper);
|
|
|
- if (one == null) {
|
|
|
- TurbineInfoDay turbineInfoDay = new TurbineInfoDay();
|
|
|
- turbineInfoDay.setTurbineId(turbine.getTurbineId());
|
|
|
- turbineInfoDay.setRecordDate(timeBegin.toJdkDate());
|
|
|
- turbineInfoDay.setXfqrfs(avgCutInWindSpeedOne);
|
|
|
- }else {
|
|
|
- one.setXfqrfs(avgCutInWindSpeedOne);
|
|
|
- }
|
|
|
System.out.println(one);
|
|
|
+// if (one == null) {
|
|
|
+// TurbineInfoDay turbineInfoDay = new TurbineInfoDay();
|
|
|
+// turbineInfoDay.setTurbineId(turbine.getTurbineId());
|
|
|
+// turbineInfoDay.setRecordDate(timeBegin.toJdkDate());
|
|
|
+// turbineInfoDay.setXfqrfs(avgCutInWindSpeedOne);
|
|
|
+// }else {
|
|
|
+// one.setXfqrfs(avgCutInWindSpeedOne);
|
|
|
+// }
|
|
|
+// System.out.println(one);
|
|
|
// turbineInfoDayService.saveOrUpdate(one);
|
|
|
|
|
|
}
|