Merge branch 'master' of http://124.70.43.205:3000/wangb/runeconomy-nx

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -13,10 +13,13 @@ import com.gyee.common.vo.monitor.MatrixLineVo;
 import com.gyee.common.vo.monitor.MatrixPowerVo;
 import com.gyee.common.vo.monitor.MatrixProVo;
 import com.gyee.common.vo.monitor.MatrixVo;
+import com.gyee.runeconomy.controller.agc.AgcDeviateTag;
+import com.gyee.runeconomy.controller.agc.AiPoints;
 import com.gyee.runeconomy.dto.PowercurveVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.service.TokenService;
+import com.gyee.runeconomy.service.agc.AgcDeviateService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerPointService;
 import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.impl.ProEconManufacturerServiceImpl;
@@ -157,7 +160,20 @@ public class MatrixService {
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
                 List<PointData> wpRealdatagl = edosUtil.getRealData(wpglPoints);
 //                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
-
+                List<PointData> wpsfgl = null;
+                List<PointData> wpzllgl = null;
+                List<AiPoints> laps = getAiPoints(wp.getId());
+                for (AiPoints tag : laps) {
+                    if ("实发有功".equals(tag.getName())) {
+                        List<String> sfgl = new ArrayList<>();
+                        sfgl.add(tag.getTag());
+                        wpsfgl = edosUtil.getRealData(sfgl);
+                    } else if ("理论功率".equals(tag.getName())) {
+                        List<String> llgl = new ArrayList<>();
+                        llgl.add(tag.getTag());
+                        wpzllgl = edosUtil.getRealData(llgl);
+                    }
+                }
 
                 MatrixPowerVo powerVo = new MatrixPowerVo();
                 powerVo.setWpid(wp.getId());
@@ -207,11 +223,17 @@ public class MatrixService {
                 powerVo.setXdts(xdts);
                 powerVo.setSlts(tjts);
                 powerVo.setLxts(lxts);
-
+                if (wpzllgl.size()>0) {
+                    powerVo.setLlgl(StringUtils.round(wpzllgl.get(0).getPointValueInDouble(),2));
+                } else {
+                    powerVo.setLlgl(0.0);
+                }
                 powerVo.setBzgl(0.0);
-                powerVo.setLlgl(0.0);
-                powerVo.setSjgl(0.0);
-
+                if (wpsfgl.size()>0) {
+                    powerVo.setSjgl(StringUtils.round(wpsfgl.get(0).getPointValueInDouble() * 1000,2));
+                } else {
+                    powerVo.setSjgl(0.0);
+                }
                 if (wp.getWindType().equals("-1")) {
                     PointData speed = edosUtil.getRealData(pointMap.get(ContantXk.SSPJFS).getNemCode());
                     powerVo.setSpped(StringUtils.round(speed.getPointValueInDouble(), 2));
@@ -863,4 +885,18 @@ public class MatrixService {
         }
         return map;
     }
+
+    /**
+     * 根据ID获取agc配置信息
+     *
+     * @param id 场站ID
+     * @return 配置信息
+     */
+    private List<AiPoints> getAiPoints(String id) {
+        if (!CacheContext.agcDeviateConfigMap.containsKey(id)) {
+            return null;
+        }
+        AiPoints[] aiPoints = CacheContext.agcDeviateConfigMap.get(id).getAiPoints();
+        return Arrays.stream(aiPoints).filter(ap -> ap.getName().contains("功") || ap.getName().contains("风") && !ap.getName().contains("预测")).collect(Collectors.toList());
+    }
 }