报警矩阵提交

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

@@ -170,7 +170,8 @@ public class AccessStatusService {
             List<ProBasicEquipment> proBasicEquipments = wpwtmap.get(wp.getId());
             List<String> pointIds = new ArrayList<>();
             proBasicEquipments.stream().forEach(wt -> {
-                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.SBZT);
+//                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.SBZT);
+                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.MXZT);
                 pointIds.add(equipmentPoint.getNemCode());
             });
             double zt = 1;

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/CommonController.java

@@ -74,11 +74,19 @@ public class CommonController {
 
         List<ProBasicEquipmentPoint> resultList = new ArrayList<>();
 
-        String[] split = unifromcodes.split(",");
-        Arrays.stream(split).forEach(s -> {
-            resultList.add(equipmentPointMap.get(s));
-        });
-
+//        String[] split = unifromcodes.split(",");
+//        Arrays.stream(split).forEach(s -> {
+//            resultList.add(equipmentPointMap.get(s));
+//        });
+
+
+        if (equipmentPointMap != null) {
+            String[] split = unifromcodes.split(",");
+            resultList = Arrays.stream(split)
+                    .map(equipmentPointMap::get)  // 获取对应的 ProBasicEquipmentPoint
+                    .filter(Objects::nonNull)    // 过滤掉 null 值
+                    .collect(Collectors.toList());
+        }
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -242,7 +250,9 @@ public class CommonController {
         List<String> pointList = new ArrayList<>();
 
         String[] points = pointIds.split(",");
-
+        if (points == null || points.length == 0 || Arrays.stream(points).allMatch(String::isEmpty)) {
+            return R.error(ResultMsg.error());
+        }
         Arrays.stream(points).forEach(p -> {
             pointList.add(p);
         });

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

@@ -104,7 +104,7 @@ public class DeviceDetailsService {
         codes.add(equipmentPointMap.get(ContantXk.RXDJCLSSDL).getNemCode());
         codes.add(equipmentPointMap.get(ContantXk.RCWSLDWSSDL).getNemCode());
         codes.add(equipmentPointMap.get(ContantXk.RCWSLTQSSDL).getNemCode());
-        codes.add(equipmentPointMap.get(ContantXk.SBZT).getNemCode());
+        codes.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
         List<PointData> realData = edosUtil.getRealData(codes);
         if (StringUtils.isNotEmpty(realData)) {
             resultMap.put("rfdl", realData.get(0).getPointValueInDouble());
@@ -131,6 +131,7 @@ public class DeviceDetailsService {
         Map<String, ProBasicEquipment> wtmap = CacheContext.wtmap;
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
         qw.lambda().eq(ProEconTestingPoint::getModel, wtmap.get(wtid).getModelId()).eq(ProEconTestingPoint::getLogicalUnitId, part);
+        qw.lambda().eq(ProEconTestingPoint::getSpare3,"1");
         List<ProEconTestingPoint> list = proEconTestingPointService.list(qw);
         resultMap.put("AI", list.stream().filter(i -> i.getUniformCode().startsWith("AI")).collect(Collectors.toList()));
         resultMap.put("DI", list.stream().filter(i -> i.getUniformCode().startsWith("DI")).collect(Collectors.toList()));

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

@@ -22,6 +22,7 @@ import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.impl.ProEconManufacturerServiceImpl;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
+import com.gyee.runeconomy.util.realtimesource.feign.RemoteServiceBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -52,10 +53,14 @@ public class MatrixService {
     @Resource
     private ProEconManufacturerServiceImpl proEconManufacturerService;
 
+    @Resource
+    private RemoteServiceBuilder remoteService;
+
     public Map<String, Object> matrixMX(String company, String type) throws Exception {
 
-        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
-        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+//        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+//        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
 
         Map<String, Double> modelpower = CacheContext.modelpower;
 
@@ -74,7 +79,8 @@ public class MatrixService {
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
 
 
-        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
+//        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
+        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
 
         List<MatrixPowerVo> powerVos = new ArrayList<>();
         AtomicInteger jrts = new AtomicInteger();
@@ -101,6 +107,7 @@ public class MatrixService {
             List<MatrixVo> volist = new ArrayList<>();
             List<String> wpPoints = new ArrayList<>();
             List<String> wtPoints = new ArrayList<>();
+            List<String> wtmxPoints = new ArrayList<>();
             List<String> wtPoints1 = new ArrayList<>();
             Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(wp.getId());
             wpPoints.add(pointMap.get(ContantXk.DJTSMX).getNemCode());
@@ -117,20 +124,15 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.CWSLTQTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.LXTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.TXZDTSMX).getNemCode());
-            //            if (wp.getWindType().equals("-1")) {
-            //                wpPoints.add(pointMap.get(ContantXk.SSPJFS).getNemCode());
-            //            } else if (wp.getWindType().equals("-2")) {
-            //                wpPoints.add(pointMap.get(ContantXk.GCGZQD).getNemCode());
-            //            }
-
             wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZGL).getNemCode());
-            //            wpPoints.add(pointMap.get(ContantXk.TPOINT_WP_YCGL).getNemCode());
+
             List<ProBasicEquipment> equipments = wpwtmap.get(wp.getId());
             equipments.stream().forEach(wt -> {
                 Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
                 wtPoints.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
+                wtmxPoints.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
                 wtPoints.add(equipmentPointMap.get(ContantXk.SSQFZT).getNemCode());
                 wtPoints.add(equipmentPointMap.get(ContantXk.RQFDL).getNemCode());
             });
@@ -148,13 +150,10 @@ public class MatrixService {
             });
             try {
 
-                //                if(wp.getId().equals("SXJ_KGDL_HSM_FDC_STA"))
-                //                {
-                //                    System.out.println("");
-                //                }
-                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
+                List<PointData> wtmxRealdatas = edosUtil.getRealData(wtmxPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
+//                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
 
 
                 MatrixPowerVo powerVo = new MatrixPowerVo();
@@ -167,17 +166,48 @@ public class MatrixService {
                     powerVo.setCzlx("-2");
                 }
                 powerVo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrquantityJz() + wp.getJrquantityZc());
-                powerVo.setDjts(wpRealdatas.get(0).getPointValueInDouble() + wpRealdatas.get(1).getPointValueInDouble());
-                powerVo.setBwts(wpRealdatas.get(2).getPointValueInDouble() + wpRealdatas.get(3).getPointValueInDouble());
-                powerVo.setGzts(wpRealdatas.get(4).getPointValueInDouble() + wpRealdatas.get(5).getPointValueInDouble());
-                powerVo.setJxts(wpRealdatas.get(6).getPointValueInDouble() + wpRealdatas.get(7).getPointValueInDouble());
-                powerVo.setXdts(wpRealdatas.get(8).getPointValueInDouble() + wpRealdatas.get(9).getPointValueInDouble());
-                powerVo.setSlts(wpRealdatas.get(10).getPointValueInDouble() + wpRealdatas.get(11).getPointValueInDouble());
-                powerVo.setLxts(wpRealdatas.get(12).getPointValueInDouble() + wpRealdatas.get(13).getPointValueInDouble());
-
-                powerVo.setBzgl(wpRealdatas.get(14).getPointValueInDouble());
-                powerVo.setLlgl(wpRealdatas.get(15).getPointValueInDouble());
-                powerVo.setSjgl(wpRealdatas.get(16).getPointValueInDouble());
+                //0 待机
+                //1 停机
+                //2 发电
+                //4 故障
+                //6 检修
+                //8 限电
+                //12 离线
+                Double bwts = 0.0;
+                Double djts = 0.0;
+                Double tjts = 0.0;
+                Double gzts = 0.0;
+                Double jxts = 0.0;
+                Double xdts = 0.0;
+                Double lxts = 0.0;
+                for (PointData zt : wtmxRealdatas){
+                    if (zt.getPointValueInDouble() == 2.0){
+                        bwts++;
+                    } else if (zt.getPointValueInDouble() == 0.0){
+                        djts++;
+                    } else if (zt.getPointValueInDouble() == 4.0){
+                        gzts++;
+                    } else if (zt.getPointValueInDouble() == 6.0){
+                        jxts++;
+                    } else if (zt.getPointValueInDouble() == 8.0){
+                        xdts++;
+                    } else if (zt.getPointValueInDouble() == 12.0){
+                        lxts++;
+                    } else if (zt.getPointValueInDouble() == 1.0){
+                        tjts++;
+                    }
+                }
+                powerVo.setBwts(bwts);
+                powerVo.setDjts(djts);
+                powerVo.setGzts(gzts);
+                powerVo.setJxts(jxts);
+                powerVo.setXdts(xdts);
+                powerVo.setSlts(tjts);
+                powerVo.setLxts(lxts);
+
+                powerVo.setBzgl(0.0);
+                powerVo.setLlgl(0.0);
+                powerVo.setSjgl(0.0);
 
                 if (wp.getWindType().equals("-1")) {
                     PointData speed = edosUtil.getRealData(pointMap.get(ContantXk.SSPJFS).getNemCode());
@@ -187,13 +217,6 @@ public class MatrixService {
                     powerVo.setSpped(StringUtils.round(speed.getPointValueInDouble(), 2));
                 }
 
-
-                //                powerVo.setSpped(wpRealdatas.get(14).getPointValueInDouble());
-                //                powerVo.setBzgl(wpRealdatas.get(15).getPointValueInDouble());
-                //                powerVo.setLlgl(wpRealdatas.get(16).getPointValueInDouble());
-                //                powerVo.setSjgl(wpRealdatas.get(17).getPointValueInDouble());
-                //                powerVo.setYcgl(wpRealdatas.get(18).getPointValueInDouble());
-
                 AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
                 AtomicReference<Double> agc = new AtomicReference<>((double) 0);
                 AtomicReference<Double> ycgl = new AtomicReference<>((double) 0);
@@ -205,16 +228,6 @@ public class MatrixService {
                     ProBasicPowerstationPoint agcPoint = powerstationPointMap.get(ContantXk.TPOINT_WP_AGC);
 
 
-                    //                    ycgl.updateAndGet(v -> {
-                    //                        try {
-                    //                            return new Double((double) (v + edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble()));
-                    //                        } catch (Exception e) {
-                    //                            e.printStackTrace();
-                    //                        }
-                    //                        return v;
-                    //                    });
-
-
                     cxgl.updateAndGet(v -> {
                         try {
                             return new Double((double) (v + edosUtil.getRealData(cxglPoint).getPointValueInDouble()));
@@ -231,14 +244,6 @@ public class MatrixService {
                         }
                         return v;
                     });
-                    //                    ycgl.updateAndGet(v -> {
-                    //                        try {
-                    //                            return new Double((double) (v + edosUtil.getHistMatrix(ycglPoint.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble()));
-                    //                        } catch (Exception e) {
-                    //                            e.printStackTrace();
-                    //                        }
-                    //                        return v;
-                    //                    });
                 });
 
                 QueryWrapper<ProBasicPowerPoint> qw = new QueryWrapper<>();
@@ -260,58 +265,54 @@ public class MatrixService {
                     }
                 }
 
-                //                ProBasicPowerstationPoint ycglPoint = pointService.getPowerstationPoint.get(ContantXk.GLYC);
-
-                List<List<PowercurveVo>> ls = new ArrayList<>();
 
                 ProBasicPowerstationPoint ycglcd = null;
 
                 double sum = 0.0;
-                for (ProBasicPowerPoint pp : qyls) {
-
-                    if (wp.getId().contains("MLJ_FDC_STA")) continue;
-                    ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
-
-                    double aDouble = 0.0;
-                    try {
-                        aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
-                        powerVo.setYcgl(aDouble + sum);
-                        sum += aDouble;
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
+//                for (ProBasicPowerPoint pp : qyls) {
+//
+//                    if (wp.getId().contains("MLJ_FDC_STA")) continue;
+//                    ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
+//
+//                    double aDouble = 0.0;
+//                    try {
+//                        aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
+//                        powerVo.setYcgl(aDouble + sum);
+//                        sum += aDouble;
+//                    } catch (Exception e) {
+//                        throw new RuntimeException(e);
+//                    }
+//                }
                 powerVo.setCxgl(cxgl.get());
                 powerVo.setAgc(agc.get());
                 //                powerVo.setYcgl(ycgl.get());
                 jrts.addAndGet(powerVo.getJrts());
-                dfts.addAndGet((int) wpRealdatas.get(0).getPointValueInDouble());
-                sdtj.addAndGet((int) wpRealdatas.get(1).getPointValueInDouble());
-                zcyx.addAndGet((int) wpRealdatas.get(2).getPointValueInDouble());
-                jclyx.addAndGet((int) wpRealdatas.get(3).getPointValueInDouble());
-                gztj.addAndGet((int) wpRealdatas.get(4).getPointValueInDouble());
-                gzsl.addAndGet((int) wpRealdatas.get(5).getPointValueInDouble());
-                jxtj.addAndGet((int) wpRealdatas.get(6).getPointValueInDouble());
-                jxsl.addAndGet((int) wpRealdatas.get(7).getPointValueInDouble());
-                xdtj.addAndGet((int) wpRealdatas.get(8).getPointValueInDouble());
-                xdjcl.addAndGet((int) wpRealdatas.get(9).getPointValueInDouble());
-                dwsl.addAndGet((int) wpRealdatas.get(10).getPointValueInDouble());
-                hjsl.addAndGet((int) wpRealdatas.get(11).getPointValueInDouble());
-                lx.addAndGet((int) wpRealdatas.get(12).getPointValueInDouble());
-                wz.addAndGet((int) wpRealdatas.get(13).getPointValueInDouble());
+                dfts.addAndGet(0);
+                sdtj.addAndGet(0);
+                zcyx.addAndGet(0);
+                jclyx.addAndGet(0);
+                gztj.addAndGet(0);
+                gzsl.addAndGet(0);
+                jxtj.addAndGet(0);
+                jxsl.addAndGet(0);
+                xdtj.addAndGet(0);
+                xdjcl.addAndGet(0);
+                dwsl.addAndGet(0);
+                hjsl.addAndGet(0);
+                lx.addAndGet(0);
+                wz.addAndGet(0);
                 int index = 3;
                 for (int j = 0; j < equipments.size(); j++) {
 
-                    //                    if(equipments.get(j).getId().equals("SXJ_KGDL_HSM_F_WT_0047_EQ"))
-                    //                    {
-                    //                        System.out.println("");
-                    //                    }
                     MatrixVo vo = new MatrixVo();
                     vo.setWtid(equipments.get(j).getId());
                     vo.setWtname(equipments.get(j).getAname());
                     vo.setStatus(wtRealdatas.get(j * index).getPointValueInDouble());
-                    vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble(), 2));
-
+                    if (equipments.get(j).getProjectId().equals("NX_FGS_HAF02_EG")) {
+                        vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble() / 1000, 2));
+                    } else {
+                        vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble(), 2));
+                    }
                     if (equipments.get(j).getEquipmentCategory() == -1) {
                         vo.setSpeed(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index + 1).getPointValueInDouble(), 2));
                         vo.setTransfer(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index + 2).getPointValueInDouble(), 2));
