修改24小时功率曲线时间

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -116,9 +116,9 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpointmap = new HashMap<>();//风机测点
     public static Map<String,Map<String, ProBasicPowerstationPoint>> linepointmap =new HashMap<>();
-    public static Map<String,Map<String, ProBasicPowerstationPoint>> lnPointmap =new HashMap<>();//线路测点
+//    public static Map<String,Map<String, ProBasicPowerstationPoint>> lnPointmap =new HashMap<>();//线路测点
     public static Map<String,Map<String, ProBasicPowerstationPoint>> propointmap =new HashMap<>();
-    public static Map<String,Map<String, ProBasicPowerstationPoint>> pjPointmap =new HashMap<>(); //期次测点
+//    public static Map<String,Map<String, ProBasicPowerstationPoint>> pjPointmap =new HashMap<>(); //期次测点
     public static Map<String,Map<String, ProBasicPowerstationPoint>> wppointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> pointwpmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> subwppointmap =new HashMap<>();
@@ -541,32 +541,32 @@ public class CacheContext implements CommandLineRunner {
         if(powerpointls!=null && !powerpointls.isEmpty()){
             for(int i=0;i<powerpointls.size();i++){
 
-                if(pjmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
-                {
-                    ProBasicPowerstationPoint point=powerpointls.get(i);
-                    if(pjPointmap.containsKey(point.getWindpowerstationId())){
-                        items=pjPointmap.get(point.getWindpowerstationId());
-                        items.put(point.getUniformCode(), point);
-                    }
-                    else{
-                        items=new HashMap<String,ProBasicPowerstationPoint>();
-                        pjPointmap.put(point.getWindpowerstationId(), items);
-                        items.put(point.getUniformCode(), point);
-                    }
-                }else if(lnmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
-                {
-                    ProBasicPowerstationPoint point=powerpointls.get(i);
-                    if(lnPointmap.containsKey(point.getWindpowerstationId())){
-                        items=lnPointmap.get(point.getWindpowerstationId());
-                        items.put(point.getUniformCode(), point);
-                    }
-                    else{
-                        items=new HashMap<String,ProBasicPowerstationPoint>();
-                        lnPointmap.put(point.getWindpowerstationId(), items);
-                        items.put(point.getUniformCode(), point);
-                    }
-                }else
-                {
+//                if(pjmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(pjPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=pjPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        pjPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else if(lnmap.containsKey(powerpointls.get(i).getWindpowerstationId()))
+//                {
+//                    ProBasicPowerstationPoint point=powerpointls.get(i);
+//                    if(lnPointmap.containsKey(point.getWindpowerstationId())){
+//                        items=lnPointmap.get(point.getWindpowerstationId());
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                    else{
+//                        items=new HashMap<String,ProBasicPowerstationPoint>();
+//                        lnPointmap.put(point.getWindpowerstationId(), items);
+//                        items.put(point.getUniformCode(), point);
+//                    }
+//                }else
+//                {
                     ProBasicPowerstationPoint point = powerpointls.get(i);
                     if(pointwpmap.containsKey(point.getWindpowerstationId())){
                         items=pointwpmap.get(point.getWindpowerstationId());
@@ -577,7 +577,7 @@ public class CacheContext implements CommandLineRunner {
                         pointwpmap.put(point.getWindpowerstationId(), items);
                         items.put(point.getUniformCode(), point);
                     }
-                }
+//                }
             }
         }
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -1268,14 +1268,14 @@ public class MonitorService {
     //24小时功率曲线
     public List<PowercurveVo> Powercurve24(String wpId) throws Exception {
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
         Date beginDate = com.gyee.common.util.DateUtils.getSamedayZero();   //当日零点
         Date endDate = com.gyee.common.util.DateUtils.getCurrentDate();   //当前时间
-        List<PowercurveVo> vos = new ArrayList<PowercurveVo>();
 
+        int day = DateUtils.getCurrentHour();//4
 
-        for (int i = 0; i < 24; i++) {
+        List<PowercurveVo> vos = new ArrayList<PowercurveVo>();
+
+        for (int i = 0; i < day; i++) {
             PowercurveVo vo = new PowercurveVo();
             vo.setLlgl(0.0); //理论功率
             vo.setSjgl(0.0); //实际功率