|
@@ -46,8 +46,6 @@ public class IvPvCurveFittingService {
|
|
private GyeeConfig config;
|
|
private GyeeConfig config;
|
|
@Resource
|
|
@Resource
|
|
private PolynomialCurveFitting pncf;
|
|
private PolynomialCurveFitting pncf;
|
|
- @Resource
|
|
|
|
- private AnnotationTool annotationTool;
|
|
|
|
|
|
|
|
private List<FixedVo> fixedVos;
|
|
private List<FixedVo> fixedVos;
|
|
private Map<String, String> uniforcodes;
|
|
private Map<String, String> uniforcodes;
|
|
@@ -638,7 +636,7 @@ public class IvPvCurveFittingService {
|
|
|
|
|
|
public List<FixedVo> getFixedVos() {
|
|
public List<FixedVo> getFixedVos() {
|
|
if (fixedVos == null) {
|
|
if (fixedVos == null) {
|
|
- fixedVos = annotationTool.getFixedVoList(PhotovoltaicInfo.class);
|
|
|
|
|
|
+ fixedVos = AnnotationTool.getFixedVoList(PhotovoltaicInfo.class);
|
|
uniforcodes = fixedVos.stream().filter(fv -> fv.getUniformCode() != null).collect(Collectors.toMap(FixedVo::getDes, FixedVo::getUniformCode));
|
|
uniforcodes = fixedVos.stream().filter(fv -> fv.getUniformCode() != null).collect(Collectors.toMap(FixedVo::getDes, FixedVo::getUniformCode));
|
|
}
|
|
}
|
|
return fixedVos;
|
|
return fixedVos;
|