@@ -340,27 +341,6 @@ public class MatrixService {
         SortUtils.sort(powerVos, "orderNum", SortUtils.ASC);
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("jrts", jrts.doubleValue());
-        dataMap.put("dfts", dfts.doubleValue());
-        dataMap.put("sdtj", sdtj.doubleValue());
-        dataMap.put("djts", dfts.doubleValue() + sdtj.doubleValue());
-        dataMap.put("zcyx", zcyx.doubleValue());
-        dataMap.put("jclyx", jclyx.doubleValue());
-        dataMap.put("bwts", zcyx.doubleValue() + jclyx.doubleValue());
-        dataMap.put("gztj", gztj.doubleValue());
-        dataMap.put("gzsl", gzsl.doubleValue());
-        dataMap.put("gzts", gztj.doubleValue() + gzsl.doubleValue());
-        dataMap.put("jxtj", jxtj.doubleValue());
-        dataMap.put("jxsl", jxsl.doubleValue());
-        dataMap.put("jxts", jxtj.doubleValue() + jxsl.doubleValue());
-        dataMap.put("xdtj", xdtj.doubleValue());
-        dataMap.put("xdjcl", xdjcl.doubleValue());
-        dataMap.put("xdts", xdtj.doubleValue() + xdjcl.doubleValue());
-        dataMap.put("dwsl", dwsl.doubleValue());
-        dataMap.put("hjsl", hjsl.doubleValue());
-        dataMap.put("slts", dwsl.doubleValue() + hjsl.doubleValue());
-        dataMap.put("lx", lx.doubleValue());
-        dataMap.put("wz", wz.doubleValue());
-        dataMap.put("lxz", lx.doubleValue() + wz.doubleValue());
         dataMap.put("qf0", DoubleUtils.keepPrecision(qf0.get(), 2));
         dataMap.put("qf1", DoubleUtils.keepPrecision(qf1.get(), 2));
         dataMap.put("qf2", DoubleUtils.keepPrecision(qf2.get(), 2));