开发和风REdis数据缓存

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

@@ -1,9 +1,14 @@
 package com.gyee.generation;
 
+import com.gyee.common.util.DateUtils;
+import com.gyee.generation.service.Status_HF_Service;
+import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.Date;
+
 /**
  * @ClassName : GenerationMain
  * @Author : xieshengjie
@@ -17,31 +22,42 @@ public class GenerationMain {
 
         SpringApplication.run(GenerationMain.class,args);
 
-//
-//        Status_HF_Service status_HF_Service= SpringUtils.getBean("status_HF_Service");
-//
-//        Date begin=new Date();
-//        System.out.println("开始欠发状态。。。。。。");
-//        status_HF_Service.calculateQfStatus();
-//        Date end=new Date();
-//        System.out.println("结束欠发状态。。。。。。"+ DateUtils.millisecondDiff(end,begin));
-//
-//        System.out.println("开始故障状态。。。。。。");
-//         begin=new Date();
-//        status_HF_Service.calculateGzStatus();
-//         end=new Date();
-//        System.out.println("结束故障状态。。。。。。"+ DateUtils.millisecondDiff(end,begin));
-//
-//        System.out.println("开始理论发电量。。。。。。");
-//         begin=new Date();
-//        status_HF_Service.calculateLlgl();
-//         end=new Date();
-//        System.out.println("结束理论发电量。。。。。。"+ DateUtils.millisecondDiff(end,begin));
-//
-//        System.out.println("开始场站指标。。。。。。");
-//        begin=new Date();
-//        status_HF_Service.calculateWpPoint();
-//         end=new Date();
-//        System.out.println("结束场站指标。。。。。。"+ DateUtils.millisecondDiff(end,begin));
+
+        Status_HF_Service status_HF_Service=SpringUtils.getBean("status_HF_Service");
+
+        while(true)
+        {
+
+
+
+            Date begin=new Date();
+            System.out.println("开始欠发状态。。。。。。");
+            status_HF_Service.calculateQfStatus();
+            Date end=new Date();
+            System.out.println("结束欠发状态。。。。。。"+ DateUtils.millisecondDiff(end,begin));
+
+            Thread.sleep(500);
+            System.out.println("开始故障状态。。。。。。");
+            begin=new Date();
+            status_HF_Service.calculateGzStatus();
+            end=new Date();
+            System.out.println("结束故障状态。。。。。。"+ DateUtils.millisecondDiff(end,begin));
+            Thread.sleep(500);
+            System.out.println("开始理论发电量。。。。。。");
+            begin=new Date();
+            status_HF_Service.calculateLlgl();
+            end=new Date();
+            System.out.println("结束理论发电量。。。。。。"+ DateUtils.millisecondDiff(end,begin));
+            Thread.sleep(500);
+            System.out.println("开始场站指标。。。。。。");
+            begin=new Date();
+            status_HF_Service.calculateWpPoint();
+            end=new Date();
+            System.out.println("结束场站指标。。。。。。"+ DateUtils.millisecondDiff(end,begin));
+
+
+            Thread.sleep(500);
+        }
+
     }
 }

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

@@ -87,6 +87,8 @@ public class CacheContext implements CommandLineRunner {
 
     public static List<Windturbinetestingpointdis> pointdis = new ArrayList<>();
 
+    public static Map< String,Map<String, Windturbinetestingpointdis>> pointdismap = new HashMap<>();
+
     @Override
     public void run(String... args) throws Exception {
         logger.info("缓存开始------------------------------------------------------------");
@@ -233,6 +235,25 @@ public class CacheContext implements CommandLineRunner {
         });
 
 
+
+
+        Map<String, Windturbinetestingpointdis> items = null;
+        if (pointdis != null && !pointdis.isEmpty()) {
+            for (int i = 0; i < pointdis.size(); i++) {
+                Windturbinetestingpointdis point = pointdis.get(i);
+                if (pointdismap.containsKey(point.getWindturbineid())) {
+                    items = pointdismap.get(point.getWindturbineid());
+                    items.put(point.getUniformcode(), point);
+                } else {
+                    items = new HashMap<String, Windturbinetestingpointdis>();
+                    pointdismap.put(point.getWindturbineid(), items);
+                    items.put(point.getUniformcode(), point);
+                }
+
+            }
+        }
+
+
         logger.info("缓存结束------------------------------------------------------------");
     }
 

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

@@ -7,6 +7,7 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.algorithm.Underdelivery;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.util.SpringUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.redis.RedisService;
 import org.springframework.stereotype.Service;
@@ -27,8 +28,7 @@ public class Status_HF_Service {
     @Resource
     private IEdosUtil edosUtil;
 
-    @Resource
-    private RedisService redisService;
+
 
 
     /**
@@ -38,10 +38,65 @@ public class Status_HF_Service {
      */
     public void calculateGzStatus() throws Exception {
 
+
+        RedisService redisService= SpringUtils.getBean("redisService");
+        Date date = new Date();
         Map<String, Map<String, Object>> pipelinedmap = new HashMap<>();
         if (!CacheContext.wtls.isEmpty()) {
 
+            Map<Integer,List<String>> pointmap=new LinkedHashMap<>();
+            for (Windturbine wt : CacheContext.wtls) {
+
+                List<Windturbinetestingpointdis> disLs = CacheContext.pointdis.stream().filter(i -> i.getWindturbineid().equals(wt.getId()) && i.getUniformcode().equals("ZT001")).collect(Collectors.toList());
+
+                if (!disLs.isEmpty()) {
+                    Windturbinetestingpointdis key = disLs.get(0);
+                    if (CacheContext.redisDbMap.containsKey(key.getId())) {
+                        int dbnum = CacheContext.redisDbMap.get(key.getId());
+
+                        if(pointmap.containsKey(dbnum))
+                        {
+                            List<String> ls=pointmap.get(dbnum);
+                            ls.add(key.getId());
+                        }else
+                        {
+                            List<String> ls=new ArrayList<>();
+                            ls.add(key.getId());
+                            pointmap.put(dbnum,ls);
+                        }
+
+                    }
 
+
+                }
+
+               disLs = CacheContext.pointdis.stream().filter(i -> i.getWindturbineid().equals(wt.getId()) && i.getUniformcode().equals("ZT002")).collect(Collectors.toList());
+
+
+                if (!disLs.isEmpty()) {
+                    Windturbinetestingpointdis key = disLs.get(0);
+                    if (CacheContext.redisDbMap.containsKey(key.getId())) {
+                        int dbnum = CacheContext.redisDbMap.get(key.getId());
+
+
+                        if(pointmap.containsKey(dbnum))
+                        {
+                            List<String> ls=pointmap.get(dbnum);
+                            ls.add(key.getId());
+                        }else
+                        {
+                            List<String> ls=new ArrayList<>();
+                            ls.add(key.getId());
+                            pointmap.put(dbnum,ls);
+                        }
+
+
+                    }
+
+                }
+            }
+
+            Map<String,Map<String,String>> valuemap=redisService.hgetall(pointmap);
             for (Windturbine wt : CacheContext.wtls) {
 
 
@@ -49,12 +104,12 @@ public class Status_HF_Service {
                     Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
                     if (map.containsKey(Contant.GZZT)) {
                         Windturbinetestingpointai pt = map.get(Contant.GZZT);
-                        redisService.select(8);
+                      // redisService.select(8);
 
                         Map<String, Object> pomap = new LinkedHashMap<>();
 
                         pomap.put("pointid", pt.getId());
-                        Date date = new Date();
+
                         pomap.put("value", 0);
                         pomap.put("timestamp", date.getTime() / 1000);
                         pomap.put("datetime", DateUtils.toDate(date));
@@ -70,49 +125,44 @@ public class Status_HF_Service {
 
                     if (!disLs.isEmpty()) {
                         Windturbinetestingpointdis key = disLs.get(0);
-                        if (CacheContext.redisDbMap.containsKey(key.getId())) {
-                            int dbnum = CacheContext.redisDbMap.get(key.getId());
-                            redisService.select(dbnum);
+                        if (valuemap.containsKey(key.getId())) {
 
-                            if (redisService.hasKey(key.getId(), "value")) {
+                            double value = 0.0;
 
-                                double value = 0.0;
-                                try {
-                                    Map<Object, Object> map = redisService.getHashEntries(key.getId());
-                                    if (map.containsKey("value")) {
-                                        value = Double.valueOf((String) map.get("value"));
-                                    }
-                                } catch (Exception e) {
-                                    System.out.println("calculateGzStatus" + "  " + e.getMessage());
+                            if(valuemap.containsKey(key.getId()))
+                            {
+                                Map<String, String> tempmap = valuemap.get(key.getId());
+                                if (tempmap.containsKey("value")) {
+                                    value = Double.valueOf((String) tempmap.get("value"));
                                 }
+                            }
 
-                                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
-                                    Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
-                                    if (map.containsKey(Contant.GZZT)) {
-                                        Windturbinetestingpointai pt = map.get(Contant.GZZT);
 
-                                        if (StringUtils.notEmp(value) && value == 3) {
-                                            redisService.select(8);
+                            if (CacheContext.wtPointmap.containsKey(wt.getId())) {
+                                Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
+                                if (map.containsKey(Contant.GZZT)) {
+                                    Windturbinetestingpointai pt = map.get(Contant.GZZT);
+
+                                    if (StringUtils.notEmp(value) && value == 3) {
+                                        redisService.select(8);
 
 
-                                            Map<String, Object> pomap = new LinkedHashMap<>();
+                                        Map<String, Object> pomap = new LinkedHashMap<>();
 
-                                            pomap.put("pointid", pt.getId());
-                                            Date date = new Date();
-                                            pomap.put("value", 1);
-                                            pomap.put("timestamp", date.getTime() / 1000);
-                                            pomap.put("datetime", DateUtils.toDate(date));
-                                            pomap.put("status", 0);
+                                        pomap.put("pointid", pt.getId());
+                                        pomap.put("value", 1);
+                                        pomap.put("timestamp", date.getTime() / 1000);
+                                        pomap.put("datetime", DateUtils.toDate(date));
+                                        pomap.put("status", 0);
 
-                                            pipelinedmap.put(pt.getId(), pomap);
-                                            // redisService.putHashAllObj(pt.getId(),pomap);
+                                        pipelinedmap.put(pt.getId(), pomap);
+                                        // redisService.putHashAllObj(pt.getId(),pomap);
 
 
-                                        }
                                     }
                                 }
-
                             }
+
                         }
 
 
@@ -123,57 +173,48 @@ public class Status_HF_Service {
 
                     if (!disLs.isEmpty()) {
                         Windturbinetestingpointdis key = disLs.get(0);
-                        if (CacheContext.redisDbMap.containsKey(key.getId())) {
-                            int dbnum = CacheContext.redisDbMap.get(key.getId());
-                            redisService.select(dbnum);
-
-                            if (redisService.hasKey(key.getId(), "value")) {
-                                double value = 0.0;
-                                try {
-
-                                    Map<Object, Object> map = redisService.getHashEntries(key.getId());
-                                    if (map.containsKey("value")) {
-                                        value = Double.valueOf((String) map.get("value"));
-                                    }
-                                } catch (Exception e) {
-                                    System.out.println("calculateGzStatus" + "  " + e.getMessage());
+                        if (valuemap.containsKey(key.getId())) {
+                            double value = 0.0;
+                            if(valuemap.containsKey(key.getId()))
+                            {
+                                Map<String, String> tempmap = valuemap.get(key.getId());
+                                if (tempmap.containsKey("value")) {
+                                    value = Double.valueOf((String) tempmap.get("value"));
                                 }
+                            }
 
 
-                                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
-                                    Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
-                                    if (map.containsKey(Contant.GZZT)) {
-                                        Windturbinetestingpointai pt = map.get(Contant.GZZT);
+                            if (CacheContext.wtPointmap.containsKey(wt.getId())) {
+                                Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
+                                if (map.containsKey(Contant.GZZT)) {
+                                    Windturbinetestingpointai pt = map.get(Contant.GZZT);
 
-                                        if (StringUtils.notEmp(value) && value == 1) {
-                                            redisService.select(8);
+                                    if (StringUtils.notEmp(value) && value == 1) {
+                                        // redisService.select(8);
 
 
-                                            Map<String, Object> pomap = new LinkedHashMap<>();
+                                        Map<String, Object> pomap = new LinkedHashMap<>();
 
-                                            pomap.put("pointid", pt.getId());
-                                            Date date = new Date();
-                                            pomap.put("value", 1);
-                                            pomap.put("timestamp", date.getTime() / 1000);
-                                            pomap.put("datetime", DateUtils.toDate(date));
-                                            pomap.put("status", 0);
-                                            pipelinedmap.put(pt.getId(), pomap);
-                                            //redisService.putHashAllObj(pt.getId(),pomap);
+                                        pomap.put("pointid", pt.getId());
+                                        pomap.put("value", 1);
+                                        pomap.put("timestamp", date.getTime() / 1000);
+                                        pomap.put("datetime", DateUtils.toDate(date));
+                                        pomap.put("status", 0);
+                                        pipelinedmap.put(pt.getId(), pomap);
+                                        //redisService.putHashAllObj(pt.getId(),pomap);
 
 
-                                        }
                                     }
                                 }
                             }
-
-
                         }
 
                     }
                 }
             }
-
+            redisService.select(8);
             redisService.putHashAllPipeObj(pipelinedmap);
+
         }
 
     }
@@ -185,9 +226,56 @@ public class Status_HF_Service {
      * @throws Exception
      */
     public void calculateQfStatus() throws Exception {
-
+        RedisService redisService= SpringUtils.getBean("redisService");
+        Date date = new Date();
         Map<String, Map<String, Object>> pipelinedmap = new HashMap<>();
         if (!CacheContext.wtls.isEmpty()) {
+            Map<Integer,List<String>> pointmap=new LinkedHashMap<>();
+
+            for (Windturbine wt : CacheContext.wtls) {
+
+                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
+                    Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
+
+
+                    if (map.containsKey(Contant.AI130) && map.containsKey(Contant.AI022)) {
+                        Windturbinetestingpointai powerpoint = map.get(Contant.AI130);
+                        Windturbinetestingpointai speedpoint = map.get(Contant.AI022);
+                        if (CacheContext.redisDbMap.containsKey(powerpoint.getId()) && CacheContext.redisDbMap.containsKey(speedpoint.getId())) {
+
+                            int dbnum = CacheContext.redisDbMap.get(powerpoint.getId());
+                            if(pointmap.containsKey(dbnum))
+                            {
+                                List<String> ls=pointmap.get(dbnum);
+                                ls.add(powerpoint.getId());
+                            }else
+                            {
+                                List<String> ls=new ArrayList<>();
+                                ls.add(powerpoint.getId());
+                                pointmap.put(dbnum,ls);
+                            }
+
+
+                            dbnum = CacheContext.redisDbMap.get(speedpoint.getId());
+                            if(pointmap.containsKey(dbnum))
+                            {
+                                List<String> ls=pointmap.get(dbnum);
+                                ls.add(speedpoint.getId());
+                            }else
+                            {
+                                List<String> ls=new ArrayList<>();
+                                ls.add(speedpoint.getId());
+                                pointmap.put(dbnum,ls);
+                            }
+
+
+                        }
+                    }
+                }
+            }
+
+            Map<String,Map<String,String>> valuemap=redisService.hgetall(pointmap);
+
             for (Windturbine wt : CacheContext.wtls) {
 
                 if (CacheContext.wtPointmap.containsKey(wt.getId())) {
@@ -196,11 +284,11 @@ public class Status_HF_Service {
 
                     if (map.containsKey(Contant.RSSQFZT)) {
                         Windturbinetestingpointai qfpt = map.get(Contant.RSSQFZT);
-                        redisService.select(8);
+                       // redisService.select(8);
                         Map<String, Object> pomap = new LinkedHashMap<>();
 
                         pomap.put("pointid", qfpt.getId());
-                        Date date = new Date();
+
                         pomap.put("value", 0);
                         pomap.put("timestamp", date.getTime() / 1000);
                         pomap.put("datetime", DateUtils.toDate(date));
@@ -211,81 +299,66 @@ public class Status_HF_Service {
                     if (map.containsKey(Contant.AI130) && map.containsKey(Contant.AI022)) {
                         Windturbinetestingpointai powerpoint = map.get(Contant.AI130);
                         Windturbinetestingpointai speedpoint = map.get(Contant.AI022);
-                        if (CacheContext.redisDbMap.containsKey(powerpoint.getId()) && CacheContext.redisDbMap.containsKey(speedpoint.getId())) {
-
-                            int dbnum = CacheContext.redisDbMap.get(powerpoint.getId());
-                            redisService.select(dbnum);
-                            double power = 0.0;
-                            if (redisService.hasKey(powerpoint.getId(), "value")) {
+                        double power = 0.0;
 
-                                try {
-
-                                    Map<Object, Object> tempmap = redisService.getHashEntries(powerpoint.getId());
-                                    if (tempmap.containsKey("value")) {
-                                        power = Double.valueOf((String) tempmap.get("value"));
-                                    }
-                                } catch (Exception e) {
-                                    System.out.println("calculateQfStatus" + "  " + e.getMessage());
-                                }
+                        if(valuemap.containsKey(powerpoint.getId()))
+                        {
+                            Map<String, String> tempmap = valuemap.get(powerpoint.getId());
 
+                            if (tempmap.containsKey("value")) {
+                                power = Double.valueOf((String) tempmap.get("value"));
                             }
+                        }
 
 
-                            dbnum = CacheContext.redisDbMap.get(speedpoint.getId());
-                            redisService.select(dbnum);
 
-                            double speed = 0.0;
-                            if (redisService.hasKey(speedpoint.getId(), "value")) {
-                                try {
+                        double speed = 0.0;
+                        if(valuemap.containsKey(speedpoint.getId()))
+                        {
+                            Map<String, String> tempmap2 = valuemap.get(speedpoint.getId());
+                            if (tempmap2.containsKey("value")) {
+                                speed = Double.valueOf((String) tempmap2.get("value"));
+                            }
+                        }
 
-                                    Map<Object, Object> tempmap = redisService.getHashEntries(speedpoint.getId());
-                                    if (tempmap.containsKey("value")) {
-                                        speed = Double.valueOf((String) tempmap.get("value"));
-                                    }
-                                } catch (Exception e) {
-                                    System.out.println("calculateQfStatus" + "  " + e.getMessage());
-                                }
 
-                            }
 
+                        if ((speed != 0 && power != 0) && CacheContext.curveFittingPowerMap.containsKey(wt.getId()) && StringUtils.notEmp(power) && StringUtils.notEmp(speed)) {
+                            Map<Double, Windturbinepowercurvefitting> wtcurvemap = CacheContext.curveFittingPowerMap.get(wt.getId());
 
-                            if ((speed != 0 && power != 0) && CacheContext.curveFittingPowerMap.containsKey(wt.getId()) && StringUtils.notEmp(power) && StringUtils.notEmp(speed)) {
-                                Map<Double, Windturbinepowercurvefitting> wtcurvemap = CacheContext.curveFittingPowerMap.get(wt.getId());
+                            if (wtcurvemap.containsKey(StringUtils.round(speed, 2))) {
+                                Windturbinepowercurvefitting wtcurve = wtcurvemap.get(StringUtils.round(speed, 2));
+                                //拟合功率
+                                Double actualpower = wtcurve.getActualpower();
 
-                                if (wtcurvemap.containsKey(StringUtils.round(speed, 2))) {
-                                    Windturbinepowercurvefitting wtcurve = wtcurvemap.get(StringUtils.round(speed, 2));
-                                    //拟合功率
-                                    Double actualpower = wtcurve.getActualpower();
+                                double qfzt = Underdelivery.underdeliveryStatusReal(power, actualpower);
+                                if (map.containsKey(Contant.RSSQFZT)) {
+                                    Windturbinetestingpointai qfpt = map.get(Contant.RSSQFZT);
+//                                        redisService.select(8);
 
-                                    double qfzt = Underdelivery.underdeliveryStatusReal(power, actualpower);
-                                    if (map.containsKey(Contant.RSSQFZT)) {
-                                        Windturbinetestingpointai qfpt = map.get(Contant.RSSQFZT);
-                                        redisService.select(8);
 
+                                    Map<String, Object> pomap = new LinkedHashMap<>();
 
-                                        Map<String, Object> pomap = new LinkedHashMap<>();
+                                    pomap.put("pointid", qfpt.getId());
 
-                                        pomap.put("pointid", qfpt.getId());
-                                        Date date = new Date();
-                                        pomap.put("value", qfzt);
-                                        pomap.put("timestamp", date.getTime() / 1000);
-                                        pomap.put("datetime", DateUtils.toDate(date));
-                                        pomap.put("status", 0);
-                                        pipelinedmap.put(qfpt.getId(), pomap);
-                                        //redisService.putHashAllObj(qfpt.getId(),pomap);
+                                    pomap.put("value", qfzt);
+                                    pomap.put("timestamp", date.getTime() / 1000);
+                                    pomap.put("datetime", DateUtils.toDate(date));
+                                    pomap.put("status", 0);
+                                    pipelinedmap.put(qfpt.getId(), pomap);
+                                    //redisService.putHashAllObj(qfpt.getId(),pomap);
 
 
-                                    }
                                 }
-
                             }
 
                         }
                     }
                 }
             }
-
+            redisService.select(8);
             redisService.putHashAllPipeObj(pipelinedmap);
+
         }
     }
 
@@ -296,22 +369,55 @@ public class Status_HF_Service {
      * @throws Exception
      */
     public void calculateLlgl() throws Exception {
-
+        RedisService redisService= SpringUtils.getBean("redisService");
+        Date date = new Date();
         Map<String, Map<String, Object>> pipelinedmap = new HashMap<>();
         if (!CacheContext.wtls.isEmpty()) {
+
+            Map<Integer,List<String>> pointmap=new LinkedHashMap<>();
+            for (Windturbine wt : CacheContext.wtls) {
+
+                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
+                    Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
+
+
+                    if (map.containsKey(Contant.AI022)) {
+                        Windturbinetestingpointai speedpoint = map.get(Contant.AI022);
+                        if (CacheContext.redisDbMap.containsKey(speedpoint.getId())) {
+
+                            int dbnum = CacheContext.redisDbMap.get(speedpoint.getId());
+                            if(pointmap.containsKey(dbnum))
+                            {
+                                List<String> ls=pointmap.get(dbnum);
+                                ls.add(speedpoint.getId());
+                            }else
+                            {
+                                List<String> ls=new ArrayList<>();
+                                ls.add(speedpoint.getId());
+                                pointmap.put(dbnum,ls);
+                            }
+
+                        }
+                    }
+                }
+
+
+            }
+
+            Map<String,Map<String,String>> valuemap=redisService.hgetall(pointmap);
             for (Windturbine wt : CacheContext.wtls) {
 
                 if (CacheContext.wtPointmap.containsKey(wt.getId())) {
                     Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
                     if (map.containsKey(Contant.LLGL)) {
                         Windturbinetestingpointai qfpt = map.get(Contant.LLGL);
-                        redisService.select(8);
+                        //redisService.select(8);
 
 
                         Map<String, Object> pomap = new LinkedHashMap<>();
 
                         pomap.put("pointid", qfpt.getId());
-                        Date date = new Date();
+
                         pomap.put("value", 0);
                         pomap.put("timestamp", date.getTime() / 1000);
                         pomap.put("datetime", DateUtils.toDate(date));
@@ -320,66 +426,59 @@ public class Status_HF_Service {
                         //  redisService.putHashAllObj(qfpt.getId(),pomap);
 
                     }
-                }
 
-                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
-                    Map<String, Windturbinetestingpointai> map = CacheContext.wtPointmap.get(wt.getId());
                     if (map.containsKey(Contant.AI022)) {
                         Windturbinetestingpointai speedpoint = map.get(Contant.AI022);
-                        if (CacheContext.redisDbMap.containsKey(speedpoint.getId())) {
-
-                            int dbnum = CacheContext.redisDbMap.get(speedpoint.getId());
-                            redisService.select(dbnum);
-                            double speed = 0.0;
-                            if (redisService.hasKey(speedpoint.getId(), "value")) {
-                                try {
-
-                                    Map<Object, Object> tempmap = redisService.getHashEntries(speedpoint.getId());
-                                    if (tempmap.containsKey("value")) {
-                                        speed = Double.valueOf((String) tempmap.get("value"));
-                                    }
-                                } catch (Exception e) {
-                                    System.out.println("calculateLlgl   " + e.getMessage());
-                                }
+                        double speed = 0.0;
+                        if(valuemap.containsKey(speedpoint.getId()))
+                        {
+                            Map<String, String> tempmap = valuemap.get(speedpoint.getId());
+                            if (tempmap.containsKey("value")) {
+                                speed = Double.valueOf((String) tempmap.get("value"));
                             }
+                        }
 
 
-                            if (speed != 0 && CacheContext.curveFittingPowerMap.containsKey(wt.getId()) && StringUtils.notEmp(speed)) {
-                                Map<Double, Windturbinepowercurvefitting> wtcurvemap = CacheContext.curveFittingPowerMap.get(wt.getId());
 
-                                if (wtcurvemap.containsKey(StringUtils.round(speed, 2))) {
-                                    Windturbinepowercurvefitting wtcurve = wtcurvemap.get(StringUtils.round(speed, 2));
-                                    //拟合功率
-                                    Double actualpower = wtcurve.getOptimalpower();
+                        if (speed != 0 && CacheContext.curveFittingPowerMap.containsKey(wt.getId()) && StringUtils.notEmp(speed)) {
+                            Map<Double, Windturbinepowercurvefitting> wtcurvemap = CacheContext.curveFittingPowerMap.get(wt.getId());
 
-                                    if (CacheContext.wtPointmap.containsKey(wt.getId())) {
+                            if (wtcurvemap.containsKey(StringUtils.round(speed, 2))) {
+                                Windturbinepowercurvefitting wtcurve = wtcurvemap.get(StringUtils.round(speed, 2));
+                                //拟合功率
+                                Double actualpower = wtcurve.getOptimalpower();
 
-                                        if (map.containsKey(Contant.LLGL)) {
-                                            Windturbinetestingpointai qfpt = map.get(Contant.LLGL);
-                                            redisService.select(8);
+                                if (CacheContext.wtPointmap.containsKey(wt.getId())) {
 
+                                    if (map.containsKey(Contant.LLGL)) {
+                                        Windturbinetestingpointai qfpt = map.get(Contant.LLGL);
+                                        // redisService.select(8);
 
-                                            Map<String, Object> pomap = new LinkedHashMap<>();
 
-                                            pomap.put("pointid", qfpt.getId());
-                                            Date date = new Date();
-                                            pomap.put("value", actualpower);
-                                            pomap.put("timestamp", date.getTime() / 1000);
-                                            pomap.put("datetime", DateUtils.toDate(date));
-                                            pomap.put("status", 0);
-                                            pipelinedmap.put(qfpt.getId(), pomap);
-                                            //redisService.putHashAllObj(qfpt.getId(),pomap);
+                                        Map<String, Object> pomap = new LinkedHashMap<>();
+
+                                        pomap.put("pointid", qfpt.getId());
+
+                                        pomap.put("value", actualpower);
+                                        pomap.put("timestamp", date.getTime() / 1000);
+                                        pomap.put("datetime", DateUtils.toDate(date));
+                                        pomap.put("status", 0);
+                                        pipelinedmap.put(qfpt.getId(), pomap);
+                                        //redisService.putHashAllObj(qfpt.getId(),pomap);
 
 
-                                        }
                                     }
                                 }
                             }
                         }
                     }
                 }
+
+
             }
+            redisService.select(8);
             redisService.putHashAllPipeObj(pipelinedmap);
+
         }
     }
 
@@ -390,6 +489,8 @@ public class Status_HF_Service {
      * @throws Exception
      */
     public void calculateWpPoint() throws Exception {
+        RedisService redisService= SpringUtils.getBean("redisService");
+        Date date = new Date();
         Map<String, Map<String, Object>> pipelinedmap = new HashMap<>();
         if (!CacheContext.wpls.isEmpty()) {
             for (Windpowerstation wp : CacheContext.wpls) {
@@ -417,14 +518,14 @@ public class Status_HF_Service {
 
                     List<PointData> vos = edosUtil.getRealData(ls);
                     if (!vos.isEmpty()) {
-                        redisService.select(8);
+
                         for (PointData vo : vos) {
                             Map<String, Object> pomap = new LinkedHashMap<>();
 
                             pomap.put("pointid", vo.getEdnaId());
                             pomap.put("value", vo.getPointValueInDouble());
-                            pomap.put("timestamp", vo.getPointTime());
-                            pomap.put("datetime", DateUtils.toDate(new Date(vo.getPointTime())));
+                            pomap.put("timestamp", date.getTime()/ 1000);
+                            pomap.put("datetime", DateUtils.toDate(date));
                             pomap.put("status", 0);
                             pipelinedmap.put(vo.getEdnaId(), pomap);
                             //redisService.putHashAllObj(vo.getEdnaId(),pomap);
@@ -433,7 +534,9 @@ public class Status_HF_Service {
 
                 }
             }
+            redisService.select(8);
             redisService.putHashAllPipeObj(pipelinedmap);
+
         }
     }
 }

realtime/generation-service/src/main/java/com/gyee/generation/task/SaticScheduleTask.java

@@ -213,12 +213,12 @@ public class SaticScheduleTask {
 
         XxlJobHelper.log("风机欠发状态调度程序执行开始!........");
         try {
-            while (true)
-            {
-                status_HF_Service.calculateQfStatus();
-                Thread.sleep(180000);
-            }
-
+//            while (true)
+//            {
+//                status_HF_Service.calculateQfStatus();
+//                Thread.sleep(180000);
+//            }
+            status_HF_Service.calculateQfStatus();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -234,12 +234,12 @@ public class SaticScheduleTask {
 
         XxlJobHelper.log("风机故障状态调度程序执行开始!........");
         try {
-            while (true)
-            {
-                status_HF_Service.calculateGzStatus();
-                Thread.sleep(180000);
-            }
-
+//            while (true)
+//            {
+//                status_HF_Service.calculateGzStatus();
+//                Thread.sleep(180000);
+//            }
+            status_HF_Service.calculateGzStatus();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -255,11 +255,12 @@ public class SaticScheduleTask {
 
         XxlJobHelper.log("风机理论发电量调度程序执行开始!........");
         try {
-            while (true)
-            {
-                status_HF_Service.calculateLlgl();
-                Thread.sleep(180000);
-            }
+//            while (true)
+//            {
+//                status_HF_Service.calculateLlgl();
+//                Thread.sleep(180000);
+//            }
+            status_HF_Service.calculateLlgl();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -275,8 +276,14 @@ public class SaticScheduleTask {
 
         XxlJobHelper.log("场站指标调度程序执行开始!........");
         try {
+//
+//
+//            while (true)
+//            {
+//                status_HF_Service.calculateWpPoint();
+//                Thread.sleep(500);
+//            }
             status_HF_Service.calculateWpPoint();
-            Thread.sleep(500);
         } catch (Exception e) {
             e.printStackTrace();
         }

realtime/generation-service/src/main/java/com/gyee/generation/util/redis/RedisAutoConfiguration.java

@@ -25,6 +25,7 @@ public class RedisAutoConfiguration {
             RedisConnectionFactory redisConnectionFactory) throws UnknownHostException {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(redisConnectionFactory);
+        template.setEnableTransactionSupport(false);
         return template;
 
     }

realtime/generation-service/src/main/java/com/gyee/generation/util/redis/RedisConfig.java

@@ -28,6 +28,7 @@ public class RedisConfig {
     public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
         RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
         template.setConnectionFactory(factory);
+        template.setEnableTransactionSupport(false);
         Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
         ObjectMapper om = new ObjectMapper();
         om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);

realtime/generation-service/src/main/java/com/gyee/generation/util/redis/RedisService.java

@@ -1,5 +1,6 @@
 package com.gyee.generation.util.redis;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -59,4 +60,9 @@ public interface RedisService {
      Map<Object,Object> getHashEntries(final String key);
 
      void putHashAllPipeObj(final Map<String,Map<String,Object> >map);
+
+    Map<String,Map<String,String>> hgetall(Map<Integer,List<String>> pointmap);
+
+    void  unbindConnection();
+
 }

realtime/generation-service/src/main/java/com/gyee/generation/util/redis/RedisServiceImpl.java

@@ -4,15 +4,14 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisConnectionUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Service("redisService")
@@ -190,6 +189,69 @@ public class RedisServiceImpl implements RedisService {
         });
     }
 
+    /**
+     * 批量取hash数据
+     *
+     * @param hashKeys
+     * @return
+     */
+    public List<Object> hashGetBatch(List<String> hashKeys) {
+
+        List list = redisTemplate.executePipelined(new RedisCallback<String>() {
+            @Override
+            public String doInRedis(RedisConnection connection) throws DataAccessException {
+                for (String hashKey : hashKeys) {
+                    Map<byte[], byte[]> map= connection.hGetAll(hashKey.getBytes());
+                }
+                return null;
+            }
+        });
+        return list;
+    }
+
+    public Map<String,Map<String,String>> hgetall(Map<Integer,List<String>> pointmap) {
+
+        Map<String,Map<String,String> >map=new LinkedHashMap<>();
+
+        for(Map.Entry<Integer,List<String>> entry:pointmap.entrySet()){
+
+
+            select(entry.getKey());
+
+            redisTemplate.execute((RedisCallback<Map<String,Map<String,String>>>) con -> {
+
+
+
+                for(String key:entry.getValue())
+                {
+                    Map<byte[], byte[]> result = con.hGetAll(key.getBytes());
+                    if (result.isEmpty()) {
+                        return new HashMap<>(0);
+                    }
+
+                    Map<String, String> ans = new HashMap<>(result.size());
+                    for (Map.Entry<byte[], byte[]> entry2 : result.entrySet()) {
+                        ans.put(new String(entry2.getKey()), new String(entry2.getValue()));
+                    }
+                    map.put(key,ans);
+                }
+
+
+
+                return map;
+            });
+
+
+        };
+
+        return map;
+    }
+
+    public void unbindConnection() {
+
+
+        RedisConnectionUtils.unbindConnection(redisTemplate.getConnectionFactory());
+    }
 
 
 }