修改实体类名称

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindturbineController.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("//pro-basic-windturbine")
-public class ProBasicWindturbineController {
+public class ProBasicEquipmentController {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindpowerstationController.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("//pro-basic-windpowerstation")
-public class ProBasicWindpowerstationController {
+public class ProBasicPowerstationController {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWppointController.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("//pro-basic-wppoint")
-public class ProBasicWppointController {
+public class ProBasicPowerstationPointController {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/controller/ProBasicWindsubStationController.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("//pro-basic-windsub-station")
-public class ProBasicWindsubStationController {
+public class ProBasicSubStationController {
 
 }

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

@@ -29,13 +29,13 @@ public class CacheContext implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(CacheContext.class);
 
     @Resource
-    private IProBasicWindturbineService proBasicWindturbineService;
+    private IProBasicEquipmentService proBasicWindturbineService;
     @Resource
     private IProBasicLineService proBasicLineService;
     @Resource
     private IProBasicProjectService proBasicProjectService;
     @Resource
-    private IProBasicWindpowerstationService proBasicWindpowerstationService;
+    private IProBasicPowerstationService proBasicWindpowerstationService;
     @Resource
     private IProBasicMeterPointService proBasicMeterPointService;
     @Resource
@@ -60,12 +60,12 @@ public class CacheContext implements CommandLineRunner {
     @Value("${runWindpowerstation}")
     private String runWindpowerstation;
 
-    public static List<ProBasicWindturbine> wtls = new ArrayList<>();
+    public static List<ProBasicEquipment> wtls = new ArrayList<>();
     public static List<ProBasicProject> pjls = new ArrayList<>();
     public static List<ProBasicLine>  lnls = new ArrayList<>();
 
     public static List<ProBasicSquare> sqls = new ArrayList<>();
-    public static List<ProBasicWindpowerstation>  wpls = new ArrayList<>();
+    public static List<ProBasicPowerstation>  wpls = new ArrayList<>();
     public static List<ProBasicCompany>  cpls = new ArrayList<>();
     public static List<ProBasicRegion>  rgls = new ArrayList<>();
     public static Map<String,ProBasicProject> pjmap = new HashMap<>();
@@ -73,25 +73,25 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,ProBasicRegion> rgmap = new HashMap<>();
     public static Map<String,ProBasicCompany> cpmap = new HashMap<>();
 
-    public static Map<String,List<ProBasicWindpowerstation>> cpwpmap = new HashMap<>();
+    public static Map<String,List<ProBasicPowerstation>> cpwpmap = new HashMap<>();
 
     public static Map<String,List<ProBasicCompany>> rgcpmap = new HashMap<>();
     public static Map<String,ProBasicSquare> sqmap = new HashMap<>();
-    public static Map<String,ProBasicWindpowerstation> wpmap = new HashMap<>();
+    public static Map<String, ProBasicPowerstation> wpmap = new HashMap<>();
     public static List<ProBasicMeterPoint>  meterpoints = new ArrayList<>();
     public static Map<String,ProBasicMeterPoint>  meterpointMap = new HashMap<>();
     public static Map<String,List<ProBasicProject>> wppromap = new HashMap<>();
     public static Map<String,List<ProBasicLine>> prolinemap = new HashMap<>();
-    public static Map<String,List<ProBasicWindturbine>> wpwtmap = new HashMap<>();
-    public static Map<String,List<ProBasicWindturbine>> pjwtmap = new HashMap<>();
-    public static Map<String,List<ProBasicWindturbine>> lnwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> wpwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> pjwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> lnwtmap = new HashMap<>();
 
 
-    public static Map<String,List<ProBasicWindturbine>> sqwtmap = new HashMap<>();
+    public static Map<String,List<ProBasicEquipment>> sqwtmap = new HashMap<>();
     public static Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = new HashMap<>();// 风电机测点AI表
-    public static Map<String,Map<String, ProBasicWppoint>> linepointmap =new HashMap<>();
-    public static Map<String,Map<String, ProBasicWppoint>> propointmap =new HashMap<>();
-    public static Map<String,Map<String, ProBasicWppoint>> wppointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> linepointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> propointmap =new HashMap<>();
+    public static Map<String,Map<String, ProBasicPowerstationPoint>> wppointmap =new HashMap<>();
 
 
     public static Map<String,Map<Double,Double>> zbzglMap = new HashMap<>();
@@ -100,7 +100,7 @@ public class CacheContext implements CommandLineRunner {
     public static Map<String,Double> modelpower = new HashMap<>();
 
     public static Map<String,String> wtstandardmap = new HashMap<>();
-    public static Map<String,ProBasicWindturbine> wtmap = new HashMap<>();
+    public static Map<String, ProBasicEquipment> wtmap = new HashMap<>();
 
     public static Map<String,Map<Double,ProBasicModelPower>> modelpowermap = new TreeMap<>();
 
@@ -182,12 +182,12 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-        for(ProBasicWindpowerstation wp:wpls)
+        for(ProBasicPowerstation wp:wpls)
         {
             if (cpwpmap.containsKey(wp.getCompanyId())){
                 cpwpmap.get(wp.getCompanyId()).add(wp);
             }else {
-                List<ProBasicWindpowerstation> wps = new ArrayList<>();
+                List<ProBasicPowerstation> wps = new ArrayList<>();
                 wps.add(wp);
                 cpwpmap.put(wp.getCompanyId(),wps);
             }
@@ -215,7 +215,7 @@ public class CacheContext implements CommandLineRunner {
             if (wpwtmap.containsKey(wt.getWindpowerstationId())){
                 wpwtmap.get(wt.getWindpowerstationId()).add(wt);
             }else {
-                List<ProBasicWindturbine> wps = new ArrayList<>();
+                List<ProBasicEquipment> wps = new ArrayList<>();
                 wps.add(wt);
                 wpwtmap.put(wt.getWindpowerstationId(),wps);
             }
@@ -223,14 +223,14 @@ public class CacheContext implements CommandLineRunner {
             if (pjwtmap.containsKey(wt.getProjectId())){
                 pjwtmap.get(wt.getProjectId()).add(wt);
             }else {
-                List<ProBasicWindturbine> pjs = new ArrayList<>();
+                List<ProBasicEquipment> pjs = new ArrayList<>();
                 pjs.add(wt);
                 pjwtmap.put(wt.getProjectId(),pjs);
             }
             if (lnwtmap.containsKey(wt.getLineId())){
                 lnwtmap.get(wt.getLineId()).add(wt);
             }else {
-                List<ProBasicWindturbine> lnls = new ArrayList<>();
+                List<ProBasicEquipment> lnls = new ArrayList<>();
                 lnls.add(wt);
                 lnwtmap.put(wt.getLineId(),lnls);
             }
@@ -238,19 +238,19 @@ public class CacheContext implements CommandLineRunner {
             if (sqwtmap.containsKey(wt.getSquareId())){
                 sqwtmap.get(wt.getSquareId()).add(wt);
             }else {
-                List<ProBasicWindturbine> lnls = new ArrayList<>();
+                List<ProBasicEquipment> lnls = new ArrayList<>();
                 lnls.add(wt);
                 sqwtmap.put(wt.getSquareId(),lnls);
             }
         });
 
         //初始化标杆风机
-        for(ProBasicWindturbine wt:wtls)
+        for(ProBasicEquipment wt:wtls)
         {
             if(wpwtmap.containsKey(wt.getLineId()))
             {
-                List<ProBasicWindturbine> wts=wpwtmap.get(wt.getLineId());
-                for(ProBasicWindturbine w:wts)
+                List<ProBasicEquipment> wts=wpwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
                 {
                     if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
                     {
@@ -261,8 +261,8 @@ public class CacheContext implements CommandLineRunner {
             }
             if(pjwtmap.containsKey(wt.getLineId()))
             {
-                List<ProBasicWindturbine> wts=pjwtmap.get(wt.getLineId());
-                for(ProBasicWindturbine w:wts)
+                List<ProBasicEquipment> wts=pjwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
                 {
                     if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
                     {
@@ -273,8 +273,8 @@ public class CacheContext implements CommandLineRunner {
             }
             if(lnwtmap.containsKey(wt.getLineId()))
             {
-                List<ProBasicWindturbine> wts=lnwtmap.get(wt.getLineId());
-                for(ProBasicWindturbine w:wts)
+                List<ProBasicEquipment> wts=lnwtmap.get(wt.getLineId());
+                for(ProBasicEquipment w:wts)
                 {
                     if(StringUtils.notEmp(w.getIsStandard()) && w.getIsStandard()!=0)
                     {
@@ -298,7 +298,7 @@ public class CacheContext implements CommandLineRunner {
                 wppromap.put(p.getWindpowerstationId(),prolist);
             }
             String pjString = redisService.get(p.getId());
-            Map<String, ProBasicWppoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(pjString, new TypeReference<Map<String, ProBasicWppoint>>() {
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(pjString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             propointmap.put(p.getId(),stringWindpowerstationpointnewMap);
 
@@ -315,7 +315,7 @@ public class CacheContext implements CommandLineRunner {
                 prolinemap.put(l.getProjectId(),lineList);
             }
             String lnString = redisService.get(l.getId());
-            Map<String, ProBasicWppoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicWppoint>>() {
+            Map<String, ProBasicPowerstationPoint> stringWindpowerstationpointnewMap = JSONObject.parseObject(lnString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             linepointmap.put(l.getId(),stringWindpowerstationpointnewMap);
         });
@@ -331,7 +331,7 @@ public class CacheContext implements CommandLineRunner {
 
             wpmap.put(wp.getId(),wp);
             String wpString = redisService.get(wp.getId());
-            Map<String, ProBasicWppoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicWppoint>>() {
+            Map<String, ProBasicPowerstationPoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicPowerstationPoint>>() {
             });
             wppointmap.put(wp.getId(),stringMapMap);
         });

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindturbineMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.mapper.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author shilin
  * @since 2022-10-31
  */
-public interface ProBasicWindturbineMapper extends BaseMapper<ProBasicWindturbine> {
+public interface ProBasicEquipmentMapper extends BaseMapper<ProBasicEquipment> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindpowerstationMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.mapper.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindpowerstation;
+import com.gyee.generation.model.auto.ProBasicPowerstation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author shilin
  * @since 2022-10-31
  */
-public interface ProBasicWindpowerstationMapper extends BaseMapper<ProBasicWindpowerstation> {
+public interface ProBasicPowerstationMapper extends BaseMapper<ProBasicPowerstation> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWppointMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.mapper.auto;
 
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author shilin
  * @since 2022-10-31
  */
-public interface ProBasicWppointMapper extends BaseMapper<ProBasicWppoint> {
+public interface ProBasicPowerstationPointMapper extends BaseMapper<ProBasicPowerstationPoint> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProBasicWindsubStationMapper.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.mapper.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindsubStation;
+import com.gyee.generation.model.auto.ProBasicSubStation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author shilin
  * @since 2022-10-31
  */
-public interface ProBasicWindsubStationMapper extends BaseMapper<ProBasicWindsubStation> {
+public interface ProBasicSubStationMapper extends BaseMapper<ProBasicSubStation> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindturbine.java

@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindturbine extends Model {
+public class ProBasicEquipment extends Model {
 
     private static final long serialVersionUID = 1L;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindpowerstation.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindpowerstation extends Model {
+public class ProBasicPowerstation extends Model {
 
     private static final long serialVersionUID = 1L;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWppoint.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWppoint extends Model {
+public class ProBasicPowerstationPoint extends Model {
 
     private static final long serialVersionUID = 1L;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProBasicWindsubStation.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ProBasicWindsubStation extends Model {
+public class ProBasicSubStation extends Model {
 
     private static final long serialVersionUID = 1L;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/ActivePowerService.java

@@ -41,7 +41,7 @@ public class ActivePowerService {
         Date beginDate = DateUtils.truncate(currentDate);
         c.add(Calendar.DAY_OF_MONTH,1);
         Date endDate=c.getTime();
-        for (ProBasicWindpowerstation station : CacheContext.wpls) {
+        for (ProBasicPowerstation station : CacheContext.wpls) {
 
             List<ProEconEquipmentInfo15minute> ei15ls = proEconEquipmentInfo15minuteService.list().stream()
                     .filter(i -> i.getWindpowerstationId().equals(station)
@@ -133,7 +133,7 @@ public class ActivePowerService {
         data.setRecordDate(beginDate);
 
         if (CacheContext.wtmap.containsKey(windturbineId)) {
-            ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+            ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
             data.setModelId(wt.getModelId());
             data.setWindturbineCode(wt.getNemCode());
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/CoefficientService.java

@@ -58,10 +58,10 @@ public class CoefficientService {
 
         Map<String,Map<String,Double>> resultmap =new HashMap<>();
             //查询风机
-            List<ProBasicWindturbine> wtls = CacheContext.wtls;
+            List<ProBasicEquipment> wtls = CacheContext.wtls;
 
             //遍历所有风机ID
-            for (ProBasicWindturbine wt : wtls)
+            for (ProBasicEquipment wt : wtls)
             {
 
                 Map<String/*风机编号*/, Map<Double/*风速*/, List<Double>/*对应功率集合*/>> map =
@@ -124,7 +124,7 @@ public class CoefficientService {
     }
 
 
-    private List<ProEconActivePowerData> calCoefficient(List<ProEconActivePowerData> query,ProBasicWindturbine wt)
+    private List<ProEconActivePowerData> calCoefficient(List<ProEconActivePowerData> query, ProBasicEquipment wt)
     {
 
 
@@ -191,7 +191,7 @@ public class CoefficientService {
                 
                 if (CacheContext.wtmap.containsKey(windturbineId))
                 {
-                    ProBasicWindturbine wt=CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt=CacheContext.wtmap.get(windturbineId);
 
                     if (wt.getWindpowerstationId().contains("GDC"))
                     {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo15minuteService.java

@@ -5,7 +5,7 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProEconEquipmentInfo15minute;
 import com.gyee.generation.service.auto.IProEconEquipmentInfo15minuteService;
 import com.gyee.generation.util.DateUtils;
@@ -58,7 +58,7 @@ public class EquipmentInfo15minuteService {
             proEconEquipmentInfo15minuteService.removeByIds(idls);
 
         }
-        for(ProBasicWindturbine wt:CacheContext.wtls)
+        for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wppointmap.containsKey(wt.getId()))
             {
@@ -126,7 +126,7 @@ public class EquipmentInfo15minuteService {
 
     }
 
-    private void calDetiall(ProEconEquipmentInfo15minute pewp,Date end, Date begin,ProBasicWindturbine wt) throws Exception {
+    private void calDetiall(ProEconEquipmentInfo15minute pewp, Date end, Date begin, ProBasicEquipment wt) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -382,7 +382,7 @@ public class EquipmentInfo15minuteService {
 
 
 
-        private void calSimple(ProEconEquipmentInfo15minute pewp,Date end, Date begin,ProBasicWindturbine wt) throws Exception {
+        private void calSimple(ProEconEquipmentInfo15minute pewp, Date end, Date begin, ProBasicEquipment wt) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo1Service.java

@@ -5,7 +5,6 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.model.vo.Location;
 import com.gyee.generation.service.auto.IProEconEquipmentInfoDay1Service;
 
 import com.gyee.generation.util.DateUtils;
@@ -59,7 +58,7 @@ public class EquipmentInfo1Service {
             proEconEquipmentInfoDay1Service.removeByIds(idls);
 
         }
-        for(ProBasicWindturbine wt:CacheContext.wtls)
+        for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
             {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo2Service.java

@@ -5,7 +5,6 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.model.vo.Location;
 import com.gyee.generation.service.auto.IProEconEquipmentInfoDay2Service;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
@@ -57,7 +56,7 @@ public class EquipmentInfo2Service {
             proEconEquipmentInfoDay2Service.removeByIds(idls);
 
         }
-        for(ProBasicWindturbine wt:CacheContext.wtls)
+        for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
             {
@@ -95,7 +94,7 @@ public class EquipmentInfo2Service {
 
     }
 
-    private void calDetiall(ProEconEquipmentInfoDay2 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
+    private void calDetiall(ProEconEquipmentInfoDay2 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -543,7 +542,7 @@ public class EquipmentInfo2Service {
         pewp.setNslxs(pewp.getRslxs());
     }
 
-        private void calSimple(ProEconEquipmentInfoDay2 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
+        private void calSimple(ProEconEquipmentInfoDay2 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo3Service.java

@@ -5,9 +5,7 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
-import com.gyee.generation.model.vo.Location;
 import com.gyee.generation.service.auto.IProEconEquipmentInfoDay3Service;
-import com.gyee.generation.service.auto.IProEconPowerstationInfoDay3Service;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.statisticcs.Initial;
@@ -59,7 +57,7 @@ public class EquipmentInfo3Service {
             proEconEquipmentInfoDay3Service.removeByIds(idls);
 
         }
-        for(ProBasicWindturbine wt:CacheContext.wtls)
+        for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(CacheContext.wtpAimap.containsKey(wt.getId()))
             {
@@ -98,7 +96,7 @@ public class EquipmentInfo3Service {
 
     }
 
-    private void calDetiall(ProEconEquipmentInfoDay3 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
+    private void calDetiall(ProEconEquipmentInfoDay3 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -544,7 +542,7 @@ public class EquipmentInfo3Service {
         pewp.setNslcs(pewp.getRslcs());
     }
 
-    private void calSimple(ProEconEquipmentInfoDay3 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
+    private void calSimple(ProEconEquipmentInfoDay3 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障

realtime/generationXK-service/src/main/java/com/gyee/generation/service/GoodnessOfFitService.java

@@ -1,6 +1,5 @@
 package com.gyee.generation.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.FitClassVo;
@@ -66,7 +65,7 @@ public class GoodnessOfFitService {
                 && i.getYear().equals(year)).collect(Collectors.toList());
 
 
-            for (ProBasicWindpowerstation wp : CacheContext.wpls)
+            for (ProBasicPowerstation wp : CacheContext.wpls)
             {
 
                 List<FitClassVo> fitsD=  proEconActivePowerDataService.getFitList(wp.getId(),startDate,endDate);

realtime/generationXK-service/src/main/java/com/gyee/generation/service/InputOrOutPutService.java

@@ -43,9 +43,9 @@ public class InputOrOutPutService {
         c.set(Calendar.MONTH,0);
         Date yearbegin =c.getTime();
 
-        for (ProBasicWindpowerstation wp : CacheContext.wpls)
+        for (ProBasicPowerstation wp : CacheContext.wpls)
         {
-            List<ProBasicWindturbine> wtls=null;
+            List<ProBasicEquipment> wtls=null;
                 if(CacheContext.wpwtmap.containsKey(wp.getId()))
                 {
                     wtls=CacheContext.wpwtmap.get(wp.getId());
@@ -53,7 +53,7 @@ public class InputOrOutPutService {
 
                 if(null!=wtls && !wtls.isEmpty())
                 {
-                    for (ProBasicWindturbine wt : wtls)
+                    for (ProBasicEquipment wt : wtls)
                     {
                         System.out.println(wt.getId());
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/LimitEventService.java

@@ -1,11 +1,9 @@
 package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.common.contant.Contant;
 import com.gyee.common.contant.ContantXk;
 
 import com.gyee.common.model.DNAStatVal;
-import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
@@ -67,7 +65,7 @@ public class LimitEventService {
 
 
     //风机列表
-    public Map<String, ProBasicWindturbine> windturbines;
+    public Map<String, ProBasicEquipment> windturbines;
 
     //风机对应额定功率
     public Map<String, Double> windturbinePowerProduction;
@@ -115,27 +113,27 @@ public class LimitEventService {
         nhxdDictionary = new HashMap<String, String>();
 
 
-        Map<String, ProBasicWppoint> tempWindPower = new HashMap<>();
-        Map<String, ProBasicWppoint> tempWindPowerSpeed = new HashMap<>();
-        Map<String, ProBasicWppoint> tempWindPowerPower = new HashMap<>();
+        Map<String, ProBasicPowerstationPoint> tempWindPower = new HashMap<>();
+        Map<String, ProBasicPowerstationPoint> tempWindPowerSpeed = new HashMap<>();
+        Map<String, ProBasicPowerstationPoint> tempWindPowerPower = new HashMap<>();
 
-        Map<String, Map<String, ProBasicWppoint>> wppointmap = CacheContext.wppointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
         CacheContext.wpls.forEach(wp -> {
-            Map<String, ProBasicWppoint> wppmap = wppointmap.get(wp.getId());
+            Map<String, ProBasicPowerstationPoint> wppmap = wppointmap.get(wp.getId());
             if (wp.getId().contains("FDC")) {
 
                 if (wppmap.containsKey(ContantXk.SBZT)) {
-                    ProBasicWppoint point = wppmap.get(ContantXk.SBZT);
+                    ProBasicPowerstationPoint point = wppmap.get(ContantXk.SBZT);
                     tempWindPower.put(wp.getId(), point);
                 }
 
                 if (wppmap.containsKey(ContantXk.SSPJFS)) {
-                    ProBasicWppoint point = wppmap.get(ContantXk.SSPJFS);
+                    ProBasicPowerstationPoint point = wppmap.get(ContantXk.SSPJFS);
                     tempWindPowerSpeed.put(wp.getId(), point);
                 }
 
                 if (wppmap.containsKey(ContantXk.SSZGL)) {
-                    ProBasicWppoint point = wppmap.get(ContantXk.SSZGL);
+                    ProBasicPowerstationPoint point = wppmap.get(ContantXk.SSZGL);
                     tempWindPowerPower.put(wp.getId(), point);
                 }
 
@@ -151,7 +149,7 @@ public class LimitEventService {
         Map<String, ProBasicEquipmentPoint> tempxd = new HashMap<>();
         Map<String, ProBasicEquipmentPoint> tempbzglDictionary = new HashMap<>();
 
-        List<ProBasicWindturbine> wtls = CacheContext.wtls;
+        List<ProBasicEquipment> wtls = CacheContext.wtls;
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
         wtls.stream().forEach(wt -> {
             if (wt.getWindpowerstationId().contains("FDC")) {
@@ -303,7 +301,7 @@ public class LimitEventService {
         }
 
 
-        for (ProBasicWindturbine item : windturbines.values()) {
+        for (ProBasicEquipment item : windturbines.values()) {
             if (modelMap.containsKey(item.getModelId()))
                 windturbinePowerProduction.put(item.getId(), modelMap.get(item.getModelId()).getPowerProduction());
             else

realtime/generationXK-service/src/main/java/com/gyee/generation/service/LimitService.java

@@ -5,8 +5,8 @@ import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicEquipment;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.gyee.generation.model.auto.ProEconLineElectrical;
 import com.gyee.generation.model.vo.RealTimeParameterVo;
 import com.gyee.generation.model.vo.SLWindpowerVo;
@@ -316,7 +316,7 @@ public  class LimitService {
         slvalue = new HashMap<String, Integer>();
 
             //var electrical = entity.ProEconLineElectrical.ToList();
-        List<ProBasicWindturbine> wtls= CacheContext.wtls;
+        List<ProBasicEquipment> wtls= CacheContext.wtls;
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap=CacheContext.wtpAimap;
         Map<String, ProEconLineElectrical> electrical = proEconLineElectricalService.list().stream().collect(Collectors.toMap(ProEconLineElectrical::getLineId, Function.identity()));
         wtls.stream().forEach(wt->{
@@ -340,7 +340,7 @@ public  class LimitService {
                 {
                     continue;
                 }
-                ProBasicWindturbine item = CacheContext.wtmap.get(key);
+                ProBasicEquipment item = CacheContext.wtmap.get(key);
 
                 slvalue.put(item.getId(), 0);
 
@@ -381,7 +381,7 @@ public  class LimitService {
 
     }
 
-    private static void initialsl(ProBasicWindturbine windturbine, ProEconLineElectrical item, SLWindpowerVo s)
+    private static void initialsl(ProBasicEquipment windturbine, ProEconLineElectrical item, SLWindpowerVo s)
     {
         //进线断路器
         if (s.getLINECODE().containsKey(item.getLineCode()))
@@ -504,11 +504,11 @@ public  class LimitService {
 
 
     //AGC限电指令
-    static Map<String, ProBasicWppoint> WindPowerAGC;
-    static Map<String, ProBasicWppoint> WindPowerCXYG;
-    static Map<String, ProBasicWppoint> WindPowerZSGL;
+    static Map<String, ProBasicPowerstationPoint> WindPowerAGC;
+    static Map<String, ProBasicPowerstationPoint> WindPowerCXYG;
+    static Map<String, ProBasicPowerstationPoint> WindPowerZSGL;
 
-    static Map<String, ProBasicWppoint> WindPowerXDZT;
+    static Map<String, ProBasicPowerstationPoint> WindPowerXDZT;
     static Map<String, Double> powerCache = new HashMap<String, Double>();
 
     static Map<String, Date> timeCache = new HashMap<String, Date>();
@@ -519,7 +519,7 @@ public  class LimitService {
         {
             WindTurbineD = new HashMap<String, Map<String, ProBasicEquipmentPoint>>();
 
-             List<ProBasicWindturbine> wtls= CacheContext.wtls;
+             List<ProBasicEquipment> wtls= CacheContext.wtls;
             Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap=CacheContext.wtpAimap;
             wtls.stream().forEach(wt->{
                 Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
@@ -531,32 +531,32 @@ public  class LimitService {
 
             });
 
-            Map<String,Map<String, ProBasicWppoint>> wppointmap =CacheContext.wppointmap;
+            Map<String,Map<String, ProBasicPowerstationPoint>> wppointmap =CacheContext.wppointmap;
             CacheContext.wpls.forEach(wp->{
-            Map<String, ProBasicWppoint> wppMap = wppointmap.get(wp.getId());
+            Map<String, ProBasicPowerstationPoint> wppMap = wppointmap.get(wp.getId());
             if(wp.getId().contains("FDC"))
             {
                 if(wppMap.containsKey(ContantXk.TPOINT_WP_AGC))
                 {
-                    ProBasicWppoint agcPoint = wppMap.get(ContantXk.TPOINT_WP_AGC);
+                    ProBasicPowerstationPoint agcPoint = wppMap.get(ContantXk.TPOINT_WP_AGC);
                     WindPowerAGC.put(wp.getId(),agcPoint);
                 }
 
                 if(wppMap.containsKey(ContantXk.TPOINT_WP_CXGL))
                 {
-                    ProBasicWppoint cxglPoint = wppMap.get(ContantXk.TPOINT_WP_CXGL);
+                    ProBasicPowerstationPoint cxglPoint = wppMap.get(ContantXk.TPOINT_WP_CXGL);
                     WindPowerCXYG.put(wp.getId(),cxglPoint);
                 }
 
                 if(wppMap.containsKey(ContantXk.SSZNHGLZS))
                 {
-                    ProBasicWppoint zsglPoint = wppMap.get(ContantXk.SSZNHGLZS);
+                    ProBasicPowerstationPoint zsglPoint = wppMap.get(ContantXk.SSZNHGLZS);
                     WindPowerZSGL.put(wp.getId(),zsglPoint);
                 }
 
                 if(wppMap.containsKey(ContantXk.XDZT))
                 {
-                    ProBasicWppoint xdztPoint = wppMap.get(ContantXk.XDZT);
+                    ProBasicPowerstationPoint xdztPoint = wppMap.get(ContantXk.XDZT);
                     WindPowerXDZT.put(wp.getId(),xdztPoint);
                 }
             }
@@ -1029,7 +1029,7 @@ public  class LimitService {
         if (WindTurbineXD == null || WindturbineXDSL == null)
         {
 
-            List<ProBasicWindturbine> wtls= CacheContext.wtls;
+            List<ProBasicEquipment> wtls= CacheContext.wtls;
             Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap=CacheContext.wtpAimap;
             wtls.stream().forEach(wt->{
                 Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());
@@ -1115,7 +1115,7 @@ public  class LimitService {
                 //实时欠发状态    SSQFZT
 
             List<ProBasicEquipmentPoint> wtpointls=new ArrayList<>();
-            List<ProBasicWindturbine> wtls= CacheContext.wtls;
+            List<ProBasicEquipment> wtls= CacheContext.wtls;
             Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap=CacheContext.wtpAimap;
             wtls.stream().forEach(wt->{
                 Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = wtpAimap.get(wt.getId());

realtime/generationXK-service/src/main/java/com/gyee/generation/service/PowerCurveFittingService.java

@@ -2,7 +2,6 @@ package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.contant.ContantXk;
-import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
@@ -54,7 +53,7 @@ public class PowerCurveFittingService {
     private IProEconWtPowerCurveFittingService proEconWtPowerCurveFittingService;
 
     //inserttype 0表示正常拟合工作，1表示存值到windturbinePowerCurveFitting表
-    public void cureFitting(Date nowDate, Date begion, int insertType, List<ProBasicWindturbine> wtls) throws Exception {
+    public void cureFitting(Date nowDate, Date begion, int insertType, List<ProBasicEquipment> wtls) throws Exception {
 
         //日期变为昨天
         Date current = DateUtils.addDays(DateUtils.truncDay(nowDate), -1);
@@ -96,7 +95,7 @@ public class PowerCurveFittingService {
         if (windturbineCapacity == null) {
             windturbineCapacity = new HashMap<String, Double>();
             Map<String, ProEconEquipmentmodel> modelMap = CacheContext.modelMap;
-            for (ProBasicWindturbine windturbine : wtls) {
+            for (ProBasicEquipment windturbine : wtls) {
                 if (modelMap.containsKey(windturbine.getModelId())) {
                     windturbineCapacity.put(windturbine.getId(), modelMap.get(windturbine.getModelId()).getPowerProduction());
                 }
@@ -104,7 +103,7 @@ public class PowerCurveFittingService {
         }
 
 
-        for (ProBasicWindturbine wt : wtls) {
+        for (ProBasicEquipment wt : wtls) {
             String windturbineId = wt.getId();
 
 
@@ -436,7 +435,7 @@ public class PowerCurveFittingService {
 
                 item.setWindturbineId(windturbineId);
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         // item.SPEED = Double.Truncate((Double)pointsF1[i].X);
@@ -462,7 +461,7 @@ public class PowerCurveFittingService {
                 item.setWindturbineId(windturbineId);
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         //item.SPEED = Double.Truncate((Double)pointsF1[i].X);
@@ -505,7 +504,7 @@ public class PowerCurveFittingService {
                 item.setWindturbineId(windturbineId);
 
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         // item.SPEED = Double.Truncate((Double)pointsF2[i].X);
@@ -536,7 +535,7 @@ public class PowerCurveFittingService {
                 item.setWindturbineId(windturbineId);
 
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         //item.SPEED = Double.Truncate((Double)pointsF2[i].X);
@@ -586,7 +585,7 @@ public class PowerCurveFittingService {
 
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         // item.SPEED = Double.Truncate((Double)pointsF1[i].X);
@@ -618,7 +617,7 @@ public class PowerCurveFittingService {
 
                 if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                    ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                    ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                     if (wt.getWindpowerstationId().contains("GDC")) {
                         continue;
                         //item.SPEED = Double.Truncate((Double)pointsF1[i].X);
@@ -866,7 +865,7 @@ public class PowerCurveFittingService {
 
                         if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                            ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                            ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                             if (wt.getWindpowerstationId().contains("GDC")) {
                                 b = (x >= 0 && y > 0);
                             } else {
@@ -922,7 +921,7 @@ public class PowerCurveFittingService {
                         boolean b = true;
                         if (CacheContext.wtmap.containsKey(windturbineId)) {
 
-                            ProBasicWindturbine wt = CacheContext.wtmap.get(windturbineId);
+                            ProBasicEquipment wt = CacheContext.wtmap.get(windturbineId);
                             if (wt.getWindpowerstationId().contains("GDC")) {
                                 b = (x >= 0 && y > 0);
                             } else {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/ShutdownService.java

@@ -1,8 +1,6 @@
 package com.gyee.generation.service;
 
-import com.alibaba.druid.sql.ast.TDDLHint;
 import com.gyee.common.contant.ContantXk;
-import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
@@ -63,7 +61,7 @@ public class ShutdownService {
     /// <summary>
     /// 保存风机信息，key为风机编号
     /// </summary>
-    private Map<String, ProBasicWindturbine> windTurbines = new HashMap<String, ProBasicWindturbine>();
+    private Map<String, ProBasicEquipment> windTurbines = new HashMap<String, ProBasicEquipment>();
 
     /// <summary>
     /// 风机状态说明,key为状态码，value为状态说明
@@ -92,14 +90,14 @@ public class ShutdownService {
     /// <summary>
     /// 测风塔风速 key为风场编号
     /// </summary>
-    Map<String, ProBasicWppoint> gzdpointMap = new HashMap<String, ProBasicWppoint>();//测风塔风速
+    Map<String, ProBasicPowerstationPoint> gzdpointMap = new HashMap<String, ProBasicPowerstationPoint>();//测风塔风速
     /// <summary>
     ///
     /// </summary>
 //    Map<String, Map<Double, ProBasicModelPower>> modelPowerMap = new HashMap<String, Map<Double, ProBasicModelPower>>();
     //不在从新拟合功率曲线，从数据库中直接取值
     Map<String, Map<Double, ProEconWtPowerCurveFitting>> modelPowerMap = new HashMap<String, Map<Double, ProEconWtPowerCurveFitting>>();
-    Map<String, ProBasicWindpowerstation> windpowerMap;//风场
+    Map<String, ProBasicPowerstation> windpowerMap;//风场
 
 
     @Value("${shutdown.keystr}")
@@ -145,7 +143,7 @@ public class ShutdownService {
         List<ProBasicEquipmentPoint> powerpointList = new ArrayList<>();
         List<ProBasicEquipmentPoint> speedpointList = new ArrayList<>();
 
-        List<ProBasicWindturbine> wtls= CacheContext.wtls;
+        List<ProBasicEquipment> wtls= CacheContext.wtls;
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap=CacheContext.wtpAimap;
         //筛选风机对应测点
         wtls.stream().forEach(wt->{
@@ -186,13 +184,13 @@ public class ShutdownService {
 
 
              windTurbines=CacheContext.wtmap;
-            List<ProBasicWppoint> gzdpointList =new ArrayList<>();
+            List<ProBasicPowerstationPoint> gzdpointList =new ArrayList<>();
                 CacheContext.wpls.stream().forEach(wp->{
 
-                    Map<String, ProBasicWppoint> wppointsmap = CacheContext.wppointmap.get(wp.getId());
+                    Map<String, ProBasicPowerstationPoint> wppointsmap = CacheContext.wppointmap.get(wp.getId());
                     if(wppointsmap.containsKey(ContantXk.FCCFTFS70))
                     {
-                        ProBasicWppoint mxztPoint = wppointsmap.get(ContantXk.FCCFTFS70);
+                        ProBasicPowerstationPoint mxztPoint = wppointsmap.get(ContantXk.FCCFTFS70);
 
                         gzdpointList.add(mxztPoint);
                     }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -435,11 +435,11 @@ public class WindPowerInfo1Service {
             proEconPowerstationInfoDay1Service.removeByIds(idls);
 
         }
-        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        for(ProBasicPowerstation wp:CacheContext.wpls)
         {
             if(CacheContext.wppointmap.containsKey(wp.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
 
                 ProEconPowerstationInfoDay1 pewp=new ProEconPowerstationInfoDay1();
                Initial.initial(pewp);
@@ -504,7 +504,7 @@ public class WindPowerInfo1Service {
         {
             if(CacheContext.wppointmap.containsKey(pj.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(pj.getId());
 
                 ProEconPowerstationInfoDay1 pewp=new ProEconPowerstationInfoDay1();
                 Initial.initial(pewp);
@@ -567,7 +567,7 @@ public class WindPowerInfo1Service {
         {
             if(CacheContext.wppointmap.containsKey(ln.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(ln.getId());
 
                 ProEconPowerstationInfoDay1 pewp=new ProEconPowerstationInfoDay1();
                 Initial.initial(pewp);
@@ -601,11 +601,11 @@ public class WindPowerInfo1Service {
 
     }
 
-    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay1 pewp,List<ProEconPowerstationInfoDay1> pepid1ls) throws Exception {
+    private void extracted(Date recordDate, Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay1 pewp, List<ProEconPowerstationInfoDay1> pepid1ls) throws Exception {
         /*******************************************日信息统计*********************************************************/
         if(pointmap.containsKey(ContantXk.SSPJFS))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.SSPJFS);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.SSPJFS);
             List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
@@ -622,7 +622,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.SSZGL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.SSZGL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.SSZGL);
             List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
@@ -639,7 +639,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RFDL);
 
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
@@ -651,7 +651,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RKYDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RKYDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RKYDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -664,7 +664,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RLLFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RLLFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RLLFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -677,7 +677,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -688,7 +688,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RCNSLGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RCNSLGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RCNSLGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -700,7 +700,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -712,7 +712,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RCNSLJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RCNSLJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RCNSLJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -724,7 +724,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RDJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RDJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RDJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -735,7 +735,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RQXJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RQXJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -746,7 +746,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RSDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RSDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RSDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -757,7 +757,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RXNSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RXNSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RXNSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -769,7 +769,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RXDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RXDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RXDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -782,7 +782,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RXDJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RXDJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RXDJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -794,7 +794,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RCWSLDWSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RCWSLDWSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RCWSLDWSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -805,7 +805,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RCWSLTQSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RCWSLTQSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RCWSLTQSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -817,7 +817,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RZFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RZFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RZFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -829,7 +829,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.RQFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RQFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RQFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -840,7 +840,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.RZHD))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.RZHD);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.RZHD);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -915,7 +915,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YFDL);
 
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
@@ -927,7 +927,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YKYDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YKYDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YKYDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -940,7 +940,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YLLFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YLLFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YLLFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -953,7 +953,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -964,7 +964,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YCNSLGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YCNSLGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YCNSLGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -976,7 +976,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -988,7 +988,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YCNSLJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YCNSLJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YCNSLJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1000,7 +1000,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YDJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YDJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YDJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1011,7 +1011,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YQXJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YQXJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YQXJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1022,7 +1022,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YSDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YSDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YSDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1033,7 +1033,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YXNSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YXNSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YXNSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1045,7 +1045,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YXDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YXDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YXDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1058,7 +1058,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YXDJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YXDJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YXDJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1070,7 +1070,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YCWSLDWSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YCWSLDWSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YCWSLDWSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1081,7 +1081,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YCWSLTQSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YCWSLTQSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YCWSLTQSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1093,7 +1093,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YZFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YZFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YZFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1105,7 +1105,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.YQFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YQFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YQFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1116,7 +1116,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.YZHD))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.YZHD);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.YZHD);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1188,7 +1188,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NFDL);
 
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
@@ -1200,7 +1200,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NKYDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NKYDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NKYDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1213,7 +1213,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NLLFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NLLFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NLLFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1226,7 +1226,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1237,7 +1237,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NCNSLGZSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NCNSLGZSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NCNSLGZSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1249,7 +1249,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1261,7 +1261,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NCNSLJXSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NCNSLJXSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NCNSLJXSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1273,7 +1273,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NDJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NDJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NDJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1284,7 +1284,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NQXJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NQXJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NQXJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1295,7 +1295,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NSDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NSDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NSDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1306,7 +1306,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NXNSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NXNSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NXNSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1318,7 +1318,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NXDTJSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NXDTJSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NXDTJSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1331,7 +1331,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NXDJCLSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NXDJCLSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NXDJCLSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1343,7 +1343,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NCWSLDWSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NCWSLDWSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NCWSLDWSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1354,7 +1354,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NCWSLTQSSDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NCWSLTQSSDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NCWSLTQSSDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1366,7 +1366,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NZFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NZFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NZFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1378,7 +1378,7 @@ public class WindPowerInfo1Service {
 
         if(pointmap.containsKey(ContantXk.NQFDL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NQFDL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NQFDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1389,7 +1389,7 @@ public class WindPowerInfo1Service {
         }
         if(pointmap.containsKey(ContantXk.NZHD))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.NZHD);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.NZHD);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -1400,7 +1400,7 @@ public class WindPowerInfo1Service {
         }
     }
 
-    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay1 pewp) throws Exception {
+    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay1 pewp) throws Exception {
         //年最大风速
         pewp.setNzdfs(pewp.getRzdfs());
         //年最小风速
@@ -1417,7 +1417,7 @@ public class WindPowerInfo1Service {
 
     }
 
-    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay1 pewp) throws Exception {
+    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay1 pewp) throws Exception {
 
         //月最大风速
         pewp.setYzdfs(pewp.getRzdfs());

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo2Service.java

@@ -426,11 +426,11 @@ public class WindPowerInfo2Service {
             proEconPowerstationInfoDay2Service.removeByIds(idls);
 
         }
-        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        for(ProBasicPowerstation wp:CacheContext.wpls)
         {
             if(CacheContext.wppointmap.containsKey(wp.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
 
                 ProEconPowerstationInfoDay2 pewp=new ProEconPowerstationInfoDay2();
                Initial.initial(pewp);
@@ -497,7 +497,7 @@ public class WindPowerInfo2Service {
         {
             if(CacheContext.wppointmap.containsKey(pj.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(pj.getId());
 
                 ProEconPowerstationInfoDay2 pewp=new ProEconPowerstationInfoDay2();
                 Initial.initial(pewp);
@@ -560,7 +560,7 @@ public class WindPowerInfo2Service {
         {
             if(CacheContext.wppointmap.containsKey(ln.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(ln.getId());
 
                 ProEconPowerstationInfoDay2 pewp=new ProEconPowerstationInfoDay2();
                 Initial.initial(pewp);
@@ -594,7 +594,7 @@ public class WindPowerInfo2Service {
 
     }
 
-    private void calDetiall(ProEconPowerstationInfoDay2 pewp,Date end, Date begin,List<ProBasicWindturbine> wtls,List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
+    private void calDetiall(ProEconPowerstationInfoDay2 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -629,7 +629,7 @@ public class WindPowerInfo2Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for(ProBasicWindturbine wt:wtls)
+        for(ProBasicEquipment wt:wtls)
         {
 
             lastState=-1;//上一分钟状态
@@ -1041,7 +1041,7 @@ public class WindPowerInfo2Service {
         pewp.setNhjslxs(pewp.getRhjslxs());
     }
 
-        private void calSimple(ProEconPowerstationInfoDay2 pewp,Date end, Date begin,List<ProBasicWindturbine> wtls,List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
+        private void calSimple(ProEconPowerstationInfoDay2 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障
@@ -1066,7 +1066,7 @@ public class WindPowerInfo2Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for(ProBasicWindturbine wt:wtls)
+        for(ProBasicEquipment wt:wtls)
         {
             Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.SBZT));

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo3Service.java

@@ -426,11 +426,11 @@ public class WindPowerInfo3Service {
             proEconPowerstationInfoDay3Service.removeByIds(idls);
 
         }
-        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        for(ProBasicPowerstation wp:CacheContext.wpls)
         {
             if(CacheContext.wppointmap.containsKey(wp.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
 
                 ProEconPowerstationInfoDay3 pewp=new ProEconPowerstationInfoDay3();
                 Initial.initial(pewp);
@@ -496,7 +496,7 @@ public class WindPowerInfo3Service {
         {
             if(CacheContext.wppointmap.containsKey(pj.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(pj.getId());
 
                 ProEconPowerstationInfoDay3 pewp=new ProEconPowerstationInfoDay3();
                 Initial.initial(pewp);
@@ -559,7 +559,7 @@ public class WindPowerInfo3Service {
         {
             if(CacheContext.wppointmap.containsKey(ln.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(ln.getId());
 
                 ProEconPowerstationInfoDay3 pewp=new ProEconPowerstationInfoDay3();
                 Initial.initial(pewp);
@@ -593,7 +593,7 @@ public class WindPowerInfo3Service {
 
     }
 
-    private void calDetiall(ProEconPowerstationInfoDay3 pewp,Date end, Date begin,List<ProBasicWindturbine> wtls,List<ProEconPowerstationInfoDay3> pepidls) throws Exception {
+    private void calDetiall(ProEconPowerstationInfoDay3 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay3> pepidls) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -628,7 +628,7 @@ public class WindPowerInfo3Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for(ProBasicWindturbine wt:wtls)
+        for(ProBasicEquipment wt:wtls)
         {
 
             lastState=-1;//上一分钟状态
@@ -1040,7 +1040,7 @@ public class WindPowerInfo3Service {
         pewp.setNhjslcs(pewp.getRhjslcs());
     }
 
-    private void calSimple(ProEconPowerstationInfoDay3 pewp,Date end, Date begin,List<ProBasicWindturbine> wtls,List<ProEconPowerstationInfoDay3> pepidls) throws Exception {
+    private void calSimple(ProEconPowerstationInfoDay3 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay3> pepidls) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障
@@ -1065,7 +1065,7 @@ public class WindPowerInfo3Service {
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
-        for(ProBasicWindturbine wt:wtls)
+        for(ProBasicEquipment wt:wtls)
         {
             Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.SBZT));

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo5Service.java

@@ -15,8 +15,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -378,11 +376,11 @@ public class WindPowerInfo5Service {
             proEconPowerstationInfoDay5Service.removeByIds(idls);
 
         }
-        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        for(ProBasicPowerstation wp:CacheContext.wpls)
         {
             if(CacheContext.wppointmap.containsKey(wp.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
 
                 ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
                 Initial.initial(pewp);
@@ -447,7 +445,7 @@ public class WindPowerInfo5Service {
         {
             if(CacheContext.wppointmap.containsKey(pj.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(pj.getId());
 
                 ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
                 Initial.initial(pewp);
@@ -510,7 +508,7 @@ public class WindPowerInfo5Service {
         {
             if(CacheContext.wppointmap.containsKey(ln.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(ln.getId());
 
                 ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
                 Initial.initial(pewp);
@@ -544,7 +542,7 @@ public class WindPowerInfo5Service {
 
     }
 
-    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay5 pewp,List<ProEconPowerstationInfoDay5> pepid1ls) throws Exception {
+    private void extracted(Date recordDate, Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay5 pewp, List<ProEconPowerstationInfoDay5> pepid1ls) throws Exception {
         /*******************************************日信息统计*********************************************************/
 
                 double rfdlsyz=0.0;
@@ -553,7 +551,7 @@ public class WindPowerInfo5Service {
                 double rnwgwdlsyz=0.0;
                 if(pointmap.containsKey(ContantXk.RFDLSYZ));
                 {
-                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
+                    ProBasicPowerstationPoint point=pointmap.get(ContantXk.RFDLSYZ);
                     PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
@@ -566,7 +564,7 @@ public class WindPowerInfo5Service {
 
                 if(pointmap.containsKey(ContantXk.RSWDL));
                 {
-                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
+                    ProBasicPowerstationPoint point=pointmap.get(ContantXk.RSWDL);
                     PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
@@ -579,7 +577,7 @@ public class WindPowerInfo5Service {
 
                 if(pointmap.containsKey(ContantXk.RGWGWDL));
                 {
-                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
+                    ProBasicPowerstationPoint point=pointmap.get(ContantXk.RGWGWDL);
                     PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
@@ -592,7 +590,7 @@ public class WindPowerInfo5Service {
 
                 if(pointmap.containsKey(ContantXk.RNWGWDL));
                 {
-                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
+                    ProBasicPowerstationPoint point=pointmap.get(ContantXk.RNWGWDL);
                     PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
@@ -609,7 +607,7 @@ public class WindPowerInfo5Service {
 
                 if(pointmap.containsKey(ContantXk.RCYDL));
                 {
-                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
+                    ProBasicPowerstationPoint point=pointmap.get(ContantXk.RCYDL);
                     PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
@@ -630,7 +628,7 @@ public class WindPowerInfo5Service {
         double ynwgwdlsyz=0.0;
         if(pointmap.containsKey(ContantXk.YFDLSYZ));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.YFDLSYZ);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.YFDLSYZ);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -643,7 +641,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.YSWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.YSWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.YSWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -656,7 +654,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.YGWGWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.YGWGWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.YGWGWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -669,7 +667,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.YNWGWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.YNWGWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.YNWGWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -686,7 +684,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.YCYDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.YCYDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.YCYDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -706,7 +704,7 @@ public class WindPowerInfo5Service {
         double nnwgwdlsyz=0.0;
         if(pointmap.containsKey(ContantXk.NFDLSYZ));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.NFDLSYZ);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.NFDLSYZ);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -719,7 +717,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.NSWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.NSWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.NSWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -732,7 +730,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.NGWGWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.NGWGWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.NGWGWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -745,7 +743,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.NNWGWDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.NNWGWDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.NNWGWDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
@@ -762,7 +760,7 @@ public class WindPowerInfo5Service {
 
         if(pointmap.containsKey(ContantXk.NCYDL));
         {
-            ProBasicWppoint point=pointmap.get(ContantXk.NCYDL);
+            ProBasicPowerstationPoint point=pointmap.get(ContantXk.NCYDL);
             PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo6Service.java

@@ -2,7 +2,6 @@ package com.gyee.generation.service;//package com.gyee.generation.service;
 
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.model.PointData;
-import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.Location;
@@ -336,11 +335,11 @@ public class WindPowerInfo6Service {
             proEconPowerstationInfoDay6Service.removeByIds(idls);
 
         }
-        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        for(ProBasicPowerstation wp:CacheContext.wpls)
         {
             if(CacheContext.wppointmap.containsKey(wp.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(wp.getId());
 
                 ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
                 Initial.initial(pewp);
@@ -405,7 +404,7 @@ public class WindPowerInfo6Service {
         {
             if(CacheContext.wppointmap.containsKey(pj.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(pj.getId());
 
                 ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
                 Initial.initial(pewp);
@@ -468,7 +467,7 @@ public class WindPowerInfo6Service {
         {
             if(CacheContext.wppointmap.containsKey(ln.getId()))
             {
-                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+                Map<String, ProBasicPowerstationPoint> pointmap=CacheContext.wppointmap.get(ln.getId());
 
                 ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
                 Initial.initial(pewp);
@@ -502,11 +501,11 @@ public class WindPowerInfo6Service {
 
     }
 
-    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp,List<ProEconPowerstationInfoDay6> pepid1ls) throws Exception {
+    private void extracted(Date recordDate, Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay6 pewp, List<ProEconPowerstationInfoDay6> pepid1ls) throws Exception {
         /*******************************************日信息统计*********************************************************/
         if(pointmap.containsKey(ContantXk.FCCFTFS70))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.FCCFTFS70);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.FCCFTFS70);
             List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
@@ -523,7 +522,7 @@ public class WindPowerInfo6Service {
 
         if(pointmap.containsKey(ContantXk.SSZGL))
         {
-            ProBasicWppoint point= pointmap.get(ContantXk.SSZGL);
+            ProBasicPowerstationPoint point= pointmap.get(ContantXk.SSZGL);
             List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
@@ -649,7 +648,7 @@ public class WindPowerInfo6Service {
         }
     }
 
-    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
+    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
         //年最大风速
         pewp.setNzdfscft(pewp.getRzdfscft());
         //年最小风速
@@ -666,7 +665,7 @@ public class WindPowerInfo6Service {
 
     }
 
-    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
+    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicPowerstationPoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
 
         //月最大风速
         pewp.setYzdfscft(pewp.getRzdfscft());

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IProBasicWindturbineService.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.service.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author shilin
  * @since 2022-10-31
  */
-public interface IProBasicWindturbineService extends IService<ProBasicWindturbine> {
+public interface IProBasicEquipmentService extends IService<ProBasicEquipment> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IProBasicWppointService.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.service.auto;
 
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author shilin
  * @since 2022-10-31
  */
-public interface IProBasicWppointService extends IService<ProBasicWppoint> {
+public interface IProBasicPowerstationPointService extends IService<ProBasicPowerstationPoint> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IProBasicWindpowerstationService.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.service.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindpowerstation;
+import com.gyee.generation.model.auto.ProBasicPowerstation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author shilin
  * @since 2022-10-31
  */
-public interface IProBasicWindpowerstationService extends IService<ProBasicWindpowerstation> {
+public interface IProBasicPowerstationService extends IService<ProBasicPowerstation> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/IProBasicWindsubStationService.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.service.auto;
 
-import com.gyee.generation.model.auto.ProBasicWindsubStation;
+import com.gyee.generation.model.auto.ProBasicSubStation;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author shilin
  * @since 2022-10-31
  */
-public interface IProBasicWindsubStationService extends IService<ProBasicWindsubStation> {
+public interface IProBasicSubStationService extends IService<ProBasicSubStation> {
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicEquipmentServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicEquipment;
+import com.gyee.generation.mapper.auto.ProBasicEquipmentMapper;
+import com.gyee.generation.service.auto.IProBasicEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 风机&光伏 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Service
+public class ProBasicEquipmentServiceImpl extends ServiceImpl<ProBasicEquipmentMapper, ProBasicEquipment> implements IProBasicEquipmentService {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicPowerstationPointServiceImpl.java

@@ -0,0 +1,24 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
+import com.gyee.generation.mapper.auto.ProBasicPowerstationPointMapper;
+import com.gyee.generation.service.auto.IProBasicPowerstationPointService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
++方阵测点 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Service
+public class ProBasicPowerstationPointServiceImpl extends ServiceImpl<ProBasicPowerstationPointMapper, ProBasicPowerstationPoint> implements IProBasicPowerstationPointService {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicPowerstationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicPowerstation;
+import com.gyee.generation.mapper.auto.ProBasicPowerstationMapper;
+import com.gyee.generation.service.auto.IProBasicPowerstationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场站表 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Service
+public class ProBasicPowerstationServiceImpl extends ServiceImpl<ProBasicPowerstationMapper, ProBasicPowerstation> implements IProBasicPowerstationService {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicSubStationServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicSubStation;
+import com.gyee.generation.mapper.auto.ProBasicSubStationMapper;
+import com.gyee.generation.service.auto.IProBasicSubStationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 调度场站名称 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-31
+ */
+@Service
+public class ProBasicSubStationServiceImpl extends ServiceImpl<ProBasicSubStationMapper, ProBasicSubStation> implements IProBasicSubStationService {
+
+}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicWindpowerstationServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.service.auto.impl;
-
-import com.gyee.generation.model.auto.ProBasicWindpowerstation;
-import com.gyee.generation.mapper.auto.ProBasicWindpowerstationMapper;
-import com.gyee.generation.service.auto.IProBasicWindpowerstationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 场站表 服务实现类
- * </p>
- *
- * @author shilin
- * @since 2022-10-31
- */
-@Service
-public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWindpowerstationMapper, ProBasicWindpowerstation> implements IProBasicWindpowerstationService {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicWindsubStationServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.service.auto.impl;
-
-import com.gyee.generation.model.auto.ProBasicWindsubStation;
-import com.gyee.generation.mapper.auto.ProBasicWindsubStationMapper;
-import com.gyee.generation.service.auto.IProBasicWindsubStationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 调度场站名称 服务实现类
- * </p>
- *
- * @author shilin
- * @since 2022-10-31
- */
-@Service
-public class ProBasicWindsubStationServiceImpl extends ServiceImpl<ProBasicWindsubStationMapper, ProBasicWindsubStation> implements IProBasicWindsubStationService {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicWindturbineServiceImpl.java

@@ -1,20 +0,0 @@
-package com.gyee.generation.service.auto.impl;
-
-import com.gyee.generation.model.auto.ProBasicWindturbine;
-import com.gyee.generation.mapper.auto.ProBasicWindturbineMapper;
-import com.gyee.generation.service.auto.IProBasicWindturbineService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 风机&光伏 服务实现类
- * </p>
- *
- * @author shilin
- * @since 2022-10-31
- */
-@Service
-public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturbineMapper, ProBasicWindturbine> implements IProBasicWindturbineService {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProBasicWppointServiceImpl.java

@@ -1,24 +0,0 @@
-package com.gyee.generation.service.auto.impl;
-
-import com.gyee.generation.model.auto.ProBasicWppoint;
-import com.gyee.generation.mapper.auto.ProBasicWppointMapper;
-import com.gyee.generation.service.auto.IProBasicWppointService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 场站测点，期次测点，线路测点，三级公司测点，区域测点
-
-
-
-+方阵测点 服务实现类
- * </p>
- *
- * @author shilin
- * @since 2022-10-31
- */
-@Service
-public class ProBasicWppointServiceImpl extends ServiceImpl<ProBasicWppointMapper, ProBasicWppoint> implements IProBasicWppointService {
-
-}

realtime/generationXK-service/src/main/java/com/gyee/generation/service/initalcache/CacheService.java

@@ -5,8 +5,6 @@ package com.gyee.generation.service.initalcache;/*
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.common.model.auto.Windturbine;
-import com.gyee.common.service.IWindturbineService;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
@@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,17 +25,17 @@ public class CacheService {
     @Autowired
     private RedisService redisService;
     @Autowired
-    private IProBasicWindturbineService windturbineService;
+    private IProBasicEquipmentService windturbineService;
     @Autowired
     private IProBasicLineService lineService;
     @Autowired
     private IProBasicProjectService projectService;
     @Autowired
-    private IProBasicWindpowerstationService windpowerstationService;
+    private IProBasicPowerstationService windpowerstationService;
     @Autowired
     private IProBasicEquipmentPointService windturbinetestingpointnewService;
     @Autowired
-    private IProBasicWppointService windpowerstationpointnewService;
+    private IProBasicPowerstationPointService windpowerstationpointnewService;
     @Autowired
     private IProBasicCompanyService companyService;
     @Autowired
@@ -49,7 +46,7 @@ public class CacheService {
 
     public void initRedisCache(){
         log.info("--------------------------redisWT");
-        List<ProBasicWindturbine> windturbineList = windturbineService.list().stream().filter(i->i.getIsable().equals(1)).collect(Collectors.toList());
+        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i->i.getIsable().equals(1)).collect(Collectors.toList());
         windturbineList.stream().forEach(i->{
             Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
             QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
@@ -65,10 +62,10 @@ public class CacheService {
         log.info("--------------------------redisLN");
         List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
         lineList.stream().forEach(i->{
-            Map<String, ProBasicWppoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
             qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicWppoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
             windpowerstationtestingpoint2List.stream().forEach(x->{
                 codeaimap.put(x.getUniformCode(),x);
             });
@@ -79,10 +76,10 @@ public class CacheService {
         log.info("--------------------------redisPJ");
         List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
         projectList.stream().forEach(i->{
-            Map<String,ProBasicWppoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
             qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicWppoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
             windpowerstationtestingpoint2List.stream().forEach(x->{
                 codeaimap.put(x.getUniformCode(),x);
             });
@@ -91,13 +88,13 @@ public class CacheService {
         });
 
         log.info("--------------------------redisWP");
-        List<ProBasicWindpowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
 
         wpList.stream().forEach(i->{
-            Map<String, ProBasicWppoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
             qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicWppoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
             windpowerstationtestingpoint2List.stream().forEach(x->{
                 codeaimap.put(x.getUniformCode(),x);
             });
@@ -114,10 +111,10 @@ public class CacheService {
             comList.add(company.getId()+"-2");
         });
         comList.stream().forEach(i->{
-            Map<String, ProBasicWppoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
             qw.eq("windpowerstation_id",i);
-            List<ProBasicWppoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
             windpowerstationtestingpoint2List.stream().forEach(x->{
                 codeaimap.put(x.getUniformCode(),x);
             });
@@ -134,10 +131,10 @@ public class CacheService {
             regList.add(region.getId()+"-2");
         });
         regList.stream().forEach(i->{
-            Map<String, ProBasicWppoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicWppoint> qw = new QueryWrapper<>();
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
             qw.eq("windpowerstation_id",i);
-            List<ProBasicWppoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
             windpowerstationtestingpoint2List.stream().forEach(x->{
                 codeaimap.put(x.getUniformCode(),x);
             });

realtime/generationXK-service/src/main/java/com/gyee/generation/service/initialpoint/InitialPointGoldenXkByEqService.java

@@ -56,7 +56,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
         List<ProBasicRegion> regions = proBasicRegionService.list();
 
 
-        List<ProBasicWppoint> allpoints = new ArrayList<>();
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
         if(!regions.isEmpty())
         {
@@ -70,7 +70,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 /********************************************区域公司测点**************************************************/
 
                 
-                List<ProBasicWppoint>  points=new ArrayList<>();
+                List<ProBasicPowerstationPoint>  points=new ArrayList<>();
                 for(int i=0;i<pointls.size();i++)
                 {
 
@@ -86,7 +86,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
                     
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -142,7 +142,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -205,7 +205,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -262,7 +262,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -317,7 +317,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -372,7 +372,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -415,7 +415,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
         /*********************************************场站、项目、线路测点生成*****************************************************/
 
 
-        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
             List<ProEconTestingPoint> ls=null;
             if(wp.getId().indexOf("FDC")>=0)
             {
@@ -463,8 +463,8 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
     }
 
-    private void createWpPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
-        List<ProBasicWppoint> points = new ArrayList<>();
+    private void createWpPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
+        List<ProBasicPowerstationPoint> points = new ArrayList<>();
         for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -505,7 +505,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
             sbtable.append(sba).append("JSFW.");
             sbtable.append(sb);
 
-            ProBasicWppoint po = new ProBasicWppoint();
+            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
             po.setId(StringUtils.getUUID());
 //            po.setNemCode(V2Config.getInitialcode());
             po.setNemCode(String.valueOf(sbtable));
@@ -537,12 +537,12 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
     
 
-    private void createPjPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
+    private void createPjPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
 
 
         for (ProBasicProject pj : CacheContext.pjls) {
             if (pj.getWindpowerstationId().equals(wp.getId())) {
-                List<ProBasicWppoint> points = new ArrayList<>();
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
                 for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -589,7 +589,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sbtable.append(sba).append("JSFW.");
                     sbtable.append(sb);
 
-                    ProBasicWppoint po = new ProBasicWppoint();
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
 
                     po.setId(StringUtils.getUUID());
 
@@ -620,14 +620,14 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
     
 
-    private void createLnPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
+    private void createLnPoints(ProBasicPowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
 
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.pjmap.containsKey(ln.getProjectId())) {
                 ProBasicProject pj = CacheContext.pjmap.get(ln.getProjectId());
 
                 if (pj.getWindpowerstationId().equals(wp.getId())) {
-                    List<ProBasicWppoint> points = new ArrayList<>();
+                    List<ProBasicPowerstationPoint> points = new ArrayList<>();
                     for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -679,7 +679,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                         sbtable.append(sba).append("JSFW.");
                         sbtable.append(sb);
 
-                        ProBasicWppoint po = new ProBasicWppoint();
+                        ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
                         po.setId(StringUtils.getUUID());
 
                         po.setNemCode(String.valueOf(sbtable));
@@ -728,7 +728,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
         List<ProEconTestingPoint>  gfls=proEconTestingPointService.list().stream().filter(i->i.getTypeId().equals("gf") || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
 
-        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
 
             List<ProEconTestingPoint> ls=null;
             if(wp.getId().indexOf("FDC")>=0)
@@ -740,11 +740,11 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                 ls=gfls;
 
             }
-            List<ProBasicWindturbine> wtls = CacheContext.wpwtmap.get(wp.getId());
+            List<ProBasicEquipment> wtls = CacheContext.wpwtmap.get(wp.getId());
 
 
             if (!ls.isEmpty() ) {
-                for (ProBasicWindturbine wt : wtls) {
+                for (ProBasicEquipment wt : wtls) {
 
                     List<ProBasicEquipmentPoint> points = new ArrayList<>();
                     for (int i = 0; i < ls.size(); i++) {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/initialpoint/InitialPointGoldenXkService.java

@@ -25,7 +25,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
     private IProBasicCompanyService proBasicCompanyService;
 
     @Resource
-    private IProBasicWindpowerstationService proBasicWindpowerstationService;
+    private IProBasicPowerstationService proBasicWindpowerstationService;
     @Resource
     private IProBasicProjectService proBasicProjectService;
     @Resource
@@ -57,7 +57,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
         List<ProBasicRegion> regions = proBasicRegionService.list();
 
 
-        List<ProBasicWppoint> allpoints = new ArrayList<>();
+        List<ProBasicPowerstationPoint> allpoints = new ArrayList<>();
 
         if(!regions.isEmpty())
         {
@@ -69,7 +69,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                 StringBuilder sba=new StringBuilder();
                 sba.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_");
 /********************************************区域公司测点**************************************************/
-                List<ProBasicWppoint>  points=new ArrayList<>();
+                List<ProBasicPowerstationPoint>  points=new ArrayList<>();
                 for(int i=0;i<stpointls.size();i++)
                 {
                     if(stpointls.get(i).getTypes().equals("GF"))
@@ -89,7 +89,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         sbtable.append("JSFW.");
                         sbtable.append(sb);
                     }
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -152,7 +152,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         sbtable.append("JSFW.");
                         sbtable.append(sb);
                     }
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -223,7 +223,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         sbtable.append("JSFW.");
                         sbtable.append(sb);
                     }
-                    ProBasicWppoint po=new ProBasicWppoint();
+                    ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                     po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                     po.setNemCode(String.valueOf(sbtable));
@@ -293,7 +293,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                                 sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -359,7 +359,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                                 sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -431,7 +431,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                                 sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
-                            ProBasicWppoint po=new ProBasicWppoint();
+                            ProBasicPowerstationPoint po=new ProBasicPowerstationPoint();
                             po.setId(StringUtils.getUUID());
 //                            po.setNemCode(V2Config.getInitialcode());
                             po.setNemCode(String.valueOf(sbtable));
@@ -483,7 +483,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
         /*********************************************场站、项目、线路测点生成*****************************************************/
 
-        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
             List<ProEconWindpowerStandardPoint> ls=null;
             if(wp.getId().indexOf("FDC")>=0)
             {
@@ -531,8 +531,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
     }
 
-    private void createWpPoints(ProBasicWindpowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicWppoint> allpoints) {
-        List<ProBasicWppoint> points = new ArrayList<>();
+    private void createWpPoints(ProBasicPowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
+        List<ProBasicPowerstationPoint> points = new ArrayList<>();
         for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -575,7 +575,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //            }
 
 
-            ProBasicWppoint po = new ProBasicWppoint();
+            ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
             po.setId(StringUtils.getUUID());
 //            po.setNemCode(V2Config.getInitialcode());
             po.setNemCode(String.valueOf(sbtable));
@@ -625,12 +625,12 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
     
 
-    private void createPjPoints(ProBasicWindpowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicWppoint> allpoints) {
+    private void createPjPoints(ProBasicPowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
 
 
         for (ProBasicProject pj : CacheContext.pjls) {
             if (pj.getWindpowerstationId().equals(wp.getId())) {
-                List<ProBasicWppoint> points = new ArrayList<>();
+                List<ProBasicPowerstationPoint> points = new ArrayList<>();
                 for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -679,7 +679,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         sbtable.append(sb);
                     }
 
-                    ProBasicWppoint po = new ProBasicWppoint();
+                    ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
 
                     po.setId(StringUtils.getUUID());
 //                    po.setNemCode(V2Config.getInitialcode());
@@ -719,14 +719,14 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
     
 
-    private void createLnPoints(ProBasicWindpowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicWppoint> allpoints) {
+    private void createLnPoints(ProBasicPowerstation wp, List<ProEconWindpowerStandardPoint> stpointls, List<ProBasicPowerstationPoint> allpoints) {
 
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.pjmap.containsKey(ln.getProjectId())) {
                 ProBasicProject pj = CacheContext.pjmap.get(ln.getProjectId());
 
                 if (pj.getWindpowerstationId().equals(wp.getId())) {
-                    List<ProBasicWppoint> points = new ArrayList<>();
+                    List<ProBasicPowerstationPoint> points = new ArrayList<>();
                     for (int i = 0; i < stpointls.size(); i++) {
 
 
@@ -785,7 +785,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         }
 
 
-                        ProBasicWppoint po = new ProBasicWppoint();
+                        ProBasicPowerstationPoint po = new ProBasicPowerstationPoint();
                         po.setId(StringUtils.getUUID());
 //                        po.setNemCode(V2Config.getInitialcode());
                         po.setNemCode(String.valueOf(sbtable));
@@ -832,7 +832,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
         List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
 
 
-        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+        for (ProBasicPowerstation wp : CacheContext.wpls) {
 
             List<ProEconWindturbineStandardPoint> ls=null;
             if(wp.getId().indexOf("FDC")>=0)
@@ -844,11 +844,11 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                 ls =stpointls.stream().filter(i->i.getTypes().equals("GF")).collect(Collectors.toList());
 
             }
-            List<ProBasicWindturbine> wtls = CacheContext.wpwtmap.get(wp.getId());
+            List<ProBasicEquipment> wtls = CacheContext.wpwtmap.get(wp.getId());
 
 
             if (!stpointls.isEmpty() ) {
-                for (ProBasicWindturbine wt : wtls) {
+                for (ProBasicEquipment wt : wtls) {
 
 //                    if(wpsmap.containsKey(wt.getModelId()))
 //                    {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/ElectricityMeteringService.java

@@ -40,10 +40,10 @@ public class ElectricityMeteringService {
         List<ProBasicLine> lnls = CacheContext.lnls;
         List<ProBasicMeterPoint> meterpoints = CacheContext.meterpoints;
         List<ProBasicProject> projects = CacheContext.pjls;
-        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;
-        Map<String, Map<String, ProBasicWppoint>> linepointmap = CacheContext.linepointmap;
-        Map<String, Map<String, ProBasicWppoint>> propointmap = CacheContext.propointmap;
-        Map<String, Map<String, ProBasicWppoint>> wppointmap = CacheContext.wppointmap;
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap = CacheContext.linepointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> propointmap = CacheContext.propointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
         Map<String, List<ProBasicLine>> prolinemap = CacheContext.prolinemap;
         Map<String, List<ProBasicProject>> wppromap = CacheContext.wppromap;
         Date samedayZero = DateUtils.getSamedayZero();
@@ -54,7 +54,7 @@ public class ElectricityMeteringService {
 
         List<PointData> lineResultList = new ArrayList<>();
         lnls.stream().forEach(line->{
-            Map<String, ProBasicWppoint> proBasicWppointMap = linepointmap.get(line.getId());
+            Map<String, ProBasicPowerstationPoint> proBasicWppointMap = linepointmap.get(line.getId());
             //线路发电量
             log.info(line.getName()+"电计量电量计算开始！");
             Optional<ProBasicMeterPoint> fdlOptional = meterpoints.stream().filter(me -> me.getLineId().equals(line.getId()) &&   me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("进线") && me.getMeterSort().equals("主")).findFirst();
@@ -89,7 +89,7 @@ public class ElectricityMeteringService {
 
         List<PointData> proResultList = new ArrayList<>();
         projects.stream().forEach(pro->{
-            Map<String, ProBasicWppoint> proBasicWppointMap = propointmap.get(pro.getId());
+            Map<String, ProBasicPowerstationPoint> proBasicWppointMap = propointmap.get(pro.getId());
             List<ProBasicLine> proBasicLines = prolinemap.get(pro.getId());
             AtomicReference<Double> rfdl = new AtomicReference<>((double) 0);
             AtomicReference<Double> yfdl = new AtomicReference<>((double) 0);
@@ -142,39 +142,39 @@ public class ElectricityMeteringService {
                     e.printStackTrace();
                 }
             });
-            ProBasicWppoint rfdlpoint = proBasicWppointMap.get(ContantXk.RFDLSYZ);
+            ProBasicPowerstationPoint rfdlpoint = proBasicWppointMap.get(ContantXk.RFDLSYZ);
             proResultList.add(PointUtil.createPointData(currentDate,rfdl.get(),rfdlpoint.getNemCode(),rfdlpoint.getName()));
-            ProBasicWppoint yfdlpoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
+            ProBasicPowerstationPoint yfdlpoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
             proResultList.add(PointUtil.createPointData(currentDate,yfdl.get(),yfdlpoint.getNemCode(),yfdlpoint.getName()));
-            ProBasicWppoint nfdlpoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
+            ProBasicPowerstationPoint nfdlpoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
             proResultList.add(PointUtil.createPointData(currentDate,nfdl.get(),yfdlpoint.getNemCode(),nfdlpoint.getName()));
 
-            ProBasicWppoint rswdlpoint = proBasicWppointMap.get(ContantXk.RSWDL);
+            ProBasicPowerstationPoint rswdlpoint = proBasicWppointMap.get(ContantXk.RSWDL);
             proResultList.add(PointUtil.createPointData(currentDate,rswdl.get(),rswdlpoint.getNemCode(),rswdlpoint.getName()));
-            ProBasicWppoint yswdlpoint = proBasicWppointMap.get(ContantXk.YSWDL);
+            ProBasicPowerstationPoint yswdlpoint = proBasicWppointMap.get(ContantXk.YSWDL);
             proResultList.add(PointUtil.createPointData(currentDate,yswdl.get(),yswdlpoint.getNemCode(),yswdlpoint.getName()));
-            ProBasicWppoint nswdlpoint = proBasicWppointMap.get(ContantXk.NSWDL);
+            ProBasicPowerstationPoint nswdlpoint = proBasicWppointMap.get(ContantXk.NSWDL);
             proResultList.add(PointUtil.createPointData(currentDate,nswdl.get(),nswdlpoint.getNemCode(),nswdlpoint.getName()));
 
-            ProBasicWppoint rgwgwdlpoint = proBasicWppointMap.get(ContantXk.RGWGWDL);
+            ProBasicPowerstationPoint rgwgwdlpoint = proBasicWppointMap.get(ContantXk.RGWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,rgwgwdl.get(),rgwgwdlpoint.getNemCode(),rgwgwdlpoint.getName()));
-            ProBasicWppoint ygwgwdlpoint = proBasicWppointMap.get(ContantXk.YGWGWDL);
+            ProBasicPowerstationPoint ygwgwdlpoint = proBasicWppointMap.get(ContantXk.YGWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,ygwgwdl.get(),ygwgwdlpoint.getNemCode(),ygwgwdlpoint.getName()));
-            ProBasicWppoint ngwgwdlpoint = proBasicWppointMap.get(ContantXk.NGWGWDL);
+            ProBasicPowerstationPoint ngwgwdlpoint = proBasicWppointMap.get(ContantXk.NGWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,ngwgwdl.get(),ngwgwdlpoint.getNemCode(),ngwgwdlpoint.getName()));
 
-            ProBasicWppoint rnwgwdlpoint = proBasicWppointMap.get(ContantXk.RNWGWDL);
+            ProBasicPowerstationPoint rnwgwdlpoint = proBasicWppointMap.get(ContantXk.RNWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,rnwgwdl.get(),rnwgwdlpoint.getNemCode(),rnwgwdlpoint.getName()));
-            ProBasicWppoint ynwgwdlpoint = proBasicWppointMap.get(ContantXk.YNWGWDL);
+            ProBasicPowerstationPoint ynwgwdlpoint = proBasicWppointMap.get(ContantXk.YNWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,ynwgwdl.get(),ynwgwdlpoint.getNemCode(),ynwgwdlpoint.getName()));
-            ProBasicWppoint nnwgwdlpoint = proBasicWppointMap.get(ContantXk.NNWGWDL);
+            ProBasicPowerstationPoint nnwgwdlpoint = proBasicWppointMap.get(ContantXk.NNWGWDL);
             proResultList.add(PointUtil.createPointData(currentDate,nnwgwdl.get(),nnwgwdlpoint.getNemCode(),nnwgwdlpoint.getName()));
 
-            ProBasicWppoint rcydlpoint = proBasicWppointMap.get(ContantXk.RCYDL);
+            ProBasicPowerstationPoint rcydlpoint = proBasicWppointMap.get(ContantXk.RCYDL);
             proResultList.add(PointUtil.createPointData(currentDate,rcydl.get(),rcydlpoint.getNemCode(),rcydlpoint.getName()));
-            ProBasicWppoint ycydlpoint = proBasicWppointMap.get(ContantXk.YCYDL);
+            ProBasicPowerstationPoint ycydlpoint = proBasicWppointMap.get(ContantXk.YCYDL);
             proResultList.add(PointUtil.createPointData(currentDate,ycydl.get(),ycydlpoint.getNemCode(),ycydlpoint.getName()));
-            ProBasicWppoint ncydlpoint = proBasicWppointMap.get(ContantXk.NCYDL);
+            ProBasicPowerstationPoint ncydlpoint = proBasicWppointMap.get(ContantXk.NCYDL);
             proResultList.add(PointUtil.createPointData(currentDate,ncydl.get(),ncydlpoint.getNemCode(),ncydlpoint.getName()));
 
         });
@@ -183,7 +183,7 @@ public class ElectricityMeteringService {
 
         List<PointData> wpResultList = new ArrayList<>();
         wpls.stream().forEach(wp->{
-            Map<String, ProBasicWppoint> wpBasicWppointMap = wppointmap.get(wp.getId());
+            Map<String, ProBasicPowerstationPoint> wpBasicWppointMap = wppointmap.get(wp.getId());
             List<ProBasicProject> proBasicPros = wppromap.get(wp.getId());
             AtomicReference<Double> rfdl = new AtomicReference<>((double) 0);
             AtomicReference<Double> yfdl = new AtomicReference<>((double) 0);
@@ -236,39 +236,39 @@ public class ElectricityMeteringService {
                     e.printStackTrace();
                 }
             });
-            ProBasicWppoint rfdlpoint = wpBasicWppointMap.get(ContantXk.RFDLSYZ);
+            ProBasicPowerstationPoint rfdlpoint = wpBasicWppointMap.get(ContantXk.RFDLSYZ);
             wpResultList.add(PointUtil.createPointData(currentDate,rfdl.get(),rfdlpoint.getNemCode(),rfdlpoint.getName()));
-            ProBasicWppoint yfdlpoint = wpBasicWppointMap.get(ContantXk.YFDLSYZ);
+            ProBasicPowerstationPoint yfdlpoint = wpBasicWppointMap.get(ContantXk.YFDLSYZ);
             wpResultList.add(PointUtil.createPointData(currentDate,yfdl.get(),yfdlpoint.getNemCode(),yfdlpoint.getName()));
-            ProBasicWppoint nfdlpoint = wpBasicWppointMap.get(ContantXk.YFDLSYZ);
+            ProBasicPowerstationPoint nfdlpoint = wpBasicWppointMap.get(ContantXk.YFDLSYZ);
             wpResultList.add(PointUtil.createPointData(currentDate,nfdl.get(),yfdlpoint.getNemCode(),nfdlpoint.getName()));
 
-            ProBasicWppoint rswdlpoint = wpBasicWppointMap.get(ContantXk.RSWDL);
+            ProBasicPowerstationPoint rswdlpoint = wpBasicWppointMap.get(ContantXk.RSWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,rswdl.get(),rswdlpoint.getNemCode(),rswdlpoint.getName()));
-            ProBasicWppoint yswdlpoint = wpBasicWppointMap.get(ContantXk.YSWDL);
+            ProBasicPowerstationPoint yswdlpoint = wpBasicWppointMap.get(ContantXk.YSWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,yswdl.get(),yswdlpoint.getNemCode(),yswdlpoint.getName()));
-            ProBasicWppoint nswdlpoint = wpBasicWppointMap.get(ContantXk.NSWDL);
+            ProBasicPowerstationPoint nswdlpoint = wpBasicWppointMap.get(ContantXk.NSWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,nswdl.get(),nswdlpoint.getNemCode(),nswdlpoint.getName()));
 
-            ProBasicWppoint rgwgwdlpoint = wpBasicWppointMap.get(ContantXk.RGWGWDL);
+            ProBasicPowerstationPoint rgwgwdlpoint = wpBasicWppointMap.get(ContantXk.RGWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,rgwgwdl.get(),rgwgwdlpoint.getNemCode(),rgwgwdlpoint.getName()));
-            ProBasicWppoint ygwgwdlpoint = wpBasicWppointMap.get(ContantXk.YGWGWDL);
+            ProBasicPowerstationPoint ygwgwdlpoint = wpBasicWppointMap.get(ContantXk.YGWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,ygwgwdl.get(),ygwgwdlpoint.getNemCode(),ygwgwdlpoint.getName()));
-            ProBasicWppoint ngwgwdlpoint = wpBasicWppointMap.get(ContantXk.NGWGWDL);
+            ProBasicPowerstationPoint ngwgwdlpoint = wpBasicWppointMap.get(ContantXk.NGWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,ngwgwdl.get(),ngwgwdlpoint.getNemCode(),ngwgwdlpoint.getName()));
 
-            ProBasicWppoint rnwgwdlpoint = wpBasicWppointMap.get(ContantXk.RNWGWDL);
+            ProBasicPowerstationPoint rnwgwdlpoint = wpBasicWppointMap.get(ContantXk.RNWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,rnwgwdl.get(),rnwgwdlpoint.getNemCode(),rnwgwdlpoint.getName()));
-            ProBasicWppoint ynwgwdlpoint = wpBasicWppointMap.get(ContantXk.YNWGWDL);
+            ProBasicPowerstationPoint ynwgwdlpoint = wpBasicWppointMap.get(ContantXk.YNWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,ynwgwdl.get(),ynwgwdlpoint.getNemCode(),ynwgwdlpoint.getName()));
-            ProBasicWppoint nnwgwdlpoint = wpBasicWppointMap.get(ContantXk.NNWGWDL);
+            ProBasicPowerstationPoint nnwgwdlpoint = wpBasicWppointMap.get(ContantXk.NNWGWDL);
             wpResultList.add(PointUtil.createPointData(currentDate,nnwgwdl.get(),nnwgwdlpoint.getNemCode(),nnwgwdlpoint.getName()));
 
-            ProBasicWppoint rcydlpoint = wpBasicWppointMap.get(ContantXk.RCYDL);
+            ProBasicPowerstationPoint rcydlpoint = wpBasicWppointMap.get(ContantXk.RCYDL);
             wpResultList.add(PointUtil.createPointData(currentDate,rcydl.get(),rcydlpoint.getNemCode(),rcydlpoint.getName()));
-            ProBasicWppoint ycydlpoint = wpBasicWppointMap.get(ContantXk.YCYDL);
+            ProBasicPowerstationPoint ycydlpoint = wpBasicWppointMap.get(ContantXk.YCYDL);
             wpResultList.add(PointUtil.createPointData(currentDate,ycydl.get(),ycydlpoint.getNemCode(),ycydlpoint.getName()));
-            ProBasicWppoint ncydlpoint = wpBasicWppointMap.get(ContantXk.NCYDL);
+            ProBasicPowerstationPoint ncydlpoint = wpBasicWppointMap.get(ContantXk.NCYDL);
             wpResultList.add(PointUtil.createPointData(currentDate,ncydl.get(),ncydlpoint.getNemCode(),ncydlpoint.getName()));
 
         });
@@ -276,13 +276,13 @@ public class ElectricityMeteringService {
         edosUtil.sendMultiPoint(wpResultList);
     }
 
-    private double getLineValue(String lineid, String uniformcode, Date currentDate, Map<String, Map<String, ProBasicWppoint>> linepointmap) throws Exception {
-        ProBasicWppoint proBasicWppoint = linepointmap.get(lineid).get(uniformcode);
+    private double getLineValue(String lineid, String uniformcode, Date currentDate, Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap) throws Exception {
+        ProBasicPowerstationPoint proBasicWppoint = linepointmap.get(lineid).get(uniformcode);
         return edosUtil.getSectionData(proBasicWppoint,currentDate.getTime()).getPointValueInDouble();
     }
 
 
-    private void setZero(List<PointData> resultList,Date currentDate,Map<String, ProBasicWppoint> linemap,String rcode,String ycode,String ncode) {
+    private void setZero(List<PointData> resultList, Date currentDate, Map<String, ProBasicPowerstationPoint> linemap, String rcode, String ycode, String ncode) {
         //线路日发电量
         PointData r = new PointData();
         r.setPointTime(currentDate.getTime());
@@ -309,7 +309,7 @@ public class ElectricityMeteringService {
         resultList.add(n);
     }
 
-    private void getLineOtherFdl(Map<String, Map<String, ProBasicWppoint>> linepointmap, Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, List<PointData> lineResultList, ProBasicLine line, Map<String, ProBasicWppoint> proBasicWppointMap, Optional<ProBasicMeterPoint> fdlOptional, List<PointData> fdlList, Optional<ProBasicMeterPoint> swdlOptional) {
+    private void getLineOtherFdl(Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap, Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, List<PointData> lineResultList, ProBasicLine line, Map<String, ProBasicPowerstationPoint> proBasicWppointMap, Optional<ProBasicMeterPoint> fdlOptional, List<PointData> fdlList, Optional<ProBasicMeterPoint> swdlOptional) {
         if (swdlOptional.isPresent()){
             ProBasicMeterPoint swdlMeterpoint = swdlOptional.get();
             if (StringUtils.isEmpty(fdlList)){
@@ -338,17 +338,17 @@ public class ElectricityMeteringService {
 
                 //线路上网电量
                 double xlswdl = (real - sameday) * magnification / xs * percentageMap.get("percentage");
-                ProBasicWppoint rpoint = proBasicWppointMap.get(ContantXk.RSWDL);
+                ProBasicPowerstationPoint rpoint = proBasicWppointMap.get(ContantXk.RSWDL);
                 PointData rpointData = PointUtil.createPointData(currentDate, xlswdl, rpoint.getNemCode(), rpoint.getName());
                 lineResultList.add(rpointData);
                 //线路月上网发电量
                 double xlyswdl = (real - month) * magnification / xs * percentageMap.get("ypercentage");
-                ProBasicWppoint ypoint = proBasicWppointMap.get(ContantXk.YSWDL);
+                ProBasicPowerstationPoint ypoint = proBasicWppointMap.get(ContantXk.YSWDL);
                 PointData ypointData = PointUtil.createPointData(currentDate, xlyswdl, ypoint.getNemCode(), ypoint.getName());
                 lineResultList.add(ypointData);
                 //线路年上网发电量
                 double xlnswfdl = (real - year) * magnification / xs * percentageMap.get("npercentage");
-                ProBasicWppoint npoint = proBasicWppointMap.get(ContantXk.NSWDL);
+                ProBasicPowerstationPoint npoint = proBasicWppointMap.get(ContantXk.NSWDL);
                 PointData npointData = PointUtil.createPointData(currentDate, xlnswfdl, npoint.getNemCode(), npoint.getName());
                 lineResultList.add(npointData);
 
@@ -358,7 +358,7 @@ public class ElectricityMeteringService {
         }
     }
 
-    private void getLineFdl(Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, List<PointData> lineResultList, Map<String, ProBasicWppoint> proBasicWppointMap, Optional<ProBasicMeterPoint> fdlOptional) {
+    private void getLineFdl(Date samedayZero, Date monthFirstZero, Date yearFirstZero, Date currentDate, List<PointData> lineResultList, Map<String, ProBasicPowerstationPoint> proBasicWppointMap, Optional<ProBasicMeterPoint> fdlOptional) {
         if (fdlOptional.isPresent()){
             ProBasicMeterPoint proBasicMeterPoint = fdlOptional.get();
             String pointid = proBasicMeterPoint.getId();
@@ -376,17 +376,17 @@ public class ElectricityMeteringService {
                 Double xs = proBasicMeterPoint.getXs();
                 //线路日发电量
                 double xlrfdl = (real - sameday) * magnification / xs;
-                ProBasicWppoint rpoint = proBasicWppointMap.get(ContantXk.RFDLSYZ);
+                ProBasicPowerstationPoint rpoint = proBasicWppointMap.get(ContantXk.RFDLSYZ);
                 PointData r = PointUtil.createPointData(currentDate, xlrfdl, rpoint.getNemCode(),rpoint.getName());
                 lineResultList.add(r);
                 //线路月发电量
                 double xlyfdl = (real - month) * magnification / xs;
-                ProBasicWppoint ypoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
+                ProBasicPowerstationPoint ypoint = proBasicWppointMap.get(ContantXk.YFDLSYZ);
                 PointData y = PointUtil.createPointData(currentDate, xlyfdl,ypoint.getNemCode(),ypoint.getName());
                 lineResultList.add(y);
                 //线路年发电量
                 double xlnfdl = (real - year) * magnification / xs;
-                ProBasicWppoint npoint = proBasicWppointMap.get(ContantXk.NFDLSYZ);
+                ProBasicPowerstationPoint npoint = proBasicWppointMap.get(ContantXk.NFDLSYZ);
                 PointData n = PointUtil.createPointData(currentDate, xlnfdl,npoint.getNemCode(),npoint.getName());
                 lineResultList.add(n);
             } catch (Exception e) {
@@ -395,7 +395,7 @@ public class ElectricityMeteringService {
         }
     }
 
-    private Map<String,Double> getPercentage(List<PointData> fdlList,ProBasicMeterPoint swdlMeterpoint,Map<String, Map<String, ProBasicWppoint>> linepointmap,ProBasicLine line){
+    private Map<String,Double> getPercentage(List<PointData> fdlList, ProBasicMeterPoint swdlMeterpoint, Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap, ProBasicLine line){
 
         Map<String,Double> percentageMap = new HashMap<>();
         String[] swdlLines = swdlMeterpoint.getLineId().split("\\|");

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/RealtimeService.java

@@ -30,19 +30,19 @@ public class RealtimeService {
      */
     public void savaRealtimeTarget() throws Exception {
 
-        List<ProBasicWindturbine> wtls = CacheContext.wtls;
+        List<ProBasicEquipment> wtls = CacheContext.wtls;
         List<ProBasicLine> lnls = CacheContext.lnls;
         List<ProBasicProject> pjls = CacheContext.pjls;
-        List<ProBasicWindpowerstation> wpls = CacheContext.wpls;
-        Map<String, List<ProBasicWindturbine>> lnwtmap = CacheContext.lnwtmap;
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
+        Map<String, List<ProBasicEquipment>> lnwtmap = CacheContext.lnwtmap;
         Map<String, List<ProBasicLine>> prolinemap = CacheContext.prolinemap;
         Map<String, List<ProBasicProject>> wppromap = CacheContext.wppromap;
         Map<String, Map<Double, ProBasicModelPowerRd>> theoreticalPowerMap = CacheContext.theoreticalPowerMap; //理论保证功率
         Map<String, Map<Double, ProEconWtPowerCurveFitting>> curveFittingPowerMap = CacheContext.curveFittingPowerMap; //最优自算功率
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-        Map<String, Map<String, ProBasicWppoint>> linepointmap = CacheContext.linepointmap;
-        Map<String, Map<String, ProBasicWppoint>> propointmap = CacheContext.propointmap;
-        Map<String, Map<String, ProBasicWppoint>> wppointmap = CacheContext.wppointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap = CacheContext.linepointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> propointmap = CacheContext.propointmap;
+        Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
         Date currentDate = DateUtils.getCurrentDate();
         Date minute15begin = DateUtils.addMinutes(currentDate, -15);
         //保存风机点
@@ -125,8 +125,8 @@ public class RealtimeService {
         //保存线路点
         List<PointData> lineResultList = new ArrayList<>();
         lnls.stream().forEach(line -> {
-            List<ProBasicWindturbine> proBasicWindturbines = lnwtmap.get(line.getId());
-            Map<String, ProBasicWppoint> proBasicWppointMap = linepointmap.get(line.getId());
+            List<ProBasicEquipment> proBasicWindturbines = lnwtmap.get(line.getId());
+            Map<String, ProBasicPowerstationPoint> proBasicWppointMap = linepointmap.get(line.getId());
             AtomicReference<Double> zssbf = new AtomicReference<>((double) 0);
             AtomicReference<Double> zssgl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zllgl = new AtomicReference<>((double) 0);
@@ -135,13 +135,13 @@ public class RealtimeService {
             AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
 
-            ProBasicWppoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
-            ProBasicWppoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
-            ProBasicWppoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
-            ProBasicWppoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
-            ProBasicWppoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
-            ProBasicWppoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
-            ProBasicWppoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
+            ProBasicPowerstationPoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
+            ProBasicPowerstationPoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
+            ProBasicPowerstationPoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
+            ProBasicPowerstationPoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
+            ProBasicPowerstationPoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
+            ProBasicPowerstationPoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
+            ProBasicPowerstationPoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
 
             proBasicWindturbines.stream().forEach(wt -> {
                 Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
@@ -228,7 +228,7 @@ public class RealtimeService {
         List<PointData> projectResultList = new ArrayList<>();
         pjls.stream().forEach(project -> {
             List<ProBasicLine> proBasicLines = prolinemap.get(project.getId());
-            Map<String, ProBasicWppoint> proBasicWppointMap = propointmap.get(project.getId());
+            Map<String, ProBasicPowerstationPoint> proBasicWppointMap = propointmap.get(project.getId());
             AtomicReference<Double> zssbf = new AtomicReference<>((double) 0);
             AtomicReference<Double> zssgl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zllgl = new AtomicReference<>((double) 0);
@@ -237,28 +237,28 @@ public class RealtimeService {
             AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
 
-            ProBasicWppoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
-            ProBasicWppoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
-            ProBasicWppoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
-            ProBasicWppoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
-            ProBasicWppoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
-            ProBasicWppoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
-            ProBasicWppoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
+            ProBasicPowerstationPoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
+            ProBasicPowerstationPoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
+            ProBasicPowerstationPoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
+            ProBasicPowerstationPoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
+            ProBasicPowerstationPoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
+            ProBasicPowerstationPoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
+            ProBasicPowerstationPoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
 
             proBasicLines.stream().forEach(wp -> {
-                Map<String, ProBasicWppoint> basicWppointMap = linepointmap.get(wp.getId());
-                ProBasicWppoint ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
-                ProBasicWppoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
+                Map<String, ProBasicPowerstationPoint> basicWppointMap = linepointmap.get(wp.getId());
+                ProBasicPowerstationPoint ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
+                ProBasicPowerstationPoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
                 //理论功率测点
-                ProBasicWppoint llglPoint = basicWppointMap.get(ContantXk.SSZLLGL);
+                ProBasicPowerstationPoint llglPoint = basicWppointMap.get(ContantXk.SSZLLGL);
                 //保证功率测点
-                ProBasicWppoint bzglPoint = basicWppointMap.get(ContantXk.SSZBZGL);
+                ProBasicPowerstationPoint bzglPoint = basicWppointMap.get(ContantXk.SSZBZGL);
                 //自算功率测点
-                ProBasicWppoint zsglPoint = basicWppointMap.get(ContantXk.SSZNHGLZS);
+                ProBasicPowerstationPoint zsglPoint = basicWppointMap.get(ContantXk.SSZNHGLZS);
                 //最优功率测点
-                ProBasicWppoint zyglPoint = basicWppointMap.get(ContantXk.SSZZYGL);
+                ProBasicPowerstationPoint zyglPoint = basicWppointMap.get(ContantXk.SSZZYGL);
                 //可用功率测点
-                ProBasicWppoint kyglPoint = basicWppointMap.get(ContantXk.SSZKYGL);
+                ProBasicPowerstationPoint kyglPoint = basicWppointMap.get(ContantXk.SSZKYGL);
 
                 zssbf.updateAndGet(v -> {
                     try {
@@ -330,7 +330,7 @@ public class RealtimeService {
         List<PointData> wpResultList = new ArrayList<>();
         wpls.stream().forEach(wps -> {
             List<ProBasicProject> proBasicProjects = wppromap.get(wps.getId());
-            Map<String, ProBasicWppoint> proBasicWppointMap = wppointmap.get(wps.getId());
+            Map<String, ProBasicPowerstationPoint> proBasicWppointMap = wppointmap.get(wps.getId());
             AtomicReference<Double> zssbf = new AtomicReference<>((double) 0);
             AtomicReference<Double> zssgl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zllgl = new AtomicReference<>((double) 0);
@@ -339,28 +339,28 @@ public class RealtimeService {
             AtomicReference<Double> zzygl = new AtomicReference<>((double) 0);
             AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
 
-            ProBasicWppoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
-            ProBasicWppoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
-            ProBasicWppoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
-            ProBasicWppoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
-            ProBasicWppoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
-            ProBasicWppoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
-            ProBasicWppoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
+            ProBasicPowerstationPoint ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
+            ProBasicPowerstationPoint ssglWpPoint = proBasicWppointMap.get(ContantXk.SSZGL);
+            ProBasicPowerstationPoint llglWpPoint = proBasicWppointMap.get(ContantXk.SSZLLGL);
+            ProBasicPowerstationPoint bzglWpPoint = proBasicWppointMap.get(ContantXk.SSZBZGL);
+            ProBasicPowerstationPoint zsglWpPoint = proBasicWppointMap.get(ContantXk.SSZNHGLZS);
+            ProBasicPowerstationPoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
+            ProBasicPowerstationPoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
 
             proBasicProjects.stream().forEach(wp -> {
-                Map<String, ProBasicWppoint> basicWppointMap = propointmap.get(wp.getId());
-                ProBasicWppoint ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
-                ProBasicWppoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
+                Map<String, ProBasicPowerstationPoint> basicWppointMap = propointmap.get(wp.getId());
+                ProBasicPowerstationPoint ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
+                ProBasicPowerstationPoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);
                 //理论功率测点
-                ProBasicWppoint llglPoint = basicWppointMap.get(ContantXk.SSZLLGL);
+                ProBasicPowerstationPoint llglPoint = basicWppointMap.get(ContantXk.SSZLLGL);
                 //保证功率测点
-                ProBasicWppoint bzglPoint = basicWppointMap.get(ContantXk.SSZBZGL);
+                ProBasicPowerstationPoint bzglPoint = basicWppointMap.get(ContantXk.SSZBZGL);
                 //自算功率测点
-                ProBasicWppoint zsglPoint = basicWppointMap.get(ContantXk.SSZNHGLZS);
+                ProBasicPowerstationPoint zsglPoint = basicWppointMap.get(ContantXk.SSZNHGLZS);
                 //最优功率测点
-                ProBasicWppoint zyglPoint = basicWppointMap.get(ContantXk.SSZZYGL);
+                ProBasicPowerstationPoint zyglPoint = basicWppointMap.get(ContantXk.SSZZYGL);
                 //可用功率测点
-                ProBasicWppoint kyglPoint = basicWppointMap.get(ContantXk.SSZKYGL);
+                ProBasicPowerstationPoint kyglPoint = basicWppointMap.get(ContantXk.SSZKYGL);
 
                 zssbf.updateAndGet(v -> {
                     try {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/realtimelibrary/TheoreticalPowerService.java

@@ -3,13 +3,11 @@ package com.gyee.generation.service.realtimelibrary;/*
 @date   2022/11/6-12:07
 */
 
-import com.alibaba.fastjson.JSONObject;
 import com.gyee.common.contant.ContantXk;
 import com.gyee.common.util.DateUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicModelPowerRd;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProEconWtPowerCurveFitting;
 import com.gyee.generation.service.auto.IProBasicModelPowerRdService;
 import com.gyee.generation.service.auto.IProEconWtPowerCurveFittingService;
@@ -61,7 +59,7 @@ public class TheoreticalPowerService {
 
         Date currentDate = DateUtils.getCurrentDate();
 
-        List<ProBasicWindturbine> wtls = CacheContext.wtls;
+        List<ProBasicEquipment> wtls = CacheContext.wtls;
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
         wtls.stream().forEach(wt->{
             Map<String, ProBasicEquipmentPoint> basicEquipmentPointMap = wtpAimap.get(wt.getId());

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

@@ -8,7 +8,7 @@ import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.gyee.generation.model.vo.RealTimeParameterVo;
 import com.gyee.generation.util.realtimesource.timeseries.ErrorRequest;
 import com.gyee.generation.util.realtimesource.timeseries.JsonObjectHelper;
@@ -30,7 +30,7 @@ public class EdosUtil implements IEdosUtil {
     @Value("${db.url}")
     private String baseURL;
     @Override
-    public PointData getRealData(ProBasicWppoint point) throws Exception {
+    public PointData getRealData(ProBasicPowerstationPoint point) throws Exception {
         try {
             Optional<String> keys = Optional.ofNullable(point.getNemCode());
             Optional<String> thingType = Optional.ofNullable("station");
@@ -86,7 +86,7 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public PointData getSectionData(ProBasicWppoint point, Long date) throws Exception {
+    public PointData getSectionData(ProBasicPowerstationPoint point, Long date) throws Exception {
         String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
 
         ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
@@ -121,7 +121,7 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasSnap(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+    public List<PointData> getHistoryDatasSnap(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
@@ -281,7 +281,7 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-    public List<PointData> getHistoryDatasRaw(ProBasicWppoint point, Long beginDate, Long endDate) throws Exception {
+    public List<PointData> getHistoryDatasRaw(ProBasicPowerstationPoint point, Long beginDate, Long endDate) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
@@ -959,7 +959,7 @@ public class EdosUtil implements IEdosUtil {
     }
 
     @Override
-    public List<PointData> getHistStat(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
+    public List<PointData> getHistStat(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
         Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());

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

@@ -5,7 +5,7 @@ import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.gyee.generation.model.vo.RealTimeParameterVo;
 
 import java.util.List;
@@ -20,7 +20,7 @@ public interface IEdosUtil {
 	 * @return
 	 * @throws Exception
 	 */
-    public PointData getRealData(ProBasicWppoint point) throws Exception;
+    public PointData getRealData(ProBasicPowerstationPoint point) throws Exception;
 
 
     /**
@@ -40,7 +40,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public PointData getSectionData(ProBasicWppoint point, Long date) throws Exception;
+    public PointData getSectionData(ProBasicPowerstationPoint point, Long date) throws Exception;
 
     /**
      * 通过风机测点获得测点切面数据
@@ -61,7 +61,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistoryDatasSnap(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
+    public List<PointData> getHistoryDatasSnap(ProBasicPowerstationPoint 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(ProBasicWppoint point, Long beginDate, Long endDate) throws Exception;
+    public List<PointData> getHistoryDatasRaw(ProBasicPowerstationPoint point, Long beginDate, Long endDate) throws Exception;
 
     /**
      * 通过风机测点获得测点实时数据
@@ -181,7 +181,7 @@ public interface IEdosUtil {
      * @return
      * @throws Exception
      */
-    public List<PointData> getHistStat(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
+    public List<PointData> getHistStat(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception;
 
     /**
      * 通过全局点名获得测点指定时间周期的统计数据

realtime/generationXK-service/src/main/java/com/gyee/generation/util/statisticcs/ActivePowerStatistics.java

@@ -1,7 +1,7 @@
 package com.gyee.generation.util.statisticcs;
 
 import com.gyee.common.contant.Contant;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.vo.StatusItemVo;
 
 import java.util.Date;
@@ -9,7 +9,7 @@ import java.util.Map;
 
 public class ActivePowerStatistics extends  StatusStatistics{
 
-    public ActivePowerStatistics(Map<String, ProBasicWindturbine> windTurbines, Date date)
+    public ActivePowerStatistics(Map<String, ProBasicEquipment> windTurbines, Date date)
     {
             super(windTurbines, date);
     }
@@ -17,7 +17,7 @@ public class ActivePowerStatistics extends  StatusStatistics{
     @Override
     public  void addPointValue(String windTurbineId, double value)
     {
-        ProBasicWindturbine wt = windTurbines.get(windTurbineId);
+        ProBasicEquipment wt = windTurbines.get(windTurbineId);
         
 
         if (dic.containsKey(wt.getWindpowerstationId()) && dic.get(wt.getWindpowerstationId()).containsKey(Contant.SSZGL)) {

realtime/generationXK-service/src/main/java/com/gyee/generation/util/statisticcs/StatusStatistics.java

@@ -2,8 +2,8 @@ package com.gyee.generation.util.statisticcs;
 
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
-import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.auto.ProBasicEquipment;
+import com.gyee.generation.model.auto.ProBasicPowerstationPoint;
 import com.gyee.generation.model.vo.StatusItemVo;
 
 import java.util.*;
@@ -25,15 +25,15 @@ public abstract class StatusStatistics {
     }
 
     protected Map<String, Map<String, StatusItemVo>> dic = new HashMap<String, Map<String, StatusItemVo>>();
-    protected Map<String, ProBasicWindturbine> windTurbines;
+    protected Map<String, ProBasicEquipment> windTurbines;
     protected Date date;
 
-    public StatusStatistics(Map<String, ProBasicWindturbine> windTurbines, Date date) {
+    public StatusStatistics(Map<String, ProBasicEquipment> windTurbines, Date date) {
         this.windTurbines = windTurbines;
         this.date = date;
     }
 
-    public void addInitData(ProBasicWppoint wpstp) {
+    public void addInitData(ProBasicPowerstationPoint wpstp) {
         Map<String, StatusItemVo> items = null;
         if (dic.containsKey(wpstp.getWindpowerstationId())) {
             items = dic.get(wpstp.getWindpowerstationId());
@@ -54,7 +54,7 @@ public abstract class StatusStatistics {
     }
 
     public   void addPointValue(String windTurbineId, Double value) {
-        ProBasicWindturbine wt = windTurbines.get(windTurbineId);
+        ProBasicEquipment wt = windTurbines.get(windTurbineId);
 
         if (!statusToUniformCode.containsKey(value.intValue())){
             return;

realtime/generationXK-service/src/main/java/com/gyee/generation/util/statisticcs/TheoryPowerStatistics.java

@@ -3,14 +3,14 @@ package com.gyee.generation.util.statisticcs;
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.vo.StatusItemVo;
 
 import java.util.*;
 
 public class TheoryPowerStatistics extends  StatusStatistics{
 
-    public TheoryPowerStatistics(Map<String, ProBasicWindturbine> windTurbines, Date date)
+    public TheoryPowerStatistics(Map<String, ProBasicEquipment> windTurbines, Date date)
     {
             super(windTurbines, date);
     }
@@ -18,7 +18,7 @@ public class TheoryPowerStatistics extends  StatusStatistics{
     protected Map<String, Map<String, StatusItemVo>> dicWindturbine = new HashMap<String, Map<String, StatusItemVo>>();
     public  void addPointValue(String windTurbineId, double value, String powerKey)
     {
-        ProBasicWindturbine wt = windTurbines.get(windTurbineId);
+        ProBasicEquipment wt = windTurbines.get(windTurbineId);
         
 
         if (dic.containsKey(wt.getWindpowerstationId()) && dic.get(wt.getWindpowerstationId()).containsKey(Contant.SSZGL)) {

realtime/generationXK-service/src/main/java/com/gyee/generation/util/statisticcs/WindSpeedStatistics.java

@@ -3,7 +3,7 @@ package com.gyee.generation.util.statisticcs;
 import com.gyee.common.contant.Contant;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
-import com.gyee.generation.model.auto.ProBasicWindturbine;
+import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.vo.StatusItemVo;
 
 import java.util.ArrayList;
@@ -13,7 +13,7 @@ import java.util.List;
 
 public class WindSpeedStatistics extends  StatusStatistics{
 
-    public WindSpeedStatistics(Map<String, ProBasicWindturbine> windTurbines, Date date)
+    public WindSpeedStatistics(Map<String, ProBasicEquipment> windTurbines, Date date)
     {
             super(windTurbines, date);
     }
@@ -21,7 +21,7 @@ public class WindSpeedStatistics extends  StatusStatistics{
     @Override
     public  void addPointValue(String windTurbineId, double value)
     {
-        ProBasicWindturbine wt = windTurbines.get(windTurbineId);
+        ProBasicEquipment wt = windTurbines.get(windTurbineId);
 
 
         if (dic.containsKey(wt.getWindpowerstationId()) && dic.get(wt.getWindpowerstationId()).containsKey(Contant.SSFS)) {

realtime/generationXK-service/src/test/java/com/gyee/generation/GenerationTest.java

@@ -37,8 +37,8 @@ public class GenerationTest {
 
     @Test
     public void test1() throws Exception {
-//        cacheService.initRedisCache();
-        electricityMeteringService.saveGenerationDatas();
+        cacheService.initRedisCache();
+//        electricityMeteringService.saveGenerationDatas();
     }