增加首页24小时功率曲线

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/GenreSetPushController.java

@@ -245,4 +245,14 @@ public class GenreSetPushController {
         return ajax;
     }
 
+    @GetMapping(value = "/Powercurve24")
+    @ApiOperation(value = "24小时功率曲线", notes = "24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
+    @ResponseBody
+    public AjaxResult Powercurve24(@RequestParam("wpId") String wpId) throws Exception {
+        AjaxResult ajax= genreSetPushService.Powercurve24(wpId);
+        return ajax;
+    }
+
 }

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/GenreSetPushServiceFallbackFactory.java

@@ -74,6 +74,11 @@ public class GenreSetPushServiceFallbackFactory implements FallbackFactory<Genre
             }
 
             @Override
+            public AjaxResult Powercurve24(String wpId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
             public AjaxResult findBasicDataInfo_fcmap(@RequestParam("id") String id) throws Exception{
                 return  AjaxResult.error(throwable.getMessage());
             }

web/consumer-hb/src/main/java/com/gyee/consumer/service/monitor/GenreSetPushService.java

@@ -69,4 +69,7 @@ public interface GenreSetPushService {
 
     @GetMapping("/genreset/Stationinformation")
     public AjaxResult  Stationinformation(@RequestParam("wpId")String wpId);
+
+    @GetMapping("/genreset/Powercurve24")
+    public AjaxResult  Powercurve24(@RequestParam("wpId")String wpId) throws Exception;
 }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -171,6 +171,8 @@ public class InitialRunner implements CommandLineRunner {
     public static Map<String, Map<String, WindTurbineTestingPointaiyj>> wtpAiyjmap = new HashMap<String, Map<String, WindTurbineTestingPointaiyj>>();// 风电机测点AI表--针对风机预警
     public static Map<String, Map<String, Object>> appendYcglMap = new HashMap<String, Map<String, Object>>();// 预测功率追加
 
+    public static Map<String, List<Windpowerstation>> wpmapls = new HashMap<String, List<Windpowerstation>>();
+
     /***********************************************光伏初始化*************************************************************/
     public static Map<String,Square> sqmap = new HashMap<String, Square>();
 
@@ -498,6 +500,17 @@ public class InitialRunner implements CommandLineRunner {
                 }
 
 
+                if(wpmapls.containsKey(wp.getId()))
+                {
+                    List<Windpowerstation> ls=wpmapls.get(wp.getId());
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }else {
+                    List<Windpowerstation> ls=new ArrayList<>();
+                    ls.add(wp);
+                    wpmapls.put(wp.getId(),ls);
+                }
+
                 if(re_wpmap.containsKey(wp.getCompanyid()+QS))
                 {
                     List<Windpowerstation> ls=re_wpmap.get(wp.getCompanyid()+QS);

web/monitor-web-sxjn/src/main/java/com/gyee/frame/controller/monitor/GenreSetPushController.java

@@ -5,9 +5,11 @@ import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.custom.DataVo;
+import com.gyee.frame.model.custom.PowercurveVo;
 import com.gyee.frame.service.ForecastwindspeedService;
 import com.gyee.frame.service.WindpowerstationPGService;
 import com.gyee.frame.service.websocket.*;
+import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -27,7 +29,7 @@ import java.util.Map;
 
 @Controller
 @RequestMapping("/genreset")
-@Api(value = "驾驶舱" ,tags =  "驾驶舱")
+@Api(value = "驾驶舱", tags = "驾驶舱")
 public class GenreSetPushController {
 
     @Resource
@@ -62,12 +64,12 @@ public class GenreSetPushController {
     public AjaxResult getAgcValues() throws Exception {
 
 
-        List<Map<String, Object>> vos=  new ArrayList<>();
+        List<Map<String, Object>> vos = new ArrayList<>();
 
 
-        vos=agcService.getAgcValues();
+        vos = agcService.getAgcValues();
 
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -78,22 +80,21 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
 
-            map=genreSetPushService.findBasicDataInfo(id);
+            map = genreSetPushService.findBasicDataInfo(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -102,25 +103,23 @@ public class GenreSetPushController {
     }
 
 
-
     @GetMapping("/findBasicDataInfo_fcmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_fcmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_fcmap(id);
+            map = genreSetPushService.findBasicDataInfo_fcmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -132,21 +131,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_mxztmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_mxztmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_mxztmap(id);
+            map = genreSetPushService.findBasicDataInfo_mxztmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -158,21 +156,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_jczbmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_jczbmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_jczbmap(id);
+            map = genreSetPushService.findBasicDataInfo_jczbmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -184,21 +181,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_tqmap_xtmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_tqmap_xtmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_tqmap_xtmap(id);
+            map = genreSetPushService.findBasicDataInfo_tqmap_xtmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -210,21 +206,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_wxssmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_wxssmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_wxssmap(id);
+            map = genreSetPushService.findBasicDataInfo_wxssmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -235,21 +230,20 @@ public class GenreSetPushController {
     @GetMapping("/findBasicDataInfo_gxkmap")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱基础信息", notes = "获取驾驶舱基础信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findBasicDataInfo_gxkmap(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findBasicDataInfo_gxkmap(id);
+            map = genreSetPushService.findBasicDataInfo_gxkmap(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -260,21 +254,20 @@ public class GenreSetPushController {
     @GetMapping("/findPowerInfo")
     @ResponseBody
     @ApiOperation(value = "获取驾驶舱功率曲线图和电量柱状图信息", notes = "获取驾驶舱功率曲线图和电量柱状图信息")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "对象编号", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findPowerInfo(String id) throws Exception {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if(StringUtils.notEmp(id))
-        {
+        if (StringUtils.notEmp(id)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
-            map=genreSetPushService.findPowerInfo(id);
+            map = genreSetPushService.findPowerInfo(id);
         }
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -294,10 +287,10 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -314,7 +307,7 @@ public class GenreSetPushController {
         }
 
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -335,11 +328,11 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
 
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -356,7 +349,7 @@ public class GenreSetPushController {
         }
 
 
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -376,10 +369,10 @@ public class GenreSetPushController {
 
         Map<String, Object> map = new HashMap<String, Object>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -396,8 +389,7 @@ public class GenreSetPushController {
         }
 
 
-
-        if (null!=map){
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -416,11 +408,11 @@ public class GenreSetPushController {
 
 
         List<DataVo> vos = new ArrayList<DataVo>();
-        if (StringUtils.notEmp(id)  ) {
+        if (StringUtils.notEmp(id)) {
 
             if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-                id=QY+id;
+                id = QY + id;
             }
             if (InitialRunner.wpmap.containsKey(id)) {
 
@@ -437,8 +429,7 @@ public class GenreSetPushController {
         }
 
 
-
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -458,16 +449,16 @@ public class GenreSetPushController {
 
         if (id.equals(QS) || id.equals(FD) || id.equals(GF)) {
 
-            id=QY+id;
+            id = QY + id;
         }
         List<Object> vos = new ArrayList<Object>();
         //       Map<String, List> vos = new HashMap<String, List>();
 
-        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName) ) {
-            vos = realPowerPushService.findGLDetail(id,targetName);
+        if (StringUtils.notEmp(id) && StringUtils.notEmp(targetName)) {
+            vos = realPowerPushService.findGLDetail(id, targetName);
         }
 
-        if (null!=vos){
+        if (null != vos) {
             return AjaxResult.successData(AjaxStatus.success.code, vos);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, vos);
@@ -508,14 +499,14 @@ public class GenreSetPushController {
 
         if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
 
-            wpId=QY+wpId;
+            wpId = QY + wpId;
         }
-        Map<String,Object> retValue = new HashMap<String, Object>();
-        if (StringUtils.notEmp(wpId) ) {
+        Map<String, Object> retValue = new HashMap<String, Object>();
+        if (StringUtils.notEmp(wpId)) {
             retValue = genreSetPushService.getWeatherRealDay5Info(wpId);
         }
 
-        if (null!=retValue){
+        if (null != retValue) {
             return AjaxResult.successData(AjaxStatus.success.code, retValue);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, retValue);
@@ -533,18 +524,18 @@ public class GenreSetPushController {
 
         if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
 
-            wpId=QY+wpId;
+            wpId = QY + wpId;
         }
-        Map<String,Object> map=new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         List<DataVo> retValue = new ArrayList<>();
-        List<String> datels=new ArrayList<>();
+        List<String> datels = new ArrayList<>();
 
         retValue = forecastwindspeedService.getForecastwindspeedInfo(wpId);
         datels = forecastwindspeedService.getDayInfo();
 
-        map.put("retValue",retValue);
-        map.put("datels",datels);
-        if (null!=map){
+        map.put("retValue", retValue);
+        map.put("datels", datels);
+        if (null != map) {
             return AjaxResult.successData(AjaxStatus.success.code, map);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, map);
@@ -558,12 +549,13 @@ public class GenreSetPushController {
     @CrossOrigin(origins = "*", maxAge = 3600)
     public R wtls() {
         List<Map> resultList = windpowerstationPGService.hso();
-        if (null != resultList){
+        if (null != resultList) {
             return R.ok().data(resultList);
-        }else {
+        } else {
             return R.error().data("查询失败！");
         }
     }
+
     @GetMapping("/Stationinformation")
     @ResponseBody
     @ApiOperation(value = "场站容量信息", notes = "场站容量信息")
@@ -574,11 +566,31 @@ public class GenreSetPushController {
 
         Map m = genreSetPushService.Stationinformation(wpId);
 
-        if (null!=m){
+        if (null != m) {
             return AjaxResult.successData(AjaxStatus.success.code, m);
         } else {
             return AjaxResult.successData(AjaxStatus.error.code, m);
         }
 
     }
+
+    @GetMapping("/Powercurve24")
+    @ResponseBody
+    @ApiOperation(value = "24小时功率曲线", notes = "24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "场站编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult Powercurve24(String wpId) throws Exception {
+
+        List<PowercurveVo> resultList = new ArrayList<>();
+        if (StringUtils.notEmp(wpId)) {
+            resultList = genreSetPushService.Powercurve24(wpId);
+        }
+
+        if (resultList != null) {
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
+        }
+
+    }
 }

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

@@ -0,0 +1,63 @@
+package com.gyee.frame.model.custom;
+
+public class PowercurveVo {
+    private Double yfgl;
+
+    private Double sjgl;
+
+    private Double ssfs;
+
+    private Double bzgl;
+
+    private Integer hours;
+
+    private String name;
+
+    public Double getYfgl() {
+        return yfgl;
+    }
+
+    public void setYfgl(Double yfgl) {
+        this.yfgl = yfgl;
+    }
+
+    public Double getSjgl() {
+        return sjgl;
+    }
+
+    public void setSjgl(Double sjgl) {
+        this.sjgl = sjgl;
+    }
+
+    public Double getSsfs() {
+        return ssfs;
+    }
+
+    public void setSsfs(Double ssfs) {
+        this.ssfs = ssfs;
+    }
+
+    public Double getBzgl() {
+        return bzgl;
+    }
+
+    public void setBzgl(Double bzgl) {
+        this.bzgl = bzgl;
+    }
+
+    public Integer getHours() {
+        return hours;
+    }
+
+    public void setHours(Integer hours) {
+        this.hours = hours;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -5,10 +5,7 @@ import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.spring.Constant;
 import com.gyee.frame.common.spring.InitialRunner;
 import com.gyee.frame.model.auto.*;
-import com.gyee.frame.model.custom.DNAVal;
-import com.gyee.frame.model.custom.DataVo;
-import com.gyee.frame.model.custom.MatrixVo;
-import com.gyee.frame.model.custom.PointData;
+import com.gyee.frame.model.custom.*;
 import com.gyee.frame.service.*;
 import com.gyee.frame.service.photovolatic.PhotovoltaicTestingPointNewService;
 import com.gyee.frame.service.weather.WeatherDay5Service;
@@ -19,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
@@ -1733,6 +1731,10 @@ public class GenreSetPushService {
                 //初始化场站信息
 
                 List<Windpowerstation> wplist = new ArrayList<>();
+//
+//                if (InitialRunner.wpmapls.containsKey(id)) {
+//                    wplist = InitialRunner.wpmapls.get(id);
+//                }
 
                 if (InitialRunner.re_wpmap.containsKey(id)) {
                     wplist = InitialRunner.re_wpmap.get(id);
@@ -4337,20 +4339,20 @@ public class GenreSetPushService {
             for (ProjectPG p : projectPGs) {
                 Map qcls = new LinkedHashMap();
                 i++;
-                qcls.put("id",i);
-                qcls.put("name",p.getName()); //name : GJY01_GC
-                qcls.put("value",  p.getCapacity());//value :45
+                qcls.put("id", i);
+                qcls.put("name", p.getName()); //name : GJY01_GC
+                qcls.put("value", p.getCapacity());//value :45
                 linenum = linenum + InitialRunner.pjlnpgmap.get(p.getId()).size();
                 qc.add(qcls);
             }
 
             czxx.put("linenum", linenum);
             czxx.put("fjts", windpowerstationPG.getQuantity());//风机台数
-            czxx.put("issue",qc);
+            czxx.put("issue", qc);
             return czxx;
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("异常",e);
+            logger.error("异常", e);
             return null;
         }
 
@@ -4418,6 +4420,80 @@ public class GenreSetPushService {
 //        return list;
     }
 
+    //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>();
+//        if (InitialRunner.wpmapls.containsKey(wpId) || InitialRunner.pjsmap.containsKey(wpId) || InitialRunner.lnsmap.containsKey(wpId)) {
+
+            //初始化场站信息
+            List<Windpowerstation> wplist = new ArrayList<>();
+            List<Project> projects = new ArrayList<>();
+            List<Line> lines = new ArrayList<>();
+
+            if (InitialRunner.wpmapls.containsKey(wpId)) {
+                wplist = InitialRunner.wpmapls.get(wpId);
+            } else {
+                if (InitialRunner.pjsmap.containsKey(wpId)){
+                    projects = InitialRunner.pjsmap.get(wpId);
+                }else {
+                    if (InitialRunner.lnsmap.containsKey(wpId)){
+                        lines = InitialRunner.lnsmap.get(wpId);
+                    }
+                }
+            }
+
+            for (int i = 0; i < 24; i++) {
+                PowercurveVo vo = new PowercurveVo();
+                vo.setYfgl(0.0); //应发功率
+                vo.setSjgl(0.0); //实际功率
+                vo.setSsfs(0.0); //实时风速
+                vo.setBzgl(0.0); //保证功率
+                vo.setHours(i);  //时间戳
+                vo.setName(wpId);
+                vos.add(vo);
+            }
+
+            Windpowerstationpointnew yfgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_ZZSGL);
+            Windpowerstationpointnew sjgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SJGL);
+            Windpowerstationpointnew ssfs = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.TPOINT_WP_SSFS);
+            Windpowerstationpointnew bzgl = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wpId, Constant.ZBZGL);
+
+            List<PointData> yfglls = realApiUtil.getHistoryDatasSnap(yfgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp1 = 0;
+            for (int i = 0; i < yfglls.size(); i++) {
+                temp1 = yfglls.get(i).getPointValueInDouble();
+                vos.get(i).setYfgl(StringUtils.round(temp1, 2));
+            }
+
+            List<PointData> sjglls = realApiUtil.getHistoryDatasSnap(sjgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp2 = 0;
+            for (int i = 0; i < sjglls.size(); i++) {
+                temp2 = sjglls.get(i).getPointValueInDouble();
+                vos.get(i).setSjgl(StringUtils.round(temp2, 2));
+            }
+
+            List<PointData> ssfsls = realApiUtil.getHistoryDatasSnap(ssfs, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp3 = 0;
+            for (int i = 0; i < ssfsls.size(); i++) {
+                temp3 = ssfsls.get(i).getPointValueInDouble();
+                vos.get(i).setSsfs(StringUtils.round(temp3, 2));
+            }
+            List<PointData> bzglls = realApiUtil.getHistoryDatasSnap(bzgl, beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600L);
+            double temp4 = 0;
+            for (int i = 0; i < bzglls.size(); i++) {
+                temp4 = bzglls.get(i).getPointValueInDouble();
+                vos.get(i).setBzgl(StringUtils.round(temp4, 2));
+
+            }
+//        }
+        return vos;
+        }
+
 
 }