修改自动生成测点功能，数据实体更新

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

@@ -1,5 +1,6 @@
 package com.gyee.generation;
 
+import com.gyee.generation.service.initialpoint.InitialPointGoldenXkByEqService;
 import com.gyee.generation.service.initialpoint.InitialPointGoldenXkService;
 import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
@@ -21,15 +22,24 @@ public class GenerationMain {
         SpringApplication.run(GenerationMain.class,args);
 
 
-        InitialPointGoldenXkService InitialPointGoldenXkService= SpringUtils.getBean("initialPointGoldenXkService");
-
-        System.out.println("开始导出风机测点。。。。。。");
-        InitialPointGoldenXkService.initalFj();
-        System.out.println("结束导出风机测点。。。。。。");
-
-        System.out.println("开始导出风场测点。。。。。。");
-        InitialPointGoldenXkService.initalFc();
-        System.out.println("结束导出风场测点。。。。。。");
+//        InitialPointGoldenXkService InitialPointGoldenXkService= SpringUtils.getBean("initialPointGoldenXkService");
+//
+//        System.out.println("开始导出风机测点。。。。。。");
+//        InitialPointGoldenXkService.initalFj();
+//        System.out.println("结束导出风机测点。。。。。。");
+//        System.out.println("开始导出风场测点。。。。。。");
+//        InitialPointGoldenXkService.initalFc();
+//        System.out.println("结束导出风场测点。。。。。。");
+
+//        InitialPointGoldenXkByEqService initialPointGoldenXkByEqService= SpringUtils.getBean("initialPointGoldenXkByEqService");
+//
+//        System.out.println("开始导出风机测点。。。。。。");
+//        initialPointGoldenXkByEqService.initalFj();
+//        System.out.println("结束导出风机测点。。。。。。");
+
+//        System.out.println("开始导出风场测点。。。。。。");
+//        initialPointGoldenXkByEqService.initalFc();
+//        System.out.println("结束导出风场测点。。。。。。");
 
     }
 }

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

@@ -134,9 +134,8 @@ public class CacheContext implements CommandLineRunner {
                 }
             }
         }
