Merge remote-tracking branch 'origin/master'

common/src/main/java/com/gyee/common/vo/specific/SpecificCenterVo.java

@@ -30,4 +30,5 @@ public class SpecificCenterVo implements Serializable {
     private Integer fwjslCompare;
     private Integer ztzhlCompare;
     private Integer xqjslCompare;
+    private Integer ordernum;
 }

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

@@ -62,7 +62,7 @@ public class AccessStatusService {
             double czzt = 0;
 
             double zycgl = 0;
-            Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
+            Optional<ProBasicMeterPoint> swdlOptional = meterpoints.stream().filter(me -> me.getWindpowerstationId().equals(wp.getId()) && me.getUniformCode().equals("ZXYG") && me.getMeterType().equals("出线") && me.getMeterSort().equals("主")).findFirst();
             Optional<ProBasicSubStation> subStationOptional = subwpls.stream().filter(sub -> sub.getWindpowerstationId().equals(wp.getId())).findFirst();
             Optional<ProBasicWeatherStation> wsOptional = wswpls.stream().filter(ws -> ws.getWindpowerstationId().equals(wp.getId())).findFirst();
             List<ProBasicSubStation> stations = subwpls.stream().filter(sub -> sub.getWindpowerstationId().equals(wp.getId())).collect(Collectors.toList());

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

@@ -1646,10 +1646,10 @@ public class CycleCalculationService {
             lineResultList.add(PointUtil.createPointData(date,npjfs.get()/proBasicWindturbines.size(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date,pjfs15.get()/proBasicWindturbines.size(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
 
-            lineResultList.add(PointUtil.createPointData(date,rpjgl.get()/proBasicWindturbines.size(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
-            lineResultList.add(PointUtil.createPointData(date,ypjgl.get()/proBasicWindturbines.size(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
-            lineResultList.add(PointUtil.createPointData(date,npjgl.get()/proBasicWindturbines.size(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
-            lineResultList.add(PointUtil.createPointData(date,pjgl15.get()/proBasicWindturbines.size(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
+            lineResultList.add(PointUtil.createPointData(date,rpjgl.get(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
+            lineResultList.add(PointUtil.createPointData(date,ypjgl.get(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
+            lineResultList.add(PointUtil.createPointData(date,npjgl.get(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
+            lineResultList.add(PointUtil.createPointData(date,pjgl15.get(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
 
             lineResultList.add(PointUtil.createPointData(date,rkydl.get(),wprkydlPoint.getNemCode(),wprkydlPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date,ykydl.get(),wpykydlPoint.getNemCode(),wpykydlPoint.getName()));
@@ -2746,10 +2746,10 @@ public class CycleCalculationService {
             projectResultList.add(PointUtil.createPointData(date,npjfs.get()/proBasicLines.size(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date,pjfs15.get()/proBasicLines.size(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
 
-            projectResultList.add(PointUtil.createPointData(date,rpjgl.get()/proBasicLines.size(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
-            projectResultList.add(PointUtil.createPointData(date,ypjgl.get()/proBasicLines.size(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
-            projectResultList.add(PointUtil.createPointData(date,npjgl.get()/proBasicLines.size(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
-            projectResultList.add(PointUtil.createPointData(date,pjgl15.get()/proBasicLines.size(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
+            projectResultList.add(PointUtil.createPointData(date,rpjgl.get(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
+            projectResultList.add(PointUtil.createPointData(date,ypjgl.get(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
+            projectResultList.add(PointUtil.createPointData(date,npjgl.get(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
+            projectResultList.add(PointUtil.createPointData(date,pjgl15.get(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
 
             projectResultList.add(PointUtil.createPointData(date,rkydl.get(),wprkydlPoint.getNemCode(),wprkydlPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date,ykydl.get(),wpykydlPoint.getNemCode(),wpykydlPoint.getName()));
@@ -3845,10 +3845,10 @@ public class CycleCalculationService {
             windpowerResultList.add(PointUtil.createPointData(date,npjfs.get()/proBasicProjects.size(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date,pjfs15.get()/proBasicProjects.size(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
 
-            windpowerResultList.add(PointUtil.createPointData(date,rpjgl.get()/proBasicProjects.size(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
-            windpowerResultList.add(PointUtil.createPointData(date,ypjgl.get()/proBasicProjects.size(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
-            windpowerResultList.add(PointUtil.createPointData(date,npjgl.get()/proBasicProjects.size(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
-            windpowerResultList.add(PointUtil.createPointData(date,pjgl15.get()/proBasicProjects.size(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
+            windpowerResultList.add(PointUtil.createPointData(date,rpjgl.get(),wprpjglPoint.getNemCode(),wprpjglPoint.getName()));
+            windpowerResultList.add(PointUtil.createPointData(date,ypjgl.get(),wpypjglPoint.getNemCode(),wpypjglPoint.getName()));
+            windpowerResultList.add(PointUtil.createPointData(date,npjgl.get(),wpnpjglPoint.getNemCode(),wpnpjglPoint.getName()));
+            windpowerResultList.add(PointUtil.createPointData(date,pjgl15.get(),wppjgl15Point.getNemCode(),wppjgl15Point.getName()));
 
             windpowerResultList.add(PointUtil.createPointData(date,rkydl.get(),wprkydlPoint.getNemCode(),wprkydlPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date,ykydl.get(),wpykydlPoint.getNemCode(),wpykydlPoint.getName()));

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

@@ -447,11 +447,11 @@ public class ElectricityMeteringService {
             }
         });
         //电量百分比
-        double percentage = xlzdl.get() != 0 ? xldl.get() / xlzdl.get() * 100 : 0;
+        double percentage = xlzdl.get() != 0 ? xldl.get() / xlzdl.get()  : 0;
         percentageMap.put("percentage",percentage);
-        double ypercentage = xlzydl.get() != 0 ? xlydl.get() / xlzydl.get() * 100 : 0;
+        double ypercentage = xlzydl.get() != 0 ? xlydl.get() / xlzydl.get() : 0;
         percentageMap.put("ypercentage",ypercentage);
-        double npercentage = xlzndl.get() != 0 ? xlndl.get() / xlzndl.get() * 100 : 0;
+        double npercentage = xlzndl.get() != 0 ? xlndl.get() / xlzndl.get() : 0;
         percentageMap.put("npercentage",npercentage);
         return percentageMap;
     }

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

@@ -1455,7 +1455,7 @@ public class RegionCalService {
             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()));
         }
-        resultList.add(PointUtil.createPointData(currentDate,rpjgl.get()/companys.size(),zrpjglPoint.getNemCode(),zrpjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,rpjgl.get(),zrpjglPoint.getNemCode(),zrpjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rfdl.get(),zrfdlPoint.getNemCode(),zrfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rkydl.get(),zrkydlPoint.getNemCode(),zrkydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rllfdl.get(),zrllfdlPoint.getNemCode(),zrllfdlPoint.getName()));
@@ -1475,7 +1475,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,rzfdl.get(),zrzfdlPoint.getNemCode(),zrzfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rqfdl.get(),zrqfdlPoint.getNemCode(),zrqfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rzhd.get(),zrzhdPoint.getNemCode(),zrzhdPoint.getName()));
-        resultList.add(PointUtil.createPointData(currentDate,ypjgl.get()/companys.size(),zypjglPoint.getNemCode(),zypjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ypjgl.get(),zypjglPoint.getNemCode(),zypjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yfdl.get(),zyfdlPoint.getNemCode(),zyfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,ykydl.get(),zykydlPoint.getNemCode(),zykydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yllfdl.get(),zyllfdlPoint.getNemCode(),zyllfdlPoint.getName()));
@@ -1495,7 +1495,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,yzfdl.get(),zyzfdlPoint.getNemCode(),zyzfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yqfdl.get(),zyqfdlPoint.getNemCode(),zyqfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yzhd.get(),zyzhdPoint.getNemCode(),zyzhdPoint.getName()));
-        resultList.add(PointUtil.createPointData(currentDate,npjgl.get()/companys.size(),znpjglPoint.getNemCode(),znpjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,npjgl.get(),znpjglPoint.getNemCode(),znpjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nfdl.get(),znfdlPoint.getNemCode(),znfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nkydl.get(),znkydlPoint.getNemCode(),znkydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nllfdl.get(),znllfdlPoint.getNemCode(),znllfdlPoint.getName()));
@@ -1515,7 +1515,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,nzfdl.get(),znzfdlPoint.getNemCode(),znzfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nqfdl.get(),znqfdlPoint.getNemCode(),znqfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nzhd.get(),znzhdPoint.getNemCode(),znzhdPoint.getName()));
-        resultList.add(PointUtil.createPointData(currentDate,pjgl15.get()/companys.size(),zpjgl15Point.getNemCode(),zpjgl15Point.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,pjgl15.get(),zpjgl15Point.getNemCode(),zpjgl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,fdl15.get(),zfdl15Point.getNemCode(),zfdl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,kydl15.get(),zkydl15Point.getNemCode(),zkydl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,llfdl15.get(),zllfdl15Point.getNemCode(),zllfdl15Point.getName()));
@@ -2912,7 +2912,7 @@ public class RegionCalService {
         }
 
 
-        resultList.add(PointUtil.createPointData(currentDate,rpjgl.get()/wps.size(),zrpjglPoint.getNemCode(),zrpjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,rpjgl.get(),zrpjglPoint.getNemCode(),zrpjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rfdl.get(),zrfdlPoint.getNemCode(),zrfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rkydl.get(),zrkydlPoint.getNemCode(),zrkydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,rllfdl.get(),zrllfdlPoint.getNemCode(),zrllfdlPoint.getName()));
@@ -2934,7 +2934,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,rzhd.get(),zrzhdPoint.getNemCode(),zrzhdPoint.getName()));
 
 
-        resultList.add(PointUtil.createPointData(currentDate,ypjgl.get()/wps.size(),zypjglPoint.getNemCode(),zypjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,ypjgl.get(),zypjglPoint.getNemCode(),zypjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yfdl.get(),zyfdlPoint.getNemCode(),zyfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,ykydl.get(),zykydlPoint.getNemCode(),zykydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,yllfdl.get(),zyllfdlPoint.getNemCode(),zyllfdlPoint.getName()));
@@ -2956,7 +2956,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,yzhd.get(),zyzhdPoint.getNemCode(),zyzhdPoint.getName()));
 
 
-        resultList.add(PointUtil.createPointData(currentDate,npjgl.get()/wps.size(),znpjglPoint.getNemCode(),znpjglPoint.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,npjgl.get(),znpjglPoint.getNemCode(),znpjglPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nfdl.get(),znfdlPoint.getNemCode(),znfdlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nkydl.get(),znkydlPoint.getNemCode(),znkydlPoint.getName()));
         resultList.add(PointUtil.createPointData(currentDate,nllfdl.get(),znllfdlPoint.getNemCode(),znllfdlPoint.getName()));
@@ -2978,7 +2978,7 @@ public class RegionCalService {
         resultList.add(PointUtil.createPointData(currentDate,nzhd.get(),znzhdPoint.getNemCode(),znzhdPoint.getName()));
 
 
-        resultList.add(PointUtil.createPointData(currentDate,pjgl15.get()/wps.size(),zpjgl15Point.getNemCode(),zpjgl15Point.getName()));
+        resultList.add(PointUtil.createPointData(currentDate,pjgl15.get(),zpjgl15Point.getNemCode(),zpjgl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,fdl15.get(),zfdl15Point.getNemCode(),zfdl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,kydl15.get(),zkydl15Point.getNemCode(),zkydl15Point.getName()));
         resultList.add(PointUtil.createPointData(currentDate,llfdl15.get(),zllfdl15Point.getNemCode(),zllfdl15Point.getName()));

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -372,11 +372,17 @@ public class SpecificService {
 
         //封装最终返回结果
         monthresultList.stream().forEach(i->{
+            i.setOrdernum(wpmap.get(i.getWpid()).getOrderNum());
             i.setWpid(wpmap.get(i.getWpid()).getAname());
+
         });
         yearresultList.stream().forEach(i->{
+            i.setOrdernum(wpmap.get(i.getWpid()).getOrderNum());
             i.setWpid(wpmap.get(i.getWpid()).getAname());
+
         });
+        SortUtils.sort(monthresultList,"ordernum",SortUtils.ASC);
+        SortUtils.sort(yearresultList,"ordernum",SortUtils.ASC);
         Map<String,List<SpecificCenterVo>> resultMap = new HashMap<>();
         resultMap.put("当月",monthresultList);
         resultMap.put("当年",yearresultList);