电计量计算调整

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -35,6 +35,12 @@ public class Contant {
     public static String CYDLY="CYDLY";//月场用电量
     public static String CYDLN="CYDLN";//年场用电量
 
+    public static String RPJFS = "RPJFS"; //日平均风速
+    public static String RPJGL = "RPJGL"; //日平均功率
+//    public static String SSFS = "SSFS"; //实时风速
+    public static String AI022 = "AI022"; //风机实时风速
+    public static String AI130 = "AI130"; //风机实时功率
+
 
     public static final String TPOINT_WP_XDTS = "XDTS";// 限电台数
     public static final String TPOINT_WP_YXTS = "YXTS";// 运行台数

realtime/generation-service/src/main/java/com/gyee/generation/init/CacheContext.java

@@ -48,6 +48,7 @@ public class CacheContext implements CommandLineRunner {
     public static List<Meterpoint>  meterpoints = new ArrayList<>();
     public static Map<String,List<Project>> wppromap = new HashMap<>();
     public static Map<String,List<Line>> prolinemap = new HashMap<>();
+    public static Map<String,List<Windturbine>> linewtmap = new HashMap<>();
     public static Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap = new HashMap<>();// 风电机测点AI表
     public static Map<String,Map<String, Windpowerstationpointnew>> linepointmap =new HashMap<>();
     public static Map<String,Map<String, Windpowerstationpointnew>> propointmap =new HashMap<>();
@@ -63,6 +64,14 @@ public class CacheContext implements CommandLineRunner {
             Map<String, Windturbinetestingpointnew> stringWindturbinetestingpointnewMap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Windturbinetestingpointnew>>() {
             });
             wtpAimap.put(wt.getId(),stringWindturbinetestingpointnewMap);
+
+            if (linewtmap.containsKey(wt.getLineid())){
+                linewtmap.get(wt.getLineid()).add(wt);
+            }else {
+                List<Windturbine> lines = new ArrayList<>();
+                lines.add(wt);
+                linewtmap.put(wt.getLineid(),lines);
+            }
         });
 
         projects = projectService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationid())).collect(Collectors.toList());
@@ -118,9 +127,9 @@ public class CacheContext implements CommandLineRunner {
 //        linepointmap = JSONObject.parseObject(lnString, new TypeReference<Map<String, Map<String, Windpowerstationpointnew>>>() {
 //        });
 
-        String wtString = redisService.get("PRODUCT-WT");
-        wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
-        });
+//        String wtString = redisService.get("PRODUCT-WT");
+//        wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
+//        });
         logger.info("缓存结束------------------------------------------------------------");
     }
 }

realtime/generation-service/src/main/java/com/gyee/generation/service/AverageAndGeneratingService.java

