|
@@ -195,7 +195,7 @@ public class IvPvCurveFittingService {
|
|
|
*/
|
|
|
public Map<String, List<PhotovoltaicInfo>> calculatAnalysis(List<String> fileList) {
|
|
|
|
|
|
- String bzcldPath = config.getFilePathPrepare() + "bzd标准点.csv";
|
|
|
+ String bzcldPath = config.getFilePathPrepare() + "bzd/标准点.csv";
|
|
|
List<PhotovoltaicInfo> bzclds = file2Info(bzcldPath, true);
|
|
|
Map<String, PhotovoltaicInfo> bzcldMap = bzclds.stream().collect(Collectors.toMap(PhotovoltaicInfo::getInverter, Function.identity()));
|
|
|
|
|
@@ -264,8 +264,8 @@ public class IvPvCurveFittingService {
|
|
|
fl.setPath(s);
|
|
|
fl.setStation(split[0]);
|
|
|
fl.setStationcn(split[1]);
|
|
|
- //fl.setWindturbine(split[1]);
|
|
|
- fl.setTime(InitialRunner.gfstationMap.get(split[0]));
|
|
|
+ fl.setWindturbineId(split[1]);
|
|
|
+ fl.setTime(InitialRunner.newgfstationMap.get(split[0]));
|
|
|
fl.setInterval(split[2] + "年" + split[3] + "月");
|
|
|
fileLists.add(fl);
|
|
|
}
|