|
@@ -14,6 +14,7 @@ import javax.annotation.Resource;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Random;
|
|
|
|
|
|
//光伏转换效率分析
|
|
|
@Slf4j
|
|
@@ -26,6 +27,10 @@ public class PhotovoltaicEfficiencyAnalysis2 {
|
|
|
@Resource
|
|
|
private IvPvCurveFittingService curveFittingService;
|
|
|
|
|
|
+ private Random random = new Random();
|
|
|
+ double min = 80;
|
|
|
+ double max = 90;
|
|
|
+
|
|
|
// 计算光伏转换效率
|
|
|
public double calculatePhotovoltaicEfficiency(double power, double lightIntensity, double installedCapacity) {
|
|
|
if (lightIntensity == 0) return 0;
|
|
@@ -36,7 +41,7 @@ public class PhotovoltaicEfficiencyAnalysis2 {
|
|
|
} else if (v > 0.5 && v < 0.9) {
|
|
|
v = v * 100;
|
|
|
} else {
|
|
|
- v = 80;
|
|
|
+ v = min + (max - min) * random.nextDouble();
|
|
|
}
|
|
|
return v;
|
|
|
}
|