|
@@ -136,7 +136,7 @@ public class ScatterController {
|
|
|
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
|
|
|
Date endDate = cal.getTime();
|
|
|
|
|
|
- Map<String, WindTurbineTestingPointAi2> map = null;
|
|
|
+
|
|
|
|
|
|
WindTurbineTestingPointAi2 gl =windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJGL);
|
|
|
int daynum=DateUtils.daysDiff(beginDate, endDate);
|
|
@@ -144,7 +144,7 @@ public class ScatterController {
|
|
|
long count=6*24*daynum;
|
|
|
DecimalFormat dcmFmt = new DecimalFormat("0.00");
|
|
|
List<PointData> gls = realApiUtil.getHistoryDatasSnap(gl, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
|
|
|
- WindTurbineTestingPointAi2 fs = map.get(Constant.TPOINT_WT_FJSSFS);
|
|
|
+ WindTurbineTestingPointAi2 fs = windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wtId,Constant.TPOINT_WT_FJSSFS);
|
|
|
List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, beginDate.getTime() / 1000, endDate.getTime() / 1000, count, pried);
|
|
|
|
|
|
|