月电量分析修改

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/auto/Windpowerinfoday.java

@@ -11,7 +11,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer id;
+    private long id;
 
     /**
      *
@@ -857,7 +857,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getId() {
+    public long getId() {
         return id;
     }
 
@@ -869,7 +869,7 @@ public class Windpowerinfoday implements Serializable {
      *
      * @mbg.generated
      */
-    public void setId(Integer id) {
+    public void setId(long id) {
         this.id = id;
     }
 

web/monitor-web-sxjn/src/main/java/com/gyee/frame/model/custom/ElePerAnalysisVo.java

@@ -33,4 +33,7 @@ public class ElePerAnalysisVo {
     private double finishrate;
 
 
+    public double getFinishrate() {
+        return generation/generatingcapacity;
+    }
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/WindpowerstationPGService.java

@@ -71,9 +71,17 @@ public class WindpowerstationPGService implements BaseService<WindpowerstationPG
         WindpowerstationPGExample example=new WindpowerstationPGExample();
         example.setOrderByClause(" id asc");
         WindpowerstationPGExample.Criteria criteria =example.createCriteria();
-        criteria.andCompanyidEqualTo(companyid);
-        criteria.andRegionidEqualTo(regionid);
-        criteria.andIdEqualTo(station);
+        if(null != companyid){
+            criteria.andCompanyidEqualTo(companyid);
+        }
+        if(null != regionid){
+            criteria.andRegionidEqualTo(regionid);
+        }
+        if(null != regionid){
+            criteria.andRegionidEqualTo(regionid);
+        }
+
+
 
         list= windpowerstationPGMapper.selectByExample(example);
         return list;

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/WindpowerstationService.java

@@ -178,7 +178,7 @@ public class WindpowerstationService implements BaseService<Windpowerstation, Wi
 	public List<StationPersisVo> getStationPersis(String station, Date startdate, Date enddate) throws Exception {
 
 		List<StationPersisVo> list = new ArrayList<>();
-		String wpString = (String) (globalCache.get(station));
+		String wpString = JSONObject.toJSONString(globalCache.get(station));
 
 		Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
 		});

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/peranalysis/ElePerAnalysisService.java

@@ -51,13 +51,15 @@ public class ElePerAnalysisService {
 
         List<WindpowerstationPG> list = windpowerstationPGService.findWindpowerstationPG(companyid, regionid, station);
         for (WindpowerstationPG wp : list) {
-            String wpString = (String) (globalCache.get(station));
+            String wpString = JSONObject.toJSONString(globalCache.get(station));
             Map<String, Windpowerstationpointnew> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, Windpowerstationpointnew>>() {
             });
 
 
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(beginDate);
+
+
             List<ProjectplanPG> pgList = projectplanPGService.findProjectplanPG(station, String.valueOf(calendar.get(Calendar.YEAR)), String.valueOf(calendar.get(Calendar.MONTH)));
             //(风场、发电量 YFDL、风速 YPJFS、计划发电量、发电小时、停机小时、故障小时、电量完成率)
             ElePerAnalysisVo vo = new ElePerAnalysisVo();
@@ -66,9 +68,14 @@ public class ElePerAnalysisService {
 
             if (null != stringMapMap) {
                 String fs = stringMapMap.get("YPJFS").getCode();//月平局风速
-                List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, endDate.getTime() - 2, endDate.getTime() - 1, 1l, null);
+                calendar.setTime(endDate);
+                calendar.add(Calendar.SECOND, -2);
+                long newend = calendar.getTimeInMillis() / 1000;
+                calendar.add(Calendar.SECOND, -1);
+                long newbing = calendar.getTimeInMillis() / 1000;
+                List<PointData> fss = realApiUtil.getHistoryDatasSnap(fs, newbing, newend, 1l, 1L);
                 String yfdl = stringMapMap.get("YFDL").getCode();//发电量
-                List<PointData> yfdls = realApiUtil.getHistoryDatasSnap(yfdl, endDate.getTime() - 2, endDate.getTime() - 1, 1l, null);
+                List<PointData> yfdls = realApiUtil.getHistoryDatasSnap(yfdl, newbing, newend, 1l, 1L);
                 if (!fss.isEmpty() && !yfdl.isEmpty()) {
                     vo.setFs(fss.get(0).getPointValueInDouble());
                     vo.setGeneration(yfdls.get(0).getPointValueInDouble());
@@ -77,9 +84,12 @@ public class ElePerAnalysisService {
             }
 
             List<Windpowerinfoday> windpowerinfodayList = windpowerinfodayService.getWindpowerinfodayList2(station, beginDate, endDate);
-            Double runhourssum = windpowerinfodayList.stream().mapToDouble(Windpowerinfoday::getRunhours).sum();
-            Double stophourssum = windpowerinfodayList.stream().mapToDouble(Windpowerinfoday::getStophours).sum();
-            Double faulthourssum = windpowerinfodayList.stream().mapToDouble(Windpowerinfoday::getFaulthours).sum();
+            Double runhourssum = windpowerinfodayList.stream().filter(n -> null!=n.getRunhours()).mapToDouble(Windpowerinfoday::getRunhours).sum();
+//            Double runhourssum = windpowerinfodayList.stream().collect(Collectors.summingDouble(Windpowerinfoday::getRunhours));
+            Double stophourssum = windpowerinfodayList.stream().filter(n->null!= n.getStophours()).mapToDouble(Windpowerinfoday::getStophours).sum();
+//            Double stophourssum = windpowerinfodayList.stream().collect(Collectors.summingDouble(Windpowerinfoday::getStophours));
+            Double faulthourssum = windpowerinfodayList.stream().filter(n->null!= n.getFaulthours()).mapToDouble(Windpowerinfoday::getFaulthours).sum();
+//            Double faulthourssum = windpowerinfodayList.stream().collect(Collectors.summingDouble(Windpowerinfoday::getFaulthours));
             vo.setRunhours(runhourssum);
             vo.setStophours(stophourssum);
             vo.setFaulthours(faulthourssum);

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/peranalysis/FreedomService.java

@@ -6,9 +6,11 @@ import com.gyee.frame.mapper.auto.FreedomMapper;
 import com.gyee.frame.model.auto.Freedom;
 import com.gyee.frame.model.auto.FreedomExample;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
+@Service
 public class FreedomService implements BaseService<Freedom, FreedomExample> {
 
     @Autowired

web/monitor-web-sxjn/src/main/java/com/gyee/frame/util/ClassUtil.java

@@ -2,7 +2,6 @@ package com.gyee.frame.util;
 
 
 import com.gyee.common.vo.analysis.DynamicBean;
-
 import java.beans.BeanInfo;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;