增加新接入平鲁光伏场站，修改首页部分数据

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/Constant.java

@@ -626,7 +626,16 @@ public static final String TPOINT_WT_60FX = "AI011";// 风机60秒风向
             "AIG166", "AIG167", "AIG168", "AIG169", "AIG170", "AIG171", "AIG172",
             "AIG173", "AIG174", "AIG175", "AIG176", "AIG177", "AIG178", "AIG179",
             "AIG180", "AIG181", "AIG182", "AIG183", "AIG184", "AIG185", "AIG186",
-            "AIG187", "AIG188"};
+            "AIG187", "AIG188","AIG189", "AIG190", "AIG191", "AIG192", "AIG193",
+            "AIG194", "AIG195","AIG196", "AIG197", "AIG198", "AIG199", "AIG200",
+            "AIG201", "AIG202","AIG203", "AIG204", "AIG205", "AIG206", "AIG207",
+            "AIG208", "AIG209","AIG210", "AIG211", "AIG212", "AIG213", "AIG214",
+            "AIG215", "AIG216","AIG217", "AIG218", "AIG219", "AIG220", "AIG221",
+            "AIG222", "AIG223","AIG224", "AIG225", "AIG226", "AIG227", "AIG228",
+            "AIG229", "AIG230","AIG231", "AIG232", "AIG233", "AIG234", "AIG235",
+            "AIG236", "AIG237","AIG238", "AIG239", "AIG240", "AIG241", "AIG242",
+            "AIG243", "AIG244","AIG245", "AIG246", "AIG247", "AIG248", "AIG249",
+            "AIG250", "AIG251","AIG252"};
 
     //逆变器支路测点
     public static final String[] TPOINT_Inverter_Matrix = { "FJZT", "AIG013","AI064","AIG009" };

