|
@@ -4366,7 +4366,7 @@ public class JavaFunctionJobHandler extends IJobHandler {
|
|
|
String tbId = min.getTurbineId();
|
|
|
List<PointData> fsDatas = rawMapFs.get(tbId).getPointDatas();
|
|
|
List<PointData> ztDatas = rawMapZt.get(tbId).getPointDatas();
|
|
|
- ztDatas = doublePointDatasFull(2, ztDatas, start.getTime() - 1000, date.getTime(), 1);
|
|
|
+ ztDatas = doublePointDatasFull(2, ztDatas, start.getTime(), date.getTime(), 1);
|
|
|
Map<Long, Double> ztMap = ztDatas.stream().collect(Collectors.toMap(PointData::getTs, PointData::getValue));
|
|
|
double pjfs = fsDatas.stream().mapToDouble(PointData::getValue).average().orElse(0.0);
|
|
|
fsDatas = fsDatas.stream().peek(pd -> pd.setDoubleValue(pd.getValue() >= 23 ? 23.0 : pd.getValue() < 0 ? 0 :
|