bug修复

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/AgcDeviateController.java

@@ -1,42 +1,18 @@
 package com.gyee.runeconomy.controller.agc;
 
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gyee.common.model.PointData;
 import com.gyee.runeconomy.config.GyeeConfig;
-import com.gyee.runeconomy.init.CacheContext;
-import com.gyee.runeconomy.model.PowerLosses;
 import com.gyee.runeconomy.model.PowerLossesDTO;
 import com.gyee.runeconomy.model.StatusTime;
-import com.gyee.runeconomy.model.auto.PointInfo;
-import com.gyee.runeconomy.model.auto.ProBasicEquipment;
-import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
 import com.gyee.runeconomy.service.PowerLossesService;
 import com.gyee.runeconomy.service.agc.AgcDeviateService;
-import com.gyee.runeconomy.service.auto.IPointInfoService;
-import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.text.DecimalFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -45,7 +21,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/agc")
 public class AgcDeviateController {
-    public static Map<String, ConcurrentHashMap<Double, Double>> fitcoef = new ConcurrentHashMap<>();
 
     @Resource
     private AgcDeviateService agcDeviateService;
@@ -53,14 +28,6 @@ public class AgcDeviateController {
     private GyeeConfig gyeeConfig;
 
     @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @Resource
-    private IEdosUtil edosUtil;
-
-    @Resource
-    private IPointInfoService pointInfoService;
-    @Resource
     private PowerLossesService powerLossService;
 
     /**
@@ -117,114 +84,14 @@ public class AgcDeviateController {
                                                                     @RequestParam(value = "endTs") long endTs,
                                                                     @RequestParam(value = "windturbineId") String windturbineId,
                                                                     @RequestParam(value = "interval", defaultValue = "60", required = false) int interval) throws Exception {
-        //切换数据库
-        LettuceConnectionFactory factory = (LettuceConnectionFactory) stringRedisTemplate.getConnectionFactory();
-        int database = factory.getDatabase();
-        factory.setDatabase(5);
-        stringRedisTemplate.setConnectionFactory(factory);
-        factory.afterPropertiesSet();
-        factory.resetConnection();
-
-        DateTime date = DateUtil.date(endTs * 1000);
-        Map<String, List<SpeedPowerAnalysis>> map = new HashMap<>();
-        String[] wtIds = windturbineId.split(",");
-        List<String> wtIdsLs = Arrays.asList(wtIds);
-        for (String wtId : wtIdsLs) {
-            List<SpeedPowerAnalysis> ls = new ArrayList<>();
-            SpeedPowerAnalysis spa = new SpeedPowerAnalysis();
-            List<ProBasicEquipmentPoint> proBasicEquipmentPoints = CacheContext.pointNewMap.get(wtId);
-            List<ProBasicEquipmentPoint> speedPoint = proBasicEquipmentPoints.stream().filter(p -> p.getUniformCode().equals("AI066")).collect(Collectors.toList());
-            List<PointData> historyspeedDatas = edosUtil.getHistoryDatasSnap(speedPoint.get(0).getNemCode(), startTs, endTs, interval);
-            List<Double> speedDatas = historyspeedDatas.stream().map(PointData::getPointValueInDouble).collect(Collectors.toList());
-            spa.setWindSpeed(speedDatas);
-            List<ProBasicEquipmentPoint> powerPoint = proBasicEquipmentPoints.stream().filter(p -> p.getUniformCode().equals("AI114")).collect(Collectors.toList());
-            List<PointData> historyPowerDatas = edosUtil.getHistoryDatasSnap(powerPoint.get(0).getNemCode(), startTs, endTs, interval);
-            List<Double> powerData = historyPowerDatas.stream().map(PointData::getPointValueInDouble).collect(Collectors.toList());
-            spa.setActuatedPower(powerData);
-            String powerCurveMonth = "glqxnh:" + date.month() + ":";
-            Set<String> keys = stringRedisTemplate.keys(powerCurveMonth + wtId);
-            Iterator<String> iterator = keys.iterator(); // 获取迭代器
-            String firstKey = iterator.hasNext() ? iterator.next() : null;
-            String yc = stringRedisTemplate.opsForValue().get(firstKey);
-            ConcurrentHashMap<Double, Double> wtyc = JSON.parseObject(yc, new TypeReference<ConcurrentHashMap<Double, Double>>() {
-            }.getType());
-            fitcoef.put(firstKey.replaceFirst(powerCurveMonth, ""), wtyc);
-            List<Double> llgl = speedDatas.stream().map(a -> fitcoef.get(wtId).get(a)).collect(Collectors.toList());
-            spa.setTheoreticalPower(llgl);
-            ls.add(spa);
-            map.put(wtId, ls);
-        }
-
-        //关闭数据库切换
-        factory.setDatabase(database);
-        factory.afterPropertiesSet();
-        factory.resetConnection();
-
-        return map;
+        return agcDeviateService.getWindturbineData(startTs,endTs,windturbineId,interval);
     }
 
     @GetMapping("/windtur")
     public Map<String, List<StatusTime>> getTestData(@RequestParam(value = "startTs") long startTs,
                                                      @RequestParam(value = "endTs") long endTs,
                                                      @RequestParam(value = "uniformcode") String uniformcode) throws Exception {
-
-        Map<String, List<StatusTime>> map = new HashMap<>();
-        QueryWrapper<PointInfo> qw = new QueryWrapper<>();
-        qw.lambda().eq(PointInfo::getUniformCode, uniformcode);
-        List<PointInfo> list = pointInfoService.list(qw);
-        for (PointInfo ls : list) {
-            List<StatusTime> ll = new ArrayList<>();
-            List<PointData> historyDatasRaw = edosUtil.getHistoryDatasRaw(ls.getPointKey(), startTs, endTs);
-            for (PointData pointData : historyDatasRaw) {
-                StatusTime st = new StatusTime();
-                st.setName(ls.getName());
-                Date da = new Date(pointData.getPointTime());
-                st.setTime(DateUtil.formatDateTime(da));
-                String getstatus = getstatus((int) pointData.getPointValueInDouble());
-                st.setStatus(getstatus);
-                ll.add(st);
-            }
-            List<String> collect = CacheContext.wtls.stream().filter(w -> w.getId().equals(ls.getTurbineId())).map(ProBasicEquipment::getNemCode).collect(Collectors.toList());
-            map.put(collect.get(0), ll);
-        }
-        List<String> sortedKeys = new ArrayList<>(map.keySet());
-        Collections.sort(sortedKeys);
-        Map<String, List<StatusTime>> sortedMap = new LinkedHashMap<>();
-        for (String key : sortedKeys) {
-            sortedMap.put(key, map.get(key));
-        }
-        return sortedMap;
-    }
-
-    private String getstatus(int number) {
-        String statusText = "";
-        switch (number) {
-            case 0:
-                statusText = "待机";
-                break;
-            case 1:
-                statusText = "停机";
-                break;
-            case 2:
-                statusText = "并网";
-                break;
-            case 4:
-                statusText = "故障";
-                break;
-            case 6:
-                statusText = "检修";
-                break;
-            case 8:
-                statusText = "限电";
-                break;
-            case 12:
-                statusText = "离线";
-                break;
-            default:
-                statusText = "未知";
-                break;
-        }
-        return statusText;
+        return agcDeviateService.getStatusTime(startTs,endTs,uniformcode);
     }
 
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/agc/SpeedPowerAnalysis.java

@@ -19,4 +19,5 @@ public class SpeedPowerAnalysis {
     private List<Double> windSpeed;
     private List<Double> theoreticalPower;
     private List<Double> actuatedPower;
+    private List<Long> time;
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/agc/AgcDeviateService.java

@@ -1,23 +1,36 @@
 package com.gyee.runeconomy.service.agc;
 
-
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.TypeReference;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.common.model.PointData;
 import com.gyee.runeconomy.config.GyeeConfig;
 import com.gyee.runeconomy.controller.agc.AgcDeviateTag;
 import com.gyee.runeconomy.controller.agc.AiPoints;
 import com.gyee.runeconomy.controller.agc.FileService;
+import com.gyee.runeconomy.controller.agc.SpeedPowerAnalysis;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.PowerLosses;
 import com.gyee.runeconomy.model.PowerLossesDTO;
+import com.gyee.runeconomy.model.StatusTime;
+import com.gyee.runeconomy.model.auto.PointInfo;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.auto.ProBasicEquipmentPoint;
 import com.gyee.runeconomy.service.PowerLossesService;
+import com.gyee.runeconomy.service.auto.IPointInfoService;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
 import com.gyee.runeconomy.util.realtimesource.feign.IDataAdapter;
 import com.gyee.runeconomy.util.realtimesource.feign.RemoteServiceBuilder;
 import com.gyee.runeconomy.util.realtimesource.feign.TsDoubleTsData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.core.annotation.Order;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -28,6 +41,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +50,8 @@ import java.util.stream.Collectors;
 @Order(0)
 @Component
 public class AgcDeviateService {
+    public static Map<String, ConcurrentHashMap<Double, Double>> fitcoef = new ConcurrentHashMap<>();
+
 
     /**
      * 是否是离线版本
@@ -69,6 +85,17 @@ public class AgcDeviateService {
     private RemoteServiceBuilder remoteService;
     @Resource
     private PowerLossesService powerLossService;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IPointInfoService pointInfoService;
+
+
     /**
      * 获取agc曲线偏差分析需要的数据
      *
@@ -261,13 +288,14 @@ public class AgcDeviateService {
 
     /**
      * 限电时间列表
+     *
      * @param startTs
      * @param endTs
      * @param pageNum
      * @param pageSize
      * @return
      */
-    public List<PowerLossesDTO> getAgcxd(long startTs, long endTs,int pageNum, int pageSize) {
+    public List<PowerLossesDTO> getAgcxd(long startTs, long endTs, int pageNum, int pageSize) {
 
         // 将时间戳转换为LocalDateTime
         LocalDateTime startDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(startTs), ZoneId.systemDefault());
@@ -306,4 +334,116 @@ public class AgcDeviateService {
         return dtos;
     }
 
+    public Map<String, List<SpeedPowerAnalysis>> getWindturbineData(long startTs, long endTs, String windturbineId, int interval) throws Exception {
+
+        //切换数据库
+        LettuceConnectionFactory factory = (LettuceConnectionFactory) stringRedisTemplate.getConnectionFactory();
+        int database = factory.getDatabase();
+        factory.setDatabase(5);
+        stringRedisTemplate.setConnectionFactory(factory);
+        factory.afterPropertiesSet();
+        factory.resetConnection();
+
+        DateTime date = DateUtil.date(endTs * 1000);
+        Map<String, List<SpeedPowerAnalysis>> map = new HashMap<>();
+        String[] wtIds = windturbineId.split(",");
+        List<String> wtIdsLs = Arrays.asList(wtIds);
+        for (String wtId : wtIdsLs) {
+            List<SpeedPowerAnalysis> ls = new ArrayList<>();
+            SpeedPowerAnalysis spa = new SpeedPowerAnalysis();
+            List<ProBasicEquipmentPoint> proBasicEquipmentPoints = CacheContext.pointNewMap.get(wtId);
+            List<ProBasicEquipmentPoint> speedPoint = proBasicEquipmentPoints.stream().filter(p -> p.getUniformCode().equals("AI066")).collect(Collectors.toList());
+            List<PointData> historyspeedDatas = edosUtil.getHistoryDatasSnap(speedPoint.get(0).getNemCode(), startTs, endTs, interval);
+            List<Double> speedDatas = historyspeedDatas.stream().map(PointData::getPointValueInDouble).collect(Collectors.toList());
+            spa.setWindSpeed(speedDatas);
+            List<Long> time = historyspeedDatas.stream().map(PointData::getPointTime).collect(Collectors.toList());
+            spa.setTime(time);
+            List<ProBasicEquipmentPoint> powerPoint = proBasicEquipmentPoints.stream().filter(p -> p.getUniformCode().equals("AI114")).collect(Collectors.toList());
+            List<PointData> historyPowerDatas = edosUtil.getHistoryDatasSnap(powerPoint.get(0).getNemCode(), startTs, endTs, interval);
+            List<Double> powerData = historyPowerDatas.stream().map(PointData::getPointValueInDouble).collect(Collectors.toList());
+            spa.setActuatedPower(powerData);
+            String powerCurveMonth = "glqxnh:" + date.month() + ":";
+            Set<String> keys = stringRedisTemplate.keys(powerCurveMonth + wtId);
+            Iterator<String> iterator = keys.iterator(); // 获取迭代器
+            String firstKey = iterator.hasNext() ? iterator.next() : null;
+            String yc = stringRedisTemplate.opsForValue().get(firstKey);
+            ConcurrentHashMap<Double, Double> wtyc = JSON.parseObject(yc, new com.alibaba.fastjson.TypeReference<ConcurrentHashMap<Double, Double>>() {
+            }.getType());
+            fitcoef.put(firstKey.replaceFirst(powerCurveMonth, ""), wtyc);
+            List<Double> llgl = speedDatas.stream().map(a -> fitcoef.get(wtId).get(a)).collect(Collectors.toList());
+            spa.setTheoreticalPower(llgl);
+            ls.add(spa);
+            map.put(wtId, ls);
+        }
+
+        //关闭数据库切换
+        factory.setDatabase(database);
+        factory.afterPropertiesSet();
+        factory.resetConnection();
+
+        return map;
+    }
+
+    public Map<String, List<StatusTime>> getStatusTime(long startTs, long endTs, String uniformcode) throws Exception {
+        Map<String, List<StatusTime>> map = new HashMap<>();
+        QueryWrapper<PointInfo> qw = new QueryWrapper<>();
+        qw.lambda().eq(PointInfo::getUniformCode, uniformcode);
+        List<PointInfo> list = pointInfoService.list(qw);
+        for (PointInfo ls : list) {
+            List<StatusTime> ll = new ArrayList<>();
+            List<PointData> historyDatasRaw = edosUtil.getHistoryDatasRaw(ls.getPointKey(), startTs, endTs);
+            for (PointData pointData : historyDatasRaw) {
+                StatusTime st = new StatusTime();
+                st.setName(ls.getName());
+                Date da = new Date(pointData.getPointTime());
+                st.setTime(DateUtil.formatDateTime(da));
+                String getstatus = getstatus((int) pointData.getPointValueInDouble());
+                st.setStatus(getstatus);
+                ll.add(st);
+            }
+            List<String> collect = CacheContext.wtls.stream().filter(w -> w.getId().equals(ls.getTurbineId())).map(ProBasicEquipment::getNemCode).collect(Collectors.toList());
+            map.put(collect.get(0), ll);
+        }
+        List<String> sortedKeys = new ArrayList<>(map.keySet());
+        Collections.sort(sortedKeys);
+        Map<String, List<StatusTime>> sortedMap = new LinkedHashMap<>();
+        for (String key : sortedKeys) {
+            sortedMap.put(key, map.get(key));
+        }
+        return sortedMap;
+
+    }
+
+
+    private String getstatus(int number) {
+        String statusText = "";
+        switch (number) {
+            case 0:
+                statusText = "待机";
+                break;
+            case 1:
+                statusText = "停机";
+                break;
+            case 2:
+                statusText = "并网";
+                break;
+            case 4:
+                statusText = "故障";
+                break;
+            case 6:
+                statusText = "检修";
+                break;
+            case 8:
+                statusText = "限电";
+                break;
+            case 12:
+                statusText = "离线";
+                break;
+            default:
+                statusText = "未知";
+                break;
+        }
+        return statusText;
+    }
+
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -80,7 +80,7 @@ public class WindturbinegoodnessService {
                     queryWrapper.eq(ProEconWindturbineGoodness::getTypes, type);
                 }
             }
-
+            queryWrapper.orderByAsc(ProEconWindturbineGoodness::getWindturbineId);
             //执行查询
             proEconWindturbineGoodnessService.page(pageInfo, queryWrapper);
         }
@@ -116,7 +116,8 @@ public class WindturbinegoodnessService {
         Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wtId);
 
         ProBasicEquipmentPoint sjgl = wtpointmap.get(ContantXk.CJ_SSGL);
-        ProBasicEquipmentPoint bzgl = wtpointmap.get(ContantXk.ZSGL);
+//        ProBasicEquipmentPoint bzgl = wtpointmap.get(ContantXk.ZSGL);
+        ProBasicEquipmentPoint bzgl = wtpointmap.get(ContantXk.BZGL);
         ProBasicEquipmentPoint pjfs = wtpointmap.get(ContantXk.CJ_SSFS);