资源分析补充提交

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService.java

@@ -198,7 +198,7 @@ public class WindresourceanalysisService {
                         vo.setName(wp.getName());
 
                         //日最大辐照度
-                        vo.setZdfdz(StringUtils.round(summaryStatistics.getMax() / 1000, 2));
+                        vo.setZdfdz(StringUtils.round(summaryStatistics.getMax(), 2));
                         vo.setRcsj(beginTime1);
                         vo.setRlsj(endTime1);
                         vo.setCxsj(hours);
@@ -349,8 +349,8 @@ public class WindresourceanalysisService {
         gzzs = proBasicPowerstationPointService.getPowerstationPoint(wplsf.get(0).getId(), ContantXk.FCCFTFS70);
 
 
-//        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
-        List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
+        List<PointData> gzzsls = edosUtil.getHistoryDatasRaw(gzzs.getNemCode(), startTime.getTime() / 1000, endTime.getTime() / 1000);
+//        List<PointData> gzzsls = edosUtil.getHistoryDatasSnap(gzzs, startTime.getTime() / 1000, endTime.getTime() / 1000, null, 900L);
 
         double temp6 = 0;
         for (int i = 0; i < gzzsls.size(); i++) {