|
@@ -1239,8 +1239,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
windTowerCalculationData.setValue(max.divide(BigDecimal.valueOf(collect.size()), 2, RoundingMode.HALF_UP));
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{}月,{}米层高月最大风速计算失败,缺少数据^ ^", equipmentId, startTime.getMonth() + 1, h);
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -1291,14 +1289,12 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
list.add(windTowerCalculationData);
|
|
|
// saveByEquipmentId(windTowerCalculationData, equipmentId);
|
|
|
- log.info("计算月平均空气密度完成");
|
|
|
- } else {
|
|
|
- log.info("月平均空气密度缺少数据,无法计算");
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
log.error("计算月平均空气密度失败");
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+ log.info("计算月平均空气密度完成");
|
|
|
return list;
|
|
|
}
|
|
|
|
|
@@ -1354,8 +1350,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationDataList.add(windTowerCalculationData);
|
|
|
list.add(windTowerCalculationData);
|
|
|
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{},{}米层高日平均风速计算失败,缺少数据^ ^", equipmentId, DateTimeUtil.dateToStrLong(new Date(start1)), h);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1412,8 +1406,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
windTowerCalculationData.setValue(wsSum.divide(new BigDecimal(windTowerCalculationDatas.size()), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{}月,{}米层高月平均风速计算失败,缺少数据^ ^", equipmentId, startTime.getMonth() + 1, h);
|
|
|
}
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
@@ -1473,8 +1465,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationDataList.add(windTowerCalculationData);
|
|
|
list.add(windTowerCalculationData);
|
|
|
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{},{}米层高日平均风功率计算失败,缺少数据^ ^", equipmentId, DateTimeUtil.dateToStrLong(new Date(start1)), h);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1529,8 +1519,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
windTowerCalculationData.setValue(sum.divide(new BigDecimal(windTowerCalculationDatas.size()), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{}月,{}米层高月平均风功率密度计算失败,缺少数据^ ^", equipmentId, startTime.getMonth() + 1, h);
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1636,8 +1624,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setValue(CalculationUtil.caTurbulenceIntensity(staDay.get(0).getValue(), wsDay.get(0).getValue()));
|
|
|
windTowerCalculationDataList.add(windTowerCalculationData);
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{},{}米层高日平均湍流计算失败,缺少数据^ ^", equipmentId, DateTimeUtil.dateToStrLong(new Date(start1)), h);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1693,8 +1679,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
windTowerCalculationData.setValue(sum.divide(new BigDecimal(windTowerCalculationDatas.size()), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_UP));
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{}月,{}米层高月平均湍流计算失败,缺少数据^ ^", equipmentId, startTime.getMonth() + 1, h);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1744,8 +1728,6 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setTime(new Date(start1));
|
|
|
windTowerCalculationDataList.add(windTowerCalculationData);
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{},{}米层高日平均风切变计算失败,缺少数据^ ^", equipmentId, DateTimeUtil.dateToStrLong(new Date(start1)));
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -1789,11 +1771,7 @@ public class WindTowerCalculationDataServiceImpl extends ServiceImpl<WindTowerCa
|
|
|
windTowerCalculationData.setEquipmentId(equipmentId);
|
|
|
windTowerCalculationData.setValue(windShear);
|
|
|
list.add(windTowerCalculationData);
|
|
|
- } else {
|
|
|
- log.info("设备编号{},{}月平均风切变指数计算失败,缺少数据^ ^", equipmentId, startTime.getMonth() + 1);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
} catch (Exception e) {
|
|
|
log.error("设备编号{}月平均风月切变计算失败^ ^", equipmentId);
|
|
|
e.printStackTrace();
|