web/monitor-web-sxjn/src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -484,7 +484,7 @@ public class InitialRunner implements CommandLineRunner {
 
         WindpowerstationExample.Criteria cr=windpowerstationExample.createCriteria();
         cr.andIdNotLike("%HR_GDC%");
-        cr.andIdNotLike("%PL_GDC%");
+//        cr.andIdNotLike("%PL_GDC%");
         cr.andIdNotLike("%TL_GDC%");
         cr.andIdNotLike("%TZ_GDC%");
         cr.andIdNotLike("%YG_GDC%");
@@ -580,7 +580,7 @@ public class InitialRunner implements CommandLineRunner {
 //        projectExample.createCriteria().andWindpowerstationidNotLike("%SY_FDC%");
         ProjectExample.Criteria pjcr=projectExample.createCriteria();
         pjcr.andWindpowerstationidNotLike("%HR_GDC%");
-        pjcr.andWindpowerstationidNotLike("%PL_GDC%");
+//        pjcr.andWindpowerstationidNotLike("%PL_GDC%");
         pjcr.andWindpowerstationidNotLike("%TL_GDC%");
         pjcr.andWindpowerstationidNotLike("%TZ_GDC%");
         pjcr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/initialpoint/InitialPointGoldenService.java

@@ -293,9 +293,12 @@ public class InitialPointGoldenService implements  IinitialPoint {
 
         for (Windpowerstation wp : InitialRunner.wpallls) {
 
-            if (!wp.getId().equals("SY_GDC")) {
+
+            if (!wp.getId().equals("PL_GDC")) {
                 continue;
             }
+//            if (wp.getId().endsWith("FDC") && !stpointls.isEmpty() && wp.getId().equals("FS_GDC") && wp.getId().equals("TL_GDC")
+//                    && wp.getId().equals("PL_GDC")&& wp.getId().equals("YX_GDC") && wp.getId().equals("JR_GDC"))
             if (wp.getId().endsWith("FDC") && !stpointls.isEmpty()) {
 
                 createWpPoints(wp, stpointls, allpoints);
@@ -1343,7 +1346,7 @@ public class InitialPointGoldenService implements  IinitialPoint {
 
     }
 
-    public void initalNbq() throws IOException {
+    public void initalNbq(String s) throws IOException {
 
 
         List<InverterStandardPoint> stpointls = inverterStandardPointService.findByType(PhotoVolaticType.NBQ);
@@ -1356,10 +1359,13 @@ public class InitialPointGoldenService implements  IinitialPoint {
             for (Windpowerstation wp : InitialRunner.wpallls) {
 
 
-                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+//                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                List<Inverter> wtls = InitialRunner.ln_nbqmap.get(s);
 
 
-                if (wp.getId().endsWith("GDC") && wp.getId().equals("SY_GDC")) {
+//                if (wp.getId().endsWith("GDC") && (wp.getId().equals("FS_GDC") || wp.getId().equals("TL_GDC")
+//                        ||  wp.getId().equals("PL_GDC") ||  wp.getId().equals("YX_GDC")  || wp.getId().equals("JR_GDC")))
+                if (wp.getId().endsWith("GDC") && (wp.getId().equals("PL_GDC"))) {
                     for (Inverter wt : wtls) {
 
                         List<PhotovoltaicTestingPointNew> points = new ArrayList<>();
@@ -1473,7 +1479,7 @@ public class InitialPointGoldenService implements  IinitialPoint {
                     "合理最小值", "风机编号", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号", "方阵编号", "箱变编号", "逆变器编号", "汇流箱编号", "测点类型"};
             String heardName = "逆变器测点表";
             //调用Excel导出工具类
-            ExcelExport.exportToPath(allpoints, arr, heardName, 6, "逆变器测点");
+            ExcelExport.exportToPath(allpoints, arr, heardName, 6, s + "逆变器测点");
         }
 
 //        if(!allpoints.isEmpty())
@@ -1501,7 +1507,8 @@ public class InitialPointGoldenService implements  IinitialPoint {
 
                 List<Junctionbox> wtls = InitialRunner.gp_hlxmap.get(wp.getId());
 
-                if (wp.getId().endsWith("GDC") && wp.getId().equals("SY_GDC")) {
+                if (wp.getId().endsWith("GDC") &&  (wp.getId().equals("FS_GDC") || wp.getId().equals("TL_GDC")
+                        ||  wp.getId().equals("PL_GDC") ||  wp.getId().equals("YX_GDC")  || wp.getId().equals("JR_GDC"))) {
                     for (Junctionbox wt : wtls) {
 
                         List<PhotovoltaicTestingPointNew> points = new ArrayList<>();
@@ -1622,7 +1629,7 @@ public class InitialPointGoldenService implements  IinitialPoint {
     }
 
 
-    public void initalZl() throws IOException {
+    public void initalZl(String s) throws IOException {
 
 
         List<InverterStandardPoint> stpointls = inverterStandardPointService.findByType(PhotoVolaticType.ZL);
@@ -1635,10 +1642,12 @@ public class InitialPointGoldenService implements  IinitialPoint {
             for (Windpowerstation wp : InitialRunner.wpallls) {
 
 
-                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+//                List<Inverter> wtls = InitialRunner.gp_nbqmap.get(wp.getId());
+                List<Inverter> wtls = InitialRunner.ln_nbqmap.get(s);
 
-
-                if (wp.getId().endsWith("GDC") && wp.getId().equals("SY_GDC")) {
+//                if (wp.getId().endsWith("GDC") &&  (wp.getId().equals("FS_GDC") || wp.getId().equals("TL_GDC")
+//                        ||  wp.getId().equals("PL_GDC") ||  wp.getId().equals("YX_GDC")  || wp.getId().equals("JR_GDC")))
+                if (wp.getId().endsWith("GDC") && (wp.getId().equals("PL_GDC"))) {
                     for (Inverter wt : wtls) {
 
                         List<PhotovoltaicTestingPointNew> points = new ArrayList<>();
@@ -1752,7 +1761,7 @@ public class InitialPointGoldenService implements  IinitialPoint {
                     "合理最小值", "风机编号", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号", "方阵编号", "箱变编号", "逆变器编号", "汇流箱编号", "测点类型"};
             String heardName = "支路测点表";
             //调用Excel导出工具类
-            ExcelExport.exportToPath(allpoints, arr, heardName, 6, "支路器测点");
+            ExcelExport.exportToPath(allpoints, arr, heardName, 6, s + "支路器测点");
         }
 
     }

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/BoxChangeService.java

@@ -96,7 +96,7 @@ public class BoxChangeService implements BaseService<BoxChange, BoxChangeExample
         BoxChangeExample example=new BoxChangeExample();
 		BoxChangeExample.Criteria cr=example.createCriteria();
 		cr.andWindpowerstationidNotLike("%HR_GDC%");
-		cr.andWindpowerstationidNotLike("%PL_GDC%");
+//		cr.andWindpowerstationidNotLike("%PL_GDC%");
 		cr.andWindpowerstationidNotLike("%TL_GDC%");
 		cr.andWindpowerstationidNotLike("%TZ_GDC%");
 		cr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/InverterService.java

@@ -96,7 +96,7 @@ public class InverterService implements BaseService<Inverter, InverterExample> {
         InverterExample example=new InverterExample();
 		InverterExample.Criteria cr=example.createCriteria();
 		cr.andWindpowerstationidNotLike("%HR_GDC%");
-		cr.andWindpowerstationidNotLike("%PL_GDC%");
+//		cr.andWindpowerstationidNotLike("%PL_GDC%");
 		cr.andWindpowerstationidNotLike("%TL_GDC%");
 		cr.andWindpowerstationidNotLike("%TZ_GDC%");
 		cr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/JunctionboxService.java

@@ -96,7 +96,7 @@ public class JunctionboxService implements BaseService<Junctionbox, JunctionboxE
         JunctionboxExample example=new JunctionboxExample();
 		JunctionboxExample.Criteria cr=example.createCriteria();
 		cr.andWindpowerstationidNotLike("%HR_GDC%");
-		cr.andWindpowerstationidNotLike("%PL_GDC%");
+//		cr.andWindpowerstationidNotLike("%PL_GDC%");
 		cr.andWindpowerstationidNotLike("%TL_GDC%");
 		cr.andWindpowerstationidNotLike("%TZ_GDC%");
 		cr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/PhotovoltaicTestingPointNewService.java

@@ -99,7 +99,7 @@ public class PhotovoltaicTestingPointNewService implements BaseService<Photovolt
         PhotovoltaicTestingPointNewExample example=new PhotovoltaicTestingPointNewExample();
         PhotovoltaicTestingPointNewExample.Criteria cr=example.createCriteria();
         cr.andWindpowerstationidNotLike("%HR_GDC%");
-        cr.andWindpowerstationidNotLike("%PL_GDC%");
+//        cr.andWindpowerstationidNotLike("%PL_GDC%");
         cr.andWindpowerstationidNotLike("%TL_GDC%");
         cr.andWindpowerstationidNotLike("%TZ_GDC%");
         cr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/photovolatic/SquareService.java

@@ -96,7 +96,7 @@ public class SquareService implements BaseService<Square, SquareExample> {
         SquareExample example=new SquareExample();
 		SquareExample.Criteria cr=example.createCriteria();
 		cr.andWindpowerstationidNotLike("%HR_GDC%");
-		cr.andWindpowerstationidNotLike("%PL_GDC%");
+//		cr.andWindpowerstationidNotLike("%PL_GDC%");
 		cr.andWindpowerstationidNotLike("%TL_GDC%");
 		cr.andWindpowerstationidNotLike("%TZ_GDC%");
 		cr.andWindpowerstationidNotLike("%YG_GDC%");

web/monitor-web-sxjn/src/main/java/com/gyee/frame/util/golden/EdosUtil.java

@@ -29,6 +29,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     private final String JRGF="JRGFJSFW.";
     private final String GFFZGLYC ="GF-FZ-GLYC.";
     private final String GFFSGLYC ="GF-FS-GLYC.";
+    private final String GFPLGLYC ="GF-PL-GLYC.";
 
     private RestTemplate restTemplate =new RestTemplate();
 
@@ -831,7 +832,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         if(StringUtils.notEmp(pointids) && !pointids.isEmpty() )
         {
 
-            if(!pointids.get(0).startsWith(FSGF) && !pointids.get(0).startsWith(JRGF) && !pointids.get(0).startsWith(GFFZGLYC) && !pointids.get(0).startsWith(GFFSGLYC))
+            if(!pointids.get(0).startsWith(FSGF) && !pointids.get(0).startsWith(JRGF) && !pointids.get(0).startsWith(GFFZGLYC) && !pointids.get(0).startsWith(GFFSGLYC) && !pointids.get(0).startsWith(GFPLGLYC))
             {
                 baseURL = V2Config.getBaseurl();
             }else

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

@@ -304,66 +304,84 @@ public class MonitorService {
 
             Map<String, Double> qt = new HashMap<>();
 
-//            if (wpId.equals(QS) || wpId.equals(FD) || wpId.equals(GF)) {
-//                wpId = "SXJ_RGN" + wpId;
-//                //安全天数
-//                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
-//                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
-//                //实时功率
-//                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-//                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
-//                //节约水
-//                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
-//                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
-//                //节约煤
-//                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
-//                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
-//                //减排二氧化碳
-//                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
-//                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
-//                //减排二氧化硫
-//                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
-//                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
-//
-//            } else {
+            if (wpId.contains(QS) || wpId.contains(FD) || wpId.contains(GF)) {
+                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
+                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
+
+                //实时功率
+                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+
 
-            //安全天数
-            ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
-            aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
+                //实时风速
+                ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
+                ssfs = edosUtil.getRealData(ssfsvalue).getPointValueInDouble();
 
-            //实时功率
-            ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
-            sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+                //光照指数
+                ProBasicPowerstationPoint gzzsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
+                gzzs = edosUtil.getRealData(gzzsvalue).getPointValueInDouble();
 
-            //实时风速
-            ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
-            ssfs = edosUtil.getRealData(ssfsvalue).getPointValueInDouble();
+                //理论功率
+                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+                llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
 
-            //光照指数
-            ProBasicPowerstationPoint gzzsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
-            gzzs = edosUtil.getRealData(gzzsvalue).getPointValueInDouble();
+                //节约水
+                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
+                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
 
-            //理论功率
-            ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
-            llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
+                //减排二氧化碳
+                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
+                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
 
-            //节约水
-            ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
-            jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
+                //减排二氧化硫
+                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
+                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
 
-            //减排二氧化碳
-            ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
-            co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
+                //节约煤
+                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
+                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+            } else {
+                //安全天数
+                ProBasicPowerstationPoint aqtsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.AQTS);
+                aqts = edosUtil.getRealData(aqtsvalue).getPointValueInDouble();
+
+                //实时功率
+                ProBasicPowerstationPoint sjglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZGL);
+                sjgl = edosUtil.getRealData(sjglvalue).getPointValueInDouble();
+
+
+                if (wpId.contains("F")) {
+                    //实时风速
+                    ProBasicPowerstationPoint ssfsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSPJFS);
+                    ssfs = edosUtil.getRealData(ssfsvalue).getPointValueInDouble();
+                }else if (wpId.contains("G")){
+                    //光照指数
+                    ProBasicPowerstationPoint gzzsvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.RPJGZD);
+                    gzzs = edosUtil.getRealData(gzzsvalue).getPointValueInDouble();
+                }
 
-            //减排二氧化硫
-            ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
-            so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
+                //理论功率
+                ProBasicPowerstationPoint llglvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.SSZLLGL);
+                llgl = edosUtil.getRealData(llglvalue).getPointValueInDouble();
 
-            //节约煤
-            ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
-            jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+                //节约水
+                ProBasicPowerstationPoint jysvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYS);
+                jys = edosUtil.getRealData(jysvalue).getPointValueInDouble();
 
-//            }
+                //减排二氧化碳
+                ProBasicPowerstationPoint co2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHT);
+                co2 = edosUtil.getRealData(co2value).getPointValueInDouble();
+
+                //减排二氧化硫
+                ProBasicPowerstationPoint so2value = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYEYHL);
+                so2 = edosUtil.getRealData(so2value).getPointValueInDouble();
+
+                //节约煤
+                ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
+                jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
+
+
+            }
             qt.put("aqts", MathUtil.twoBit(aqts));
             qt.put("sjgl", MathUtil.twoBit(sjgl));
             qt.put("llgl", MathUtil.twoBit(llgl));
@@ -812,7 +830,7 @@ public class MonitorService {
                     //接入光伏集中数量
                     jr_gf_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
-                    if (pg.getId().contains("FLFD")){
+                    if (pg.getId().contains("FLFD")) {
                         //风电装机容量
                         flfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;
                         //接入风电装机容量
@@ -825,7 +843,7 @@ public class MonitorService {
                         flfdfj_ts += null != pg.getWindQuantityLd() ? pg.getWindQuantityLd() : 0.0;
                         //接入风机数量
                         jr_flfdfj_ts += null != pg.getJrwindQuantityLd() ? pg.getJrwindQuantityLd() : 0.0;
-                    } else if (pg.getId().contains("GFFD")){
+                    } else if (pg.getId().contains("GFFD")) {
                         //清洁能源光伏装机容量
                         gffd_zjrl += null != pg.getCapacity() ? pg.getCapacity() : 0.0;
                         //接入光伏装机容量
@@ -843,7 +861,7 @@ public class MonitorService {
                         //接入光伏集中数量
                         jr_gffd_jzts += null != pg.getJrquantityJz() ? pg.getJrquantityJz() : 0.0;
 
-                    }else if (pg.getId().contains("QH")){
+                    } else if (pg.getId().contains("QH")) {
 
                         //七和风电装机容量
                         qhfd_zjrl += null != pg.getWindCapacity() ? pg.getWindCapacity() : 0.0;