Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -539,13 +539,23 @@ public class GenreSetPushService {
 
                     List<MatrixVo> vos = new ArrayList<>();
                     List<String> fjzbls = new ArrayList<>();
+                    List<String> gfzbls = new ArrayList<>();
+
+                    //光伏没有明细计算点，所以区分开
+                    if (wp.getId().endsWith("FDC")) {
                         for (Windturbine wt : wtls) {
-                            //状态
+                            //明细状态
                             fjzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.ZTMX).getId());
-
+                        }
+                    } else if (wp.getId().endsWith("GDC")) {
+                        for (Windturbine wt : wtls) {
+                            //状态
+                            gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(wt.getId(), Constant.FJZT).getId());
+                        }
                     }
 
                     List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
+                    List<PointData> gfzblist = realApiUtil.getRealData(gfzbls);
 
                     if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
 
@@ -601,17 +611,48 @@ public class GenreSetPushService {
 
                                     break;
                             }
+                        }
+                    }
 
 
-                        }
+                    if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
+                        for (int i = 0; i < wtls.size(); i++) {
+                            double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
+                            switch (Double.valueOf(gfzt).intValue()) {
+                                case 0:
+                                    djnum++;
+                                    break;
+                                case 1:
+                                    zcfdnum++;
+                                    break;
+                                case 2:
+                                    gztjnum++;
+                                    break;
+                                case 3:
+                                    lxnum++;
+                                    break;
+                                case 4:
+                                    jxtjnum++;
+                                    break;
+                                case 5:
+                                    xdjclnum++;
+                                    break;
+                                case 6:
+                                    xdjclnum++;
+                                    break;
 
+                                default:
+
+                                    break;
+                            }
+                        }
 
                     }
+
                 }
 
                 mxztmap.put("jrts", djnum + sdtjnum + zcfdnum + qxjclnum + xdjclnum + xdtjnum + gztjnum + cnsltjnum + jxtjnum + cnsljxnum + dwslnum + hjslnum + lxnum);
 
-
                 mxztmap.put("djts", djnum);
                 mxztmap.put("sdtjts", sdtjnum);
                 mxztmap.put("yxts", zcfdnum);
@@ -626,82 +667,151 @@ public class GenreSetPushService {
                 mxztmap.put("hjslts", hjslnum);
                 mxztmap.put("lxts", lxnum);
 
+
+
             } else {
-                List<String> mxztls = new ArrayList<>();
+
                 //待机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DJNUM).getCode());
+                Double djnum = 0.0;
                 //手动停机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TJNUM).getCode());
+                Double sdtjnum = 0.0;
                 //正常发电台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDNUM).getCode());
-                // 缺陷降出力台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDJCLNUM).getCode());
+                Double zcfdnum = 0.0;
+                //缺陷降出力台数
+                Double qxjclnum = 0.0;
                 // 限电降出力台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDJCLNUM).getCode());
+                Double xdjclnum = 0.0;
                 // 限电停机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDTJNUM).getCode());
+                Double xdtjnum = 0.0;
                 // 故障停机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.GZNUM).getCode());
+                Double gztjnum = 0.0;
                 // 场内受累停机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNGZNUM).getCode());
+                Double cnsltjnum = 0.0;
                 // 检修停机台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.JXNUM).getCode());
+                Double jxtjnum = 0.0;
                 // 场内受累检修台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNJXNUM).getCode());
+                Double cnsljxnum = 0.0;
                 // 电网受累台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DWSLNUM).getCode());
+                Double dwslnum = 0.0;
                 // 环境受累台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.HJSLNUM).getCode());
+                Double hjslnum = 0.0;
                 // 风机离线台数
-                mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.LXNUM).getCode());
-
-
-                List<PointData> mxztlist = realApiUtil.getRealData(mxztls);
-
-                if (!mxztlist.isEmpty() && mxztlist.size() == mxztls.size()) {
-
+                Double lxnum = 0.0;
 
+                if (id.endsWith("FDC")) {
+                    List<String> mxztls = new ArrayList<>();
                     //待机台数
-                    Double djnum = MathUtil.twoBit(mxztlist.get(0).getPointValueInDouble());
-                    mxztmap.put("djts", djnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DJNUM).getCode());
                     //手动停机台数
-                    Double sdtjnum = MathUtil.twoBit(mxztlist.get(1).getPointValueInDouble());
-                    mxztmap.put("sdtjts", sdtjnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TJNUM).getCode());
                     //正常发电台数
