|
@@ -220,13 +220,13 @@ public class GhostService {
|
|
|
wtls = wtls.stream().filter(a -> fr.getProjectid().equals(a.getProjectid())).collect(Collectors.toList());
|
|
|
double rfdl= wpday.getGeneratingcapacity2();
|
|
|
double ssdl = new BigDecimal(rfdl).divide(new BigDecimal(wtls.size()), 2, RoundingMode.HALF_EVEN).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(gzsc)).doubleValue();
|
|
|
- if("内报".equals(fr.getType())) ssdl = ssdl * 0.6;
|
|
|
- fr.setPowerloss(StringUtils.round(ssdl,2));
|
|
|
- if(StringUtils.round(ssdl,2)==0)
|
|
|
- {
|
|
|
- ssdl=0.01;
|
|
|
- fr.setPowerloss(ssdl);
|
|
|
+ if("内报".equals(fr.getType())) {
|
|
|
+// ssdl = ssdl * 0.6;
|
|
|
+ double round = StringUtils.round(ssdl*0.6, 2);
|
|
|
+ if(round==0) round = 0.01;
|
|
|
+ fr.setPowerloss(round);
|
|
|
}
|
|
|
+
|
|
|
mainrecordService.saveOrUpdate(fr);
|
|
|
}
|
|
|
|