Merge remote-tracking branch 'origin/master'

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEquipmentmodel.java

@@ -90,7 +90,7 @@ public class ProEconEquipmentmodel extends Model {
     /**
      * 设备类别
      */
-    private Integer equipmentCategory;
+    private String equipmentCategory;
 
 
 }

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

@@ -52,7 +52,8 @@ public class RegionCalService {
                 weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps1, "-1");
             if (wps2.size()>0)
                 weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps2, "-2");
-            weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps0, "0");
+            if (wps0.size()>0)
+                weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps0, "0");
 
         });
         edosUtil.sendMultiPoint(resultList);
@@ -67,8 +68,10 @@ public class RegionCalService {
         List<PointData> resultList = new ArrayList<>();
         rgls.stream().forEach(region->{
             List<ProBasicCompany> companys = cpls.stream().filter(company -> company.getRegionId().equals(region.getId())).collect(Collectors.toList());
-            weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "-1");
-            weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region,companys, "-2");
+            if (region.getJrwindCapacity()>0)
+                weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "-1");
+            if (region.getJrCapacity()>0)
+                weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region,companys, "-2");
             weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "0");
         });
         edosUtil.sendMultiPoint(resultList);
@@ -1439,7 +1442,7 @@ public class RegionCalService {
             resultList.add(PointUtil.createPointData(currentDate,pjfs15.get()/fcComCount.doubleValue(),zpjfs15Point.getNemCode(),zpjfs15Point.getName()));
         }else if(type.equals("-2")){
             resultList.add(PointUtil.createPointData(currentDate,rpjgzd.get()/gcComCount.doubleValue(),zrpjgzdPoint.getNemCode(),zrpjgzdPoint.getName()));
-            resultList.add(PointUtil.createPointData(currentDate,ypjgzd.get()/gcComCount.doubleValue(),zypjgzdPoint.getNemCode(),zypjgzdPoint.getName()));
+                resultList.add(PointUtil.createPointData(currentDate,ypjgzd.get()/gcComCount.doubleValue(),zypjgzdPoint.getNemCode(),zypjgzdPoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,npjgzd.get()/gcComCount.doubleValue(),znpjgzdPoint.getNemCode(),znpjgzdPoint.getName()));
             resultList.add(PointUtil.createPointData(currentDate,pjgzd15.get()/gcComCount.doubleValue(),zpjgzd15Point.getNemCode(),zpjgzd15Point.getName()));
         }else {

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

@@ -50,7 +50,8 @@ public class RegionCalreService  {
                 weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps1, "-1");
             if (wps2.size()>0)
                 weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps2, "-2");
-            weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps0, "0");
+            if (wps0.size()>0)
+                weightingCompany(currentDate, companypointmap, wppointmap, resultList, company, wps0, "0");
 
         });
         edosUtil.sendMultiPoint(resultList);
@@ -65,8 +66,10 @@ public class RegionCalreService  {
         List<PointData> resultList = new ArrayList<>();
         rgls.stream().forEach(region->{
             List<ProBasicCompany> companys = cpls.stream().filter(company -> company.getRegionId().equals(region.getId())).collect(Collectors.toList());
-            weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "-1");
-            weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region,companys, "-2");
+            if (region.getJrCapacity()>0)
+                weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region,companys, "-2");
+            if (region.getJrwindCapacity()>0)
+                weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "-1");
             weightingRegion(currentDate, companypointmap, regionpointmap, resultList,region, companys, "0");
         });
         edosUtil.sendMultiPoint(resultList);

realtime/generationXK-service/src/main/resources/xxl-job-executorRG.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9202
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationRG-job
+xxl.job.executor.logpath=C:\\jobs\\generationRG-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPGD.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9301
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWPGD-job
+xxl.job.executor.logpath=C:\\jobs\\generationWPGD-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPGH.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9303
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWPGH-job
+xxl.job.executor.logpath=C:\\jobs\\generationWPGH-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPLY.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9302
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWPLY-job
+xxl.job.executor.logpath=C:\\jobs\\generationWPLY-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

realtime/generationXK-service/src/main/resources/xxl-job-executorWPXNY.properties

@@ -19,7 +19,7 @@ xxl.job.executor.ip=
 xxl.job.executor.port=9304
 
 ### xxl-job executor log-path
-xxl.job.executor.logpath=E:\\jobs\\generationWPXNY-job
+xxl.job.executor.logpath=C:\\jobs\\generationWPXNY-job
 ### xxl-job executor log-retention-days
 xxl.job.executor.logretentiondays=30
 

web/gdsx-ghost/src/main/java/com/gyee/ghost/model/auto/Involved.java

@@ -47,5 +47,6 @@ public class Involved extends Model {
 
     private Double faultduration;
 
+    private Double impactcapacity;
 
 }

web/gdsx-ghost/src/main/java/com/gyee/ghost/service/auto/GhostService.java

@@ -560,7 +560,10 @@ public class GhostService {
         Long end = involvedVo.getEnd();
         List<Line> lines = involvedVo.getLines();
         Double ssdl = involvedVo.getSsdl();
+        Double impactcapacity = involvedVo.getImpactcapacity();
         String type = involvedVo.getType();
+
+
         List<Involved> resultList = new ArrayList<>();
         double zcapacity = lines.stream().mapToDouble(line -> lineMap.get(line.getId()).getCapacity()).sum();
         lines.stream().forEach(line->{
@@ -576,6 +579,7 @@ public class GhostService {
             involved.setEnddate(DateUtils.parseLongToDate(end));
             involved.setFaulttype(type);
             involved.setPowerloss(ssdl*(lineMap.get(line.getId()).getCapacity()/zcapacity));
+            involved.setImpactcapacity(impactcapacity*(lineMap.get(line.getId()).getCapacity()/zcapacity));
             double hours = DateUtils.hoursDiff2(DateUtils.parseLongToDate(begin), DateUtils.parseLongToDate(end));
             involved.setFaultduration(hours);
             resultList.add(involved);

web/gdsx-ghost/src/main/java/com/gyee/ghost/vo/InvolvedVo.java

@@ -17,6 +17,7 @@ public class InvolvedVo {
     public Double ssdl;  //损失电量
     public List<Line> lines;   //勾选线路
     public String type;  //类型
+    public Double impactcapacity;  //影响容量
 
 
 }