|
@@ -81,7 +81,6 @@ public class WeatherStationStatusDataServiceImpl extends ServiceImpl<WeatherStat
|
|
|
List<Float> globalRDatas = new ArrayList<>();
|
|
|
List<Float> directRDatas = new ArrayList<>();
|
|
|
List<Float> diffuseRDatas = new ArrayList<>();
|
|
|
- List<Float> obliqueRDatas = new ArrayList<>();
|
|
|
Map<String, Object> radiationMap = new HashMap<>();
|
|
|
|
|
|
|
|
@@ -117,15 +116,7 @@ public class WeatherStationStatusDataServiceImpl extends ServiceImpl<WeatherStat
|
|
|
diffuseRDatas.add(b.floatValue());
|
|
|
}
|
|
|
}
|
|
|
- //斜面辐射
|
|
|
- List<BigDecimal> obliqueRs = checkList.stream().map(WeatherStationStatusData::getObliqueR).collect(Collectors.toList());
|
|
|
- for (BigDecimal b : obliqueRs) {
|
|
|
- if (b.compareTo(nullValue) == 0) {
|
|
|
- obliqueRDatas.add(null);
|
|
|
- } else {
|
|
|
- obliqueRDatas.add(b.floatValue());
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
List<BigDecimal> wss = checkList.stream().map(WeatherStationStatusData::getWs).collect(Collectors.toList());
|
|
@@ -149,7 +140,6 @@ public class WeatherStationStatusDataServiceImpl extends ServiceImpl<WeatherStat
|
|
|
radiationMap.put("globalRs", globalRDatas);
|
|
|
radiationMap.put("directRs", directRDatas);
|
|
|
radiationMap.put("diffuseRs", diffuseRDatas);
|
|
|
- radiationMap.put("obliqueRs", obliqueRDatas);
|
|
|
|
|
|
otherMap.put("wss", wsDatas);
|
|
|
otherMap.put("wds", wdDatas);
|