-                    Double zcfdnum = MathUtil.twoBit(mxztlist.get(2).getPointValueInDouble());
-                    mxztmap.put("yxts", zcfdnum);
-                    //缺陷降出力台数
-                    Double qxjclnum = MathUtil.twoBit(mxztlist.get(3).getPointValueInDouble());
-                    mxztmap.put("fdjclts", qxjclnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDNUM).getCode());
+                    // 缺陷降出力台数
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.FDJCLNUM).getCode());
                     // 限电降出力台数
-                    Double xdjclnum = MathUtil.twoBit(mxztlist.get(4).getPointValueInDouble());
-                    mxztmap.put("xdjclts", xdjclnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDJCLNUM).getCode());
                     // 限电停机台数
-                    Double xdtjnum = MathUtil.twoBit(mxztlist.get(5).getPointValueInDouble());
-                    mxztmap.put("xdtjts", xdtjnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.XDTJNUM).getCode());
                     // 故障停机台数
-                    Double gztjnum = MathUtil.twoBit(mxztlist.get(6).getPointValueInDouble());
-                    mxztmap.put("gzts", gztjnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.GZNUM).getCode());
                     // 场内受累停机台数
-                    Double cnsltjnum = MathUtil.twoBit(mxztlist.get(7).getPointValueInDouble());
-                    mxztmap.put("cnslgzts", cnsltjnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNGZNUM).getCode());
                     // 检修停机台数
-                    Double jxtjnum = MathUtil.twoBit(mxztlist.get(8).getPointValueInDouble());
-                    mxztmap.put("jxts", jxtjnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.JXNUM).getCode());
                     // 场内受累检修台数
-                    Double cnsljxnum = MathUtil.twoBit(mxztlist.get(9).getPointValueInDouble());
-                    mxztmap.put("cnsljxts", cnsljxnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.CNJXNUM).getCode());
                     // 电网受累台数
-                    Double dwslnum = MathUtil.twoBit(mxztlist.get(10).getPointValueInDouble());
-                    mxztmap.put("dwslts", dwslnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.DWSLNUM).getCode());
                     // 环境受累台数
-                    Double hjslnum = MathUtil.twoBit(mxztlist.get(11).getPointValueInDouble());
-                    mxztmap.put("hjslts", hjslnum);
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.HJSLNUM).getCode());
                     // 风机离线台数
-                    Double lxnum = MathUtil.twoBit(mxztlist.get(12).getPointValueInDouble());
-                    mxztmap.put("lxts", lxnum);
-
-
+                    mxztls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.LXNUM).getCode());
+
+
+                    List<PointData> mxztlist = realApiUtil.getRealData(mxztls);
+
+                    if (!mxztlist.isEmpty() && mxztlist.size() == mxztls.size()) {
+
+
+                        //待机台数
+                        djnum = MathUtil.twoBit(mxztlist.get(0).getPointValueInDouble());
+                        mxztmap.put("djts", djnum);
+                        //手动停机台数
+                        sdtjnum = MathUtil.twoBit(mxztlist.get(1).getPointValueInDouble());
+                        mxztmap.put("sdtjts", sdtjnum);
+                        //正常发电台数
+                        zcfdnum = MathUtil.twoBit(mxztlist.get(2).getPointValueInDouble());
+                        mxztmap.put("yxts", zcfdnum);
+                        //缺陷降出力台数
+                        qxjclnum = MathUtil.twoBit(mxztlist.get(3).getPointValueInDouble());
+                        mxztmap.put("fdjclts", qxjclnum);
+                        // 限电降出力台数
+                        xdjclnum = MathUtil.twoBit(mxztlist.get(4).getPointValueInDouble());
+                        mxztmap.put("xdjclts", xdjclnum);
+                        // 限电停机台数
+                        xdtjnum = MathUtil.twoBit(mxztlist.get(5).getPointValueInDouble());
+                        mxztmap.put("xdtjts", xdtjnum);
+                        // 故障停机台数
+                        gztjnum = MathUtil.twoBit(mxztlist.get(6).getPointValueInDouble());
+                        mxztmap.put("gzts", gztjnum);
+                        // 场内受累停机台数
+                        cnsltjnum = MathUtil.twoBit(mxztlist.get(7).getPointValueInDouble());
+                        mxztmap.put("cnslgzts", cnsltjnum);
+                        // 检修停机台数
+                        jxtjnum = MathUtil.twoBit(mxztlist.get(8).getPointValueInDouble());
+                        mxztmap.put("jxts", jxtjnum);
+                        // 场内受累检修台数
+                        cnsljxnum = MathUtil.twoBit(mxztlist.get(9).getPointValueInDouble());
+                        mxztmap.put("cnsljxts", cnsljxnum);
+                        // 电网受累台数
+                        dwslnum = MathUtil.twoBit(mxztlist.get(10).getPointValueInDouble());
+                        mxztmap.put("dwslts", dwslnum);
+                        // 环境受累台数
+                        hjslnum = MathUtil.twoBit(mxztlist.get(11).getPointValueInDouble());
+                        mxztmap.put("hjslts", hjslnum);
+                        // 风机离线台数
+                        lxnum = MathUtil.twoBit(mxztlist.get(12).getPointValueInDouble());
+                        mxztmap.put("lxts", lxnum);
+
+
+                    } else if (id.endsWith("GDC")) {
+                        List<String> gfzbls = new ArrayList<>();
+                        //状态
+                        gfzbls.add(windTurbineTestingPointAiService.getWindTurbineTestingPointAi2(id, Constant.FJZT).getId());
+
+                        List<PointData> gfzblist = realApiUtil.getRealData(gfzbls);
+                        if (!gfzblist.isEmpty() && gfzblist.size() == gfzblist.size()) {
+                            List<Windturbine> wtls = InitialRunner.wp_wtmap.get(id);
+                            for (int i = 0; i < wtls.size(); i++) {
+                                double gfzt = MathUtil.twoBit(MathUtil.twoBit(gfzblist.get(i).getPointValueInDouble()));
+                                switch (Double.valueOf(gfzt).intValue()) {
+                                    case 0:
+                                        djnum++;
+                                        break;
+                                    case 1:
+                                        zcfdnum++;
+                                        break;
+                                    case 2:
+                                        gztjnum++;
+                                        break;
+                                    case 3:
+                                        lxnum++;
+                                        break;
+                                    case 4:
+                                        jxtjnum++;
+                                        break;
+                                    case 5:
+                                        xdjclnum++;
+                                        break;
+                                    case 6:
+                                        xdjclnum++;
+                                        break;
+                                    default:
+                                        break;
+                                }
+                            }
+                        }
+                    }
                     mxztmap.put("jrts", djnum + sdtjnum + zcfdnum + qxjclnum + xdjclnum + xdtjnum + gztjnum + cnsltjnum + jxtjnum + cnsljxnum + dwslnum + hjslnum + lxnum);
 
                 } else {

src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -1271,13 +1271,6 @@ public class WpInfoPushService {
                     }
                     List<PointData> fjzblist = realApiUtil.getRealData(fjzbls);
                     if (!fjzblist.isEmpty() && fjzblist.size() == fjzbls.size()) {
-//                        double djnum=0.0;
-//                        double yxts=0.0;
-//                        double gzts=0.0;
-//                        double lxts=0.0;
-//                        double whts=0.0;
-//                        double xdts=0.0;
-//                        double slts=0.0;
                         for(int i=0;i<wtls.size();i++){
                             double fjzt = MathUtil.twoBit(MathUtil.twoBit(fjzblist.get(i).getPointValueInDouble()));
                             switch (Double.valueOf(fjzt).intValue()) {