-        sqls=proBasicSquareService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
-        if
-      (!sqls.isEmpty())
+        sqls=proBasicSquareService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsAble()==1).collect(Collectors.toList());
+        if (!sqls.isEmpty())
         {
             for(ProBasicSquare sq:sqls)
             {
@@ -144,9 +143,8 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-        cpls=proBasicCompanyService.list().stream().collect(Collectors.toList());
-        if
-        (!cpls.isEmpty())
+        cpls=proBasicCompanyService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+        if (!cpls.isEmpty())
         {
             for(ProBasicCompany sq:cpls)
             {
@@ -155,9 +153,8 @@ public class CacheContext implements CommandLineRunner {
         }
 
 
-        rgls=proBasicRegionService.list().stream().collect(Collectors.toList());
-        if
-        (!rgls.isEmpty())
+        rgls=proBasicRegionService.list().stream().filter(i->i.getIsAble()==1).collect(Collectors.toList());
+        if  (!rgls.isEmpty())
         {
             for(ProBasicRegion sq:rgls)
             {
@@ -188,7 +185,7 @@ public class CacheContext implements CommandLineRunner {
             }
         }
 
-        wtls = proBasicWindturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
+        wtls = proBasicWindturbineService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsable()==1).collect(Collectors.toList());
         logger.info(wtls.size()+"");
         wtls.forEach(wt->{
             if(modelMap.containsKey(wt.getModelId()))
@@ -282,7 +279,7 @@ public class CacheContext implements CommandLineRunner {
 
 
 
-        pjls = proBasicProjectService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
+        pjls = proBasicProjectService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsAble()==1).collect(Collectors.toList());
         pjls.stream().forEach(p->{
             pjmap.put(p.getId(),p);
             if (wppromap.containsKey(p.getWindpowerstationId())){
@@ -299,7 +296,7 @@ public class CacheContext implements CommandLineRunner {
 
         });
 
-        lnls = proBasicLineService.list().stream().filter(i-> StringUtils.isNotNull(pjmap.get(i.getProjectId())) && runWpids.contains(pjmap.get(i.getProjectId()).getWindpowerstationId())).collect(Collectors.toList());
+        lnls = proBasicLineService.list().stream().filter(i-> StringUtils.isNotNull(pjmap.get(i.getProjectId())) && runWpids.contains(pjmap.get(i.getProjectId()).getWindpowerstationId()) && i.getIsAble()==1).collect(Collectors.toList());
         lnls.stream().forEach(l->{
             lnmap.put(l.getId(),l);
             if (prolinemap.containsKey(l.getProjectId())){
@@ -315,8 +312,8 @@ public class CacheContext implements CommandLineRunner {
             linepointmap.put(l.getId(),stringWindpowerstationpointnewMap);
         });
 
-        wpls = proBasicWindpowerstationService.list().stream().filter(i->runWpids.contains(i.getId())).collect(Collectors.toList());;
-        meterpoints = proBasicMeterPointService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId())).collect(Collectors.toList());
+        wpls = proBasicWindpowerstationService.list().stream().filter(i->runWpids.contains(i.getId()) && i.getIsAble()==1).collect(Collectors.toList());;
+        meterpoints = proBasicMeterPointService.list().stream().filter(i->runWpids.contains(i.getWindpowerstationId()) && i.getIsAble()==1).collect(Collectors.toList());
         meterpoints.stream().forEach(meterpoint -> {
             meterpointMap.put(meterpoint.getId(),meterpoint);
         });

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

@@ -27,7 +27,7 @@ public class ProBasicCompany extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -27,7 +27,7 @@ public class ProBasicEnergyGroup extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 父编号

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

@@ -27,7 +27,7 @@ public class ProBasicEquipmentPoint extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -27,7 +27,7 @@ public class ProBasicLine extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -27,7 +27,7 @@ public class ProBasicMeterPoint extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 使用/排序

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

@@ -30,7 +30,7 @@ public class ProBasicProject extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -27,7 +27,7 @@ public class ProBasicRegion extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -26,7 +26,7 @@ public class ProBasicSquare extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 风场编号(冗余)

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

@@ -27,7 +27,7 @@ public class ProBasicWindpowerstation extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -26,7 +26,7 @@ public class ProBasicWindsubStation extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -30,7 +30,7 @@ public class ProBasicWindturbine extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 场站编号(冗余)

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

@@ -31,7 +31,7 @@ public class ProBasicWppoint extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -27,7 +27,7 @@ public class ProEconElectricaltestPoint extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -183,7 +183,7 @@ public class ProEconEquipmentInfoDay1 extends Model {
     /**
      * 月最小风速
      */
-    private Double yrzxfs;
+    private Double yzxfs;
 
     /**
      * 月最大功率

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

@@ -27,7 +27,7 @@ public class ProEconEquipmentmodel extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -26,7 +26,7 @@ public class ProEconLogicalUnit extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -26,7 +26,7 @@ public class ProEconManufacturer extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -78,7 +78,7 @@ public class ProEconPowerstationInfoDay6 extends Model {
     /**
      * 日最小风速（测风塔）
      */
-    private Double rzxfdcft;
+    private Double rzxfscft;
 
     /**
      * 日最大功率（出线）
@@ -108,7 +108,7 @@ public class ProEconPowerstationInfoDay6 extends Model {
     /**
      * 月最小风速（测风塔）
      */
-    private Double yzxfdcft;
+    private Double yzxfscft;
 
     /**
      * 月最大功率（出线）
@@ -138,7 +138,7 @@ public class ProEconPowerstationInfoDay6 extends Model {
     /**
      * 年最小风速（测风塔）
      */
-    private Double nzxfdcft;
+    private Double nzxfscft;
 
     /**
      * 年最大功率（出线）

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

@@ -27,7 +27,7 @@ public class ProEconTestingPoint extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 名称

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

@@ -26,7 +26,7 @@ public class ProEconUniformCode extends Model {
     /**
      * 编码
      */
-    private String code;
+    private String nemCode;
 
     /**
      * 说明

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

@@ -20,7 +20,7 @@ public class ProEconWindpowerStandardPoint extends Model {
 
     private String id;
 
-    private String code;
+    private String nemCode;
 
     private String name;
 

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

@@ -20,7 +20,7 @@ public class ProEconWindturbineStandardPoint extends Model {
 
     private String id;
 
-    private String code;
+    private String nemCode;
 
     private String name;
 

realtime/generationXK-service/src/main/java/com/gyee/generation/model/vo/EquipmentInfo15Vo.java

@@ -0,0 +1,134 @@
+package com.gyee.generation.model.vo;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class EquipmentInfo15Vo {
+
+
+    /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
+     * 日期
+     */
+    private Date recordDate;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 项目编号
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    /**
+     * 公司编号
+     */
+    private String companyId;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 日故障小时（明细）
+     */
+    private Double rgzxsmx;
+
+    /**
+     * 日场内受累故障小时（明细）
+     */
+    private Double rcnslgzxsmx;
+
+    /**
+     * 日检修小时（明细）
+     */
+    private Double rjxxsmx;
+
+    /**
+     * 日场内受累检修小时（明细）
+     */
+    private Double rcnsljxxsmx;
+
+    /**
+     * 日待机小时（明细）
+     */
+    private Double rdjxsmx;
+
+    /**
+     * 日缺陷降出力小时（明细）
+     */
+    private Double rqxjclxsmx;
+
+    /**
+     * 日手动停机小时（明细）
+     */
+    private Double rsdtjxsmx;
+
+    /**
+     * 日并网小时（明细）
+     */
+    private Double rbwxsmx;
+
+    /**
+     * 日限电停机小时（明细）
+     */
+    private Double rxdtjxsmx;
+
+    /**
+     * 日限电降出力小时（明细）
+     */
+    private Double rxdjclxsmx;
+
+    /**
+     * 日场外受累电网小时（明细）
+     */
+    private Double rcwsldwxsmx;
+
+    /**
+     * 日场外受累天气小时（明细）
+     */
+    private Double rcwsltqxsmx;
+
+    /**
+     * 日离线小时（明细）
+     */
+    private Double rlxxsmx;
+
+    /**
+     * 日通讯中断小时（明细）
+     */
+    private Double rtxzdxsmx;
+    /**
+     * 日平均功率
+     */
+    private Double rpjgl;
+
+    /**
+     * 日平均风速
+     */
+    private Double rpjfs;
+    /**
+     * 装机容量
+     */
+    private Double powerProduction;
+
+}

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

@@ -0,0 +1,435 @@
+//package com.gyee.generation.service;
+//
+//import com.gyee.generation.init.CacheContext;
+//import com.gyee.generation.model.auto.ProBasicWindpowerstation;
+//import com.gyee.generation.model.auto.ProBasicWindturbine;
+//import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
+//import com.gyee.generation.model.auto.ProEconEquipmentInfoDay2;
+//import com.gyee.generation.model.vo.EquipmentInfo15Vo;
+//import com.gyee.generation.service.auto.IProEconEquipmentInfoDay1Service;
+//import com.gyee.generation.service.auto.IProEconEquipmentInfoDay2Service;
+//import com.gyee.generation.service.auto.IProEconEquipmentInfoDay3Service;
+//import com.gyee.generation.util.DateUtils;
+//import com.gyee.generation.util.StringUtils;
+//import com.gyee.generation.util.realtimesource.IEdosUtil;
+//import org.slf4j.Logger;
+//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;
+//
+//@Service
+//public class ActivePowerService {
+//
+//
+//        private static final Logger logger = LoggerFactory.getLogger(ActivePowerService.class);
+//        @Resource
+//        private IEdosUtil edosUtil;
+//
+//        @Resource
+//        private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
+//        private IProEconEquipmentInfoDay2Service proEconEquipmentInfoDay2Service;
+//        private IProEconEquipmentInfoDay3Service proEconEquipmentInfoDay3Service;
+//
+//
+//
+//        public List<EquipmentInfo15Vo> initailEi1515(List<ProBasicWindturbine> wtls,Date currentDate,ProBasicWindpowerstation station)
+//        {
+//
+//            List<EquipmentInfo15Vo> ei15ls=new ArrayList<>();
+//            if(!wtls.isEmpty())
+//            {
+//                Map<String,ProEconEquipmentInfoDay1> peeidmap1=new HashMap<>();
+//                Map<String,ProEconEquipmentInfoDay2> peeidmap2=new HashMap<>();
+//                List<ProEconEquipmentInfoDay1> peeidls1 = proEconEquipmentInfoDay1Service.list().stream()
+//                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(currentDate)) == 0
+//                                && i.getWindpowerstationId().equals(station.getId())
+//                        ).collect(Collectors.toList());
+//
+//                if(!peeidls1.isEmpty())
+//                {
+//                    for(ProEconEquipmentInfoDay1 peeid:peeidls1)
+//                    {
+//                        peeidmap1.put(peeid.getWindturbineId(),peeid);
+//                    }
+//                }
+//                List<ProEconEquipmentInfoDay2> peeidls2 = proEconEquipmentInfoDay2Service.list().stream()
+//                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(currentDate)) == 0
+//                                && i.getWindpowerstationId().equals(station.getId())
+//                        ).collect(Collectors.toList());
+//
+//                if(!peeidls2.isEmpty())
+//                {
+//                    for(ProEconEquipmentInfoDay2 peeid:peeidls2)
+//                    {
+//                        peeidmap2.put(peeid.getWindturbineId(),peeid);
+//                    }
+//                }
+//
+//                for(ProBasicWindturbine wt:wtls)
+//                {
+//                    EquipmentInfo15Vo vo=new EquipmentInfo15Vo();
+//                    vo.setWindpowerstationId(wt.getWindpowerstationId());
+//                    vo.setWindturbineId(wt.getId());
+//                    vo.setProjectId(wt.getProjectId());
+//                    vo.setLineId(wt.getLineId());
+//                    vo.setCompanyId(wt.getCompanyId());
+//                    vo.setRegionId(wt.getRegionId());
+//
+//                    if(peeidmap1.containsKey(wt.getId()))
+//                    {
+//                        ProEconEquipmentInfoDay1  peeid1= peeidmap1.get(wt.getId());
+//                        vo.setRecordDate(peeid1.getRecordDate());
+//                        vo.setRpjfs(peeid1.getRpjfs());
+//                        vo.setRpjgl(peeid1.getRpjgl());
+//                    }
+//
+//                    if(peeidmap2.containsKey(wt.getId()))
+//                    {
+//                        ProEconEquipmentInfoDay2  peeid1= peeidmap2.get(wt.getId());
+//                        vo.setRecordDate(peeid1.getRecordDate());
+//
+//                        //日合计故障小时（明细）
+//                        vo.setRgzxsmx(vo.getRgzxsmx());
+//                        //日合计场内受累故障小时（明细）
+//                        vo.setRcnslgzxsmx(vo.getRcnslgzxsmx());
+//                        //日合计检修小时（明细）
+//                        vo.setRjxxsmx(vo.getRjxxsmx());
+//                        //日合计场内受累检修小时（明细）
+//                        vo.setRcnsljxxsmx(vo.getRcnsljxxsmx());
+//                        //日合计待机小时（明细）
+//                        vo.setRdjxsmx(vo.getRdjxsmx());
+//                        //日合计缺陷降出力小时（明细）
+//                        vo.setRqxjclxsmx(vo.getRqxjclxsmx());
+//                        //日合计手动停机小时（明细）
+//                        vo.setRsdtjxsmx(vo.getRsdtjxsmx());
+//                        //日合计性能小时（明细）
+//                        vo.setRbwxsmx(vo.getRbwxsmx());
+//                        //日合计限电停机小时（明细）
+//                        vo.setRxdtjxsmx(vo.getRxdtjxsmx());
+//                        //日合计限电降出力小时（明细）
+//                        vo.setRxdjclxsmx( vo.getRxdjclxsmx());
+//                        //日合计场外受累电网小时（明细）
+//                        vo.setRcwsldwxsmx(vo.getRcwsldwxsmx());
+//                        //日合计场外受累电网小时（明细）
+//                        vo.setRcwsltqxsmx(vo.getRcwsltqxsmx());
+//                        //日合计通讯中断小时（明细）
+//                        vo.setRtxzdxsmx(vo.getRtxzdxsmx());
+//                        //日合计离线小时（明细）
+//                        vo.setRlxxsmx(vo.getRlxxsmx());
+//
+//                    }
+//                    ei15ls.add(vo);
+//                }
+//            }
+//
+//            return ei15ls;
+//        }
+//
+//    public void calcActivePowerData(Date currentDate)
+//    {
+//        Calendar c=Calendar.getInstance();
+//        c.setTime(currentDate);
+//        Date beginDate = DateUtils.truncate(currentDate);
+//
+//        c.set(Calendar.HOUR_OF_DAY, 23);
+//        c.set(Calendar.MINUTE, 59);
+//        c.set(Calendar.SECOND, 59);
+//        Date endDate = c.getTime();
+//
+//
+//
+//
+//            Map<String, Double> windInfo = new HashMap<String, Double>();
+//            for (ProBasicWindpowerstation station : CacheContext.wpls)
+//            {
+//                List<ProBasicWindturbine> wtls= CacheContext.wpwtmap.get(station.getId());
+//                List<EquipmentInfo15Vo> ei15ls= initailEi1515(wtls,currentDate,station);
+//
+//
+//
+//                Map<String/*风机编号*/, Map<Double/*风速*/, List<Double>>> map =
+//                        new HashMap<String, Map<Double, List<Double>>>();
+//
+//
+//
+//                Map<Double/*风速*/, List<Double>> speedMap;
+//                for (EquipmentInfo15Vo item : ei15ls)
+//                {
+//
+//                    if (map.containsKey(item.getWindturbineId()))
+//                    {
+//                        speedMap = map.get(item.getWindturbineId());
+//                    }
+//                    else
+//                    {
+//                        speedMap = new HashMap<Double, List<Double>>();
+//                        map.put(item.getWindturbineId(), speedMap);
+//                    }
+//                    Double speed = StringUtils.round(item.getRpjfs(),2);
+//                    if (speed > item.getRpjfs())
+//                    {
+//
+//                        if (speed - item.getRpjfs() > 0.25)
+//                        {
+//                            speed -= 0.5;
+//                        }
+//                            else if (speed - item.getRpjfs() > 0.175)
+//                        {
+//                            speed -= 0.25;
+//                        }
+//                    }
+//                    else if (speed < item.getRpjfs())
+//                    {
+//                        if (item.getRpjfs() - speed > 0.25)
+//                        {
+//                            speed += 0.5;
+//                        }
+//                            else if (item.getRpjfs() - speed > 0.175)
+//                        {
+//                            speed += 0.25;
+//                        }
+//                    }
+//                    if ((item.getRpjgl() > 0 && item.getRpjfs() >= 3) || (item.getRpjfs() <= 3))
+//                    {
+//                        List<Double> powers;
+//                        if (speedMap.containsKey(speed))
+//                        {
+//                            powers = speedMap.get(speed);
+//                        }
+//                        else
+//                        {
+//                            powers = new ArrayList<Double>();
+//                            speedMap.put(speed, powers);
+//                        }
+//                        powers.add(item.getRpjgl());
+//                    }
+//
+//                }
+//                for (String windturbineId : map.keySet())
+//                {
+//                    List<ACTIVEPOWERDATA> dataList = new ArrayList<ACTIVEPOWERDATA>();
+//                    int frequency = 0;
+//                    Map<Double/*风速*/, List<Double>> intnalMap = map[windturbineId];
+//                    for (Double speed : intnalMap.keySet())
+//                    {
+//                        List<Double> powers = intnalMap[speed];
+//
+//                        var data = (from c : entities.ACTIVEPOWERDATA
+//                        where (c.WINDTURBINEID == windturbineId && c.RECORDDATE.Value.CompareTo(beginDate) == 0 && c.SPEED == speed)
+//                        select c).FirstOrDefault();
+//
+//                        if (data == null)
+//                        {
+//                            data = new Entities.ACTIVEPOWERDATA();
+//                            BuildActivePowerData(beginDate, entities, station, windturbineId, speed, powers, data);
+//                            entities.AddToACTIVEPOWERDATA(data);
+//                        }
+//                        else
+//                        {
+//                            BuildActivePowerData(beginDate, entities, station, windturbineId, speed, powers, data);
+//                        }
+//                        frequency += powers.Count;
+//                        dataList.Add(data);
+//                    }
+//
+//
+//                    //if (dataList.Count > 0)
+//                    //{
+//
+//                    //    Date recordDate = dataList[0].RECORDDATE.Value;
+//                    //    var dayInfo = (from c : entities.WINDTURBINEINFODAY
+//                    //                   where (c.WINDTURBINEID == windturbineId && c.RECORDDATE.Value.CompareTo(recordDate) == 0)
+//                    //                   select c).FirstOrDefault();
+//                    //    if (dayInfo != null)
+//                    //    {
+//                    //        Double result = UpdateTheoryGeneration(dataList, frequency, beginDate,windturbineId);
+//                    //        dayInfo.THEORYGENERATION = result;
+//
+//
+//                    //        #region 新添风场日信息表代码
+//                    //        if (windInfo.containsKey(dayInfo.LINEID))
+//                    //        {
+//                    //            windInfo[dayInfo.LINEID] += result;
+//                    //        }
+//                    //        else
+//                    //        {
+//                    //            windInfo.Add(dayInfo.LINEID, result);
+//                    //        }
+//
+//                    //        if (windInfo.containsKey(dayInfo.PROJECTID))
+//                    //        {
+//                    //            windInfo[dayInfo.PROJECTID] += result;
+//                    //        }
+//                    //        else
+//                    //        {
+//                    //            windInfo.Add(dayInfo.PROJECTID, result);
+//                    //        }
+//
+//                    //        if (windInfo.containsKey(dayInfo.WINDPOWERSTATIONID))
+//                    //        {
+//                    //            windInfo[dayInfo.WINDPOWERSTATIONID] += result;
+//                    //        }
+//                    //        else
+//                    //        {
+//                    //            windInfo.Add(dayInfo.WINDPOWERSTATIONID, result);
+//                    //        }
+//                    //        #endregion
+//                    //    }
+//                    //}
+//                }
+//
+//            //for (var key : windInfo.keySet())
+//            //{
+//            //    var dayInfo = (from c : entities.WINDPOWERINFODAY
+//            //                   where (c.FOREIGNKEYID == key && c.RECORDDATE.Value.CompareTo(beginDate) == 0)
+//            //                   select c).FirstOrDefault();
+//
+//            //    if (dayInfo != null)
+//            //    {
+//            //        dayInfo.THEORYGENERATION = windInfo[key]/10000;
+//            //    }
+//            //}
+//                #endregion
+//
+//            int z = entities.SaveChanges(false);
+//            logger.Info(String.Format("{1}:更新sqlserver数据库记录数：{0}", z, Date.Now));
+//        }
+//    }
+//
+//    private void BuildActivePowerData(Date beginDate, GdsjEntities entities, String station, String windturbineId, Double speed, List<Double> powers, Entities.ACTIVEPOWERDATA data)
+//    {
+//        data.WINDPOWERSTATIONID = station;
+//        data.WINDTURBINEID = windturbineId;
+//        data.POWER = powers.Average();
+//        data.SPEED = speed;
+//        data.FREQUENCY = powers.Count;
+//        data.RECORDDATE = beginDate;
+//        data.WINDTURBINECODE = this.windTurbineDictionary[windturbineId].CODE;
+//        data.MODELID = windTurbineDictionary[windturbineId].MODELID;
+//        data.MODELNAME = this.windTurbineModelDictionary[data.MODELID].CODE;
+//
+//    }
+//
+//    private Double UpdateTheoryGeneration(List<Entities.ACTIVEPOWERDATA> dataList, int frequency, Date currentDate, String windturbineId)
+//    {
+//        //电量分析主要针对省公司和各风场的每月实际发电量与计划的对比分析，可以查看省公司及各风场每月计划的完成情况和总体的计划完成情况，可以同比和环比进行比较；
+//        //对省公司和各风场的实际发电量与理论发电量的对比分析，利用标准功率曲线中的风速，理论功率，和固定时间段的风频进行统计，设计统计分析公式为：
+//        //理论发电量=（T*f1/f）*P1+（T*f2/f）*P2+…………（T*fn/f）*Pn
+//        //T是选取的时间段；
+//        //f是所有风频的和；
+//        //f1、f2、fn是某风速对应的风频；
+//        //P1、Pn是某风速对应理论曲线上的功率。
+//        //必要性：如果理论电量能够实现计算的准确，调峰电量就可以用理论电量来减去实际电量得出。
+//        //b、可选一段时间内的实际功率和理论功率能够形成曲线形式展示对比,理论功率根据实际风速利用理论功率曲线得出。
+//        //c、风频数据取值时间段需要统一。
+//
+//
+//            #region WINDTURBINECURVEFITTINGMONTH 替换成WINDTURBINEPOWERCURVEFITTING
+//        //List<WINDTURBINECURVEFITTINGMONTH> powerList = null;
+//        List<WINDTURBINEPOWERCURVEFITTING> powerList = null;
+//            #endregion
+//        using (GdsjEntities entity = new GdsjEntities())
+//        {
+//            //powerList = entity.WINDTURBINECURVEFITTING.Where(it => it.WINDTURBINEID == windturbineId && it.RECORDDATE.Value.CompareTo(currentDate) == 0).ToList();
+//
+//            String year=currentDate.Year.ToString();
+//            String month=currentDate.Month.ToString();
+//
+//
+//                #region WINDTURBINECURVEFITTINGMONTH 替换成WINDTURBINEPOWERCURVEFITTING
+//                //powerList = entity.WINDTURBINECURVEFITTINGMONTH.Where(it => it.WINDTURBINEID == windturbineId && it.YEAR == year && it.MONTH == month).ToList();
+//                powerList = entity.WINDTURBINEPOWERCURVEFITTING.Where(it => it.WINDTURBINEID == windturbineId).ToList();
+//                #endregion
+//
+//        }
+//
+//        Double t = 24;
+//
+//        Double result = 0;
+//
+//
+//        for (var data : dataList)
+//        {
+//            Double speed = data.SPEED.Value;
+//                #region WINDTURBINECURVEFITTINGMONTH 替换成 WINDTURBINEPOWERCURVEFITTING
+//            //if (type == "GDC")
+//            //{
+//            //    speed /= 100;
+//            //    speed = Math.Round(speed, 1);
+//            //    speed *= 100;
+//
+//            //    speed = Double.Truncate(speed);
+//            //}
+//            //else
+//            //{
+//            //    speed = Math.Round(speed, 1);
+//            //}
+//            if (type == "GDC")
+//            {
+//                speed /= 100;
+//                speed = Math.Round(speed, 2);
+//                speed *= 100;
+//
+//                speed = Double.Truncate(speed);
+//            }
+//            else
+//            {
+//                speed = Math.Round(speed, 2);
+//            }
+//                #endregion
+//
+//            if (modelPowerDictionary.containsKey(data.MODELID))
+//            {
+//                if (modelPowerDictionary[data.MODELID].Count > 0)
+//                {
+//                    if (modelPowerDictionary[data.MODELID].containsKey(speed))
+//                    {
+//                        Double p = modelPowerDictionary[data.MODELID][speed].ENSUREPOWER.Value;
+//
+//                        result += (t * data.FREQUENCY.Value / frequency) * p;
+//                    }
+//                }
+//                else
+//                {
+//                    if (powerList != null && powerList.Count>0)
+//                    {
+//                        Double? p = powerList.Where(it => it.SPEED == speed).Select(it => it.OPTIMALPOWER).FirstOrDefault();
+//
+//                        if (p != null)
+//                        {
+//                            result += (t * data.FREQUENCY.Value / frequency) * p.Value;
+//                        }
+//                        else
+//                        {
+//                            Double max = powerList.Max(it => it.SPEED).Value;
+//                            if (speed > max)
+//                            {
+//                                p = powerList.Max(it => it.ACTUALPOWER).Value;
+//                                if (p != null)
+//                                {
+//
+//                                    result += (t * data.FREQUENCY.Value / frequency) * p.Value;
+//                                }
+//                            }
+//
+//                        }
+//
+//                    }
+//                }
+//
+//
+//
+//            }
+//
+//        }
+//        return result;
+//
+//    }
+//}
+//
+//    }

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

@@ -0,0 +1,940 @@
+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;
+import com.gyee.generation.service.auto.IProEconEquipmentInfoDay1Service;
+
+import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.statisticcs.Initial;
+import org.slf4j.Logger;
+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;
+
+@Service
+public class EquipmentInfo1Service {
+
+    private static final Logger logger = LoggerFactory.getLogger(EquipmentInfo1Service.class);
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
+
+
+
+
+
+    /**
+     * 计算设备日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calEquipmentInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconEquipmentInfoDay1Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.wtmap.containsKey(i.getWindturbineId())).map(ProEconEquipmentInfoDay1::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconEquipmentInfoDay1Service.removeByIds(idls);
+
+        }
+        for(ProBasicWindturbine wt:CacheContext.wtls)
+        {
+            if(CacheContext.wppointmap.containsKey(wt.getId()))
+            {
+                Map<String, ProBasicEquipmentPoint> pointmap=CacheContext.wtpAimap.get(wt.getId());
+
+                ProEconEquipmentInfoDay1 pewp=new ProEconEquipmentInfoDay1();
+                Initial.initial(pewp);
+                pewp.setCompanyId(wt.getCompanyId());
+                pewp.setWindpowerstationId(wt.getWindpowerstationId());
+                pewp.setLineId(wt.getLineId());
+                pewp.setProjectId(wt.getProjectId());
+                pewp.setRegionId(wt.getRegionId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconEquipmentInfoDay1> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+                {
+                    pepid1ls = proEconEquipmentInfoDay1Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && CacheContext.wtmap.containsKey(i.getWindturbineId())
+                            ).collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+
+                proEconEquipmentInfoDay1Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp,List<ProEconEquipmentInfoDay1> pepid1ls) throws Exception {
+        /*******************************************日信息统计*********************************************************/
+        if(pointmap.containsKey(ContantXk.SSPJFS))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.SSPJFS);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+            if(!pointls.isEmpty())
+            {
+                DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
+                //日最大风速
+                pewp.setRzdfs(summaryStatistics.getMax());
+                //日最小风速
+                pewp.setRzxfs(summaryStatistics.getMin());
+                //日平均风速
+                pewp.setRpjfs(summaryStatistics.getAverage());
+            }
+
+        }
+
+        if(pointmap.containsKey(ContantXk.SSZGL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.SSZGL);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+            if(!pointls.isEmpty())
+            {
+                DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
+                //日最大功率
+                pewp.setRzdgl(summaryStatistics.getMax());
+                //日最小功率
+                pewp.setRzxgl(summaryStatistics.getMin());
+                //日平均功率
+                pewp.setRpjgl(summaryStatistics.getAverage());
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.RFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RFDL);
+
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日发电量
+                pewp.setRfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RKYDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RKYDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日可用电量
+                pewp.setRkydl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.RLLFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RLLFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日理论发电量
+                pewp.setRllfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.RGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日故障损失电量
+                pewp.setRgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RCNSLGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCNSLGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日场内受累故障损失电量
+                pewp.setRcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日检修损失电量
+                pewp.setRjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RCNSLJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCNSLJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日场内受累检修损失电量
+                pewp.setRcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RDJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RDJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日待机损失电量
+                pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RQXJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日缺陷降出力损失电量
+                pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RSDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RSDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日手动停机损失电量
+                pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RXNSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXNSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日性能损失电量
+                pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RXDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日限电停机损失电量
+                pewp.setRxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.RXDJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RXDJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日限电降出力损失电量
+                pewp.setRxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RCWSLDWSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCWSLDWSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日场外受累电网损失电量
+                pewp.setRcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RCWSLTQSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RCWSLTQSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日场外受累天气损失电量
+                pewp.setRcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RZFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RZFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日增发电量
+                pewp.setRzfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.RQFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RQFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日欠发电量
+                pewp.setRqfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.RZHD))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.RZHD);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //日自耗电
+                pewp.setRzhd(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+/*******************************************日信息统计*********************************************************/
+
+/*******************************************月信息统计*********************************************************/
+
+        if(pepid1ls.isEmpty())
+        {
+            setPowerandSpeedMonth(end, begin, pointmap, pewp);
+        }else
+        {
+
+
+            if(!pepid1ls.isEmpty())
+            {
+               ProEconEquipmentInfoDay1 pepid=pepid1ls.get(0);
+
+               //如果昨日大于今日最大功率
+                if(pepid.getYzdgl()> pewp.getRzdgl())
+                {
+                    pewp.setYzdgl(pepid.getRzdgl());
+                }else {
+                    pewp.setYzdgl(pewp.getRzdgl());
+                }
+                //如果昨日大于今日最大风速
+                if(pepid.getYzdfs()> pewp.getRzdfs())
+                {
+                    pewp.setYzdfs(pepid.getRzdfs());
+                }else
+                {
+                    pewp.setYzdfs(pewp.getRzdfs());
+                }
+
+                //如果昨日小于今日最小功率
+                if(pepid.getYzxgl()< pewp.getRzxgl())
+                {
+                    pewp.setYzxgl(pepid.getRzxgl());
+                }else
+                {
+                    pewp.setYzxgl(pewp.getRzxgl());
+                }
+                //如果昨日小于今日最小风速
+                if(pepid.getYzxfs()< pewp.getRzxfs())
+                {
+                    pewp.setYzxfs(pepid.getRzxfs());
+                }else
+                {
+                    pewp.setYzxfs(pewp.getRzxfs());
+                }
+                double   pjfs = new BigDecimal(pewp.getYpjfs()+pepid.getRpjfs()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+
+                pewp.setYzxfs(pjfs);
+
+                double   pjgl = new BigDecimal(pewp.getYpjgl()+pepid.getRpjgl()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+                pewp.setYzxgl(pjgl);
+
+            }else
+            {
+                setPowerandSpeedMonth(end, begin, pointmap, pewp);
+            }
+
+        }
+
+
+
+        if(pointmap.containsKey(ContantXk.YFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YFDL);
+
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月发电量
+                pewp.setYfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YKYDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YKYDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月可用电量
+                pewp.setYkydl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.YLLFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YLLFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月理论发电量
+                pewp.setYllfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.YGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月故障损失电量
+                pewp.setYgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YCNSLGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCNSLGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月场内受累故障损失电量
+                pewp.setYcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月检修损失电量
+                pewp.setYjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YCNSLJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCNSLJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月场内受累检修损失电量
+                pewp.setYcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YDJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YDJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月待机损失电量
+                pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YQXJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YQXJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月缺陷降出力损失电量
+                pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YSDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YSDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月手动停机损失电量
+                pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YXNSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXNSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月性能损失电量
+                pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YXDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月限电停机损失电量
+                pewp.setYxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.YXDJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YXDJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月限电降出力损失电量
+                pewp.setYxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YCWSLDWSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCWSLDWSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月场外受累电网损失电量
+                pewp.setYcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YCWSLTQSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YCWSLTQSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月场外受累天气损失电量
+                pewp.setYcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YZFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YZFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月增发电量
+                pewp.setYzfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YQFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YQFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月欠发电量
+                pewp.setYqfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.YZHD))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.YZHD);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月自耗电
+                pewp.setYzhd(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+/*******************************************月信息统计*********************************************************/
+
+/*******************************************年信息统计*********************************************************/
+        if(pepid1ls.isEmpty())
+        {
+            setPowerandSpeedYear(end, begin, pointmap, pewp);
+        }else
+        {
+
+            if(!pepid1ls.isEmpty())
+            {
+                ProEconEquipmentInfoDay1 pepid=pepid1ls.get(0);
+
+                //如果昨日大于今日最大功率
+                if(pepid.getNzdgl()> pewp.getRzdgl())
+                {
+                    pewp.setNzdgl(pepid.getRzdgl());
+                }else {
+                    pewp.setNzdgl(pewp.getRzdgl());
+                }
+                //如果昨日大于今日最大风速
+                if(pepid.getNzdfs()> pewp.getRzdfs())
+                {
+                    pewp.setNzdfs(pepid.getRzdfs());
+                }else
+                {
+                    pewp.setNzdfs(pewp.getRzdfs());
+                }
+
+                //如果昨日小于今日最小功率
+                if(pepid.getNzxgl()< pewp.getRzxgl())
+                {
+                    pewp.setNzxgl(pepid.getRzxgl());
+                }else
+                {
+                    pewp.setNzxgl(pewp.getRzxgl());
+                }
+                //如果昨日小于今日最小风速
+                if(pepid.getNzxfs()< pewp.getRzxfs())
+                {
+                    pewp.setNzxfs(pepid.getRzxfs());
+                }else
+                {
+                    pewp.setNzxfs(pewp.getRzxfs());
+                }
+                double   pjfs = new BigDecimal(pewp.getNpjfs()+pepid.getRpjfs()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+
+                pewp.setNzxfs(pjfs);
+
+                double   pjgl = new BigDecimal(pewp.getNpjgl()+pepid.getRpjgl()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+                pewp.setNzxgl(pjgl);
+
+            }else
+            {
+                setPowerandSpeedYear(end, begin, pointmap, pewp);
+            }
+
+        }
+
+        if(pointmap.containsKey(ContantXk.NFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NFDL);
+
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年发电量
+                pewp.setNfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NKYDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NKYDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年可用电量
+                pewp.setNkydl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.NLLFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NLLFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年理论发电量
+                pewp.setNllfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.NGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年故障损失电量
+                pewp.setNgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NCNSLGZSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCNSLGZSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年场内受累故障损失电量
+                pewp.setNcnslgzssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年检修损失电量
+                pewp.setNjxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NCNSLJXSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCNSLJXSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年场内受累检修损失电量
+                pewp.setNcnsljxssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NDJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NDJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年待机损失电量
+                pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NQXJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NQXJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年缺陷降出力损失电量
+                pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NSDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NSDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年手动停机损失电量
+                pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NXNSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXNSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年性能损失电量
+                pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NXDTJSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXDTJSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年限电停机损失电量
+                pewp.setNxdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+        if(pointmap.containsKey(ContantXk.NXDJCLSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NXDJCLSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年限电降出力损失电量
+                pewp.setNxdjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NCWSLDWSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCWSLDWSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年场外受累电网损失电量
+                pewp.setNcwsldwssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NCWSLTQSSDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NCWSLTQSSDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年场外受累天气损失电量
+                pewp.setNcwsltqssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NZFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NZFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年增发电量
+                pewp.setNzfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NQFDL))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NQFDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年欠发电量
+                pewp.setNqfdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+        if(pointmap.containsKey(ContantXk.NZHD))
+        {
+            ProBasicEquipmentPoint point= pointmap.get(ContantXk.NZHD);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年自耗电
+                pewp.setNzhd(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+    }
+
+    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp) throws Exception {
+        //年最大风速
+        pewp.setNzdfs(pewp.getRzdfs());
+        //年最小风速
+        pewp.setNzxfs(pewp.getRzxfs());
+        //年平均风速
+        pewp.setNpjfs(pewp.getRpjfs());
+
+        //年最大功率
+        pewp.setNzdgl(pewp.getRzdgl());
+        //年最小功率
+        pewp.setNzxgl(pewp.getRzxgl());
+        //年平均功率
+        pewp.setNpjgl(pewp.getRpjgl());
+
+    }
+
+    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp) throws Exception {
+
+        //月最大风速
+        pewp.setYzdfs(pewp.getRzdfs());
+        //月最小风速
+        pewp.setYzxfs(pewp.getRzxfs());
+        //月平均风速
+        pewp.setYpjfs(pewp.getRpjfs());
+
+        //月最大功率
+        pewp.setYzdgl(pewp.getRzdgl());
+        //月最小功率
+        pewp.setYzxgl(pewp.getRzxgl());
+        //月平均功率
+        pewp.setYpjgl(pewp.getRpjgl());
+    }
+
+
+}
+
+
+
+
+
+
+

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

@@ -0,0 +1,762 @@
+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;
+import com.gyee.generation.service.auto.IProEconEquipmentInfoDay2Service;
+import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.statisticcs.Initial;
+import org.slf4j.Logger;
+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;
+
+@Service
+public class EquipmentInfo2Service {
+
+    private static final Logger logger = LoggerFactory.getLogger(EquipmentInfo2Service.class);
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProEconEquipmentInfoDay2Service proEconEquipmentInfoDay2Service;
+
+
+
+    /**
+     * 计算设备日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calLineInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconEquipmentInfoDay2Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.wtmap.containsKey(i.getWindturbineId())
+           ).map(ProEconEquipmentInfoDay2::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconEquipmentInfoDay2Service.removeByIds(idls);
+
+        }
+        for(ProBasicWindturbine wt:CacheContext.wtls)
+        {
+            if(CacheContext.wppointmap.containsKey(wt.getId()))
+            {
+
+
+                ProEconEquipmentInfoDay2 pewp=new ProEconEquipmentInfoDay2();
+                Initial.initial(pewp);
+                pewp.setCompanyId(wt.getCompanyId());
+                pewp.setWindpowerstationId(wt.getWindpowerstationId());
+                pewp.setLineId(wt.getLineId());
+                pewp.setProjectId(wt.getProjectId());
+                pewp.setRegionId(wt.getRegionId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+                //昨日的统计结果
+                List<ProEconEquipmentInfoDay2> pepidls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepidls = proEconEquipmentInfoDay2Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindturbineId().equals(wt.getId())
+                            )
+                            .collect(Collectors.toList());
+                }
+                calDetiall( pewp, end, begin, wt,pepidls);
+
+                proEconEquipmentInfoDay2Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    private void calDetiall(ProEconEquipmentInfoDay2 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
+        //        //                0	待机
+//                1	手动停机
+//                2	正常发电
+//                3	发电降出力
+//                4	故障
+//                5	故障受累
+//                6	检修
+//                7	检修受累
+//                8	限电降出力
+//                9	限电停机
+//                10	电网受累
+//                11	环境受累
+//                12	通讯中断
+//                13	设备离线
+
+        double lastState=-1;//上一分钟状态
+
+        double djsc=0;//待机时长
+        double sdtjsc=0;//手动停机时长
+        double zcfdsc=0;//正常发电时长
+        double fdjclsc=0;//发电降出力时长
+        double gzsc=0;//故障时长
+        double gzslsc=0;//故障受累时长
+        double jxsc=0;//检修时长
+        double jxslsc=0;//检修受累时长
+        double xdjclsc=0;//限电降出力时长
+        double xdtjsc=0;//限电停机时长
+        double dwslsc=0;//电网受累时长
+        double hjslsc=0;//环境受累时长
+        double txzdsc=0;//通讯中断时长
+        double sblxsc=0;//设备离线时长
+
+        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
+
+
+            lastState=-1;//上一分钟状态
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
+            if(wtpAimap.containsKey(ContantXk.MXZT));
+            {
+
+                ProBasicEquipmentPoint point=aimap.get(ContantXk.MXZT);
+                 //按照分钟时间进行统计状态快照值
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+                if(!pointls.isEmpty())
+                {
+                    for(PointData po :pointls)
+                    {
+
+                        if(po.getPointValueInDouble()==0)
+                        {
+
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //待机时长加1分钟
+                            djsc++;
+                        }else  if(po.getPointValueInDouble()==1)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //手动停机时长加1分钟
+                            sdtjsc++;
+                        }else  if(po.getPointValueInDouble()==2)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //正常发电时长加1分钟
+                            zcfdsc++;
+                        }else  if(po.getPointValueInDouble()==3)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //发电降出力时长加1分钟
+                            fdjclsc++;
+                        }else  if(po.getPointValueInDouble()==4)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //故障时长加1分钟
+                            gzsc++;
+                        }else  if(po.getPointValueInDouble()==5)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //故障受累时长加1分钟
+                            gzslsc++;
+                        }else  if(po.getPointValueInDouble()==6)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //检修时长加1分钟
+                            jxsc++;
+                        }else  if(po.getPointValueInDouble()==7)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //检修受累时长加1分钟
+                            jxslsc++;
+                        }else  if(po.getPointValueInDouble()==8)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //限电降出力时长加1分钟
+                            xdjclsc++;
+                        }else  if(po.getPointValueInDouble()==9)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //限电停机时长加1分钟
+                            xdtjsc++;
+                        }else  if(po.getPointValueInDouble()==10)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //电网受累时长加1分钟
+                            dwslsc++;
+                        }else  if(po.getPointValueInDouble()==11)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //环境受累时长加1分钟
+                            hjslsc++;
+                        }else  if(po.getPointValueInDouble()==12)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //通讯中断时长加1分钟
+                            txzdsc++;
+                        }else  if(po.getPointValueInDouble()==13)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //设备离线时长加1分钟
+                            sblxsc++;
+                        }
+
+                    }
+
+
+
+                }
+
+            }
+   
+        //日合计故障小时（明细）
+        pewp.setRgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累故障小时（明细）
+        pewp.setRcnslgzxsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计检修小时（明细）
+        pewp.setRjxxsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累检修小时（明细）
+        pewp.setRcnsljxxsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计待机小时（明细）
+        pewp.setRdjxsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计缺陷降出力小时（明细）
+        pewp.setRqxjclxsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计手动停机小时（明细）
+        pewp.setRsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计性能小时（明细）
+        pewp.setRbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电停机小时（明细）
+        pewp.setRxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电降出力小时（明细）
+        pewp.setRxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时（明细）
+        pewp.setRtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计离线小时（明细）
+        pewp.setRlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
+
+/*******************************************日信息统计*********************************************************/
+
+/*******************************************月信息统计*********************************************************/
+
+        if(pepidls.isEmpty())
+        {
+            setLossHoursMonth(pewp);
+
+        }else
+        {
+
+
+            if(!pepidls.isEmpty())
+            {
+               ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+
+                //月合计故障小时（明细）
+                pewp.setYgzxsmx(StringUtils.round(pepid.getYgzxsmx()+pewp.getRgzxsmx(),2));
+                //月合计场内受累故障小时（明细）
+                pewp.setYcnslgzxsmx(StringUtils.round(pepid.getYcnslgzxsmx()+pewp.getRcnslgzxsmx(),2));
+                //月合计检修小时（明细）
+                pewp.setYjxxsmx(StringUtils.round(pepid.getYjxxsmx()+pewp.getRjxxsmx(),2));
+                //月合计场内受累检修小时（明细）
+                pewp.setYcnsljxxsmx(StringUtils.round( pepid.getYcnsljxxsmx()+pewp.getRcnsljxxsmx(),2));
+                //月合计待机小时（明细）
+                pewp.setYdjxsmx(StringUtils.round(pepid.getYdjxsmx()+pewp.getRdjxsmx(),2));
+                //月合计缺陷降出力小时（明细）
+                pewp.setYqxjclxsmx(StringUtils.round(pepid.getYqxjclxsmx()+pewp.getRqxjclxsmx(),2));
+                //月合计手动停机小时（明细）
+                pewp.setYsdtjxsmx(StringUtils.round(pepid.getYsdtjxsmx()+pewp.getRsdtjxsmx(),2));
+                //月合计性能小时（明细）
+                pewp.setYbwxsmx(StringUtils.round(pepid.getYbwxsmx()+pewp.getRbwxsmx(),2));
+                //月合计限电停机小时（明细）
+                pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+                //月合计限电降出力小时（明细）
+                pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+                //月合计场外受累电网小时（明细）
+                pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+                //月合计场外受累电网小时（明细）
+                pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+                //月合计通讯中断小时（明细）
+                pewp.setYtxzdxsmx(StringUtils.round(pepid.getYtxzdxsmx()+pewp.getRtxzdxsmx(),2));
+                //月合计离线小时（明细）
+                pewp.setYlxxsmx(StringUtils.round(pepid.getYlxxsmx()+pewp.getRlxxsmx(),2));
+            }else
+            {
+                setLossHoursMonth(pewp);
+            }
+
+        }
+
+
+
+/*******************************************月信息统计*********************************************************/
+
+/*******************************************年信息统计*********************************************************/
+        if(pepidls.isEmpty())
+        {
+            setLossHoursYear(pewp);
+        }else
+        {
+
+            if(!pepidls.isEmpty())
+            {
+                ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+
+                //年合计故障小时（明细）
+                pewp.setYgzxsmx(StringUtils.round(pepid.getNgzxsmx()+pewp.getRgzxsmx(),2));
+                //年合计场内受累故障小时（明细）
+                pewp.setYcnslgzxsmx(StringUtils.round(pepid.getNcnslgzxsmx()+pewp.getRcnslgzxsmx(),2));
+                //年合计检修小时（明细）
+                pewp.setYjxxsmx(StringUtils.round(pepid.getNjxxsmx()+pewp.getRjxxsmx(),2));
+                //年合计场内受累检修小时（明细）
+                pewp.setYcnsljxxsmx(StringUtils.round( pepid.getNcnsljxxsmx()+pewp.getRcnsljxxsmx(),2));
+                //年合计待机小时（明细）
+                pewp.setYdjxsmx(StringUtils.round(pepid.getNdjxsmx()+pewp.getRdjxsmx(),2));
+                //年合计缺陷降出力小时（明细）
+                pewp.setYqxjclxsmx(StringUtils.round(pepid.getNqxjclxsmx()+pewp.getRqxjclxsmx(),2));
+                //年合计手动停机小时（明细）
+                pewp.setYsdtjxsmx(StringUtils.round(pepid.getNsdtjxsmx()+pewp.getRsdtjxsmx(),2));
+                //年合计性能小时（明细）
+                pewp.setYbwxsmx(StringUtils.round(pepid.getNbwxsmx()+pewp.getRbwxsmx(),2));
+                //年合计限电停机小时（明细）
+                pewp.setYxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+                //年合计限电降出力小时（明细）
+                pewp.setYxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+                //年合计场外受累电网小时（明细）
+                pewp.setYcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+                //年合计场外受累电网小时（明细）
+                pewp.setYcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+                //年合计通讯中断小时（明细）
+                pewp.setYtxzdxsmx(StringUtils.round(pepid.getNtxzdxsmx()+pewp.getRtxzdxsmx(),2));
+                //年合计离线小时（明细）
+                pewp.setYlxxsmx(StringUtils.round(pepid.getNlxxsmx()+pewp.getRlxxsmx(),2));
+
+            }else
+            {
+                setLossHoursYear(pewp);
+            }
+
+        }
+
+
+    }
+
+    private static void setLossHoursYear(ProEconEquipmentInfoDay2 pewp) {
+        //年合计故障小时（明细）
+        pewp.setNgzxsmx(pewp.getRgzxsmx());
+        //年合计场内受累故障小时（明细）
+        pewp.setNcnslgzxsmx(pewp.getRcnslgzxsmx());
+        //年合计检修小时（明细）
+        pewp.setNjxxsmx(pewp.getRjxxsmx());
+        //年合计场内受累检修小时（明细）
+        pewp.setNcnsljxxsmx(pewp.getRcnsljxxsmx());
+        //年合计待机小时（明细）
+        pewp.setNdjxsmx(pewp.getRdjxsmx());
+        //年合计缺陷降出力小时（明细）
+        pewp.setNqxjclxsmx(pewp.getRqxjclxsmx());
+        //年合计手动停机小时（明细）
+        pewp.setNsdtjxsmx(pewp.getRsdtjxsmx());
+        //年合计性能小时（明细）
+        pewp.setNbwxsmx(pewp.getRbwxsmx());
+        //年合计限电停机小时（明细）
+        pewp.setNxdtjxsmx(pewp.getRxdtjxsmx());
+        //年合计限电降出力小时（明细）
+        pewp.setNxdjclxsmx(pewp.getRxdjclxsmx());
+        //年合计场外受累电网小时（明细）
+        pewp.setNcwsldwxsmx(pewp.getRcwsldwxsmx());
+        //年合计场外受累电网小时（明细）
+        pewp.setNcwsltqxsmx(pewp.getRcwsltqxsmx());
+        //年合计通讯中断小时（明细）
+        pewp.setNtxzdxsmx(pewp.getRtxzdxsmx());
+        //年合计离线小时（明细）
+        pewp.setNlxxsmx(pewp.getRlxxsmx());
+    }
+
+    private static void setLossHoursMonth(ProEconEquipmentInfoDay2 pewp) {
+        //月合计故障小时（明细）
+        pewp.setYgzxsmx(pewp.getRgzxsmx());
+        //月合计场内受累故障小时（明细）
+        pewp.setYcnslgzxsmx(pewp.getRcnslgzxsmx());
+        //月合计检修小时（明细）
+        pewp.setYjxxsmx(pewp.getRjxxsmx());
+        //月合计场内受累检修小时（明细）
+        pewp.setYcnsljxxsmx(pewp.getRcnsljxxsmx());
+        //月合计待机小时（明细）
+        pewp.setYdjxsmx(pewp.getRdjxsmx());
+        //月合计缺陷降出力小时（明细）
+        pewp.setYqxjclxsmx(pewp.getRqxjclxsmx());
+        //月合计手动停机小时（明细）
+        pewp.setYsdtjxsmx(pewp.getRsdtjxsmx());
+        //月合计性能小时（明细）
+        pewp.setYbwxsmx(pewp.getRbwxsmx());
+        //月合计限电停机小时（明细）
+        pewp.setYxdtjxsmx(pewp.getRxdtjxsmx());
+        //月合计限电降出力小时（明细）
+        pewp.setYxdjclxsmx(pewp.getRxdjclxsmx());
+        //月合计场外受累电网小时（明细）
+        pewp.setYcwsldwxsmx(pewp.getRcwsldwxsmx());
+        //月合计场外受累电网小时（明细）
+        pewp.setYcwsltqxsmx(pewp.getRcwsltqxsmx());
+        //月合计通讯中断小时（明细）
+        pewp.setYtxzdxsmx(pewp.getRtxzdxsmx());
+        //月合计离线小时（明细）
+        pewp.setYlxxsmx(pewp.getRlxxsmx());
+    }
+
+
+    private static void setLossHoursMonthSimple(ProEconEquipmentInfoDay2 pewp) {
+        //月合计待机小时
+        pewp.setYdjxs(pewp.getRdjxs());
+        //月合计维护停机小时
+        pewp.setYjxtjxs(pewp.getRjxtjxs());
+        // 月合计故障停机小时
+        pewp.setYgztjxs(pewp.getRgztjxs());
+        //月合计运行小时
+        pewp.setYyxxs(pewp.getRyxxs());
+        //月合计限电小时
+        pewp.setYxdxs(pewp.getRxdxs());
+        //月合计通讯中断小时
+        pewp.setYtxzdxs(pewp.getRtxzdxs());
+        //月合计受累小时
+        pewp.setYslxs(pewp.getRslxs());
+    }
+
+    private static void setLossHoursYearSimple(ProEconEquipmentInfoDay2 pewp) {
+        //年合计待机小时
+        pewp.setNdjxs(pewp.getRdjxs());
+        //年合计维护停机小时
+        pewp.setNjxtjxs(pewp.getRjxtjxs());
+        // 年合计故障小时
+        pewp.setNgztjxs(pewp.getRgztjxs());
+        //年合计运行小时
+        pewp.setNyxxs(pewp.getRyxxs());
+        //年合计限电小时
+        pewp.setNxdxs(pewp.getRxdxs());
+        //年合计通讯中断小时
+        pewp.setNtxzdxs(pewp.getRtxzdxs());
+        //年合计受累小时
+        pewp.setNslxs(pewp.getRslxs());
+    }
+
+        private void calSimple(ProEconEquipmentInfoDay2 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
+//        0	待机
+//        1	运行
+//        2	故障
+//        3	检修
+//        4	限电
+//        5	受累
+//        6	离线
+/*******************************************日信息统计*********************************************************/
+
+        double lastState=-1;//上一分钟状态
+
+
+        double djsc=0;//待机时长
+        double zcfdsc=0;//正常发电时长
+        double gzsc=0;//故障时长
+        double jxsc=0;//检修时长
+        double xdtjsc=0;//限电停机时长
+        double slsc=0;//受累时长
+        double txzdsc=0;//通讯中断时长
+
+
+
+        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
+
+
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
+            if(wtpAimap.containsKey(ContantXk.SBZT));
+            {
+
+                ProBasicEquipmentPoint point=aimap.get(ContantXk.SBZT);
+                //按照分钟时间进行统计状态快照值
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+                if(!pointls.isEmpty()) {
+                    for (PointData po : pointls) {
+
+                        if (po.getPointValueInDouble() == 0) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //待机时长加1分钟
+                            djsc++;
+                        } else if (po.getPointValueInDouble() == 1) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //正常发电时长加1分钟
+                            zcfdsc++;
+                        } else if (po.getPointValueInDouble() == 2) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //故障时长加1分钟
+                            gzsc++;
+                        } else if (po.getPointValueInDouble() == 3) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //检修时长加1分钟
+                            jxsc++;
+
+                        } else if (po.getPointValueInDouble() == 4) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //限电停机时长加1分钟
+                            xdtjsc++;
+                        } else if (po.getPointValueInDouble() == 5) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //受累时长加1分钟
+                            slsc++;
+
+                        } else if (po.getPointValueInDouble() == 6) {
+                            if (lastState != po.getPointValueInDouble()) {
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //通讯中断时长加1分钟
+                            txzdsc++;
+                        }
+
+                    }
+
+                }
+
+
+
+            }
+        
+
+
+    //日合计待机小时
+                    pewp.setRdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    //日合计维护停机小时
+                    pewp.setRjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    // 日合计待机小时
+                    pewp.setRdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    //日合计运行小时
+                    pewp.setRyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    //日合计限电小时
+                    pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    //日合计通讯中断小时
+                    pewp.setRtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+    //日合计受累小时
+                    pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
+            /*******************************************日信息统计*********************************************************/
+
+            /*******************************************月信息统计*********************************************************/
+            if(pepidls.isEmpty())
+            {
+                setLossHoursMonthSimple(pewp);
+
+            }else
+            {
+
+
+                if(!pepidls.isEmpty())
+                {
+                    ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+
+
+
+
+                    //月合计待机小时
+                    pewp.setYdjxs(StringUtils.round(pepid.getYdjxs()+pewp.getRdjxs(),2));
+                    //月合计维护停机小时
+                    pewp.setYjxtjxs(StringUtils.round(pepid.getYjxtjxs()+pewp.getRjxtjxs(),2));
+                    // 月合计故障小时
+                    pewp.setYgztjxs(StringUtils.round(pepid.getYgztjxs()+pewp.getRgztjxs(),2));
+                    //月合计运行小时
+                    pewp.setYyxxs(StringUtils.round(pepid.getYyxxs()+pewp.getRyxxs(),2));
+                    //月合计限电小时
+                    pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
+                    //月合计通讯中断小时
+                    pewp.setYtxzdxs(StringUtils.round(pepid.getYtxzdxs()+pewp.getRtxzdxs(),2));
+                    //月合计受累小时
+                    pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
+                }else
+                {
+                    setLossHoursMonthSimple(pewp);
+                }
+
+            }
+            /*******************************************月信息统计*********************************************************/
+
+            /*******************************************年信息统计*********************************************************/
+            if(pepidls.isEmpty())
+            {
+                setLossHoursYearSimple(pewp);
+
+            }else
+            {
+
+
+                if(!pepidls.isEmpty())
+                {
+                    ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+
+
+                    //年合计待机小时
+                    pewp.setNdjxs(StringUtils.round(pepid.getNdjxs()+pewp.getRdjxs(),2));
+                    //年合计维护停机小时
+                    pewp.setNjxtjxs(StringUtils.round(pepid.getNjxtjxs()+pewp.getRjxtjxs(),2));
+                    // 年合计故障小时
+                    pewp.setNgztjxs(StringUtils.round(pepid.getNgztjxs()+pewp.getRgztjxs(),2));
+                    //年合计运行小时
+                    pewp.setNyxxs(StringUtils.round(pepid.getNyxxs()+pewp.getRyxxs(),2));
+                    //年合计限电小时
+                    pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
+                    //年合计通讯中断小时
+                    pewp.setNtxzdxs(StringUtils.round(pepid.getNtxzdxs()+pewp.getRtxzdxs(),2));
+                    //年合计受累小时
+                    pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
+                }else
+                {
+                    setLossHoursYearSimple(pewp);
+                }
+
+            }
+            /*******************************************年信息统计*********************************************************/
+    }
+
+
+}
+
+
+
+
+
+
+

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

@@ -0,0 +1,760 @@
+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;
+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;
+import org.slf4j.Logger;
+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;
+
+@Service
+public class EquipmentInfo3Service {
+
+    private static final Logger logger = LoggerFactory.getLogger(WindPowerInfo2Service.class);
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProEconEquipmentInfoDay3Service proEconEquipmentInfoDay3Service;
+
+
+
+
+    /**
+     * 计算设备日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calEquipmentInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconEquipmentInfoDay3Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.wtmap.containsKey(i.getWindturbineId())
+                         ).map(ProEconEquipmentInfoDay3::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconEquipmentInfoDay3Service.removeByIds(idls);
+
+        }
+        for(ProBasicWindturbine wt:CacheContext.wtls)
+        {
+            if(CacheContext.wppointmap.containsKey(wt.getId()))
+            {
+
+
+                ProEconEquipmentInfoDay3 pewp=new ProEconEquipmentInfoDay3();
+                Initial.initial(pewp);
+                pewp.setCompanyId(wt.getCompanyId());
+                pewp.setWindpowerstationId(wt.getWindpowerstationId());
+                pewp.setLineId(wt.getLineId());
+                pewp.setProjectId(wt.getProjectId());
+                pewp.setRegionId(wt.getRegionId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconEquipmentInfoDay3> pepidls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepidls = proEconEquipmentInfoDay3Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindturbineId().equals(wt.getId())
+                                  )
+                            .collect(Collectors.toList());
+                }
+                calDetiall( pewp, end, begin,wt,pepidls);
+
+                proEconEquipmentInfoDay3Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    private void calDetiall(ProEconEquipmentInfoDay3 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
+        //        //                0	待机
+//                1	手动停机
+//                2	正常发电
+//                3	发电降出力
+//                4	故障
+//                5	故障受累
+//                6	检修
+//                7	检修受累
+//                8	限电降出力
+//                9	限电停机
+//                10	电网受累
+//                11	环境受累
+//                12	通讯中断
+//                13	设备离线
+
+        double lastState=-1;//上一分钟状态
+
+        double djsc=0;//待机时长
+        double sdtjsc=0;//手动停机时长
+        double zcfdsc=0;//正常发电时长
+        double fdjclsc=0;//发电降出力时长
+        double gzsc=0;//故障时长
+        double gzslsc=0;//故障受累时长
+        double jxsc=0;//检修时长
+        double jxslsc=0;//检修受累时长
+        double xdjclsc=0;//限电降出力时长
+        double xdtjsc=0;//限电停机时长
+        double dwslsc=0;//电网受累时长
+        double hjslsc=0;//环境受累时长
+        double txzdsc=0;//通讯中断时长
+        double sblxsc=0;//设备离线时长
+
+        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
+
+
+
+            lastState=-1;//上一分钟状态
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
+            if(wtpAimap.containsKey(ContantXk.MXZT));
+            {
+
+                ProBasicEquipmentPoint point=aimap.get(ContantXk.MXZT);
+                //按照分钟时间进行统计状态快照值
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+                if(!pointls.isEmpty())
+                {
+                    for(PointData po :pointls)
+                    {
+
+                        if(po.getPointValueInDouble()==0)
+                        {
+
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //待机时长加1分钟
+                            djsc++;
+                        }else  if(po.getPointValueInDouble()==1)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //手动停机时长加1分钟
+                            sdtjsc++;
+                        }else  if(po.getPointValueInDouble()==2)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //正常发电时长加1分钟
+                            zcfdsc++;
+                        }else  if(po.getPointValueInDouble()==3)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //发电降出力时长加1分钟
+                            fdjclsc++;
+                        }else  if(po.getPointValueInDouble()==4)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //故障时长加1分钟
+                            gzsc++;
+                        }else  if(po.getPointValueInDouble()==5)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //故障受累时长加1分钟
+                            gzslsc++;
+                        }else  if(po.getPointValueInDouble()==6)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //检修时长加1分钟
+                            jxsc++;
+                        }else  if(po.getPointValueInDouble()==7)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //检修受累时长加1分钟
+                            jxslsc++;
+                        }else  if(po.getPointValueInDouble()==8)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //限电降出力时长加1分钟
+                            xdjclsc++;
+                        }else  if(po.getPointValueInDouble()==9)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //限电停机时长加1分钟
+                            xdtjsc++;
+                        }else  if(po.getPointValueInDouble()==10)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //电网受累时长加1分钟
+                            dwslsc++;
+                        }else  if(po.getPointValueInDouble()==11)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //环境受累时长加1分钟
+                            hjslsc++;
+                        }else  if(po.getPointValueInDouble()==12)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+                            //通讯中断时长加1分钟
+                            txzdsc++;
+                        }else  if(po.getPointValueInDouble()==13)
+                        {
+                            if(lastState!=po.getPointValueInDouble())
+                            {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState=po.getPointValueInDouble();
+
+                            }
+
+                            //设备离线时长加1分钟
+                            sblxsc++;
+                        }
+
+                    }
+
+                }
+
+            }
+        
+
+        //日合计故障小时（明细）
+        pewp.setRgzcsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累故障小时（明细）
+        pewp.setRcnslgzcsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计检修小时（明细）
+        pewp.setRjxcsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累检修小时（明细）
+        pewp.setRcnsljxcsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计待机小时（明细）
+        pewp.setRdjcsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计缺陷降出力小时（明细）
+        pewp.setRqxjclcsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计手动停机小时（明细）
+        pewp.setRsdtjcsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计性能小时（明细）
+        pewp.setRbwcsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电停机小时（明细）
+        pewp.setRxdtjcsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电降出力小时（明细）
+        pewp.setRxdjclcsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRcwsldwcsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRcwsltqcsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时（明细）
+        pewp.setRtxzdcsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计离线小时（明细）
+        pewp.setRlxcsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+/*******************************************日信息统计*********************************************************/
+
+/*******************************************月信息统计*********************************************************/
+
+        if(pepidls.isEmpty())
+        {
+            setLossHoursMonth(pewp);
+
+        }else
+        {
+
+
+            if(!pepidls.isEmpty())
+            {
+                ProEconEquipmentInfoDay3 pepid=pepidls.get(0);
+
+                //月合计故障小时（明细）
+                pewp.setYgzcsmx(StringUtils.round(pepid.getYgzcsmx()+pewp.getRgzcsmx(),2));
+                //月合计场内受累故障小时（明细）
+                pewp.setYcnslgzcsmx(StringUtils.round(pepid.getYcnslgzcsmx()+pewp.getRcnslgzcsmx(),2));
+                //月合计检修小时（明细）
+                pewp.setYjxcsmx(StringUtils.round(pepid.getYjxcsmx()+pewp.getRjxcsmx(),2));
+                //月合计场内受累检修小时（明细）
+                pewp.setYcnsljxcsmx(StringUtils.round( pepid.getYcnsljxcsmx()+pewp.getRcnsljxcsmx(),2));
+                //月合计待机小时（明细）
+                pewp.setYdjcsmx(StringUtils.round(pepid.getYdjcsmx()+pewp.getRdjcsmx(),2));
+                //月合计缺陷降出力小时（明细）
+                pewp.setYqxjclcsmx(StringUtils.round(pepid.getYqxjclcsmx()+pewp.getRqxjclcsmx(),2));
+                //月合计手动停机小时（明细）
+                pewp.setYsdtjcsmx(StringUtils.round(pepid.getYsdtjcsmx()+pewp.getRsdtjcsmx(),2));
+                //月合计性能小时（明细）
+                pewp.setYbwcsmx(StringUtils.round(pepid.getYbwcsmx()+pewp.getRbwcsmx(),2));
+                //月合计限电停机小时（明细）
+                pewp.setYxdtjcsmx(StringUtils.round(pepid.getYxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+                //月合计限电降出力小时（明细）
+                pewp.setYxdjclcsmx(StringUtils.round(pepid.getYxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+                //月合计场外受累电网小时（明细）
+                pewp.setYcwsldwcsmx(StringUtils.round(pepid.getYcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+                //月合计场外受累电网小时（明细）
+                pewp.setYcwsltqcsmx(StringUtils.round(pepid.getYcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+                //月合计通讯中断小时（明细）
+                pewp.setYtxzdcsmx(StringUtils.round(pepid.getYtxzdcsmx()+pewp.getRtxzdcsmx(),2));
+                //月合计离线小时（明细）
+                pewp.setYlxcsmx(StringUtils.round(pepid.getYlxcsmx()+pewp.getRlxcsmx(),2));
+            }else
+            {
+                setLossHoursMonth(pewp);
+            }
+
+        }
+
+
+
+/*******************************************月信息统计*********************************************************/
+
+/*******************************************年信息统计*********************************************************/
+        if(pepidls.isEmpty())
+        {
+            setLossHoursYear(pewp);
+        }else
+        {
+
+            if(!pepidls.isEmpty())
+            {
+                ProEconEquipmentInfoDay3 pepid=pepidls.get(0);
+
+                //年合计故障小时（明细）
+                pewp.setYgzcsmx(StringUtils.round(pepid.getNgzcsmx()+pewp.getRgzcsmx(),2));
+                //年合计场内受累故障小时（明细）
+                pewp.setYcnslgzcsmx(StringUtils.round(pepid.getNcnslgzcsmx()+pewp.getRcnslgzcsmx(),2));
+                //年合计检修小时（明细）
+                pewp.setYjxcsmx(StringUtils.round(pepid.getNjxcsmx()+pewp.getRjxcsmx(),2));
+                //年合计场内受累检修小时（明细）
+                pewp.setYcnsljxcsmx(StringUtils.round( pepid.getNcnsljxcsmx()+pewp.getRcnsljxcsmx(),2));
+                //年合计待机小时（明细）
+                pewp.setYdjcsmx(StringUtils.round(pepid.getNdjcsmx()+pewp.getRdjcsmx(),2));
+                //年合计缺陷降出力小时（明细）
+                pewp.setYqxjclcsmx(StringUtils.round(pepid.getNqxjclcsmx()+pewp.getRqxjclcsmx(),2));
+                //年合计手动停机小时（明细）
+                pewp.setYsdtjcsmx(StringUtils.round(pepid.getNsdtjcsmx()+pewp.getRsdtjcsmx(),2));
+                //年合计性能小时（明细）
+                pewp.setYbwcsmx(StringUtils.round(pepid.getNbwcsmx()+pewp.getRbwcsmx(),2));
+                //年合计限电停机小时（明细）
+                pewp.setYxdtjcsmx(StringUtils.round(pepid.getNxdtjcsmx()+pewp.getRxdtjcsmx(),2));
+                //年合计限电降出力小时（明细）
+                pewp.setYxdjclcsmx(StringUtils.round(pepid.getNxdjclcsmx()+pewp.getRxdjclcsmx(),2));
+                //年合计场外受累电网小时（明细）
+                pewp.setYcwsldwcsmx(StringUtils.round(pepid.getNcwsldwcsmx()+pewp.getRcwsldwcsmx(),2));
+                //年合计场外受累电网小时（明细）
+                pewp.setYcwsltqcsmx(StringUtils.round(pepid.getNcwsltqcsmx()+pewp.getRcwsltqcsmx(),2));
+                //年合计通讯中断小时（明细）
+                pewp.setYtxzdcsmx(StringUtils.round(pepid.getNtxzdcsmx()+pewp.getRtxzdcsmx(),2));
+                //年合计离线小时（明细）
+                pewp.setYlxcsmx(StringUtils.round(pepid.getNlxcsmx()+pewp.getRlxcsmx(),2));
+
+            }else
+            {
+                setLossHoursYear(pewp);
+            }
+
+        }
+
+
+    }
+
+    private static void setLossHoursYear(ProEconEquipmentInfoDay3 pewp) {
+        //年合计故障小时（明细）
+        pewp.setNgzcsmx(pewp.getRgzcsmx());
+        //年合计场内受累故障小时（明细）
+        pewp.setNcnslgzcsmx(pewp.getRcnslgzcsmx());
+        //年合计检修小时（明细）
+        pewp.setNjxcsmx(pewp.getRjxcsmx());
+        //年合计场内受累检修小时（明细）
+        pewp.setNcnsljxcsmx(pewp.getRcnsljxcsmx());
+        //年合计待机小时（明细）
+        pewp.setNdjcsmx(pewp.getRdjcsmx());
+        //年合计缺陷降出力小时（明细）
+        pewp.setNqxjclcsmx(pewp.getRqxjclcsmx());
+        //年合计手动停机小时（明细）
+        pewp.setNsdtjcsmx(pewp.getRsdtjcsmx());
+        //年合计性能小时（明细）
+        pewp.setNbwcsmx(pewp.getRbwcsmx());
+        //年合计限电停机小时（明细）
+        pewp.setNxdtjcsmx(pewp.getRxdtjcsmx());
+        //年合计限电降出力小时（明细）
+        pewp.setNxdjclcsmx(pewp.getRxdjclcsmx());
+        //年合计场外受累电网小时（明细）
+        pewp.setNcwsldwcsmx(pewp.getRcwsldwcsmx());
+        //年合计场外受累电网小时（明细）
+        pewp.setNcwsltqcsmx(pewp.getRcwsltqcsmx());
+        //年合计通讯中断小时（明细）
+        pewp.setNtxzdcsmx(pewp.getRtxzdcsmx());
+        //年合计离线小时（明细）
+        pewp.setNlxcsmx(pewp.getRlxcsmx());
+    }
+
+    private static void setLossHoursMonth(ProEconEquipmentInfoDay3 pewp) {
+        //月合计故障小时（明细）
+        pewp.setYgzcsmx(pewp.getRgzcsmx());
+        //月合计场内受累故障小时（明细）
+        pewp.setYcnslgzcsmx(pewp.getRcnslgzcsmx());
+        //月合计检修小时（明细）
+        pewp.setYjxcsmx(pewp.getRjxcsmx());
+        //月合计场内受累检修小时（明细）
+        pewp.setYcnsljxcsmx(pewp.getRcnsljxcsmx());
+        //月合计待机小时（明细）
+        pewp.setYdjcsmx(pewp.getRdjcsmx());
+        //月合计缺陷降出力小时（明细）
+        pewp.setYqxjclcsmx(pewp.getRqxjclcsmx());
+        //月合计手动停机小时（明细）
+        pewp.setYsdtjcsmx(pewp.getRsdtjcsmx());
+        //月合计性能小时（明细）
+        pewp.setYbwcsmx(pewp.getRbwcsmx());
+        //月合计限电停机小时（明细）
+        pewp.setYxdtjcsmx(pewp.getRxdtjcsmx());
+        //月合计限电降出力小时（明细）
+        pewp.setYxdjclcsmx(pewp.getRxdjclcsmx());
+        //月合计场外受累电网小时（明细）
+        pewp.setYcwsldwcsmx(pewp.getRcwsldwcsmx());
+        //月合计场外受累电网小时（明细）
+        pewp.setYcwsltqcsmx(pewp.getRcwsltqcsmx());
+        //月合计通讯中断小时（明细）
+        pewp.setYtxzdcsmx(pewp.getRtxzdcsmx());
+        //月合计离线小时（明细）
+        pewp.setYlxcsmx(pewp.getRlxcsmx());
+    }
+
+
+    private static void setLossHoursMonthSimple(ProEconEquipmentInfoDay3 pewp) {
+        //月合计待机小时
+        pewp.setYdjcs(pewp.getRdjcs());
+        //月合计维护停机小时
+        pewp.setYjxtjcs(pewp.getRjxtjcs());
+        // 月合计故障停机小时
+        pewp.setYgztjcs(pewp.getRgztjcs());
+        //月合计运行小时
+        pewp.setYyxcs(pewp.getRyxcs());
+        //月合计限电小时
+        pewp.setYxdcs(pewp.getRxdcs());
+        //月合计通讯中断小时
+        pewp.setYtxzdcs(pewp.getRtxzdcs());
+        //月合计受累小时
+        pewp.setYslcs(pewp.getRslcs());
+    }
+
+    private static void setLossHoursYearSimple(ProEconEquipmentInfoDay3 pewp) {
+        //年合计待机小时
+        pewp.setNdjcs(pewp.getRdjcs());
+        //年合计维护停机小时
+        pewp.setNjxtjcs(pewp.getRjxtjcs());
+        // 年合计故障小时
+        pewp.setNgztjcs(pewp.getRgztjcs());
+        //年合计运行小时
+        pewp.setNyxcs(pewp.getRyxcs());
+        //年合计限电小时
+        pewp.setNxdcs(pewp.getRxdcs());
+        //年合计通讯中断小时
+        pewp.setNtxzdcs(pewp.getRtxzdcs());
+        //年合计受累小时
+        pewp.setNslcs(pewp.getRslcs());
+    }
+
+    private void calSimple(ProEconEquipmentInfoDay3 pewp,Date end, Date begin,ProBasicWindturbine wt,List<ProEconEquipmentInfoDay3> pepidls) throws Exception {
+//        0	待机
+//        1	运行
+//        2	故障
+//        3	检修
+//        4	限电
+//        5	受累
+//        6	离线
+/*******************************************日信息统计*********************************************************/
+
+        double lastState=-1;//上一分钟状态
+
+
+        double djsc=0;//待机时长
+        double zcfdsc=0;//正常发电时长
+        double gzsc=0;//故障时长
+        double jxsc=0;//检修时长
+        double xdtjsc=0;//限电停机时长
+        double slsc=0;//受累时长
+        double txzdsc=0;//通讯中断时长
+
+
+
+        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
+
+
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
+            if(wtpAimap.containsKey(ContantXk.SBZT));
+            {
+
+                ProBasicEquipmentPoint point=aimap.get(ContantXk.SBZT);
+                //按照分钟时间进行统计状态快照值
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+                if(!pointls.isEmpty()) {
+                    for (PointData po : pointls) {
+
+                        if (po.getPointValueInDouble() == 0) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //待机时长加1分钟
+                            djsc++;
+                        } else if (po.getPointValueInDouble() == 1) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //正常发电时长加1分钟
+                            zcfdsc++;
+                        } else if (po.getPointValueInDouble() == 2) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //故障时长加1分钟
+                            gzsc++;
+                        } else if (po.getPointValueInDouble() == 3) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //检修时长加1分钟
+                            jxsc++;
+
+                        } else if (po.getPointValueInDouble() == 4) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //限电停机时长加1分钟
+                            xdtjsc++;
+                        } else if (po.getPointValueInDouble() == 5) {
+                            if (lastState != po.getPointValueInDouble()) {
+
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+
+                            //受累时长加1分钟
+                            slsc++;
+
+                        } else if (po.getPointValueInDouble() == 6) {
+                            if (lastState != po.getPointValueInDouble()) {
+                                //将当前状态保存到上一分钟状态
+                                lastState = po.getPointValueInDouble();
+
+                            }
+                            //通讯中断时长加1分钟
+                            txzdsc++;
+                        }
+
+                    }
+
+                }
+
+            }
+        
+
+
+        //日合计待机小时
+        pewp.setRdjcs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计维护停机小时
+        pewp.setRjxtjcs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        // 日合计待机小时
+        pewp.setRdjcs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计运行小时
+        pewp.setRyxcs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电小时
+        pewp.setRxdcs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时
+        pewp.setRtxzdcs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计受累小时
+        pewp.setRslcs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
+        /*******************************************日信息统计*********************************************************/
+
+        /*******************************************月信息统计*********************************************************/
+        if(pepidls.isEmpty())
+        {
+            setLossHoursMonthSimple(pewp);
+
+        }else
+        {
+
+
+            if(!pepidls.isEmpty())
+            {
+                ProEconEquipmentInfoDay3 pepid=pepidls.get(0);
+
+
+                //月合计待机小时
+                pewp.setYdjcs(StringUtils.round(pepid.getYdjcs()+pewp.getRdjcs(),2));
+                //月合计维护停机小时
+                pewp.setYjxtjcs(StringUtils.round(pepid.getYjxtjcs()+pewp.getRjxtjcs(),2));
+                // 月合计故障小时
+                pewp.setYgztjcs(StringUtils.round(pepid.getYgztjcs()+pewp.getRgztjcs(),2));
+                //月合计运行小时
+                pewp.setYyxcs(StringUtils.round(pepid.getYyxcs()+pewp.getRyxcs(),2));
+                //月合计限电小时
+                pewp.setYxdcs(StringUtils.round(pepid.getYxdcs()+pewp.getRxdcs(),2));
+                //月合计通讯中断小时
+                pewp.setYtxzdcs(StringUtils.round(pepid.getYtxzdcs()+pewp.getRtxzdcs(),2));
+                //月合计受累小时
+                pewp.setYslcs(StringUtils.round(pepid.getYslcs()+pewp.getRslcs(),2));
+            }else
+            {
+                setLossHoursMonthSimple(pewp);
+            }
+
+        }
+        /*******************************************月信息统计*********************************************************/
+
+        /*******************************************年信息统计*********************************************************/
+        if(pepidls.isEmpty())
+        {
+            setLossHoursYearSimple(pewp);
+
+        }else
+        {
+
+
+            if(!pepidls.isEmpty())
+            {
+                ProEconEquipmentInfoDay3 pepid=pepidls.get(0);
+
+
+                //年合计待机小时
+                pewp.setNdjcs(StringUtils.round(pepid.getNdjcs()+pewp.getRdjcs(),2));
+                //年合计维护停机小时
+                pewp.setNjxtjcs(StringUtils.round(pepid.getNjxtjcs()+pewp.getRjxtjcs(),2));
+                // 年合计故障小时
+                pewp.setNgztjcs(StringUtils.round(pepid.getNgztjcs()+pewp.getRgztjcs(),2));
+                //年合计运行小时
+                pewp.setNyxcs(StringUtils.round(pepid.getNyxcs()+pewp.getRyxcs(),2));
+                //年合计限电小时
+                pewp.setNxdcs(StringUtils.round(pepid.getNxdcs()+pewp.getRxdcs(),2));
+                //年合计通讯中断小时
+                pewp.setNtxzdcs(StringUtils.round(pepid.getNtxzdcs()+pewp.getRtxzdcs(),2));
+                //年合计受累小时
+                pewp.setNslcs(StringUtils.round(pepid.getNslcs()+pewp.getRslcs(),2));
+            }else
+            {
+                setLossHoursYearSimple(pewp);
+            }
+
+        }
+        /*******************************************年信息统计*********************************************************/
+    }
+
+
+
+}
+
+
+
+
+
+
+

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

@@ -192,28 +192,28 @@ public class LimitEventService {
 
 
         for (String key : tempWindPowerSpeed.keySet()) {
-            wSpeedDictionary.put(key, tempWindPowerSpeed.get(key).getCode());
+            wSpeedDictionary.put(key, tempWindPowerSpeed.get(key).getNemCode());
             if (tempWindPowerPower.containsKey(key)) {
-                wPowerDictionary.put(key, tempWindPowerPower.get(key).getCode());
+                wPowerDictionary.put(key, tempWindPowerPower.get(key).getNemCode());
             }
         }
 
         for (String key : tempSpeed.keySet()) {
-            speedDictionary.put(key, tempSpeed.get(key).getCode());
+            speedDictionary.put(key, tempSpeed.get(key).getNemCode());
             if (tempPower.containsKey(key)) {
-                powerDictionary.put(key, tempPower.get(key).getCode());
+                powerDictionary.put(key, tempPower.get(key).getNemCode());
             }
 
             if (tempbzglDictionary.containsKey(key)) {
-                bzglDictionary.put(key, tempbzglDictionary.get(key).getCode());
+                bzglDictionary.put(key, tempbzglDictionary.get(key).getNemCode());
             }
 
             if (tempnh.containsKey(key)) {
-                nhDictionary.put(key, tempnh.get(key).getCode());
+                nhDictionary.put(key, tempnh.get(key).getNemCode());
             }
 
             if (tempxd.containsKey(key)) {
-                nhxdDictionary.put(key, tempxd.get(key).getCode());
+                nhxdDictionary.put(key, tempxd.get(key).getNemCode());
             }
         }
 
@@ -223,7 +223,7 @@ public class LimitEventService {
 
 
         for (String key : tempWindPower.keySet()) {
-            windPowerDictionary.put(key, tempWindPower.get(key).getCode());
+            windPowerDictionary.put(key, tempWindPower.get(key).getNemCode());
 
             List<ProEconMainBrownouts> tempMain = proEconMainBrownoutsService.list().stream().filter(i -> StringUtils.empty(i.getStartTime())
                             && i.getWindpowerstationId().equals(key))
@@ -923,7 +923,7 @@ public class LimitEventService {
 
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -946,7 +946,7 @@ public class LimitEventService {
                 double endvalue=0.0;
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -975,7 +975,7 @@ public class LimitEventService {
                 double endvalue=0.0;
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -998,7 +998,7 @@ public class LimitEventService {
                 double endvalue=0.0;
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -1025,7 +1025,7 @@ public class LimitEventService {
 
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDTJSSDL).getNemCode());
 
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -1049,7 +1049,7 @@ public class LimitEventService {
 
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NXDJCLSSDL).getNemCode());
 
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 

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

@@ -208,7 +208,7 @@ public  class LimitService {
             for (String key : windSL.keySet())
             {
 
-                double t =edosUtil.getRealData(windSL.get(key).getCode()).getPointValueInDouble();
+                double t =edosUtil.getRealData(windSL.get(key).getNemCode()).getPointValueInDouble();
                 if (!slv.containsKey(key))
                 {
 
@@ -220,7 +220,7 @@ public  class LimitService {
                         {
                             RealTimeParameterVo rt = new RealTimeParameterVo();
 
-                            rt.setPoint(windSL.get(key).getCode());
+                            rt.setPoint(windSL.get(key).getNemCode());
                             rt.setTime(dt);
                             rt.setInsertValue(0.0);
                             rList.put(key, rt);
@@ -260,7 +260,7 @@ public  class LimitService {
                         if (slvalue.get(windturbineid) != i)
                         {
                             RealTimeParameterVo rt = new RealTimeParameterVo();
-                            rt.setPoint(windSL.get(windturbineid).getCode());
+                            rt.setPoint(windSL.get(windturbineid).getNemCode());
                             rt.setTime(dt);
                             rt.setInsertValue(i);
 
@@ -291,7 +291,7 @@ public  class LimitService {
                     if (slvalue.get(windturbineid) != i)
                     {
                         RealTimeParameterVo rt = new RealTimeParameterVo();
-                        rt.setPoint(windSL.get(windturbineid).getCode());
+                        rt.setPoint(windSL.get(windturbineid).getNemCode());
                         rt.setTime(dt);
                         rt.setInsertValue(i);
 
@@ -627,20 +627,20 @@ public  class LimitService {
                 Double windpoweragc = 0.0;
                 if (WindPowerAGC.containsKey(item))
                 {
-                    windpoweragc =edosUtil.getRealData(WindPowerAGC.get(item).getCode()).getPointValueInDouble(); ;
+                    windpoweragc =edosUtil.getRealData(WindPowerAGC.get(item).getNemCode()).getPointValueInDouble(); ;
                 }
                 //读取出线有功实时数据
                 Double windpowercxyg = 0.0;
                 if (WindPowerCXYG.containsKey(item))
                 {
-                    windpowercxyg = edosUtil.getRealData(WindPowerCXYG.get(item).getCode()).getPointValueInDouble();
+                    windpowercxyg = edosUtil.getRealData(WindPowerCXYG.get(item).getNemCode()).getPointValueInDouble();
                 }
 
                  //   #region 读取历史数据
                 Double windpoweragcHis = 0.0;
                 if (WindPowerAGC.containsKey(item))
                 {
-                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerAGC.get(item).getCode(), begin.getTime()/1000, time.getTime()/1000,1);
+                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerAGC.get(item).getNemCode(), begin.getTime()/1000, time.getTime()/1000,1);
                     if(StringUtils.notEmp(hsls) && hsls.length>0)
                     {
                         windpoweragcHis =hsls[0].avg.DValue;
@@ -652,7 +652,7 @@ public  class LimitService {
                 if (WindPowerCXYG.containsKey(item))
                 {
 
-                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerCXYG.get(item).getCode(), begin.getTime()/1000, time.getTime()/1000,1);
+                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerCXYG.get(item).getNemCode(), begin.getTime()/1000, time.getTime()/1000,1);
                     if(StringUtils.notEmp(hsls) && hsls.length>0)
                     {
                         windpoweragcHis =hsls[0].avg.DValue;
@@ -662,7 +662,7 @@ public  class LimitService {
                 Double windpowerzsglHis = 0.0;
                 if (WindPowerZSGL.containsKey(item))
                 {
-                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerZSGL.get(item).getCode(), begin.getTime()/1000, time.getTime()/1000,1);
+                    DNAStatVal[] hsls= edosUtil.getHistStat(WindPowerZSGL.get(item).getNemCode(), begin.getTime()/1000, time.getTime()/1000,1);
                     if(StringUtils.notEmp(hsls) && hsls.length>0)
                     {
                         windpoweragcHis =hsls[0].avg.DValue;
@@ -721,7 +721,7 @@ public  class LimitService {
                         //{
 
                         //限电受累
-                        String id2 = WindturbineXDSL.get(key).getCode();
+                        String id2 = WindturbineXDSL.get(key).getNemCode();
                         Double xdsl = edosUtil.getRealData(id2).getPointValueInDouble();
                         Double val = 0.0;
                         if (xdsl == 1)
@@ -730,7 +730,7 @@ public  class LimitService {
                         }
                         RealTimeParameterVo rt = new RealTimeParameterVo();
 
-                        rt.setPoint(WindTurbineD.get(item).get(key).getCode());
+                        rt.setPoint(WindTurbineD.get(item).get(key).getNemCode());
                         rt.setTime(time);
                         rt.setInsertValue(val);
                         projectRT.add(rt);
@@ -740,7 +740,7 @@ public  class LimitService {
 
                     RealTimeParameterVo fcrt = new RealTimeParameterVo();
 
-                    fcrt.setPoint(WindPowerXDZT.get(item).getCode());
+                    fcrt.setPoint(WindPowerXDZT.get(item).getNemCode());
                     fcrt.setTime(time);
                     fcrt.setInsertValue(0.0);
                     projectRT.add(fcrt);
@@ -826,7 +826,7 @@ public  class LimitService {
                             //if (d == 1d)
                             //{
                             //限电受累
-                            String id2 = WindturbineXDSL.get(key).getCode();
+                            String id2 = WindturbineXDSL.get(key).getNemCode();
                             Double xdsl = edosUtil.getRealData(id2).getPointValueInDouble();
                             Double val = 0.0;
                             if (xdsl == 1)
@@ -835,7 +835,7 @@ public  class LimitService {
                             }
                             RealTimeParameterVo rt = new RealTimeParameterVo();
 
-                            rt.setPoint(WindTurbineD.get(item).get(key).getCode());
+                            rt.setPoint(WindTurbineD.get(item).get(key).getNemCode());
                             rt.setTime(time);
                             rt.setInsertValue(val);
                             projectRT.add(rt);
@@ -846,7 +846,7 @@ public  class LimitService {
                         }
                         RealTimeParameterVo fcrt = new RealTimeParameterVo();
   
-                        fcrt.setPoint(WindPowerXDZT.get(item).getCode());
+                        fcrt.setPoint(WindPowerXDZT.get(item).getNemCode());
                         fcrt.setTime(time);
                         fcrt.setInsertValue(0.0);
                         projectRT.add(fcrt);
@@ -854,7 +854,7 @@ public  class LimitService {
                     else
                     {
                         RealTimeParameterVo fcrt = new RealTimeParameterVo();
-                        fcrt.setPoint(WindPowerXDZT.get(item).getCode());
+                        fcrt.setPoint(WindPowerXDZT.get(item).getNemCode());
                         fcrt.setTime(time);
                         fcrt.setInsertValue(1.0);
                         projectRT.add(fcrt);
@@ -892,7 +892,7 @@ public  class LimitService {
 
                                 if (WindturbineQXDic4.containsKey(key))
                                 {
-                                    Double tempk = edosUtil.getRealData(WindturbineQXDic4.get(key).getCode()).getPointValueInDouble();
+                                    Double tempk = edosUtil.getRealData(WindturbineQXDic4.get(key).getNemCode()).getPointValueInDouble();
 
                                     if (tempk >= 3)
                                     {
@@ -910,7 +910,7 @@ public  class LimitService {
                                 if(windturbinetestingpointnewMap.containsKey(ContantXk.CJ_SSFS))
                                 {
                                     ProBasicEquipmentPoint xdztPoint = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS);
-                                    Double rtbbb = edosUtil.getRealData(xdztPoint.getCode()).getPointValueInDouble();
+                                    Double rtbbb = edosUtil.getRealData(xdztPoint.getNemCode()).getPointValueInDouble();
                                     if (rtbbb >= xz2 * 0.9)
                                     {
                                         tempb = false;
@@ -922,7 +922,7 @@ public  class LimitService {
 
 
                             //限出力状态
-                            String id1 = WindTurbineE.get(key).getCode();
+                            String id1 = WindTurbineE.get(key).getNemCode();
                             Double xcl = edosUtil.getRealData(id1).getPointValueInDouble();
 
 
@@ -931,7 +931,7 @@ public  class LimitService {
 
 
                             //限电受累
-                            String id2 = WindturbineXDSL.get(key).getCode();
+                            String id2 = WindturbineXDSL.get(key).getNemCode();
                             Double xdsl = edosUtil.getRealData(id2).getPointValueInDouble();
                             Double val = 0.0;
                             if (xdsl == 1 || xcl == 1 || tempb)
@@ -940,7 +940,7 @@ public  class LimitService {
                             }
                             RealTimeParameterVo rt = new RealTimeParameterVo();
 
-                            rt.setPoint(WindTurbineD.get(item).get(key).getCode());
+                            rt.setPoint(WindTurbineD.get(item).get(key).getNemCode());
                             rt.setTime(time);
                             rt.setInsertValue(val);
                             projectRT.add(rt);
@@ -1058,12 +1058,12 @@ public  class LimitService {
 //                {
 //                    Console.WriteLine("1");
 //                }
-                String point = xd.getCode();//重点注意！！！！
+                String point = xd.getNemCode();//重点注意！！！！
                 Double val = 0.0;
 
                 if (WindturbineXDSL.containsKey(key))
                 {
-                    Double ret = edosUtil.getRealData(WindturbineXDSL.get(key).getCode()).getPointValueInDouble();
+                    Double ret = edosUtil.getRealData(WindturbineXDSL.get(key).getNemCode()).getPointValueInDouble();
 
                     if (ret == 1)
                     {
@@ -1144,12 +1144,12 @@ public  class LimitService {
 //                if(windturbinetestingpointnewMap.containsKey(ContantXk.DI11139))
 //                {
 //                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.DI11139);
-//                    WindturbineQXDic2.put(wt.getCode(),point);
+//                    WindturbineQXDic2.put(wt.getNemCode(),point);
 //                }
 //                if(windturbinetestingpointnewMap.containsKey(ContantXk.DI10923))
 //                {
 //                    ProBasicEquipmentPoint point = windturbinetestingpointnewMap.get(ContantXk.DI10923);
-//                    WindturbineQXDic2.put(wt.getCode(),point);
+//                    WindturbineQXDic2.put(wt.getNemCode(),point);
 //                }
 
                 if(windturbinetestingpointnewMap.containsKey(ContantXk.XDZT))
@@ -1166,7 +1166,7 @@ public  class LimitService {
                     {
                         WindturbineQXDic.put(dis.getWindturbineId(), new ArrayList<String>());
                     }
-                    WindturbineQXDic.get(dis.getWindturbineId()).add(dis.getCode());
+                    WindturbineQXDic.get(dis.getWindturbineId()).add(dis.getNemCode());
                 }
 
         }
@@ -1188,7 +1188,7 @@ public  class LimitService {
 //                    Console.WriteLine(key);
 //
 //                }
-                String point = item.getCode();//重点注意！！！！
+                String point = item.getNemCode();//重点注意！！！！
                 Double val = 0.0;
                 if (CacheContext.wtmap.containsKey(key) && WindturbineQXDic.containsKey(key))
                 {
@@ -1226,7 +1226,7 @@ public  class LimitService {
 
                     if (WindturbineQXDic2.containsKey(key))
                     {
-                        PointData k = edosUtil.getRealData(WindturbineQXDic2.get(key).getCode());
+                        PointData k = edosUtil.getRealData(WindturbineQXDic2.get(key).getNemCode());
 
                         b = b && (k.getPointValueInDouble() == 0);
                     }

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

@@ -128,19 +128,19 @@ public class PowerCurveFittingService {
 
                 Map<String, ProBasicEquipmentPoint> windturbinetestingpointnewMap = CacheContext.wtpAimap.get(wt.getId());
 
-                String pointIdGL =windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getCode();
+                String pointIdGL =windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL).getNemCode();
 
 
-                String pointIdZT =windturbinetestingpointnewMap.get(ContantXk.MXZT).getCode();
+                String pointIdZT =windturbinetestingpointnewMap.get(ContantXk.MXZT).getNemCode();
 
                 String pointIdFS = "";
                 if (wt.getWindpowerstationId().indexOf("GDC")>=0)
                 {
-                    pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70).getCode();;
+                    pointIdFS = windturbinetestingpointnewMap.get(ContantXk.FCCFTFS70).getNemCode();;
 
                 }else
                 {
-                    pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getCode();
+                    pointIdFS = windturbinetestingpointnewMap.get(ContantXk.CJ_SSFS).getNemCode();
                 }
 
 
@@ -909,7 +909,7 @@ public class PowerCurveFittingService {
         //与保证功率进行对比，偏差大于25%的进行过滤
         List<String> pointid=new ArrayList<>();
 
-        pointid.add(wtpointmap.get(ContantXk.BZGL).getCode());
+        pointid.add(wtpointmap.get(ContantXk.BZGL).getNemCode());
         List<PointData> value=edosUtil.getHistMatrix(pointid,gl.getPointTime()/1000);
 
 

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

@@ -161,7 +161,7 @@ public class ShutdownService {
             {
                 ProBasicEquipmentPoint ygglPoint = windturbinetestingpointnewMap.get(ContantXk.CJ_SSGL);
 
-                powerPoints.put(ygglPoint.getCode(),ygglPoint);
+                powerPoints.put(ygglPoint.getNemCode(),ygglPoint);
                 powerpointList.add(ygglPoint);
             }
 
@@ -279,10 +279,10 @@ public class ShutdownService {
             double power = 0;
             if (powerPoints.containsKey(key))
             {
-                power = StringUtils.round(edosUtil.getRealData(powerPoints.get(key).getCode()).getPointValueInDouble(),4);
+                power = StringUtils.round(edosUtil.getRealData(powerPoints.get(key).getNemCode()).getPointValueInDouble(),4);
 
             }
-            Double value = StringUtils.round(edosUtil.getRealData(statusPoints.get(key).getCode()).getPointValueInDouble(),4);
+            Double value = StringUtils.round(edosUtil.getRealData(statusPoints.get(key).getNemCode()).getPointValueInDouble(),4);
 
             if (power > 1)
             {
@@ -456,7 +456,7 @@ public class ShutdownService {
 
                         if (speedpointMap.containsKey(s))
                         {
-                            double value =edosUtil.getRealData(speedpointMap.get(s).getCode()).getPointValueInDouble();
+                            double value =edosUtil.getRealData(speedpointMap.get(s).getNemCode()).getPointValueInDouble();
                             input.setSpeed(value);
                         }
 
@@ -474,7 +474,7 @@ public class ShutdownService {
                         input.setInputOrOutput(0);
                         if (speedpointMap.containsKey(s))
                         {
-                            double value =edosUtil.getRealData(speedpointMap.get(s).getCode()).getPointValueInDouble();
+                            double value =edosUtil.getRealData(speedpointMap.get(s).getNemCode()).getPointValueInDouble();
                             input.setSpeed(value);
                         }
 
@@ -533,13 +533,13 @@ public class ShutdownService {
 
         if (windTurbines.get(status.getWindturbineId()).getWindpowerstationId().indexOf("GDC") >= 0)
         {
-            String point=gzdpointMap.get(windTurbines.get(status.getWindturbineId()).getWindpowerstationId()).getCode();
+            String point=gzdpointMap.get(windTurbines.get(status.getWindturbineId()).getWindpowerstationId()).getNemCode();
             speedDataList1 =edosUtil.getHistoryDatasSnap(point,status.getStopTime().getTime()/1000,status.getStartTime().getTime()/1000);
             type1 = "GDC";
         }
         else
         {
-            String point=speedpointMap.get(status.getWindturbineId()).getCode();
+            String point=speedpointMap.get(status.getWindturbineId()).getNemCode();
             speedDataList1 =edosUtil.getHistoryDatasSnap(point,status.getStopTime().getTime()/1000,status.getStartTime().getTime()/1000);
 
             type1 = "FDC";
@@ -727,7 +727,7 @@ public class ShutdownService {
                 double endvalue=0.0;
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -760,7 +760,7 @@ public class ShutdownService {
 
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getNemCode());
                 List<PointData> xdbegin=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,endDate.getTime()/1000);
 
@@ -787,7 +787,7 @@ public class ShutdownService {
 
 
                 List<String> pointid=new ArrayList<>();
-                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getCode());
+                pointid.add(wtpointmap.get(ContantXk.NGZSSDL).getNemCode());
                 List<PointData> xdend=edosUtil.getHistMatrix(pointid,startDate.getTime()/1000);
 
 

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

@@ -523,7 +523,7 @@ public class WindPowerInfo1Service {
                 {
                     pepid1ls = proEconPowerstationInfoDay1Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(pj.getId())
+                                    && i.getProjectId().equals(pj.getId())
                                     && i.getLocation().equals(Location.pj.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -586,7 +586,7 @@ public class WindPowerInfo1Service {
                 {
                     pepid1ls = proEconPowerstationInfoDay1Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(ln.getId())
+                                    && i.getLineId().equals(ln.getId())
                                     && i.getLocation().equals(Location.ln.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -606,7 +606,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.SSPJFS))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.SSPJFS);
-            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
                 DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -623,7 +623,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.SSZGL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.SSZGL);
-            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
             if(!pointls.isEmpty())
             {
                 DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -641,7 +641,7 @@ public class WindPowerInfo1Service {
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RFDL);
 
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日发电量
@@ -652,7 +652,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RKYDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RKYDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日可用电量
@@ -665,7 +665,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RLLFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RLLFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日理论发电量
@@ -678,7 +678,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日故障损失电量
@@ -689,7 +689,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RCNSLGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RCNSLGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日场内受累故障损失电量
@@ -701,7 +701,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日检修损失电量
@@ -713,7 +713,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RCNSLJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RCNSLJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日场内受累检修损失电量
@@ -725,7 +725,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RDJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RDJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日待机损失电量
@@ -736,7 +736,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RQXJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日缺陷降出力损失电量
@@ -747,7 +747,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RSDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RSDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日手动停机损失电量
@@ -758,7 +758,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RXNSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RXNSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日性能损失电量
@@ -770,7 +770,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RXDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RXDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日限电停机损失电量
@@ -783,7 +783,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RXDJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RXDJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日限电降出力损失电量
@@ -795,7 +795,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RCWSLDWSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RCWSLDWSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日场外受累电网损失电量
@@ -806,7 +806,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RCWSLTQSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RCWSLTQSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日场外受累天气损失电量
@@ -818,7 +818,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RZFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RZFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日增发电量
@@ -830,7 +830,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RQFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RQFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日欠发电量
@@ -841,7 +841,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.RZHD))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.RZHD);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //日自耗电
@@ -917,7 +917,7 @@ public class WindPowerInfo1Service {
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YFDL);
 
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月发电量
@@ -928,7 +928,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YKYDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YKYDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月可用电量
@@ -941,7 +941,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YLLFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YLLFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月理论发电量
@@ -954,7 +954,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月故障损失电量
@@ -965,7 +965,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YCNSLGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YCNSLGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月场内受累故障损失电量
@@ -977,7 +977,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月检修损失电量
@@ -989,7 +989,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YCNSLJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YCNSLJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月场内受累检修损失电量
@@ -1001,7 +1001,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YDJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YDJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月待机损失电量
@@ -1012,7 +1012,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YQXJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YQXJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月缺陷降出力损失电量
@@ -1023,7 +1023,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YSDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YSDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月手动停机损失电量
@@ -1034,7 +1034,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YXNSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YXNSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月性能损失电量
@@ -1046,7 +1046,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YXDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YXDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月限电停机损失电量
@@ -1059,7 +1059,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YXDJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YXDJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月限电降出力损失电量
@@ -1071,7 +1071,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YCWSLDWSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YCWSLDWSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月场外受累电网损失电量
@@ -1082,7 +1082,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YCWSLTQSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YCWSLTQSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月场外受累天气损失电量
@@ -1094,7 +1094,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YZFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YZFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月增发电量
@@ -1106,7 +1106,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YQFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YQFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月欠发电量
@@ -1117,7 +1117,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.YZHD))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.YZHD);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月自耗电
@@ -1190,7 +1190,7 @@ public class WindPowerInfo1Service {
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NFDL);
 
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年发电量
@@ -1201,7 +1201,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NKYDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NKYDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年可用电量
@@ -1214,7 +1214,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NLLFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NLLFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年理论发电量
@@ -1227,7 +1227,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年故障损失电量
@@ -1238,7 +1238,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NCNSLGZSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NCNSLGZSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年场内受累故障损失电量
@@ -1250,7 +1250,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年检修损失电量
@@ -1262,7 +1262,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NCNSLJXSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NCNSLJXSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年场内受累检修损失电量
@@ -1274,7 +1274,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NDJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NDJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年待机损失电量
@@ -1285,7 +1285,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NQXJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NQXJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年缺陷降出力损失电量
@@ -1296,7 +1296,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NSDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NSDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年手动停机损失电量
@@ -1307,7 +1307,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NXNSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NXNSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年性能损失电量
@@ -1319,7 +1319,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NXDTJSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NXDTJSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年限电停机损失电量
@@ -1332,7 +1332,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NXDJCLSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NXDJCLSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年限电降出力损失电量
@@ -1344,7 +1344,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NCWSLDWSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NCWSLDWSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年场外受累电网损失电量
@@ -1355,7 +1355,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NCWSLTQSSDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NCWSLTQSSDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年场外受累天气损失电量
@@ -1367,7 +1367,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NZFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NZFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年增发电量
@@ -1379,7 +1379,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NQFDL))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NQFDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年欠发电量
@@ -1390,7 +1390,7 @@ public class WindPowerInfo1Service {
         if(pointmap.containsKey(ContantXk.NZHD))
         {
             ProBasicWppoint point= pointmap.get(ContantXk.NZHD);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(), recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年自耗电

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

@@ -514,7 +514,7 @@ public class WindPowerInfo2Service {
                 {
                     pepidls = proEconPowerstationInfoDay2Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(pj.getId())
+                                    && i.getProjectId().equals(pj.getId())
                                     && i.getLocation().equals(Location.pj.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -577,7 +577,7 @@ public class WindPowerInfo2Service {
                 {
                     pepidls = proEconPowerstationInfoDay2Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(ln.getId())
+                                    && i.getLineId().equals(ln.getId())
                                     && i.getLocation().equals(Location.ln.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -631,13 +631,13 @@ public class WindPowerInfo2Service {
         {
 
             lastState=-1;//上一分钟状态
-            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.MXZT));
             {
 
                 ProBasicEquipmentPoint point=aimap.get(ContantXk.MXZT);
                  //按照分钟时间进行统计状态快照值
-                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                 if(!pointls.isEmpty())
                 {
                     for(PointData po :pointls)
@@ -802,42 +802,40 @@ public class WindPowerInfo2Service {
                         }
 
                     }
-                    //日合计故障小时（明细）
-                    pewp.setRhjgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场内受累故障小时（明细）
-                    pewp.setRhjcnslgzxsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计检修小时（明细）
-                    pewp.setRhjjxxsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场内受累检修小时（明细）
-                    pewp.setRhjcnsljxxsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计待机小时（明细）
-                    pewp.setRhjdjxsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计缺陷降出力小时（明细）
-                    pewp.setRhjqxjclxsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计手动停机小时（明细）
-                    pewp.setRhjsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计性能小时（明细）
-                    pewp.setRhjbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电停机小时（明细）
-                    pewp.setRhjxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电降出力小时（明细）
-                    pewp.setRhjxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场外受累电网小时（明细）
-                    pewp.setRhjcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场外受累电网小时（明细）
-                    pewp.setRhjcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计通讯中断小时（明细）
-                    pewp.setRhjtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计离线小时（明细）
-                    pewp.setRhjlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
-
-
 
                 }
 
             }
         }
+        //日合计故障小时（明细）
+        pewp.setRhjgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累故障小时（明细）
+        pewp.setRhjcnslgzxsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计检修小时（明细）
+        pewp.setRhjjxxsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累检修小时（明细）
+        pewp.setRhjcnsljxxsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计待机小时（明细）
+        pewp.setRhjdjxsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计缺陷降出力小时（明细）
+        pewp.setRhjqxjclxsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计手动停机小时（明细）
+        pewp.setRhjsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计性能小时（明细）
+        pewp.setRhjbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电停机小时（明细）
+        pewp.setRhjxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电降出力小时（明细）
+        pewp.setRhjxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRhjcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRhjcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时（明细）
+        pewp.setRhjtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计离线小时（明细）
+        pewp.setRhjlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 
 /*******************************************日信息统计*********************************************************/
 
@@ -1068,13 +1066,13 @@ public class WindPowerInfo2Service {
 
         for(ProBasicWindturbine wt:wtls)
         {
-            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.SBZT));
             {
 
                 ProBasicEquipmentPoint point=aimap.get(ContantXk.SBZT);
                 //按照分钟时间进行统计状态快照值
-                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                 if(!pointls.isEmpty()) {
                     for (PointData po : pointls) {
 
@@ -1149,28 +1147,25 @@ public class WindPowerInfo2Service {
 
                     }
 
-
-                    //日合计待机小时
-                    pewp.setRhjdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计维护停机小时
-                    pewp.setRhjjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    // 日合计待机小时
-                    pewp.setRhjdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计运行小时
-                    pewp.setRhjyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电小时
-                    pewp.setRhjxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计通讯中断小时
-                    pewp.setRhjtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计受累小时
-                    pewp.setRhjslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
                 }
 
-
-
             }
         }
 
+            //日合计待机小时
+            pewp.setRhjdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            //日合计维护停机小时
+            pewp.setRhjjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            // 日合计待机小时
+            pewp.setRhjdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            //日合计运行小时
+            pewp.setRhjyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            //日合计限电小时
+            pewp.setRhjxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            //日合计通讯中断小时
+            pewp.setRhjtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+            //日合计受累小时
+            pewp.setRhjslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
             /*******************************************日信息统计*********************************************************/

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

@@ -514,7 +514,7 @@ public class WindPowerInfo3Service {
                 {
                     pepidls = proEconPowerstationInfoDay3Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(pj.getId())
+                                    && i.getProjectId().equals(pj.getId())
                                     && i.getLocation().equals(Location.pj.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -577,7 +577,7 @@ public class WindPowerInfo3Service {
                 {
                     pepidls = proEconPowerstationInfoDay3Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(ln.getId())
+                                    && i.getLineId().equals(ln.getId())
                                     && i.getLocation().equals(Location.ln.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -631,13 +631,13 @@ public class WindPowerInfo3Service {
         {
 
             lastState=-1;//上一分钟状态
-            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.MXZT));
             {
 
                 ProBasicEquipmentPoint point=aimap.get(ContantXk.MXZT);
                 //按照分钟时间进行统计状态快照值
-                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                 if(!pointls.isEmpty())
                 {
                     for(PointData po :pointls)
@@ -802,43 +802,41 @@ public class WindPowerInfo3Service {
                         }
 
                     }
-                    //日合计故障小时（明细）
-                    pewp.setRhjgzcsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场内受累故障小时（明细）
-                    pewp.setRhjcnslgzcsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计检修小时（明细）
-                    pewp.setRhjjxcsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场内受累检修小时（明细）
-                    pewp.setRhjcnsljxcsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计待机小时（明细）
-                    pewp.setRhjdjcsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计缺陷降出力小时（明细）
-                    pewp.setRhjqxjclcsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计手动停机小时（明细）
-                    pewp.setRhjsdtjcsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计性能小时（明细）
-                    pewp.setRhjbwcsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电停机小时（明细）
-                    pewp.setRhjxdtjcsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电降出力小时（明细）
-                    pewp.setRhjxdjclcsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场外受累电网小时（明细）
-                    pewp.setRhjcwsldwcsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计场外受累电网小时（明细）
-                    pewp.setRhjcwsltqcsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计通讯中断小时（明细）
-                    pewp.setRhjtxzdcsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计离线小时（明细）
-                    pewp.setRhjlxcsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
-
-
 
                 }
 
             }
         }
 
+        //日合计故障小时（明细）
+        pewp.setRhjgzcsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累故障小时（明细）
+        pewp.setRhjcnslgzcsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计检修小时（明细）
+        pewp.setRhjjxcsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场内受累检修小时（明细）
+        pewp.setRhjcnsljxcsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计待机小时（明细）
+        pewp.setRhjdjcsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计缺陷降出力小时（明细）
+        pewp.setRhjqxjclcsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计手动停机小时（明细）
+        pewp.setRhjsdtjcsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计性能小时（明细）
+        pewp.setRhjbwcsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电停机小时（明细）
+        pewp.setRhjxdtjcsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电降出力小时（明细）
+        pewp.setRhjxdjclcsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRhjcwsldwcsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计场外受累电网小时（明细）
+        pewp.setRhjcwsltqcsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时（明细）
+        pewp.setRhjtxzdcsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计离线小时（明细）
+        pewp.setRhjlxcsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 /*******************************************日信息统计*********************************************************/
 
 /*******************************************月信息统计*********************************************************/
@@ -1068,13 +1066,13 @@ public class WindPowerInfo3Service {
 
         for(ProBasicWindturbine wt:wtls)
         {
-            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
             if(wtpAimap.containsKey(ContantXk.SBZT));
             {
 
                 ProBasicEquipmentPoint point=aimap.get(ContantXk.SBZT);
                 //按照分钟时间进行统计状态快照值
-                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
                 if(!pointls.isEmpty()) {
                     for (PointData po : pointls) {
 
@@ -1149,29 +1147,27 @@ public class WindPowerInfo3Service {
 
                     }
 
-
-                    //日合计待机小时
-                    pewp.setRhjdjcs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计维护停机小时
-                    pewp.setRhjjxtjcs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    // 日合计待机小时
-                    pewp.setRhjdjcs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计运行小时
-                    pewp.setRhjyxcs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计限电小时
-                    pewp.setRhjxdcs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计通讯中断小时
-                    pewp.setRhjtxzdcs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-                    //日合计受累小时
-                    pewp.setRhjslcs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
                 }
 
-
-
             }
         }
 
 
+        //日合计待机小时
+        pewp.setRhjdjcs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计维护停机小时
+        pewp.setRhjjxtjcs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        // 日合计待机小时
+        pewp.setRhjdjcs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计运行小时
+        pewp.setRhjyxcs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电小时
+        pewp.setRhjxdcs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时
+        pewp.setRhjtxzdcs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计受累小时
+        pewp.setRhjslcs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 
         /*******************************************日信息统计*********************************************************/
 

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

@@ -466,7 +466,7 @@ public class WindPowerInfo5Service {
                 {
                     pepid1ls = proEconPowerstationInfoDay5Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(pj.getId())
+                                    && i.getProjectId().equals(pj.getId())
                                     && i.getLocation().equals(Location.pj.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -529,7 +529,7 @@ public class WindPowerInfo5Service {
                 {
                     pepid1ls = proEconPowerstationInfoDay5Service.list().stream()
                             .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
-                                    && i.getWindpowerstationId().equals(ln.getId())
+                                    && i.getLineId().equals(ln.getId())
                                     && i.getLocation().equals(Location.ln.getValue()))
                             .collect(Collectors.toList());
                 }
@@ -554,7 +554,7 @@ public class WindPowerInfo5Service {
                 if(pointmap.containsKey(ContantXk.RFDLSYZ));
                 {
                     ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
                         //日发电量(升压站)
@@ -567,7 +567,7 @@ public class WindPowerInfo5Service {
                 if(pointmap.containsKey(ContantXk.RSWDL));
                 {
                     ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
                         //日上网电量
@@ -580,7 +580,7 @@ public class WindPowerInfo5Service {
                 if(pointmap.containsKey(ContantXk.RGWGWDL));
                 {
                     ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
                         //日工网购网电量
@@ -593,7 +593,7 @@ public class WindPowerInfo5Service {
                 if(pointmap.containsKey(ContantXk.RNWGWDL));
                 {
                     ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
                         //日农网购网电量
@@ -610,7 +610,7 @@ public class WindPowerInfo5Service {
                 if(pointmap.containsKey(ContantXk.RCYDL));
                 {
                     ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
                     if(StringUtils.notEmp(pointValue))
                     {
                         //日厂用电量
@@ -631,7 +631,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.YFDLSYZ));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.YFDLSYZ);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月发电量(升压站)
@@ -644,7 +644,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.YSWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.YSWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月上网电量
@@ -657,7 +657,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.YGWGWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.YGWGWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月工网购网电量
@@ -670,7 +670,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.YNWGWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.YNWGWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月农网购网电量
@@ -687,7 +687,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.YCYDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.YCYDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //月厂用电量
@@ -707,7 +707,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.NFDLSYZ));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.NFDLSYZ);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年发电量(升压站)
@@ -720,7 +720,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.NSWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.NSWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年上网电量
@@ -733,7 +733,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.NGWGWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.NGWGWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年工网购网电量
@@ -746,7 +746,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.NNWGWDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.NNWGWDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
             if(StringUtils.notEmp(pointValue))
             {
                 //年农网购网电量
@@ -763,7 +763,7 @@ public class WindPowerInfo5Service {
         if(pointmap.containsKey(ContantXk.NCYDL));
         {
             ProBasicWppoint point=pointmap.get(ContantXk.NCYDL);
-            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            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

@@ -0,0 +1,694 @@
+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;
+import com.gyee.generation.service.auto.*;
+import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.statisticcs.Initial;
+import org.slf4j.Logger;
+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;
+
+@Service
+public class WindPowerInfo6Service {
+
+    private static final Logger logger = LoggerFactory.getLogger(WindPowerInfo1Service.class);
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProEconPowerstationInfoDay6Service proEconPowerstationInfoDay6Service;
+
+
+
+
+    /**
+     * 计算区域日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calRegionInfoDay(Date recordDate) throws Exception {
+
+        List<ProEconPowerstationInfoDay6> wpinfodayls = proEconPowerstationInfoDay6Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.cp.getValue()))
+                .collect(Collectors.toList());
+        if(!wpinfodayls.isEmpty())
+        {
+
+            Map<String, Map<String, List<ProEconPowerstationInfoDay6>>>rgmap=new HashMap<>();
+
+
+
+
+            for(ProEconPowerstationInfoDay6 wpinfo:wpinfodayls)
+            {
+
+                if(rgmap.containsKey(wpinfo.getCompanyId()))
+                {
+                    Map<String, List<ProEconPowerstationInfoDay6>> map=rgmap.get(wpinfo.getCompanyId());
+                    List<ProEconPowerstationInfoDay6> qbls=map.get("qb");
+                    List<ProEconPowerstationInfoDay6> gfls=map.get("fd");
+                    List<ProEconPowerstationInfoDay6> fdls=map.get("gf");
+
+                    if(wpinfo.getForeignKeyId().equals("-1"))
+                    {
+                        fdls.add(wpinfo);
+                    }else if(wpinfo.getForeignKeyId().equals("-2")){
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                }else
+                {
+                    Map<String, List<ProEconPowerstationInfoDay6>> map=new HashMap<>();
+
+                    List<ProEconPowerstationInfoDay6> qbls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay6> gfls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay6> fdls=new ArrayList<>();
+
+                    if(wpinfo.getForeignKeyId().equals("-1"))
+                    {
+                        fdls.add(wpinfo);
+                    }else if(wpinfo.getForeignKeyId().equals("-2")){
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                    map.put("qb",qbls);
+                    map.put("fd",fdls);
+                    map.put("gf",gfls);
+                }
+            }
+
+
+            //判断是否有重复记录，先删除重复记录
+            List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                            && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                            && i.getLocation().equals(Location.rg.getValue())).map(ProEconPowerstationInfoDay6::getId)
+                    .collect(Collectors.toList());
+
+            if (idls != null && idls.size() > 0) {
+
+                proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+            }
+            for(Map.Entry<String, Map<String, List<ProEconPowerstationInfoDay6>>> entry:rgmap.entrySet()){
+                Map<String, List<ProEconPowerstationInfoDay6>> map=entry.getValue();
+                List<ProEconPowerstationInfoDay6> qbls=map.get("qb");
+                List<ProEconPowerstationInfoDay6> gfls=map.get("fd");
+                List<ProEconPowerstationInfoDay6> fdls=map.get("gf");
+//                if(CacheContext.cpwpmap.size()==qbls.size())
+//                {
+
+                ProEconPowerstationInfoDay6 qb=new ProEconPowerstationInfoDay6();
+                ProEconPowerstationInfoDay6 fd=new ProEconPowerstationInfoDay6();
+                ProEconPowerstationInfoDay6 gf=new ProEconPowerstationInfoDay6();
+
+                if(CacheContext.rgmap.containsKey(entry.getKey()))
+                {
+                    ProBasicRegion cp=CacheContext.rgmap.get(entry.getKey());
+                    gf.setRegionId(cp.getId());
+
+                    gf.setRecordDate(DateUtils.truncDay(recordDate));
+                    gf.setForeignKeyId("-2");
+                    gf.setLocation(Location.rg.getValue());
+
+                    fd.setRegionId(cp.getId());
+
+                    fd.setRecordDate(DateUtils.truncDay(recordDate));
+                    fd.setForeignKeyId("-1");
+                    fd.setLocation(Location.rg.getValue());
+
+                    qb.setRegionId(cp.getId());
+
+                    qb.setRecordDate(DateUtils.truncDay(recordDate));
+                    qb.setForeignKeyId("0");
+                    qb.setLocation(Location.rg.getValue());
+
+                    //计算区域级全部
+                    calCp(qb,qbls);
+                    //计算公司级风电场站
+                    calCp(fd,fdls);
+                    //计算公司级光电场站
+                    calCp(gf,gfls);
+
+                    proEconPowerstationInfoDay6Service.save(qb);
+                    proEconPowerstationInfoDay6Service.save(fd);
+                    proEconPowerstationInfoDay6Service.save(gf);
+                }
+
+
+//                }else
+//                {
+//                    logger.debug("公司所属场站数量与保存的场站日信息数量不一致，未进行{0}统计-------结束", entry.getKey());
+//
+//                }
+
+
+
+
+
+            };
+        }
+
+    }
+
+    /**
+     * 计算公司日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calCompanyInfoDay(Date recordDate) throws Exception {
+
+        List<ProEconPowerstationInfoDay6> wpinfodayls = proEconPowerstationInfoDay6Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.wp.getValue()))
+                .collect(Collectors.toList());
+        if(!wpinfodayls.isEmpty())
+        {
+
+            Map<String, Map<String, List<ProEconPowerstationInfoDay6>>>cpmap=new HashMap<>();
+
+
+
+
+            for(ProEconPowerstationInfoDay6 wpinfo:wpinfodayls)
+            {
+
+                if(cpmap.containsKey(wpinfo.getCompanyId()))
+                {
+                    Map<String, List<ProEconPowerstationInfoDay6>> map=cpmap.get(wpinfo.getCompanyId());
+                    List<ProEconPowerstationInfoDay6> qbls=map.get("qb");
+                    List<ProEconPowerstationInfoDay6> gfls=map.get("fd");
+                    List<ProEconPowerstationInfoDay6> fdls=map.get("gf");
+
+                    if(wpinfo.getWindpowerstationId().indexOf("FDC")>=0)
+                    {
+                        fdls.add(wpinfo);
+                    }else {
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                }else
+                {
+                    Map<String, List<ProEconPowerstationInfoDay6>> map=new HashMap<>();
+
+                    List<ProEconPowerstationInfoDay6> qbls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay6> gfls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay6> fdls=new ArrayList<>();
+
+                    if(wpinfo.getWindpowerstationId().indexOf("FDC")>=0)
+                    {
+                        fdls.add(wpinfo);
+                    }else {
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                    map.put("qb",qbls);
+                    map.put("fd",fdls);
+                    map.put("gf",gfls);
+                }
+            }
+
+
+            //判断是否有重复记录，先删除重复记录
+            List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                            && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                            && i.getLocation().equals(Location.cp.getValue())).map(ProEconPowerstationInfoDay6::getId)
+                    .collect(Collectors.toList());
+
+            if (idls != null && idls.size() > 0) {
+
+                proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+            }
+            for(Map.Entry<String, Map<String, List<ProEconPowerstationInfoDay6>>> entry:cpmap.entrySet()){
+                Map<String, List<ProEconPowerstationInfoDay6>> map=entry.getValue();
+                List<ProEconPowerstationInfoDay6> qbls=map.get("qb");
+                List<ProEconPowerstationInfoDay6> gfls=map.get("fd");
+                List<ProEconPowerstationInfoDay6> fdls=map.get("gf");
+//                if(CacheContext.cpwpmap.size()==qbls.size())
+//                {
+
+                ProEconPowerstationInfoDay6 qb=new ProEconPowerstationInfoDay6();
+                ProEconPowerstationInfoDay6 fd=new ProEconPowerstationInfoDay6();
+                ProEconPowerstationInfoDay6 gf=new ProEconPowerstationInfoDay6();
+
+                if(CacheContext.cpmap.containsKey(entry.getKey()))
+                {
+                    ProBasicCompany cp=CacheContext.cpmap.get(entry.getKey());
+                    gf.setRegionId(cp.getRegionId());
+                    gf.setCompanyId(cp.getId());
+                    gf.setRecordDate(DateUtils.truncDay(recordDate));
+                    gf.setForeignKeyId("-2");
+                    gf.setLocation(Location.cp.getValue());
+
+
+
+                    fd.setRegionId(cp.getRegionId());
+                    fd.setCompanyId(cp.getId());
+                    fd.setRecordDate(DateUtils.truncDay(recordDate));
+                    fd.setForeignKeyId("-1");
+                    fd.setLocation(Location.cp.getValue());
+
+                    qb.setRegionId(cp.getRegionId());
+                    qb.setCompanyId(cp.getId());
+                    qb.setRecordDate(DateUtils.truncDay(recordDate));
+                    qb.setForeignKeyId("0");
+                    qb.setLocation(Location.cp.getValue());
+
+                    //计算公司级全部场站
+                    calCp(qb,qbls);
+                    //计算公司级风电场站
+                    calCp(fd,fdls);
+                    //计算公司级光电场站
+                    calCp(gf,gfls);
+
+                    proEconPowerstationInfoDay6Service.save(qb);
+                    proEconPowerstationInfoDay6Service.save(fd);
+                    proEconPowerstationInfoDay6Service.save(gf);
+                }
+
+
+//                }else
+//                {
+//                    logger.debug("公司所属场站数量与保存的场站日信息数量不一致，未进行{0}统计-------结束", entry.getKey());
+//
+//                }
+
+
+
+
+
+            };
+        }
+
+    }
+
+    private void calCp(ProEconPowerstationInfoDay6 pewp,List<ProEconPowerstationInfoDay6> ls) throws Exception {
+
+        if(!ls.isEmpty())
+        {
+
+
+        }
+    }
+    /**
+     * 计算场站日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calWindpowerInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+
+        List<ProEconPowerstationInfoDay6> wpinfodayls=new ArrayList<>();
+
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.wp.getValue())).map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
+        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        {
+            if(CacheContext.wppointmap.containsKey(wp.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+
+                ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
+                Initial.initial(pewp);
+                pewp.setRegionId(wp.getRegionId());
+                pewp.setCompanyId(wp.getCompanyId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+                pewp.setForeignKeyId("0");
+                pewp.setWindpowerstationId(wp.getId());
+                pewp.setLocation(Location.wp.getValue());
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay6> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay6Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindpowerstationId().equals(wp.getId())
+                                    && i.getLocation().equals(Location.wp.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+/*******************************************年信息统计*********************************************************/
+//                wpinfodayls.add(pewp);
+                proEconPowerstationInfoDay6Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    /**
+     * 计算项目日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calProjectInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.pjmap.containsKey(i.getProjectId())
+                        && i.getLocation().equals(Location.pj.getValue())).map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
+        for(ProBasicProject pj:CacheContext.pjls)
+        {
+            if(CacheContext.wppointmap.containsKey(pj.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+
+                ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
+                Initial.initial(pewp);
+                pewp.setForeignKeyId("0");
+                pewp.setWindpowerstationId(pj.getWindpowerstationId());
+                pewp.setProjectId(pj.getId());
+                pewp.setLocation(Location.pj.getValue());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay6> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay6Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getProjectId().equals(pj.getId())
+                                    && i.getLocation().equals(Location.pj.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+
+
+                proEconPowerstationInfoDay6Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+    /**
+     * 计算线路日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calLineInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay6Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.lnmap.containsKey(i.getLineId())
+                        && i.getLocation().equals(Location.ln.getValue()) ).map(ProEconPowerstationInfoDay6::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay6Service.removeByIds(idls);
+
+        }
+        for(ProBasicLine ln:CacheContext.lnls)
+        {
+            if(CacheContext.wppointmap.containsKey(ln.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+
+                ProEconPowerstationInfoDay6 pewp=new ProEconPowerstationInfoDay6();
+                Initial.initial(pewp);
+                pewp.setForeignKeyId("0");
+                pewp.setLineId(ln.getId());
+                pewp.setLocation(Location.ln.getValue());
+                pewp.setProjectId(ln.getProjectId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay6> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay6Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getLineId().equals(ln.getId())
+                                    && i.getLocation().equals(Location.ln.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+
+                proEconPowerstationInfoDay6Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp,List<ProEconPowerstationInfoDay6> pepid1ls) throws Exception {
+        /*******************************************日信息统计*********************************************************/
+        if(pointmap.containsKey(ContantXk.FCCFTFS70))
+        {
+            ProBasicWppoint point= pointmap.get(ContantXk.FCCFTFS70);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+            if(!pointls.isEmpty())
+            {
+                DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
+                //日最大风速
+                pewp.setRzdfscft(summaryStatistics.getMax());
+                //日最小风速
+                pewp.setRzxfscft(summaryStatistics.getMin());
+                //日平均风速
+                pewp.setRpjfscft(summaryStatistics.getAverage());
+            }
+
+        }
+
+        if(pointmap.containsKey(ContantXk.SSZGL))
+        {
+            ProBasicWppoint point= pointmap.get(ContantXk.SSZGL);
+            List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
+            if(!pointls.isEmpty())
+            {
+                DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
+                //日最大功率
+                pewp.setRzdglcx(summaryStatistics.getMax());
+                //日最小功率
+                pewp.setRzxglcx(summaryStatistics.getMin());
+                //日平均功率
+                pewp.setRpjglcx(summaryStatistics.getAverage());
+            }
+        }
+
+
+/*******************************************日信息统计*********************************************************/
+
+/*******************************************月信息统计*********************************************************/
+
+        if(pepid1ls.isEmpty())
+        {
+            setPowerandSpeedMonth(end, begin, pointmap, pewp);
+        }else
+        {
+
+
+            if(!pepid1ls.isEmpty())
+            {
+                ProEconPowerstationInfoDay6 pepid=pepid1ls.get(0);
+
+                //如果昨日大于今日最大功率
+                if(pepid.getYzdglcx()> pewp.getRzdglcx())
+                {
+                    pewp.setYzdglcx(pepid.getRzdglcx());
+                }else {
+                    pewp.setYzdglcx(pewp.getRzdglcx());
+                }
+                //如果昨日大于今日最大风速
+                if(pepid.getYzdfscft()> pewp.getRzdfscft())
+                {
+                    pewp.setYzdfscft(pepid.getRzdfscft());
+                }else
+                {
+                    pewp.setYzdfscft(pewp.getRzdfscft());
+                }
+
+                //如果昨日小于今日最小功率
+                if(pepid.getYzxglcx()< pewp.getRzxglcx())
+                {
+                    pewp.setYzxglcx(pepid.getRzxglcx());
+                }else
+                {
+                    pewp.setYzxglcx(pewp.getRzxglcx());
+                }
+                //如果昨日小于今日最小风速
+                if(pepid.getYzxfscft()< pewp.getRzxfscft())
+                {
+                    pewp.setYzxfscft(pepid.getRzxfscft());
+                }else
+                {
+                    pewp.setYzxfscft(pewp.getRzxfscft());
+                }
+                double   pjfs = new BigDecimal(pewp.getYpjfscft()+pepid.getRpjfscft()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+
+                pewp.setYzxfscft(pjfs);
+
+                double   pjgl = new BigDecimal(pewp.getYpjglcx()+pepid.getRpjglcx()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+                pewp.setYzxglcx(pjgl);
+
+            }else
+            {
+                setPowerandSpeedMonth(end, begin, pointmap, pewp);
+            }
+
+        }
+
+
+/*******************************************月信息统计*********************************************************/
+
+/*******************************************年信息统计*********************************************************/
+        if(pepid1ls.isEmpty())
+        {
+            setPowerandSpeedYear(end, begin, pointmap, pewp);
+        }else {
+
+            if (!pepid1ls.isEmpty()) {
+                ProEconPowerstationInfoDay6 pepid = pepid1ls.get(0);
+
+                //如果昨年大于今年最大功率
+                if (pepid.getNzdglcx() > pewp.getRzdglcx()) {
+                    pewp.setNzdglcx(pepid.getRzdglcx());
+                } else {
+                    pewp.setNzdglcx(pewp.getRzdglcx());
+                }
+                //如果昨年大于今年最大风速
+                if (pepid.getNzdfscft() > pewp.getRzdfscft()) {
+                    pewp.setNzdfscft(pepid.getRzdfscft());
+                } else {
+                    pewp.setNzdfscft(pewp.getRzdfscft());
+                }
+
+                //如果昨年小于今年最小功率
+                if (pepid.getNzxglcx() < pewp.getRzxglcx()) {
+                    pewp.setNzxglcx(pepid.getRzxglcx());
+                } else {
+                    pewp.setNzxglcx(pewp.getRzxglcx());
+                }
+                //如果昨年小于今年最小风速
+                if (pepid.getNzxfscft() < pewp.getRzxfscft()) {
+                    pewp.setNzxfscft(pepid.getRzxfscft());
+                } else {
+                    pewp.setNzxfscft(pewp.getRzxfscft());
+                }
+                double pjfs = new BigDecimal(pewp.getNpjfscft() + pepid.getRpjfscft()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+
+                pewp.setNzxfscft(pjfs);
+
+                double pjgl = new BigDecimal(pewp.getNpjglcx() + pepid.getRpjglcx()).divide(new BigDecimal(2), 4, RoundingMode.HALF_EVEN).doubleValue();
+                pewp.setNzxglcx(pjgl);
+            } else {
+                setPowerandSpeedMonth(end, begin, pointmap, pewp);
+            }
+
+        }
+    }
+
+    private void setPowerandSpeedYear(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
+        //年最大风速
+        pewp.setNzdfscft(pewp.getRzdfscft());
+        //年最小风速
+        pewp.setNzxfscft(pewp.getRzxfscft());
+        //年平均风速
+        pewp.setNpjfscft(pewp.getRpjfscft());
+
+        //年最大功率
+        pewp.setNzdglcx(pewp.getRzdglcx());
+        //年最小功率
+        pewp.setNzxglcx(pewp.getRzxglcx());
+        //年平均功率
+        pewp.setNpjglcx(pewp.getRpjglcx());
+
+    }
+
+    private void setPowerandSpeedMonth(Date end, Date begin, Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay6 pewp) throws Exception {
+
+        //月最大风速
+        pewp.setYzdfscft(pewp.getRzdfscft());
+        //月最小风速
+        pewp.setYzxfscft(pewp.getRzxfscft());
+        //月平均风速
+        pewp.setYpjfscft(pewp.getRpjfscft());
+
+        //月最大功率
+        pewp.setYzdglcx(pewp.getRzdglcx());
+        //月最小功率
+        pewp.setYzxglcx(pewp.getRzxglcx());
+        //月平均功率
+        pewp.setYpjglcx(pewp.getRpjglcx());
+    }
+
+
+}
+
+
+
+
+
+
+

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

@@ -634,7 +634,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -651,7 +651,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -669,7 +669,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -680,7 +680,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -693,7 +693,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -708,7 +708,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -719,7 +719,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -731,7 +731,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -743,7 +743,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -755,7 +755,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -766,7 +766,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -777,7 +777,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -788,7 +788,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -800,7 +800,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -813,7 +813,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -825,7 +825,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -836,7 +836,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -848,7 +848,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -860,7 +860,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -871,7 +871,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -887,7 +887,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -900,7 +900,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -913,7 +913,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -926,7 +926,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -943,7 +943,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -955,7 +955,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1029,7 +1029,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1046,7 +1046,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1064,7 +1064,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1075,7 +1075,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1090,7 +1090,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1103,7 +1103,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1114,7 +1114,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1126,7 +1126,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1138,7 +1138,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1150,7 +1150,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1161,7 +1161,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1172,7 +1172,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1183,7 +1183,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1195,7 +1195,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -1208,7 +1208,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -1220,7 +1220,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -1231,7 +1231,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -1243,7 +1243,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -1255,7 +1255,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -1266,7 +1266,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -1282,7 +1282,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -1295,7 +1295,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -1308,7 +1308,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -1321,7 +1321,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -1338,7 +1338,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -1350,7 +1350,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1420,7 +1420,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1437,7 +1437,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1455,7 +1455,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1466,7 +1466,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1481,7 +1481,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1494,7 +1494,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1505,7 +1505,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1517,7 +1517,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1529,7 +1529,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1541,7 +1541,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1552,7 +1552,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1563,7 +1563,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1574,7 +1574,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1586,7 +1586,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -1599,7 +1599,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -1611,7 +1611,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -1622,7 +1622,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -1634,7 +1634,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -1646,7 +1646,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -1657,7 +1657,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -1673,7 +1673,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -1686,7 +1686,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -1699,7 +1699,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -1712,7 +1712,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -1729,7 +1729,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -1741,7 +1741,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1808,7 +1808,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1825,7 +1825,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1843,7 +1843,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1854,7 +1854,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1869,7 +1869,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1882,7 +1882,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1893,7 +1893,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1905,7 +1905,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1917,7 +1917,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1929,7 +1929,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1940,7 +1940,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1951,7 +1951,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1962,7 +1962,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1974,7 +1974,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -1987,7 +1987,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -1999,7 +1999,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -2010,7 +2010,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -2022,7 +2022,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -2034,7 +2034,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -2045,7 +2045,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -2061,7 +2061,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -2074,7 +2074,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -2087,7 +2087,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -2100,7 +2100,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -2117,7 +2117,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -2129,7 +2129,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -2222,13 +2222,13 @@
 //        {
 //
 //            lastState=-1;//上一分钟状态
-//            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+//            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
 //            if(wtpAimap.containsKey(ContantXk.MXZT));
 //            {
 //
 //                ProBasicEquipmentPoint point=aimap.get(ContantXk.MXZT);
 //                //按照分钟时间进行统计状态快照值
-//                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+//                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
 //                if(!pointls.isEmpty())
 //                {
 //                    for(PointData po :pointls)
@@ -2581,13 +2581,13 @@
 //
 //        for(ProBasicWindturbine wt:wtls)
 //        {
-//            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getCode());
+//            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getNemCode());
 //            if(wtpAimap.containsKey(ContantXk.SBZT));
 //            {
 //
 //                ProBasicEquipmentPoint point=aimap.get(ContantXk.SBZT);
 //                //按照分钟时间进行统计状态快照值
-//                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(), begin.getTime()/1000, end.getTime()/1000);
+//                List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
 //                if(!pointls.isEmpty())
 //                {
 //                    for(PointData po :pointls)

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

@@ -632,7 +632,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -649,7 +649,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -667,7 +667,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -678,7 +678,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -691,7 +691,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -706,7 +706,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -717,7 +717,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -729,7 +729,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -741,7 +741,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -753,7 +753,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -764,7 +764,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -775,7 +775,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -786,7 +786,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -798,7 +798,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -811,7 +811,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -823,7 +823,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -834,7 +834,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -846,7 +846,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -858,7 +858,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -869,7 +869,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -885,7 +885,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -898,7 +898,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -911,7 +911,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -924,7 +924,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -941,7 +941,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -953,7 +953,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1034,7 +1034,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1051,7 +1051,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1069,7 +1069,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1080,7 +1080,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1095,7 +1095,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1108,7 +1108,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1119,7 +1119,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1131,7 +1131,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1143,7 +1143,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1155,7 +1155,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1166,7 +1166,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1177,7 +1177,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1188,7 +1188,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1200,7 +1200,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -1213,7 +1213,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -1225,7 +1225,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -1236,7 +1236,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -1248,7 +1248,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -1260,7 +1260,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -1271,7 +1271,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -1287,7 +1287,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -1300,7 +1300,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -1313,7 +1313,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -1326,7 +1326,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -1343,7 +1343,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -1355,7 +1355,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1432,7 +1432,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1449,7 +1449,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1467,7 +1467,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1478,7 +1478,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1493,7 +1493,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1506,7 +1506,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1517,7 +1517,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1529,7 +1529,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1541,7 +1541,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1553,7 +1553,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1564,7 +1564,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1575,7 +1575,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1586,7 +1586,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1598,7 +1598,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -1611,7 +1611,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -1623,7 +1623,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -1634,7 +1634,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -1646,7 +1646,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -1658,7 +1658,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -1669,7 +1669,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -1685,7 +1685,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -1698,7 +1698,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -1711,7 +1711,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -1724,7 +1724,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -1741,7 +1741,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -1753,7 +1753,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1825,7 +1825,7 @@
 //                if(pointmap.containsKey(ContantXk.SSPJFS));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSPJFS);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1842,7 +1842,7 @@
 //                if(pointmap.containsKey(ContantXk.SSZGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.SSZGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();
@@ -1860,7 +1860,7 @@
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDL);
 //
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量
@@ -1871,7 +1871,7 @@
 //                if(pointmap.containsKey(ContantXk.RKYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RKYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日可用电量
@@ -1886,7 +1886,7 @@
 //                if(pointmap.containsKey(ContantXk.RLLFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RLLFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日理论发电量
@@ -1899,7 +1899,7 @@
 //                if(pointmap.containsKey(ContantXk.RGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日故障损失电量
@@ -1910,7 +1910,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLGZSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLGZSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累故障损失电量
@@ -1922,7 +1922,7 @@
 //                if(pointmap.containsKey(ContantXk.RJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日检修损失电量
@@ -1934,7 +1934,7 @@
 //                if(pointmap.containsKey(ContantXk.RCNSLJXSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCNSLJXSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场内受累检修损失电量
@@ -1946,7 +1946,7 @@
 //                if(pointmap.containsKey(ContantXk.RDJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RDJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日待机损失电量
@@ -1957,7 +1957,7 @@
 //                if(pointmap.containsKey(ContantXk.RQXJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQXJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日缺陷降出力损失电量
@@ -1968,7 +1968,7 @@
 //                if(pointmap.containsKey(ContantXk.RSDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日手动停机损失电量
@@ -1979,7 +1979,7 @@
 //                if(pointmap.containsKey(ContantXk.RXNSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXNSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日性能损失电量
@@ -1991,7 +1991,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDTJSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDTJSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电停机损失电量
@@ -2004,7 +2004,7 @@
 //                if(pointmap.containsKey(ContantXk.RXDJCLSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RXDJCLSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日限电降出力损失电量
@@ -2016,7 +2016,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLDWSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLDWSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累电网损失电量
@@ -2027,7 +2027,7 @@
 //                if(pointmap.containsKey(ContantXk.RCWSLTQSSDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCWSLTQSSDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日场外受累天气损失电量
@@ -2039,7 +2039,7 @@
 //                if(pointmap.containsKey(ContantXk.RZFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日增发电量
@@ -2051,7 +2051,7 @@
 //                if(pointmap.containsKey(ContantXk.RQFDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RQFDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日欠发电量
@@ -2062,7 +2062,7 @@
 //                if(pointmap.containsKey(ContantXk.RZHD));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RZHD);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日自耗电
@@ -2078,7 +2078,7 @@
 //                if(pointmap.containsKey(ContantXk.RFDLSYZ));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日发电量(升压站)
@@ -2091,7 +2091,7 @@
 //                if(pointmap.containsKey(ContantXk.RSWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日上网电量
@@ -2104,7 +2104,7 @@
 //                if(pointmap.containsKey(ContantXk.RGWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日工网购网电量
@@ -2117,7 +2117,7 @@
 //                if(pointmap.containsKey(ContantXk.RNWGWDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日农网购网电量
@@ -2134,7 +2134,7 @@
 //                if(pointmap.containsKey(ContantXk.RCYDL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
-//                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+//                    PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(),recordDate.getTime()/1000);
 //                    if(StringUtils.notEmp(pointValue))
 //                    {
 //                        //日厂用电量
@@ -2146,7 +2146,7 @@
 //                if(pointmap.containsKey(ContantXk.TPOINT_WP_CXGL));
 //                {
 //                    ProBasicWppoint point=pointmap.get(ContantXk.TPOINT_WP_CXGL);
-//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getCode(),begin.getTime()/1000,end.getTime()/1000);
+//                    List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(),begin.getTime()/1000,end.getTime()/1000);
 //                    if(!pointls.isEmpty())
 //                    {
 //                        DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(n -> n.getPointValueInDouble()).summaryStatistics();

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

@@ -81,15 +81,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sb.append(String.valueOf(sba));
                     sb.append("XXXX_XXX_X_XX_XX_XXXX_");
                     sb.append("CI");
-                    sb.append(stp.getCode());
+                    sb.append(stp.getNemCode());
                     
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
                     
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -98,9 +98,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                     StringBuilder tempsb=new StringBuilder();
 
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("0");
+                        tempsb.append(re.getNemCode()).append("0");
                     }else
                     {
                         tempsb.append("0");
@@ -112,7 +112,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
 
                     sb =new StringBuilder();
-                    sb.append(re.getCode()).append(".JSFW");
+                    sb.append(re.getNemCode()).append(".JSFW");
                     po.setRealtimeId(String.valueOf(sb));
 
 
@@ -137,15 +137,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sb.append(String.valueOf(sba));
                     sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
                     sb.append("CI");
-                    sb.append(stp.getCode());
+                    sb.append(stp.getNemCode());
 
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append("风电").append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -153,9 +153,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     po.setModelId(null);
 
                     StringBuilder tempsb=new StringBuilder();
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("-1");
+                        tempsb.append(re.getNemCode()).append("-1");
                     }else
                     {
                         tempsb.append("-1");
@@ -166,12 +166,12 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
 
                     sb =new StringBuilder();
-                    sb.append(re.getCode()).append(".JSFW");
+                    sb.append(re.getNemCode()).append(".JSFW");
                     po.setRealtimeId(String.valueOf(sb));
 //                            else
 //                            {
 //                                sb =new StringBuilder();
-//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                sb.append(re.getNemCode()).append(cs.getId()).append(".JSFWDD");
 //                                po.setRealtimeId(String.valueOf(sb));
 //                            }
 
@@ -200,15 +200,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     sb.append(String.valueOf(sba));
                     sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
                     sb.append("CI");
-                    sb.append(stp.getCode());
+                    sb.append(stp.getNemCode());
 
                     sbtable.append("JSFW.");
                     sbtable.append(sb);
 
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append("光伏").append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -216,9 +216,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     po.setModelId(null);
                     StringBuilder tempsb=new StringBuilder();
 
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("-2");
+                        tempsb.append(re.getNemCode()).append("-2");
                     }else
                     {
                         tempsb.append("-2");
@@ -228,7 +228,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     po.setUniformCode(stp.getUniformCode());
 
                     sb =new StringBuilder();
-                    sb.append(re.getCode()).append(".JSFW");
+                    sb.append(re.getNemCode()).append(".JSFW");
                     po.setRealtimeId(String.valueOf(sb));
 
 
@@ -257,15 +257,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sb.append(String.valueOf(sba));
                             sb.append("XXX_X_XX_XX_XXXX_");
                             sb.append("CI");
-                            sb.append(stp.getCode());
+                            sb.append(stp.getNemCode());
 
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -274,9 +274,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                             StringBuilder tempsb=new StringBuilder();
 
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("0");
+                                tempsb.append(cs.getNemCode()).append("0");
                             }else
                             {
                                 tempsb.append("0");
@@ -312,15 +312,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sb.append(String.valueOf(sba));
                             sb.append("XXX_F_XX_XX_XXXX_");
                             sb.append("CI");
-                            sb.append(stp.getCode());
+                            sb.append(stp.getNemCode());
 
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append("风电").append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -328,9 +328,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             po.setModelId(null);
 
                             StringBuilder tempsb=new StringBuilder();
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("-1");
+                                tempsb.append(cs.getNemCode()).append("-1");
                             }else
                             {
                                 tempsb.append("-1");
@@ -367,15 +367,15 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sb.append(String.valueOf(sba));
                             sb.append("XXX_G_XX_XX_XXXX_");
                             sb.append("CI");
-                            sb.append(stp.getCode());
+                            sb.append(stp.getNemCode());
 
                             sbtable.append("JSFW.");
                             sbtable.append(sb);
 
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append("光伏").append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -383,9 +383,9 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             po.setModelId(null);
                             StringBuilder tempsb=new StringBuilder();
 
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("-2");
+                                tempsb.append(cs.getNemCode()).append("-2");
                             }else
                             {
                                 tempsb.append("-2");
@@ -477,22 +477,28 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
             temp = temp.substring(temp.lastIndexOf("_")+1);
             StringBuilder sba = new StringBuilder();
 
+
+            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+            temp2=temp2.substring(temp2.indexOf("_")+1);
+
+            String temp3=wp.getId().substring(0,wp.getId().lastIndexOf("_"));
+            temp3=temp3.substring(0,temp3.lastIndexOf("_"));
+            temp3=temp3.substring(temp3.lastIndexOf("_")+1);
+
             sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_");
             if (wp.getId().indexOf("FDC")>=0) {
 
-                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                temp2=temp2.substring(temp2.indexOf("_")+1);
-                sba.append(temp2).append("FC");
+
+                sba.append(temp2).append(temp3).append("FC");
                 sb.append(temp).append("_F").append("_XX_XX_XXXX_");
             } else if (wp.getId().indexOf("GDC")>=0) {
-                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                temp2=temp2.substring(temp2.indexOf("_")+1);
-                sba.append(temp2).append("GC");
+
+                sba.append(temp2).append(temp3).append("GC");
                 sb.append(temp).append("_G").append("_XX_XX_XXXX_");
             }
 
             sb.append("CI");
-            sb.append(stp.getCode());
+            sb.append(stp.getNemCode());
             StringBuilder sbtable = new StringBuilder();
 
 
@@ -501,8 +507,8 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
             ProBasicWppoint po = new ProBasicWppoint();
             po.setId(StringUtils.getUUID());
-//            po.setCode(V2Config.getInitialcode());
-            po.setCode(String.valueOf(sbtable));
+//            po.setNemCode(V2Config.getInitialcode());
+            po.setNemCode(String.valueOf(sbtable));
             sb = new StringBuilder();
             sb.append(wp.getName()).append(stp.getName());
             po.setName(String.valueOf(sb));
@@ -551,18 +557,23 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                     StringBuilder sba = new StringBuilder();
 
+                    String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                    temp2=temp2.substring(temp2.indexOf("_")+1);
+
+                    String temp3=wp.getId().substring(0,wp.getId().lastIndexOf("_"));
+                    temp3=temp3.substring(0,temp3.lastIndexOf("_"));
+                    temp3=temp3.substring(temp3.lastIndexOf("_")+1);
+
                     if (wp.getId().indexOf("FDC")>=0) {
-                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                        temp2=temp2.substring(temp2.indexOf("_")+1);
-                        sba.append(temp2).append("FC");
+
+                        sba.append(temp2).append(temp3).append("FC");
                         sb.append(temp).append("_F_");
                         temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                         sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
                         sb.append("XX_XXXX_");
                     } else if (wp.getId().indexOf("GDC")>=0) {
-                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                        temp2=temp2.substring(temp2.indexOf("_")+1);
-                        sba.append(temp2).append("GC");
+
+                        sba.append(temp2).append(temp3).append("GC");
                         sb.append(temp).append("_G_");
                         temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                         sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
@@ -570,7 +581,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                     }
 
                     sb.append("CI");
-                    sb.append(stp.getCode());
+                    sb.append(stp.getNemCode());
 
                     StringBuilder sbtable = new StringBuilder();
 
@@ -582,7 +593,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                     po.setId(StringUtils.getUUID());
 
-                    po.setCode(String.valueOf(sbtable));
+                    po.setNemCode(String.valueOf(sbtable));
                     sb = new StringBuilder();
                     sb.append(pj.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -631,10 +642,16 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                         StringBuilder sba = new StringBuilder();
 
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+
+                        String temp3=wp.getId().substring(0,wp.getId().lastIndexOf("_"));
+                        temp3=temp3.substring(0,temp3.lastIndexOf("_"));
+                        temp3=temp3.substring(temp3.lastIndexOf("_")+1);
+
                         if (wp.getId().indexOf("FDC")>=0) {
-                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                            temp2=temp2.substring(temp2.indexOf("_")+1);
-                            sba.append(temp2).append("FC");
+
+                            sba.append(temp2).append(temp3).append("FC");
                             sb.append(temp).append("_F_");
                             temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                             sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
@@ -643,9 +660,8 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                             sb.append("XXXX_");
 //                            sb.append(CI);
                         } else if (wp.getId().indexOf("GDC")>=0) {
-                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
-                            temp2=temp2.substring(temp2.indexOf("_")+1);
-                            sba.append(temp2).append("GC");
+
+                            sba.append(temp2).append(temp3).append("GC");
                             sb.append(temp).append("G_");
                             temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                             sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
@@ -656,7 +672,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                         }
 
                         sb.append("CI");
-                        sb.append(stp.getCode());
+                        sb.append(stp.getNemCode());
 
                         StringBuilder sbtable = new StringBuilder();
 
@@ -666,7 +682,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                         ProBasicWppoint po = new ProBasicWppoint();
                         po.setId(StringUtils.getUUID());
 
-                        po.setCode(String.valueOf(sbtable));
+                        po.setNemCode(String.valueOf(sbtable));
                         sb = new StringBuilder();
                         sb.append(ln.getName()).append(stp.getName());
                         po.setName(String.valueOf(sb));
@@ -769,9 +785,21 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                         }
 
 
-                        sb.append(stp.getCode());
+                        if(ls.get(i).getUniformCode().indexOf("AI")>=0)
+                        {
+                            sb.append("AI");
+
+                        }else if(ls.get(i).getUniformCode().indexOf("DI")>=0)
+                        {
+                            sb.append("DI");
+
+                        }else
+                        {
+                            sb.append("CI");
 
-                        sb.append(stp.getCode());
+                        }
+
+                        sb.append(stp.getNemCode());
 
                         StringBuilder sba = new StringBuilder();
 
@@ -781,10 +809,14 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                         String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
                         temp2=temp2.substring(temp2.indexOf("_")+1);
+
+                        String temp3=wp.getId().substring(0,wp.getId().lastIndexOf("_"));
+                        temp3=temp3.substring(0,temp3.lastIndexOf("_"));
+                        temp3=temp3.substring(temp3.lastIndexOf("_")+1);
                         if (wp.getId().indexOf("FDC")>=0) {
-                            sba.append(temp2).append("FJ");
+                            sba.append(temp2).append(temp3).append("FJ");
                         } else if (wp.getId().indexOf("GDC")>=0) {
-                            sba.append(temp2).append("GF");
+                            sba.append(temp2).append(temp3).append("GF");
                         }
 
                         StringBuilder sbtable = new StringBuilder();
@@ -800,14 +832,14 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
                         ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
                         po.setId(StringUtils.getUUID());
-//                        po.setCode(V2Config.getInitialcode());
+//                        po.setNemCode(V2Config.getInitialcode());
 
                         if (stp.getUniformCode().indexOf("AI")<0 && stp.getUniformCode().indexOf("DI")<0)
                         {
-                            po.setCode(String.valueOf(sbtable));
+                            po.setNemCode(String.valueOf(sbtable));
                         }else
                         {
-                            po.setCode("INITIAL");
+                            po.setNemCode("INITIAL");
                         }
 
                         sb = new StringBuilder();
@@ -818,6 +850,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
                         po.setWindturbineId(wt.getId());
                         po.setUniformCode(stp.getUniformCode());
                         po.setWindpowerstationId(wt.getWindpowerstationId());
+                        po.setLogicalUnitId(ls.get(i).getLogicalUnitId());
 
                         if (stp.getUniformCode().indexOf("AI")<0 && stp.getUniformCode().indexOf("DI")<0) {
                             sb = new StringBuilder();
@@ -850,7 +883,7 @@ public class InitialPointGoldenXkByEqService implements IinitialPoint {
 
         //创建一个数组用于设置表头
         String[] arr = new String[]{"编号", "编码", "名称","别名", "型号", "单位", "英文名称", "类型编号", "所属型号", "最大值", "最小值", "合理最大值",
-                "合理最小值", "风机编号", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号"};
+                "合理最小值", "风机编号", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号", "部件编号", "集团测点编号", "具体名称", "系数"};
         String heardName = "风机测点表";
         //调用Excel导出工具类
         ExcelExport.exportToPath(allpoints, arr, heardName, 6, "风机测点");

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

@@ -84,15 +84,15 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     sb.append("XXXX_XXX_X_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
                         sbtable.append("JSFW.");
                         sbtable.append(sb);
                     }
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -101,9 +101,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
                     StringBuilder tempsb=new StringBuilder();
 
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("0");
+                        tempsb.append(re.getNemCode()).append("0");
                     }else
                     {
                         tempsb.append("0");
@@ -114,10 +114,10 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
 
 
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
                         sb =new StringBuilder();
-                        sb.append(re.getCode()).append(".JSFW");
+                        sb.append(re.getNemCode()).append(".JSFW");
                         po.setRealtimeId(String.valueOf(sb));
                     }
 
@@ -146,7 +146,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
 //                                sbtable.append("JSFW.");
                         sbtable.append("JSFW.");
@@ -154,8 +154,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     }
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append("风电").append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -163,9 +163,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     po.setModelId(null);
 
                     StringBuilder tempsb=new StringBuilder();
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("-1");
+                        tempsb.append(re.getNemCode()).append("-1");
                     }else
                     {
                         tempsb.append("-1");
@@ -175,16 +175,16 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
 
 
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
                         sb =new StringBuilder();
-                        sb.append(re.getCode()).append(".JSFW");
+                        sb.append(re.getNemCode()).append(".JSFW");
                         po.setRealtimeId(String.valueOf(sb));
                     }
 //                            else
 //                            {
 //                                sb =new StringBuilder();
-//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                sb.append(re.getNemCode()).append(cs.getId()).append(".JSFWDD");
 //                                po.setRealtimeId(String.valueOf(sb));
 //                            }
 
@@ -217,7 +217,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
 //                                sbtable.append("JSFW.");
                         sbtable.append("JSFW.");
@@ -225,8 +225,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     }
                     ProBasicWppoint po=new ProBasicWppoint();
                     po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb =new StringBuilder();
                     sb.append(re.getName()).append("光伏").append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -234,9 +234,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     po.setModelId(null);
                     StringBuilder tempsb=new StringBuilder();
 
-                    if(StringUtils.notEmp(re.getCode()))
+                    if(StringUtils.notEmp(re.getNemCode()))
                     {
-                        tempsb.append(re.getCode()).append("-2");
+                        tempsb.append(re.getNemCode()).append("-2");
                     }else
                     {
                         tempsb.append("-2");
@@ -245,16 +245,16 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     po.setWindpowerstationId(String.valueOf(tempsb));
                     po.setUniformCode(stp.getUniformcode());
 
-                    if(stp.getCode().equals(CI))
+                    if(stp.getNemCode().equals(CI))
                     {
                         sb =new StringBuilder();
-                        sb.append(re.getCode()).append(".JSFW");
+                        sb.append(re.getNemCode()).append(".JSFW");
                         po.setRealtimeId(String.valueOf(sb));
                     }
 //                            else
 //                            {
 //                                sb =new StringBuilder();
-//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                sb.append(re.getNemCode()).append(cs.getId()).append(".JSFWDD");
 //                                po.setRealtimeId(String.valueOf(sb));
 //                            }
 
@@ -288,15 +288,15 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             sb.append("XXX_X_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
                                 sbtable.append("JSFW.");
                                 sbtable.append(sb);
                             }
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -305,9 +305,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
                             StringBuilder tempsb=new StringBuilder();
 
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("0");
+                                tempsb.append(cs.getNemCode()).append("0");
                             }else
                             {
                                 tempsb.append("0");
@@ -318,7 +318,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
 
 
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
                                 sb =new StringBuilder();
                                 sb.append(cs.getId()).append(".JSFW");
@@ -353,7 +353,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             sb.append("XXX_F_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
 //                                sbtable.append("JSFW.");
                                 sbtable.append("JSFW.");
@@ -361,8 +361,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             }
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append("风电").append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -370,9 +370,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             po.setModelId(null);
 
                             StringBuilder tempsb=new StringBuilder();
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("-1");
+                                tempsb.append(cs.getNemCode()).append("-1");
                             }else
                             {
                                 tempsb.append("-1");
@@ -382,7 +382,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
 
 
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
                                 sb =new StringBuilder();
                                 sb.append(cs.getId()).append(".JSFW");
@@ -391,7 +391,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //                            else
 //                            {
 //                                sb =new StringBuilder();
-//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                sb.append(re.getNemCode()).append(cs.getId()).append(".JSFWDD");
 //                                po.setRealtimeId(String.valueOf(sb));
 //                            }
 
@@ -425,7 +425,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             sb.append("XXX_G_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
 //                                sbtable.append("JSFW.");
                                 sbtable.append("JSFW.");
@@ -433,8 +433,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             }
                             ProBasicWppoint po=new ProBasicWppoint();
                             po.setId(StringUtils.getUUID());
-//                            po.setCode(V2Config.getInitialcode());
-                            po.setCode(String.valueOf(sbtable));
+//                            po.setNemCode(V2Config.getInitialcode());
+                            po.setNemCode(String.valueOf(sbtable));
                             sb =new StringBuilder();
                             sb.append(cs.getName()).append("光伏").append(stp.getName());
                             po.setName(String.valueOf(sb));
@@ -442,9 +442,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             po.setModelId(null);
                             StringBuilder tempsb=new StringBuilder();
 
-                            if(StringUtils.notEmp(cs.getCode()))
+                            if(StringUtils.notEmp(cs.getNemCode()))
                             {
-                                tempsb.append(cs.getCode()).append("-2");
+                                tempsb.append(cs.getNemCode()).append("-2");
                             }else
                             {
                                 tempsb.append("-2");
@@ -453,7 +453,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             po.setWindpowerstationId(String.valueOf(tempsb));
                             po.setUniformCode(stp.getUniformcode());
 
-                            if(stp.getCode().equals(CI))
+                            if(stp.getNemCode().equals(CI))
                             {
                                 sb =new StringBuilder();
                                 sb.append(cs.getId()).append(".JSFW");
@@ -462,7 +462,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //                            else
 //                            {
 //                                sb =new StringBuilder();
-//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                sb.append(re.getNemCode()).append(cs.getId()).append(".JSFWDD");
 //                                po.setRealtimeId(String.valueOf(sb));
 //                            }
 
@@ -564,7 +564,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
             StringBuilder sbtable = new StringBuilder();
 
 
-            if (stp.getCode().equals(CI)) {
+            if (stp.getNemCode().equals(CI)) {
                 sbtable.append(sba).append("JSFW.");
                 sbtable.append(sb);
             }
@@ -577,8 +577,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
             ProBasicWppoint po = new ProBasicWppoint();
             po.setId(StringUtils.getUUID());
-//            po.setCode(V2Config.getInitialcode());
-            po.setCode(String.valueOf(sbtable));
+//            po.setNemCode(V2Config.getInitialcode());
+            po.setNemCode(String.valueOf(sbtable));
             sb = new StringBuilder();
             sb.append(wp.getName()).append(stp.getName());
             po.setName(String.valueOf(sb));
@@ -587,7 +587,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
             po.setWindpowerstationId(wp.getId());
             po.setUniformCode(stp.getUniformcode());
 
-//            if(stp.getCode().equals(CI))
+//            if(stp.getNemCode().equals(CI))
 //            {
 //                sb =new StringBuilder();
 //                temp=wp.getId().substring(0,wp.getId().indexOf("_"));
@@ -595,7 +595,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //                po.setRealtimeId(String.valueOf(sb));
 //            }
 
-            if (stp.getCode().equals(CI)) {
+            if (stp.getNemCode().equals(CI)) {
                 sb = new StringBuilder();
 
                 if (StringUtils.notEmp(wp.getPhoto())) {
@@ -674,7 +674,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     StringBuilder sbtable = new StringBuilder();
 
 
-                    if (stp.getCode().equals(CI)) {
+                    if (stp.getNemCode().equals(CI)) {
                         sbtable.append(sba).append("JSFW.");
                         sbtable.append(sb);
                     }
@@ -682,8 +682,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     ProBasicWppoint po = new ProBasicWppoint();
 
                     po.setId(StringUtils.getUUID());
-//                    po.setCode(V2Config.getInitialcode());
-                    po.setCode(String.valueOf(sbtable));
+//                    po.setNemCode(V2Config.getInitialcode());
+                    po.setNemCode(String.valueOf(sbtable));
                     sb = new StringBuilder();
                     sb.append(pj.getName()).append(stp.getName());
                     po.setName(String.valueOf(sb));
@@ -692,7 +692,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     po.setWindpowerstationId(pj.getId());
                     po.setUniformCode(stp.getUniformcode());
 
-//                    if(stp.getCode().equals(CI))
+//                    if(stp.getNemCode().equals(CI))
 //                    {
 //                        sb =new StringBuilder();
 //                        temp=wp.getId().substring(0,wp.getId().indexOf("_"));
@@ -700,7 +700,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //                        po.setRealtimeId(String.valueOf(sb));
 //                    }
 
-                    if (stp.getCode().equals(CI)) {
+                    if (stp.getNemCode().equals(CI)) {
                         sb = new StringBuilder();
 
                         if (StringUtils.notEmp(wp.getPhoto())) {
@@ -779,7 +779,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         StringBuilder sbtable = new StringBuilder();
 
 
-                        if (stp.getCode().equals(CI)) {
+                        if (stp.getNemCode().equals(CI)) {
                             sbtable.append(sba).append("JSFW.");
                             sbtable.append(sb);
                         }
@@ -787,8 +787,8 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
                         ProBasicWppoint po = new ProBasicWppoint();
                         po.setId(StringUtils.getUUID());
-//                        po.setCode(V2Config.getInitialcode());
-                        po.setCode(String.valueOf(sbtable));
+//                        po.setNemCode(V2Config.getInitialcode());
+                        po.setNemCode(String.valueOf(sbtable));
                         sb = new StringBuilder();
                         sb.append(ln.getName()).append(stp.getName());
                         po.setName(String.valueOf(sb));
@@ -798,7 +798,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         po.setUniformCode(stp.getUniformcode());
 
 
-                        if (stp.getCode().equals(CI)) {
+                        if (stp.getNemCode().equals(CI)) {
                             sb = new StringBuilder();
 
                             if (StringUtils.notEmp(wp.getPhoto())) {
@@ -893,7 +893,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         }
 
 
-                        sb.append(stp.getCode());
+                        sb.append(stp.getNemCode());
 
                         sb.append(stp.getOrdernum());
 
@@ -914,7 +914,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         StringBuilder sbtable = new StringBuilder();
 
 
-                        if (stp.getCode().equals(CI)) {
+                        if (stp.getNemCode().equals(CI)) {
                             sbtable.append(sba).append("JSFW.");
                             sbtable.append(sb);
                         } else {
@@ -924,14 +924,14 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
                         ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
                         po.setId(StringUtils.getUUID());
-//                        po.setCode(V2Config.getInitialcode());
+//                        po.setNemCode(V2Config.getInitialcode());
 
-                        if(stp.getCode().equals(CI))
+                        if(stp.getNemCode().equals(CI))
                         {
-                            po.setCode(String.valueOf(sbtable));
+                            po.setNemCode(String.valueOf(sbtable));
                         }else
                         {
-                            po.setCode("INITIAL");
+                            po.setNemCode("INITIAL");
                         }
 
                         sb = new StringBuilder();
@@ -943,7 +943,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         po.setUniformCode(stp.getUniformcode());
                         po.setWindpowerstationId(wt.getWindpowerstationId());
 
-                        if (stp.getCode().equals(CI)) {
+                        if (stp.getNemCode().equals(CI)) {
                             sb = new StringBuilder();
 
                             sb.append(wp.getId().substring(0,wp.getId().lastIndexOf("_")).replace("_", "")).append(".JSFW").append(sba);

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

@@ -32,7 +32,7 @@ public class EdosUtil implements IEdosUtil {
     @Override
     public PointData getRealData(ProBasicWppoint point) throws Exception {
         try {
-            Optional<String> keys = Optional.ofNullable(point.getCode());
+            Optional<String> keys = Optional.ofNullable(point.getNemCode());
             Optional<String> thingType = Optional.ofNullable("station");
             Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
             Optional<String> uniformCodes = Optional.ofNullable(point.getUniformCode());
@@ -54,14 +54,14 @@ public class EdosUtil implements IEdosUtil {
                 if (list.size() > 0)
                     return list.get(0);
                 else
-                    return ErrorRequest.RequestError(point.getCode());
+                    return ErrorRequest.RequestError(point.getNemCode());
             } else {
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
             }
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -87,7 +87,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public PointData getSectionData(ProBasicWppoint point, Long date) throws Exception {
-        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + date;
+        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
 
         ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
         JSONObject jsonArray = resp.getBody();
@@ -96,15 +96,15 @@ public class EdosUtil implements IEdosUtil {
             if (list.size() > 0)
                 return list.get(0);
             else
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
         } else {
-            return ErrorRequest.RequestError(point.getCode());
+            return ErrorRequest.RequestError(point.getNemCode());
         }
     }
 
     @Override
     public PointData getSectionData(ProBasicEquipmentPoint point, Long date) throws Exception {
-        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + date;
+        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
 
         ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
         JSONObject jsonArray = resp.getBody();
@@ -113,16 +113,16 @@ public class EdosUtil implements IEdosUtil {
             if (list.size() > 0)
                 return list.get(0);
             else
-                return ErrorRequest.RequestError(point.getCode());
+                return ErrorRequest.RequestError(point.getNemCode());
         } else {
-            return ErrorRequest.RequestError(point.getCode());
+            return ErrorRequest.RequestError(point.getNemCode());
         }
     }
 
 
     @Override
     public List<PointData> getHistoryDatasSnap(ProBasicWppoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -135,7 +135,7 @@ public class EdosUtil implements IEdosUtil {
         else if (count != null)
             finalInterval = (endDate - beginDate) / count;
         else
-            return ErrorRequest.RequestListError(point.getCode());
+            return ErrorRequest.RequestListError(point.getNemCode());
         Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
 
         try {
@@ -161,13 +161,13 @@ public class EdosUtil implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null) {
-                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                List<PointData> snapList = JsonObjectHelper.phrasePointData(jsonArray, point.getNemCode());
                 List<PointData> resultList = new ArrayList<>();
 
                 if(snapList.isEmpty())
                 {
 
-                	getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
+                	getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
                 }else
                 {
                 	 for (PointData snapItem : snapList) {
@@ -176,7 +176,7 @@ public class EdosUtil implements IEdosUtil {
                          //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
                          // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
                          // 则代表该时间节点快照有效，否则为0
-                         String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+                         String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() + "000";
                          ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
                          JSONObject jsonObjectSection = sectionResp.getBody();
 
@@ -188,7 +188,7 @@ public class EdosUtil implements IEdosUtil {
                                  }
                                  else{
                                      PointData data = new PointData();
-                                     data.setEdnaId(point.getCode());
+                                     data.setEdnaId(point.getNemCode());
                                      data.setPointTime(snapItem.getPointTime());
                                      data.setPointValue("0");
                                      data.setPointName("1");
@@ -197,7 +197,7 @@ public class EdosUtil implements IEdosUtil {
                                  }
                              } else {
                                  PointData data = new PointData();
-                                 data.setEdnaId(point.getCode());
+                                 data.setEdnaId(point.getNemCode());
                                  data.setPointTime(snapItem.getPointTime());
                                  data.setPointValue("0");
                                  data.setPointName("1");
@@ -206,7 +206,7 @@ public class EdosUtil implements IEdosUtil {
                              }
                          } else {
                              PointData data = new PointData();
-                             data.setEdnaId(point.getCode());
+                             data.setEdnaId(point.getNemCode());
                              data.setPointTime(snapItem.getPointTime());
                              data.setPointValue("0");
                              data.setPointName("1");
@@ -221,13 +221,13 @@ public class EdosUtil implements IEdosUtil {
 
 
             } else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
 
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -282,7 +282,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public List<PointData> getHistoryDatasRaw(ProBasicWppoint point, Long beginDate, Long endDate) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -311,15 +311,15 @@ public class EdosUtil implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null)
-                return JsonObjectHelper.phrasePointData(jsonArray, point.getCode());
+                return JsonObjectHelper.phrasePointData(jsonArray, point.getNemCode());
             else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
 
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }
@@ -328,7 +328,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public PointData getRealData(ProBasicEquipmentPoint point) throws Exception {
-        Optional<String> keys = Optional.ofNullable(point.getCode());
+        Optional<String> keys = Optional.ofNullable(point.getNemCode());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> uniformCodes = Optional.ofNullable(point.getUniformCode());
@@ -376,7 +376,7 @@ public class EdosUtil implements IEdosUtil {
         }else if(point.getId()==null){
             System.out.println(222);
         }
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -429,7 +429,7 @@ public class EdosUtil implements IEdosUtil {
                         //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
                         // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
                         // 则代表该时间节点快照有效，否则为0
-                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getCode() + "&ts=" + snapItem.getPointTime() + "000";
+                        String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() + "000";
                         ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
                         JSONObject jsonObjectSection = sectionResp.getBody();
 
@@ -477,7 +477,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public List<PointData> getHistoryDatasRaw(ProBasicEquipmentPoint point, Long beginDate, Long endDate) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -898,7 +898,7 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public List<PointData> getHistStat(ProBasicEquipmentPoint point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -960,7 +960,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 {
-        Optional<String> tagName = Optional.ofNullable(point.getCode());
+        Optional<String> tagName = Optional.ofNullable(point.getNemCode());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationId());
         Optional<String> thingType = Optional.ofNullable(point.getModelId());
         Optional<String> uniformCode = Optional.ofNullable(point.getUniformCode());
@@ -973,7 +973,7 @@ public class EdosUtil implements IEdosUtil {
         else if (count != null)
             finalInterval = (endDate - beginDate) / count;
         else
-            return ErrorRequest.RequestListError(point.getCode());
+            return ErrorRequest.RequestListError(point.getNemCode());
         Optional<Integer> interval = Optional.ofNullable(Integer.parseInt(finalInterval.toString()));
 
         try {
@@ -999,14 +999,14 @@ public class EdosUtil implements IEdosUtil {
             ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
             JSONArray jsonArray = resp.getBody();
             if (jsonArray != null)
-                return JsonObjectHelper.GeneralTsDataToPointDataByStat(jsonArray, point.getCode(), type);
+                return JsonObjectHelper.GeneralTsDataToPointDataByStat(jsonArray, point.getNemCode(), type);
             else {
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             }
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");
-                return ErrorRequest.RequestListError(point.getCode());
+                return ErrorRequest.RequestListError(point.getNemCode());
             } else {
                 throw exception;
             }

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

@@ -46,7 +46,7 @@ public abstract class StatusStatistics {
         StatusItemVo item = new StatusItemVo();
         item.setUniformCode(wpstp.getUniformCode());
         item.setEdnaValue(0.0);
-        item.setEdnaPoint(wpstp.getCode());
+        item.setEdnaPoint(wpstp.getNemCode());
         item.setCount(0.0);
 
 

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

@@ -96,7 +96,7 @@ public class TheoryPowerStatistics extends  StatusStatistics{
         StatusItemVo item = new StatusItemVo();
         item.setUniformCode(ais.getUniformCode());
         item.setEdnaValue(0.0);
-        item.setEdnaPoint(ais.getCode());
+        item.setEdnaPoint(ais.getNemCode());
         item.setCount(0.0);
 
 

realtime/generationXK-service/src/main/resources/application-xk.yml

@@ -36,7 +36,7 @@ spring:
 #    url: jdbc:postgresql://192.168.11.248:5432/eng_mctl
 #    username: postgres
 #    password: postgres
-    url: jdbc:postgresql://120.46.148.180:5432/wisdom
+    url: jdbc:postgresql://120.46.148.180:5432/postgres
     username: gdprod
     password: gd123
     oracle-schema=: