平鲁光伏计算服务取值修改

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

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

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

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

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

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

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

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

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

@@ -98,7 +98,7 @@ public class PhotovoltaicTestingPointNewService implements BaseService<Photovolt
     public List<PhotovoltaicTestingPointNew> selectAll() {
         PhotovoltaicTestingPointNewExample example=new PhotovoltaicTestingPointNewExample();
         PhotovoltaicTestingPointNewExample.Criteria cr=example.createCriteria();
-//        cr.andWindpowerstationidNotLike("%HR_GDC%");
+        cr.andWindpowerstationidNotLike("%HR_GDC%");
 //        cr.andWindpowerstationidNotLike("%PL_GDC%");
         cr.andWindpowerstationidNotLike("%TL_GDC%");
         cr.andWindpowerstationidNotLike("%TZ_GDC%");

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

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

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

@@ -27,6 +27,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     private final String FSGF="FSGFJSFW.";
     private final String JRGF="JRGFJSFW.";
+    private final String PLGF="PLGFJSFW.";
     private final String GFFZGLYC ="GF-FZ-GLYC.";
     private final String GFFSGLYC ="GF-FS-GLYC.";
     private final String GFPLGLYC ="GF-PL-GLYC.";
@@ -39,7 +40,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public PointData getRealData(Windpowerstationpointnew point) throws Exception {
 
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -99,7 +100,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public List<PointData> getHistoryDatasSnap(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
 
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -157,7 +158,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                         getHistsnapSameTiem(point.getCode(), beginDate, pried, resultList);
                     }else
                     {
-                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !point.getCode().startsWith(PLGF))
                         {
                             resultList=snapList;
                         }else
@@ -245,7 +246,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     private void getHistsnapSameTiem(String pointid, Long beginDate, Long pried,
                                      List<PointData> resultList) {
 
-        if(!pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+        if(!pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -294,7 +295,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public List<PointData> getHistoryDatasRaw(Windpowerstationpointnew point, Long beginDate, Long endDate) throws Exception {
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -360,7 +361,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public PointData getRealData(Windturbinetestingpointnew point) throws Exception {
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -420,7 +421,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public List<PointData> getHistoryDatasSnap(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -480,7 +481,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     }else
                     {
 
-                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
                         {
                             resultList=snapList;
                         }else
@@ -564,7 +565,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public List<PointData> getHistoryDatasRaw(Windturbinetestingpointnew point, Long beginDate, Long endDate) throws Exception {
 
-        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) &&  StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -631,7 +632,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     public PointData getRealData(String pointid) throws Exception {
 
 
-        if(StringUtils.notEmp(pointid) &&  !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+        if(StringUtils.notEmp(pointid) &&  !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -685,7 +686,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
         if(StringUtils.notEmp(pointids) )
         {
-            if(!pointids[0].startsWith(FSGF) && !pointids[0].startsWith(JRGF))
+            if(!pointids[0].startsWith(FSGF) && !pointids[0].startsWith(JRGF) && !pointids[0].startsWith(PLGF))
             {
                 baseURL = V2Config.getBaseurl();
             }else
@@ -832,7 +833,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) && !pointids.get(0).startsWith(GFPLGLYC))
+            if(!pointids.get(0).startsWith(FSGF) && !pointids.get(0).startsWith(JRGF) && !pointids.get(0).startsWith(PLGF) && !pointids.get(0).startsWith(GFFZGLYC) && !pointids.get(0).startsWith(GFFSGLYC) && !pointids.get(0).startsWith(GFPLGLYC))
             {
                 baseURL = V2Config.getBaseurl();
             }else
@@ -979,7 +980,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         if(StringUtils.notEmp(pointids) )
         {
 
-            if(!pointids[0].startsWith(FSGF) && !pointids[0].startsWith(JRGF))
+            if(!pointids[0].startsWith(FSGF) && !pointids[0].startsWith(JRGF) && !pointids[0].startsWith(PLGF))
             {
                 baseURL = V2Config.getBaseurl();
             }else
@@ -1072,7 +1073,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
 
 
-        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1121,7 +1122,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
                     }else
                     {
 
-                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+                        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
                         {
                             resultList=list;
                         }else
@@ -1206,7 +1207,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public List<PointData> getHistoryDatasRaw(String pointid, Long beginDate, Long endDate) throws Exception {
 
-        if(StringUtils.notEmp(pointid) && StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+        if(StringUtils.notEmp(pointid) && StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1261,7 +1262,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public List<PointData> getHistStat(Windturbinetestingpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
 
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) &&   !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) &&   !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1343,7 +1344,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
     @Override
     public List<PointData> getHistStat(Windpowerstationpointnew point, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF))
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getCode()) && !point.getCode().startsWith(FSGF) && !point.getCode().startsWith(JRGF) && !point.getCode().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1419,7 +1420,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public List<PointData> getHistStat(String pointid, Long beginDate, Long endDate, Long count, Long pried, int type) throws Exception {
 
-        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF))
+        if(StringUtils.notEmp(pointid) && !pointid.startsWith(FSGF) && !pointid.startsWith(JRGF) && !pointid.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1484,7 +1485,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public DNAStatVal[] getHistStat(String point, Long beginDate, Long endDate, Integer pried) throws Exception {
 
-        if(StringUtils.notEmp(point) && !point.startsWith(FSGF) && !point.startsWith(JRGF))
+        if(StringUtils.notEmp(point) && !point.startsWith(FSGF) && !point.startsWith(JRGF) && !point.startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1588,7 +1589,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
     @Override
     public void updatePoint(PointData point) throws Exception {
 
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getEdnaId()) &&!point.getEdnaId().startsWith(FSGF) && !point.getEdnaId().startsWith(JRGF))
+        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getEdnaId()) &&!point.getEdnaId().startsWith(FSGF) && !point.getEdnaId().startsWith(JRGF) && !point.getEdnaId().startsWith(PLGF))
         {
             baseURL = V2Config.getBaseurl();
         }else
@@ -1618,7 +1619,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
         if (StringUtils.notEmp(tagNames) && tagNames.length > 0) {
 
 
-            if(!tagNames[0].startsWith(FSGF) && !tagNames[0].startsWith(JRGF))
+            if(!tagNames[0].startsWith(FSGF) && !tagNames[0].startsWith(JRGF) && !tagNames[0].startsWith(PLGF))
             {
                 baseURL = V2Config.getBaseurl();
             }else
@@ -1667,7 +1668,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
         if(null!=pointls && !pointls.isEmpty())
         {
-            if(!pointls.get(0).getEdnaId().startsWith(FSGF) && !pointls.get(0).getEdnaId().startsWith(JRGF))
+            if(!pointls.get(0).getEdnaId().startsWith(FSGF) && !pointls.get(0).getEdnaId().startsWith(JRGF) && !pointls.get(0).getEdnaId().startsWith(PLGF))
             {
                 baseURL = V2Config.getBaseurl();
             }else
@@ -1762,7 +1763,7 @@ public class EdosUtil implements IRealTimeDataBaseUtil {
 
         if(StringUtils.notEmp(nameList) && nameList.length>0 && StringUtils.notEmp(tTime))
         {
-            if(!nameList[0].startsWith(FSGF) && !nameList[0].startsWith(JRGF))
+            if(!nameList[0].startsWith(FSGF) && !nameList[0].startsWith(JRGF) && !nameList[0].startsWith(PLGF))
             {
                 baseURL = V2Config.getBaseurl();
             }else