计算服务修改

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

@@ -25,7 +25,7 @@ public class GenerationMain {
 //
 //        begin=new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for(int i=0;i<22;i++)
+//        for(int i=0;i<23;i++)
 //        {
 //
 //
@@ -47,10 +47,10 @@ public class GenerationMain {
 ////            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 ////
 ////            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
-//
-//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
-//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+////
+////            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+////            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+////            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
 //
 //            c.add(Calendar.DAY_OF_MONTH,1);

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

@@ -7,7 +7,6 @@
 //import org.springframework.context.EnvironmentAware;
 //import org.springframework.context.annotation.Bean;
 //import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.PropertySource;
 //import org.springframework.core.env.Environment;
 //
 ///**
@@ -19,7 +18,7 @@
 //
 //@Configuration
 ////@PropertySource("classpath:xxl-job-executor.properties")
-//@PropertySource("classpath:xxl-job-executor2.properties")
+////@PropertySource("classpath:xxl-job-executor2.properties")
 ////@PropertySource("classpath:xxl-job-executor3.properties")
 ////@PropertySource("classpath:xxl-job-executor4.properties")
 ////@PropertySource("classpath:xxl-job-executorWPLY.properties")

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

@@ -39,6 +39,9 @@ public class EquipmentInfo1Service {
         Calendar c=Calendar.getInstance();
         c.setTime(recordDate);
 
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
         Date end=c.getTime();
 
         Date begin= DateUtils.truncate(c.getTime());
@@ -86,8 +89,8 @@ public class EquipmentInfo1Service {
         }
 
         List<ProEconEquipmentInfoDay1> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
-        for(ProBasicEquipment wt:CacheContext.wtls)
+        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtfdls.size());
+        for(ProBasicEquipment wt:CacheContext.wtfdls)
         {
 //            if(CacheContext.wtpAimap.containsKey(wt.getId()))
 //            {

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

@@ -65,9 +65,25 @@ public class TimelinessRateService {
 //                 )
                 .map(ProEconFaultLiminatedefects::getId).collect(Collectors.toList());
 
-        if (!deleteitems.isEmpty()) {
-            proEconFaultLiminatedefectsService.removeByIds(deleteitems);
+        List<Long> tempids=new ArrayList<>();
+
+        for(int i=0;i<deleteitems.size();i++)
+        {
+            tempids.add(deleteitems.get(i));
+            if(tempids.size()==100)
+            {
+                proEconFaultLiminatedefectsService.removeByIds(tempids);
+                tempids=new ArrayList<>();
+            }
+        }
+
+        if(!tempids.isEmpty())
+        {
+            proEconFaultLiminatedefectsService.removeByIds(tempids);
         }
+//        if (!deleteitems.isEmpty()) {
+//            proEconFaultLiminatedefectsService.removeByIds(deleteitems);
+//        }
         QueryWrapper<ProEconShutdownEvent> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.ge("stop_Time",begin).le("stop_Time",end)
                 .isNotNull("stoptype_id").isNotNull("stop_Hours").ne("stoptype_id","wh");

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

@@ -5,7 +5,8 @@ package com.gyee.generation.service.initalcache;/*
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.auto.ProBasicEquipment;
+import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -61,7 +61,16 @@ public class CacheService {
     public void initRedisCache(){
         redisService.select(9);
         log.info("--------------------------redisWT");
+//        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i->(
+//                i.getWindpowerstationId().equals("SXJ_KGDL_XWT_FDC_STA")
+////                        ||
+////                i.getWindpowerstationId().equals("SXJ_KGDL_GJY_FDC_STA") ||
+////                        i.getWindpowerstationId().equals("SXJ_KGDL_NJL_FDC_STA") ||
+////                        i.getWindpowerstationId().equals("SXJ_KGDL_PDL_FDC_STA")  ||
+////                        i.getWindpowerstationId().equals("SXJ_KGDL_ZK_FDC_STA")
+//        ) &&  i.getIsable().equals(1)).collect(Collectors.toList());
         List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
+
         log.info("--------------------------windturbineList"+windturbineList.size());
         windturbineList.stream().forEach(i->{
             Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
@@ -77,184 +86,186 @@ public class CacheService {
             redisService.set(i.getId(),s);
         });
 
-
-        log.info("--------------------------redisSQ");
-        List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        squareList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisLN");
-        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        lineList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-
-
-        log.info("--------------------------redisPJ");
-        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        projectList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisSubWP");
-        redisService.select(9);
-        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        subStationList.stream().forEach(i->{
-            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisWeatherWP");
-        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        weatherStationList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisWP");
-        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-
-        wpList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i.getId());
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
-
-        log.info("--------------------------redisCOMPANY");
-        List<ProBasicCompany> coms = companyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        List<String> comList = coms.stream().map(i->i.getId()).collect(Collectors.toList());
-        List<String> comList = new ArrayList<>();
-        coms.stream().forEach(company -> {
-            comList.add(company.getId()+"0");
-            comList.add(company.getId()+"-1");
-            comList.add(company.getId()+"-2");
-        });
-        comList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i);
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i,s);
-        });
-
-        log.info("--------------------------redisREGION");
-        List<ProBasicRegion> regs = regionsService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-        List<String> regList = new ArrayList<>();
-//        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
-        regs.stream().forEach(region -> {
-            regList.add(region.getId()+"0");
-            regList.add(region.getId()+"-1");
-            regList.add(region.getId()+"-2");
-        });
-        regList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i);
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i,s);
-        });
-        log.info("--------------------------redisGroup");
-        List<ProBasicEnergyGroup> groups = energyGroupService.list().stream().filter(i->i.getIsAble().equals(1) && !i.getParentid().equals("0")).collect(Collectors.toList());
-        List<String> groupList = new ArrayList<>();
-//        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
-        groups.stream().forEach(group -> {
-            groupList.add(group.getId()+"0");
-            groupList.add(group.getId()+"-1");
-            groupList.add(group.getId()+"-2");
-        });
-        groupList.stream().forEach(i->{
-            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-            qw.eq("windpowerstation_id",i);
-            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-            windpowerstationtestingpoint2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i,s);
-        });
-        redisService.select(9);
-        log.info("--------------------------redis理论保证功率");
-        Map<String, Map<Double, ProBasicModelPowerRd>> powerrdMap = new HashMap<>();
-
-        List<ProBasicModelPowerRd> proBasicModelPowerRds = proBasicModelPowerRdService.list();
-        proBasicModelPowerRds.stream().forEach(powerrd->{
-            if (powerrdMap.containsKey(powerrd.getModelId())){
-                powerrdMap.get(powerrd.getModelId()).put(powerrd.getSpeed(),powerrd);
-            }else {
-                Map<Double,ProBasicModelPowerRd> powerMap = new HashMap<>();
-                powerMap.put(powerrd.getSpeed(),powerrd);
-                powerrdMap.put(powerrd.getModelId(),powerMap);
-            }
-        });
-        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
-
-        log.info("--------------------------redis十三种状态");
-        Map<String, List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
-        List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
-        windturbinestatusdis.stream().forEach(w->{
-            if (sszztMap.containsKey(w.getWindturbineId())){
-                sszztMap.get(w.getWindturbineId()).add(w);
-            }else {
-                List<ProBasicStatusPoint> wdisList = new ArrayList<>();
-                wdisList.add(w);
-                sszztMap.put(w.getWindturbineId(),wdisList);
-            }
-        });
-        redisService.set("SSZZT", JSONObject.toJSONString(sszztMap));
+                log.info("--------------------------完成");
+//
+//
+//        log.info("--------------------------redisSQ");
+//        List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        squareList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//        log.info("--------------------------redisLN");
+//        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        lineList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//
+//
+//        log.info("--------------------------redisPJ");
+//        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        projectList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//        log.info("--------------------------redisSubWP");
+//        redisService.select(9);
+//        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        subStationList.stream().forEach(i->{
+//            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//        log.info("--------------------------redisWeatherWP");
+//        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        weatherStationList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//        log.info("--------------------------redisWP");
+//        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//
+//        wpList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i.getId());
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
+//
+//        log.info("--------------------------redisCOMPANY");
+//        List<ProBasicCompany> coms = companyService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+////        List<String> comList = coms.stream().map(i->i.getId()).collect(Collectors.toList());
+//        List<String> comList = new ArrayList<>();
+//        coms.stream().forEach(company -> {
+//            comList.add(company.getId()+"0");
+//            comList.add(company.getId()+"-1");
+//            comList.add(company.getId()+"-2");
+//        });
+//        comList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i);
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i,s);
+//        });
+//
+//        log.info("--------------------------redisREGION");
+//        List<ProBasicRegion> regs = regionsService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+//        List<String> regList = new ArrayList<>();
+////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
+//        regs.stream().forEach(region -> {
+//            regList.add(region.getId()+"0");
+//            regList.add(region.getId()+"-1");
+//            regList.add(region.getId()+"-2");
+//        });
+//        regList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i);
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i,s);
+//        });
+//        log.info("--------------------------redisGroup");
+//        List<ProBasicEnergyGroup> groups = energyGroupService.list().stream().filter(i->i.getIsAble().equals(1) && !i.getParentid().equals("0")).collect(Collectors.toList());
+//        List<String> groupList = new ArrayList<>();
+////        List<String> regList = regs.stream().map(i->i.getId()).collect(Collectors.toList());
+//        groups.stream().forEach(group -> {
+//            groupList.add(group.getId()+"0");
+//            groupList.add(group.getId()+"-1");
+//            groupList.add(group.getId()+"-2");
+//        });
+//        groupList.stream().forEach(i->{
+//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+//            qw.eq("windpowerstation_id",i);
+//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+//            windpowerstationtestingpoint2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i,s);
+//        });
+//        redisService.select(9);
+//        log.info("--------------------------redis理论保证功率");
+//        Map<String, Map<Double, ProBasicModelPowerRd>> powerrdMap = new HashMap<>();
+//
+//        List<ProBasicModelPowerRd> proBasicModelPowerRds = proBasicModelPowerRdService.list();
+//        proBasicModelPowerRds.stream().forEach(powerrd->{
+//            if (powerrdMap.containsKey(powerrd.getModelId())){
+//                powerrdMap.get(powerrd.getModelId()).put(powerrd.getSpeed(),powerrd);
+//            }else {
+//                Map<Double,ProBasicModelPowerRd> powerMap = new HashMap<>();
+//                powerMap.put(powerrd.getSpeed(),powerrd);
+//                powerrdMap.put(powerrd.getModelId(),powerMap);
+//            }
+//        });
+//        redisService.set("ZLLGL", JSONObject.toJSONString(powerrdMap));
+//
+//        log.info("--------------------------redis十三种状态");
+//        Map<String, List<ProBasicStatusPoint>> sszztMap = new HashMap<>();
+//        List<ProBasicStatusPoint> windturbinestatusdis = proBasicStatusPointService.list();
+//        windturbinestatusdis.stream().forEach(w->{
+//            if (sszztMap.containsKey(w.getWindturbineId())){
+//                sszztMap.get(w.getWindturbineId()).add(w);
+//            }else {
+//                List<ProBasicStatusPoint> wdisList = new ArrayList<>();
+//                wdisList.add(w);
+//                sszztMap.put(w.getWindturbineId(),wdisList);
+//            }
+//        });
+//        redisService.set("SSZZT", JSONObject.toJSONString(sszztMap));
     }
 }

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

@@ -14,6 +14,8 @@ import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /*
@@ -91,10 +93,16 @@ public class CalculationService {
                 double nfdl = edosUtil.getSectionData(nfdlPoint, currentDate.getTime()).getPointValueInDouble();
                 double yllfdl = edosUtil.getSectionData(yllfdlPoint, currentDate.getTime()).getPointValueInDouble();
                 double rfdl = edosUtil.getSectionData(rfdlPoint, currentDate.getTime()).getPointValueInDouble();
-                jym = yfdl * 0.37 / 1000;
-                jys = yfdl * 3.05 / 1000;
-                jyeyht = yfdl * 0.8568 / 1000;
-                jyeyhl = yfdl * 0.0059 / 1000;
+//                jym = nfdl * 0.37 / 1000;
+//                jys = nfdl * 3.05 / 1000;
+//                jyeyht = nfdl * 0.8568 / 1000;
+//                jyeyhl = nfdl * 0.0059 / 1000;
+
+                jym = new BigDecimal(nfdl * 0.37).divide(new BigDecimal(1000 * 10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jys = new BigDecimal(nfdl * 3.05).divide(new BigDecimal(1000 * 10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jyeyht = new BigDecimal(nfdl * 0.8568).divide(new BigDecimal(1000 * 10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                jyeyhl = new BigDecimal(nfdl * 0.0059).divide(new BigDecimal(1000 * 10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
                 rlyxs = rfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
                 ylyxs = yfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());
                 nlyxs = nfdl / (wp.getJrwindCapacity()+wp.getJrCapacity());

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

@@ -381,18 +381,14 @@ public class CycleCalculationService {
                         double jxss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 6);
                         //检修受累
                         double jxsl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 7);
-//                        //待机
-//                        double djss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 0);
-//                        //手动停机
-//                        double sdtj = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 1);
-//                        //性能
-//                    double xnss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 2);
-                        double xnss = 0;
-                        double djss = 0;
-                        double sdtj = 0;
-                        double fdjcl = 0;
-//                        //发电降出力
-//                        double fdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 3);
+                        //待机
+                        double djss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 0);
+                        //手动停机
+                        double sdtj = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 1);
+                        //性能
+                        double xnss = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 2);
+                        //发电降出力
+                        double fdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 3);
                         //限电降出力
                         double xdjcl = generalLoss(mxztPointDatas, zsglPointDatas, ssglPointDatas, 8);
                         //限电停机
@@ -506,19 +502,17 @@ public class CycleCalculationService {
                             rjxss = DoubleUtils.sum(lsjxss, jxss);
                             double lsjxsl = edosUtil.getSectionData(rjxslPoint, currentDate.getTime()).getPointValueInDouble();
                             rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
-//                            double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
-//                            rdjss = DoubleUtils.sum(lsdjss, djss);
-//                            double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
-//                            rsdtj = DoubleUtils.sum(lssdtj, sdtj);
-//                            double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
-//                        rxnss = DoubleUtils.sum(lsxnss, xnss);
-
-                            rdjss = 0.0;
-                            rsdtj = 0.0;
-                            rxnss = 0.0;
-                            rfdjcl = 0.0;
-//                            double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
-//                            rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
+
+                            double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rdjss = DoubleUtils.sum(lsdjss, djss)*0.1;
+                            double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
+                            rsdtj = DoubleUtils.sum(lssdtj, sdtj)*0.1;;
+                            double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rxnss = DoubleUtils.sum(lsxnss, xnss)*0.1;;
+                            double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
+                            rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl)*0.1;;
+
+
                             double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();
                             rxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
                             double lsxdtj = edosUtil.getSectionData(rxdtjPoint, currentDate.getTime()).getPointValueInDouble();
@@ -547,7 +541,6 @@ public class CycleCalculationService {
                             ydjss = djss;
                             ysdtj = sdtj;
 
-                            xnss= 0;
                             yxnss = xnss;
 
                             yfdjcl = fdjcl;
@@ -584,15 +577,16 @@ public class CycleCalculationService {
                             yjxss = DoubleUtils.sum(lsjxss, jxss);
                             double lsjxsl = edosUtil.getSectionData(yjxslPoint, currentDate.getTime()).getPointValueInDouble();
                             yjxsl = DoubleUtils.sum(lsjxsl, jxsl);
+
                             double lsdjss = edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble();
                             ydjss = DoubleUtils.sum(lsdjss, djss);
                             double lssdtj = edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble();
                             ysdtj = DoubleUtils.sum(lssdtj, sdtj);
                             double lsxnss = edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble();
-//                        yxnss = DoubleUtils.sum(lsxnss, xnss);
-                            yxnss = 0.0;
+                            yxnss = DoubleUtils.sum(lsxnss, xnss);
                             double lsfdjcl = edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble();
                             yfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
+
                             double lsxdjcl = edosUtil.getSectionData(yxdjclPoint, currentDate.getTime()).getPointValueInDouble();
                             yxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
                             double lsxdtj = edosUtil.getSectionData(yxdtjPoint, currentDate.getTime()).getPointValueInDouble();
@@ -620,7 +614,6 @@ public class CycleCalculationService {
                             njxsl = jxsl;
                             ndjss = djss;
                             nsdtj = sdtj;
-                            xnss= 0;
                             nxnss = xnss;
 
                             nfdjcl = fdjcl;
@@ -658,16 +651,16 @@ public class CycleCalculationService {
                             njxss = DoubleUtils.sum(lsjxss, jxss);
                             double lsjxsl = edosUtil.getSectionData(njxslPoint, currentDate.getTime()).getPointValueInDouble();
                             njxsl = DoubleUtils.sum(lsjxsl, jxsl);
+
                             double lsdjss = edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble();
-                            ndjss = DoubleUtils.sum(lsdjss, djss);
+                            ndjss = DoubleUtils.sum(lsdjss, djss);;
                             double lssdtj = edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble();
-                            nsdtj = DoubleUtils.sum(lssdtj, sdtj);
+                            nsdtj = DoubleUtils.sum(lssdtj, sdtj);;
                             double lsxnss = edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble();
-//                        nxnss = DoubleUtils.sum(lsxnss, xnss);
-
-                            nxnss = 0.0;
+                            nxnss = DoubleUtils.sum(lsxnss, xnss);;
                             double lsfdjcl = edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble();
-                            nfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
+                            nfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);;
+
                             double lsxdjcl = edosUtil.getSectionData(nxdjclPoint, currentDate.getTime()).getPointValueInDouble();
                             nxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
                             double lsxdtj = edosUtil.getSectionData(nxdtjPoint, currentDate.getTime()).getPointValueInDouble();
@@ -1477,30 +1470,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rdjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ydjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ndjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rdjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ydjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ndjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 djss15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(djss15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -1509,30 +1502,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ysdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ysdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 sdtj15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(sdtj15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -1541,30 +1534,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
 
 
                 xnss15.updateAndGet(v -> {
@@ -1575,30 +1568,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 fdjcl15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(fdjcl15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -2588,30 +2581,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rdjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ydjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ndjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rdjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ydjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ndjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 djss15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(djss15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -2620,30 +2613,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ysdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ysdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 sdtj15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(sdtj15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -2652,30 +2645,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 xnss15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(xnss15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -2684,30 +2677,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 fdjcl15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(fdjcl15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -3696,30 +3689,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rdjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ydjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ndjss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rdjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ydjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ydjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ndjss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 djss15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(djss15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -3728,30 +3721,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                ysdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nsdtj.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                ysdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(ysdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nsdtj.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 sdtj15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(sdtj15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -3760,30 +3753,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nxnss.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nxnss.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 xnss15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(xnss15Point, currentDate.getTime()).getPointValueInDouble()));
@@ -3792,30 +3785,30 @@ public class CycleCalculationService {
                     }
                     return v;
                 });
-//                rfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                yfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
-//                nfdjcl.updateAndGet(v -> {
-//                    try {
-//                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
-//                    } catch (Exception e) {
-//                        e.printStackTrace();
-//                    }
-//                    return v;
-//                });
+                rfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                yfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(yfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
+                nfdjcl.updateAndGet(v -> {
+                    try {
+                        return new Double((double) (v + edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble()));
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return v;
+                });
                 fdjcl15.updateAndGet(v -> {
                     try {
                         return new Double((double) (v + edosUtil.getSectionData(fdjcl15Point, currentDate.getTime()).getPointValueInDouble()));

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

@@ -553,8 +553,8 @@ public class StatusService {
                     Calendar c = Calendar.getInstance();
                     c.setTime(currentDate);
 
-//
-//                    if (wt.getId().equals("SXJ_KGDL_NJL_F_WT_0044_EQ")) {
+
+//                    if (wt.getId().equals("SXJ_KGDL_YF_F_WT_0021_EQ")) {
 //                        System.out.println("");
 //                    }
 
@@ -1100,6 +1100,19 @@ public class StatusService {
                 }
 
             }
+
+            if (mxstatus==2 || (mxstatus==3)){
+                if(ssgl<0 || ssgl==0 )
+                {
+                    mxstatus=0;
+                }
+            }else if (mxstatus==0 || (mxstatus==1)){
+                if(ssgl>10 )
+                {
+                    mxstatus=2;
+                }
+            }
+
         }else {
             //每个状态一个状态点
             Map<String,String> stateMap = new HashMap<>();
@@ -1152,12 +1165,18 @@ public class StatusService {
             }
 
 
-            if (mxstatus==2 ){
+            if (mxstatus==2 || (mxstatus==3)){
               if(ssgl<0 || ssgl==0 )
               {
                   mxstatus=0;
               }
+            }else if (mxstatus==0 || (mxstatus==1)){
+                if(ssgl>10 )
+                {
+                    mxstatus=2;
+                }
             }
+
             if (zjzt==3){
                 if ( stateMap.containsKey("MX009")){
                     mxstatus = 9;

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo1ThreadPool.java

@@ -116,11 +116,38 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//日最大风速
-					pewp.setRzdfs(summaryStatistics.getMax());
+					if(summaryStatistics.getMax()>30)
+					{
+						pewp.setRzdfs(StringUtils.round(25,2));
+						System.out.println(summaryStatistics.getMax());
+					}else
+					{
+						pewp.setRzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						System.out.println(summaryStatistics.getMax());
+					}
+
 					//日最小风速
-					pewp.setRzxfs(summaryStatistics.getMin());
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setRzxfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//日平均风速
-					pewp.setRpjfs(summaryStatistics.getAverage());
+
+					if(summaryStatistics.getAverage()>30)
+					{
+						pewp.setRpjfs(StringUtils.round(25,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setRpjfs(StringUtils.round(0,2));
+					}
+						else
+					{
+						pewp.setRpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 				}
 
 			}
@@ -135,11 +162,37 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//日最大风速
-					pewp.setRzdfs(summaryStatistics.getMax());
+
+
+					if(summaryStatistics.getMax()>30)
+					{
+						pewp.setRzdfs(StringUtils.round(25.0,2));
+					}else
+					{
+						pewp.setRzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+					}
 					//日最小风速
-					pewp.setRzxfs(summaryStatistics.getMin());
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setRzxfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//日平均风速
-					pewp.setRpjfs(summaryStatistics.getAverage());
+
+
+					if(summaryStatistics.getAverage()>30)
+					{
+						pewp.setRpjfs(StringUtils.round(25,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setRpjfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setRpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 				}
 
 			}
@@ -155,11 +208,35 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			{
 				DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 				//日最大功率
-				pewp.setRzdgl(summaryStatistics.getMax());
+				if(summaryStatistics.getMax()>48000)
+				{
+					pewp.setRzdgl(StringUtils.round(48000,2));
+				}else
+				{
+					pewp.setRzdgl(StringUtils.round(summaryStatistics.getMax(),2));
+				}
+
 				//日最小功率
-				pewp.setRzxgl(summaryStatistics.getMin());
+				if(summaryStatistics.getMin()<0)
+				{
+					pewp.setRzxgl(StringUtils.round(0,2));
+				}else
+				{
+					pewp.setRzxgl(StringUtils.round(summaryStatistics.getMin(),2));
+				}
+
 				//日平均功率
-				pewp.setRpjgl(summaryStatistics.getAverage());
+				if(summaryStatistics.getAverage()>48000)
+				{
+					pewp.setRpjgl(StringUtils.round(48000,2));
+				}else if(summaryStatistics.getAverage()<0)
+				{
+					pewp.setRpjgl(StringUtils.round(0,2));
+				}else
+				{
+					pewp.setRpjgl(StringUtils.round(summaryStatistics.getAverage(),2));
+				}
+
 			}
 		}
 
@@ -266,8 +343,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日待机损失电量
-//				pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setRdjssdl(0.0);
+				pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
@@ -277,8 +353,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日缺陷降出力损失电量
-//				pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setRqxjclssdl(0.0);
+				 pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RSDTJSSDL))
@@ -288,8 +364,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日手动停机损失电量
-//				pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setRsdtjssdl(0.0);
+				pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -300,8 +376,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日性能损失电量
-//				pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setRxnssdl(0.0);
+				pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 			}
 		}
 
@@ -411,11 +487,37 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//月最大风速
-					pewp.setYzdfs(summaryStatistics.getMax());
+					if(summaryStatistics.getMax()>30)
+					{
+						pewp.setYzdfs(StringUtils.round(25.0,2));
+					}else
+					{
+						pewp.setYzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+					}
+
 					//月最小风速
-					pewp.setYzxfs(summaryStatistics.getMin());
+
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setYzxfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setYzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//月平均风速
-					pewp.setYpjfs(summaryStatistics.getAverage());
+
+
+					if(summaryStatistics.getAverage()>30)
+					{
+						pewp.setYpjfs(StringUtils.round(25,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setYpjfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setYpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 				}
 
 			}
@@ -428,11 +530,35 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//月最大功率
-					pewp.setYzdgl(summaryStatistics.getMax());
+
+					if(summaryStatistics.getMax()>1440000)
+					{
+						pewp.setYzdgl(StringUtils.round(1440000,2));
+					}else
+					{
+						pewp.setYzdgl(StringUtils.round(summaryStatistics.getMax(),2));
+					}
 					//月最小功率
-					pewp.setYzxgl(summaryStatistics.getMin());
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setYzxgl(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setYzxgl(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//月平均功率
-					pewp.setYpjgl(summaryStatistics.getAverage());
+					if(summaryStatistics.getAverage()>1440000)
+					{
+						pewp.setYpjgl(StringUtils.round(1440000,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setYpjgl(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setYpjgl(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
+
 				}
 			}
 
@@ -545,8 +671,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月待机损失电量
-//				pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setYdjssdl(0.0);
+				pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -557,8 +683,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月缺陷降出力损失电量
-//				pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setYqxjclssdl(0.0);
+				pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -569,8 +695,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月手动停机损失电量
-//				pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setYsdtjssdl(0.0);
+				pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -581,8 +707,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月性能损失电量
-//				pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setYxnssdl(0.0);
+				pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -692,11 +818,35 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//年最大风速
-					pewp.setNzdfs(summaryStatistics.getMax());
+					if(summaryStatistics.getMax()>30)
+					{
+						pewp.setNzdfs(StringUtils.round(25.0,2));
+					}else
+					{
+						pewp.setNzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+					}
+
 					//年最小风速
-					pewp.setNzxfs(summaryStatistics.getMin());
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setNzxfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setNzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//年平均风速
-					pewp.setNpjfs(summaryStatistics.getAverage());
+
+					if(summaryStatistics.getAverage()>30)
+					{
+						pewp.setNpjfs(StringUtils.round(25.0,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setNpjfs(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setNpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
 				}
 
 			}
@@ -709,11 +859,35 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 				{
 					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
 					//年最大功率
-					pewp.setNzdgl(summaryStatistics.getMax());
+
+					if(summaryStatistics.getMax()>17520000)
+					{
+						pewp.setNzdgl(StringUtils.round(17520000,2));
+					}else
+					{
+						pewp.setNzdgl(StringUtils.round(summaryStatistics.getMax(),2));
+					}
 					//年最小功率
-					pewp.setNzxgl(summaryStatistics.getMin());
+
+					if(summaryStatistics.getMin()<0)
+					{
+						pewp.setNzxgl(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setNzxgl(StringUtils.round(summaryStatistics.getMin(),2));
+					}
 					//年平均功率
-					pewp.setNpjgl(summaryStatistics.getAverage());
+					if(summaryStatistics.getAverage()>17520000)
+					{
+						pewp.setNpjgl(StringUtils.round(17520000,2));
+					}else if(summaryStatistics.getAverage()<0)
+					{
+						pewp.setNpjgl(StringUtils.round(0,2));
+					}else
+					{
+						pewp.setNpjgl(StringUtils.round(summaryStatistics.getAverage(),2));
+					}
+
 				}
 			}
 
@@ -825,8 +999,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年待机损失电量
-//				pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setNdjssdl(0.0);
+				pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -837,8 +1011,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年缺陷降出力损失电量
-//				pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setNqxjclssdl(0.0);
+				pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -849,8 +1023,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年手动停机损失电量
-//				pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setNsdtjssdl(0.0);
+				pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -861,8 +1035,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年性能损失电量
-//				pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
-				pewp.setNxnssdl(0.0);
+				pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+
 
 			}
 		}
@@ -959,35 +1133,36 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 	private void setPowerandSpeedYear(ProEconEquipmentInfoDay1 pewp) {
 		//年最大风速
-		pewp.setNzdfs(pewp.getRzdfs());
+		pewp.setNzdfs(StringUtils.round(pewp.getRzdfs(),2));
+
 		//年最小风速
-		pewp.setNzxfs(pewp.getRzxfs());
+		pewp.setNzxfs(StringUtils.round(pewp.getRzxfs(),2));
 		//年平均风速
-		pewp.setNpjfs(pewp.getRpjfs());
+		pewp.setNpjfs(StringUtils.round(pewp.getRpjfs(),2));
 
 		//年最大功率
-		pewp.setNzdgl(pewp.getRzdgl());
+		pewp.setNzdgl(StringUtils.round(pewp.getRzdgl(),2));
 		//年最小功率
-		pewp.setNzxgl(pewp.getRzxgl());
+		pewp.setNzxgl(StringUtils.round(pewp.getRzxgl(),2));
 		//年平均功率
-		pewp.setNpjgl(pewp.getRpjgl());
+		pewp.setNpjgl(StringUtils.round(pewp.getRpjgl(),2));
 
 	}
 
 	private void setPowerandSpeedMonth(ProEconEquipmentInfoDay1 pewp) {
 
 		//月最大风速
-		pewp.setYzdfs(pewp.getRzdfs());
+		pewp.setYzdfs(StringUtils.round(pewp.getRzdfs(),2));
 		//月最小风速
-		pewp.setYzxfs(pewp.getRzxfs());
+		pewp.setYzxfs(StringUtils.round(pewp.getRzxfs(),2));
 		//月平均风速
-		pewp.setYpjfs(pewp.getRpjfs());
+		pewp.setYpjfs(StringUtils.round(pewp.getRpjfs(),2));
 
 		//月最大功率
-		pewp.setYzdgl(pewp.getRzdgl());
+		pewp.setYzdgl(StringUtils.round(pewp.getRzdgl(),2));
 		//月最小功率
-		pewp.setYzxgl(pewp.getRzxgl());
+		pewp.setYzxgl(StringUtils.round(pewp.getRzxgl(),2));
 		//月平均功率
-		pewp.setYpjgl(pewp.getRpjgl());
+		pewp.setYpjgl(StringUtils.round(pewp.getRpjgl(),2));
 	}
 }

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

@@ -2,7 +2,7 @@ package com.gyee.generation;
 
 import com.gyee.generation.service.InitialRedisService;
 import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.WindturbineGoodnessService;
+import com.gyee.generation.service.initalcache.CacheService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -22,10 +22,10 @@ public class HealthTest {
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
-//        CacheService cacheService= SpringUtils.getBean("cacheService");
-//        cacheService.initRedisCache();
-//
-//        System.out.println("完成!。。。。。。");
+        CacheService cacheService= SpringUtils.getBean("cacheService");
+        cacheService.initRedisCache();
+
+        System.out.println("完成!。。。。。。");
 //
 //
 //
@@ -263,15 +263,15 @@ public class HealthTest {
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
-
-        begin=new Date();
-        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
-        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
-
-        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
-        end=new Date();
-        System.out.println("执行用时"+ com.gyee.generation.util.DateUtils.secondsDiff(begin,end) +"秒");
-        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
+//
+//        begin=new Date();
+//        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
+//        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+//
+//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//        end=new Date();
+//        System.out.println("执行用时"+ com.gyee.generation.util.DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("功率一致性系数和拟合优度调度程序执行结束!。。。。。。");
 //
 //        c.add(Calendar.DAY_OF_MONTH,-1);
 //        begin=new Date();

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

@@ -33,8 +33,8 @@ public class RealTest {
         System.out.println("状态判定调度程序执行开始!。。。。。。");
 
 //        statusService.middleStatusReal();
-        statusService.startStatusReal();
-
+//        statusService.startStatusReal();
+        calculationService.calWp();
 //        cycleCalculationService.saveCyle();
 
 //        realtimeService.savaRealtimeTarget();