@@ -0,0 +1,202 @@
+package com.gyee.generation.service;
+
+import com.gyee.benchmarkinghistroy.util.realtimesource.IEdosUtil;
+import com.gyee.common.contant.Contant;
+import com.gyee.common.model.PointData;
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.auto.*;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @ClassName : AverageAndGeneratingService
+ * @Author : xieshengjie
+ * @Date: 2022/3/22 10:42
+ * @Description :
+ */
+@Service
+public class AverageAndGeneratingService {
+
+    private Date samedayZero;
+    private Date monthFirstZero;
+    private Date yearFirstZero;
+    private Date currentDate;
+    private List<Windpowerstation> wpls;
+    private Map<String, List<Project>> wppromap;
+    private Map<String, List<Line>> prolinemap;
+    private Map<String, List<Windturbine>> linewtmap;
+    private List<Windturbine> wtls;
+    private Map<String, Map<String, Windpowerstationpointnew>> wppointmap;
+    private Map<String, Map<String, Windpowerstationpointnew>> linepointmap;
+    private Map<String, Map<String, Windpowerstationpointnew>> propointmap;
+    private Map<String, Map<String, Windturbinetestingpointnew>> wtpAimap;
+    @Resource
+    private IEdosUtil edosUtil;
+
+
+    private void init(){
+        samedayZero = DateUtils.getSamedayZero();
+        monthFirstZero = DateUtils.getMonthFirstZero();
+        yearFirstZero = DateUtils.getYearFirstZero();
+        currentDate = DateUtils.getCurrentDate();
+        wpls = CacheContext.wpls;
+        wtls = CacheContext.wtls;
+        wppromap = CacheContext.wppromap;
+        prolinemap = CacheContext.prolinemap;
+        wppointmap = CacheContext.wppointmap;
+        linepointmap = CacheContext.linepointmap;
+        propointmap = CacheContext.propointmap;
+        wtpAimap = CacheContext.wtpAimap;
+        linewtmap = CacheContext.linewtmap;
+    }
+
+    /**
+     * 保存风速，功率实时计算点
+     * @throws Exception
+     */
+    public  void saveAvespeedAndAvepowerAndScada() throws Exception {
+        init();
+        List<PointData> resultList = new ArrayList<>();
+        wpls.stream().forEach(wp->{
+            List<Project> projects = wppromap.get(wp.getId());
+            Map<String, Windpowerstationpointnew> wppointnewmap = wppointmap.get(wp.getId());
+            Windpowerstationpointnew wppointnew = wppointnewmap.get(Contant.RPJFS);
+            Windpowerstationpointnew powerwppointnew = wppointnewmap.get(Contant.RPJGL);
+            List<PointData> projectavespeedList = new ArrayList<>();
+            List<PointData> projectavepowerList = new ArrayList<>();
+            projects.stream().forEach(project -> {
+                List<Line> lines = prolinemap.get(project);
+                Map<String, Windpowerstationpointnew> projectpointnewmap = propointmap.get(project.getId());
+                Windpowerstationpointnew projectpointnew = projectpointnewmap.get(Contant.RPJFS);
+                Windpowerstationpointnew powerprojectpointnew = projectpointnewmap.get(Contant.RPJGL);
+                List<PointData> lineavespeedList = new ArrayList<>();
+                List<PointData> lineavepowerList = new ArrayList<>();
+                lines.stream().forEach(line -> {
+                    List<Windturbine> windturbines = linewtmap.get(line.getId());
+                    Map<String, Windpowerstationpointnew> linepointnewmap = linepointmap.get(line.getId());
+                    Windpowerstationpointnew linepointnew = linepointnewmap.get(Contant.RPJFS);
+                    Windpowerstationpointnew linepowerpointnew = linepointnewmap.get(Contant.RPJGL);
+                    List<PointData> wtavespeedList = new ArrayList<>();
+                    List<PointData> wtavepowerList = new ArrayList<>();
+
+                    windturbines.stream().forEach(wt->{
+                        Map<String, Windturbinetestingpointnew> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
+                        Windturbinetestingpointnew aveSpeedPoint = windturbinetestingpointnewMap.get(Contant.RPJFS);
+                        Windturbinetestingpointnew fjssfs = windturbinetestingpointnewMap.get(Contant.AI022);
+                        Windturbinetestingpointnew avePowerPoint = windturbinetestingpointnewMap.get(Contant.RPJGL);
+                        Windturbinetestingpointnew fjssgl = windturbinetestingpointnewMap.get(Contant.AI130);
+                        try {
+                            //算平均风速
+                            List<PointData> ssfsList = edosUtil.getHistStat(fjssfs, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, 1l, null, 2);
+                            Optional<PointData> ssfsFirst = ssfsList.stream().findFirst();
+                            if (ssfsFirst.isPresent()){
+                                PointData pointData = ssfsFirst.get();
+                                double inDouble = pointData.getPointValueInDouble();
+                                pointData.setEdnaId(aveSpeedPoint.getCode());
+                                pointData.setPointName(aveSpeedPoint.getName());
+                                pointData.setPointValueInDouble(inDouble);
+                                pointData.setPointValue(String.valueOf(inDouble));
+                                pointData.setPointTime(currentDate.getTime());
+                                wtavespeedList.add(pointData);
+                            }
+                            //算平均功率
+                            List<PointData> ssglList = edosUtil.getHistStat(fjssgl, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, 1l, null, 2);
+                            Optional<PointData> ssglFirst = ssglList.stream().findFirst();
+                            if (ssglFirst.isPresent()){
+                                PointData pointData = ssglFirst.get();
+                                double inDouble = pointData.getPointValueInDouble();
+                                pointData.setEdnaId(avePowerPoint.getCode());
+                                pointData.setPointName(avePowerPoint.getName());
+                                pointData.setPointValueInDouble(inDouble);
+                                pointData.setPointValue(String.valueOf(inDouble));
+                                pointData.setPointTime(currentDate.getTime());
+                                wtavepowerList.add(pointData);
+                            }
+
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    });
+                    resultList.addAll(wtavespeedList);
+                    resultList.addAll(wtavepowerList);
+                    OptionalDouble average = wtavespeedList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+                    if (average.isPresent()){
+                        double linespeed = average.getAsDouble();
+                        PointData pointData = new PointData();
+                        pointData.setEdnaId(linepointnew.getCode());
+                        pointData.setPointTime(currentDate.getTime());
+                        pointData.setPointName(linepointnew.getName());
+                        pointData.setPointValue(String.valueOf(linespeed));
+                        pointData.setPointValueInDouble(linespeed);
+                        lineavespeedList.add(pointData);
+                    }
+                    OptionalDouble poweraverage = wtavepowerList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+                    if (poweraverage.isPresent()){
+                        double linepower = poweraverage.getAsDouble();
+                        PointData pointData = new PointData();
+                        pointData.setEdnaId(linepowerpointnew.getCode());
+                        pointData.setPointTime(currentDate.getTime());
+                        pointData.setPointName(linepowerpointnew.getName());
+                        pointData.setPointValue(String.valueOf(linepower));
+                        pointData.setPointValueInDouble(linepower);
+                        lineavepowerList.add(pointData);
+                    }
+                });
+                OptionalDouble average = lineavespeedList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+                OptionalDouble poweraverage = lineavepowerList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+                resultList.addAll(lineavespeedList);
+                resultList.addAll(lineavepowerList);
+                if (average.isPresent()){
+                    double projectspeed = average.getAsDouble();
+                    PointData pointData = new PointData();
+                    pointData.setEdnaId(projectpointnew.getCode());
+                    pointData.setPointTime(currentDate.getTime());
+                    pointData.setPointName(projectpointnew.getName());
+                    pointData.setPointValue(String.valueOf(projectspeed));
+                    pointData.setPointValueInDouble(projectspeed);
+                    projectavespeedList.add(pointData);
+                }
+                if (poweraverage.isPresent()){
+                    double projectpower = poweraverage.getAsDouble();
+                    PointData pointData = new PointData();
+                    pointData.setEdnaId(powerprojectpointnew.getCode());
+                    pointData.setPointTime(currentDate.getTime());
+                    pointData.setPointName(powerprojectpointnew.getName());
+                    pointData.setPointValue(String.valueOf(projectpower));
+                    pointData.setPointValueInDouble(projectpower);
+                    projectavepowerList.add(pointData);
+                }
+
+            });
+            OptionalDouble average = projectavespeedList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+            resultList.addAll(projectavespeedList);
+            if (average.isPresent()){
+                double wpspeed = average.getAsDouble();
+                PointData pointData = new PointData();
+                pointData.setEdnaId(wppointnew.getCode());
+                pointData.setPointTime(currentDate.getTime());
+                pointData.setPointName(wppointnew.getName());
+                pointData.setPointValue(String.valueOf(wpspeed));
+                pointData.setPointValueInDouble(wpspeed);
+                resultList.add(pointData);
+            }
+            OptionalDouble poweraverage = projectavepowerList.stream().mapToDouble(PointData::getPointValueInDouble).average();
+            resultList.addAll(projectavepowerList);
+            if (poweraverage.isPresent()){
+                double wppwer = poweraverage.getAsDouble();
+                PointData pointData = new PointData();
+                pointData.setEdnaId(powerwppointnew.getCode());
+                pointData.setPointTime(currentDate.getTime());
+                pointData.setPointName(powerwppointnew.getName());
+                pointData.setPointValue(String.valueOf(wppwer));
+                pointData.setPointValueInDouble(wppwer);
+                resultList.add(pointData);
+            }
+        });
+
+        edosUtil.sendMultiPoint(resultList);
+    }
+}

realtime/generation-service/src/main/java/com/gyee/generation/service/GenerationService.java

@@ -1,6 +1,7 @@
 package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.benchmarkinghistroy.util.realtimesource.IEdosUtil;
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
@@ -9,7 +10,6 @@ import com.gyee.common.util.DoubleUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.IMeterpointvalueService;
-import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.stereotype.Service;

realtime/generation-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -3,12 +3,13 @@ package com.gyee.generation.util.realtimesource;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.gyee.benchmarkinghistroy.util.realtimesource.IEdosUtil;
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
-import com.gyee.generation.model.auto.Windpowerstationtestingpoint;
-import com.gyee.generation.model.auto.Windturbinetestingpointai;
+import com.gyee.generation.model.auto.Windpowerstationpointnew;
+import com.gyee.generation.model.auto.Windturbinetestingpointnew;
 import com.gyee.generation.util.realtimesource.timeseries.ErrorRequest;
 import com.gyee.generation.util.realtimesource.timeseries.JsonObjectHelper;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,17 +21,18 @@ import org.springframework.web.client.RestTemplate;
 
 import java.util.*;
 
-
 /**
  */
 @Component
 public class EdosUtil implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();
-    @Value("${db.url}")
+    @Value("${golden.baseURL}")
     private String baseURL;
+//    private static String baseURL = "http://10.155.32.4:8011/ts";
+//    private static String baseURL = "http://10.65.79.30:8019/ts";
     @Override
-    public PointData getRealData(Windpowerstationtestingpoint point) throws Exception {
+    public PointData getRealData(Windpowerstationpointnew point) throws Exception {
         try {
             Optional<String> keys = Optional.ofNullable(point.getCode());
             Optional<String> thingType = Optional.ofNullable("station");
@@ -70,7 +72,7 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -230,7 +232,7 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(Windpowerstationtestingpoint point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
@@ -276,8 +278,8 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public PointData getRealData(Windturbinetestingpointai point) throws Exception {
-        Optional<String> keys = Optional.ofNullable(point.getId());
+    public PointData getRealData(Windturbinetestingpointnew point) throws Exception {
+        Optional<String> keys = Optional.ofNullable(point.getCode());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> uniformCodes = Optional.ofNullable(point.getUniformcode());
@@ -318,14 +320,14 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         if (point==null){
             System.out.println(1111);
 
         }else if(point.getId()==null){
             System.out.println(222);
         }
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -425,8 +427,8 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointai point, Long beginDate, Long endDate) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -847,8 +849,8 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getId());
+    public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+        Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformcode());
@@ -909,7 +911,7 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());

realtime/generation-service/src/main/java/com/gyee/generation/util/realtimesource/IEdosUtil.java

@@ -1,11 +1,11 @@
-package com.gyee.generation.util.realtimesource;
+package com.gyee.benchmarkinghistroy.util.realtimesource;
 
 
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
-import com.gyee.generation.model.auto.Windpowerstationtestingpoint;
-import com.gyee.generation.model.auto.Windturbinetestingpointai;
+import com.gyee.generation.model.auto.Windpowerstationpointnew;
+import com.gyee.generation.model.auto.Windturbinetestingpointnew;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +19,7 @@ public interface IEdosUtil {
 	 * @return
 	 * @throws Exception
 	 */
-    public PointData getRealData(Windpowerstationtestingpoint point) throws Exception;
+    public PointData getRealData(Windpowerstationpointnew point) throws Exception;
 
     /**
      * 通过风场测点获得测点历史快照数据
@@ -31,7 +31,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风场测点获得测点历史存储数据，存多少取多少
@@ -41,7 +41,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(Windpowerstationtestingpoint point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception;
 
     /**
      * 通过风机测点获得测点实时数据
@@ -49,7 +49,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public PointData getRealData(Windturbinetestingpointai point) throws Exception;
+    public PointData getRealData(Windturbinetestingpointnew point) throws Exception;
 
     /**
      * 通过风机测点获得历史快照
@@ -61,7 +61,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
     /**
      * 通过风机测点获得测点历史存储数据，存多少取多少
@@ -71,7 +71,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointai point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception;
 
 
     /**
@@ -138,7 +138,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(Windturbinetestingpointai point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过风场测点获得测点指定时间周期的统计数据
@@ -151,7 +151,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(Windpowerstationtestingpoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过全局点名获得测点指定时间周期的统计数据