修改统计分析

histroy/analysis-histroy-hb/src/main/java/com/gyee/analysis/init/CacheContext.java

@@ -112,14 +112,7 @@ public class CacheContext implements CommandLineRunner {
 //            }
 //        }
 
-        //保存主表
-        analysisNewService.savaAnalysismain("2022-03-01", "2022-03-13");
-        //风电表底
-        analysisNewService.saveAnalysisTableBottom("2022-03-01", "2022-03-13");
-        //风电工程
-        analysisNewService.saveWindProject("2022-03-01", "2022-03-13");
-        //风电场站
-        analysisNewService.saveWindStation("2022-03-01", "2022-03-13");
+
 
     }
 }

histroy/analysis-histroy-hb/src/main/java/com/gyee/analysis/service/analysis/AnalysisNewService.java

@@ -296,7 +296,7 @@ public class AnalysisNewService {
 //                List<Analysissubtablebottom> currentDay = currentDayBdz.stream().filter(i -> i.getWpid().equals(project.getWindpowerstationid())).collect(Collectors.toList());
 //                List<String> fcswmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                        .filter(i -> (
-//                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功")
+//                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG")
 //                        )).map(i -> i.getId()).collect(Collectors.toList());
 //                double fcfdl = 0.0;
 //                double fcswfdl = 0.0;
@@ -305,7 +305,7 @@ public class AnalysisNewService {
 //                if (fcswmeterids.size() == 1) {
 //                    List<String> fcfdlmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                            .filter(i -> (
-//                                    i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+//                                    i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
 //                            )).map(i -> i.getId()).collect(Collectors.toList());
 //                    for (String meterid : fcfdlmeterids) {
 //                        fcfdl += currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -315,7 +315,7 @@ public class AnalysisNewService {
 //                    }
 //                    List<String> fcgwmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                            .filter(i -> (
-//                                    i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功")
+//                                    i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG")
 //                            )).map(i -> i.getId()).collect(Collectors.toList());
 //                    for (String meterid : fcgwmeterids) {
 //                        fcgwfdl += currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -324,11 +324,11 @@ public class AnalysisNewService {
 //                } else {
 //                    List<Meterpoint2> collect = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                            .filter(i -> (
-//                                    i.getProjectid().contains(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功")
+//                                    i.getProjectid().contains(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG")
 //                            )).collect(Collectors.toList());
 //                    List<Meterpoint2> gwdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                            .filter(i -> (
-//                                    i.getProjectid().contains(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功")
+//                                    i.getProjectid().contains(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG")
 //                            )).collect(Collectors.toList());
 //                    if (StringUtils.isNotEmpty(gwdls)) {
 //                        fcgwfdl += currentDay.stream().filter(i -> i.getMeterid().equals(gwdls.get(0).getId())).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(gwdls.get(0).getId())).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -339,7 +339,7 @@ public class AnalysisNewService {
 //                        for (String projectid : projects) {
 //                            List<Meterpoint2> fcfdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                                    .filter(i -> (
-//                                            i.getProjectid().equals(projectid) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+//                                            i.getProjectid().equals(projectid) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
 //                                    )).collect(Collectors.toList());
 //                            for (Meterpoint2 meterpoint2 : fcfdls) {
 //                                fcfdl += currentDay.stream().filter(i -> i.getMeterid().equals(meterpoint2.getId())).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(meterpoint2.getId())).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -352,7 +352,7 @@ public class AnalysisNewService {
 //
 //                List<String> fczybmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                        .filter(i -> (
-//                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getDisplaytype().equals("正向有功")
+//                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getUniformcode().equals("ZXYG")
 //                        )).map(i -> i.getId()).collect(Collectors.toList());
 //                for (String meterid : fczybmeterids) {
 //                    fczyb += currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -362,7 +362,7 @@ public class AnalysisNewService {
 ////                //-------------------------------------------------------------------------------------------------------------------------------------------------
 ////                List<String> fcswmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 ////                        .filter(i -> (
-////                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功")
+////                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG")
 ////                        )).map(i -> i.getId()).collect(Collectors.toList());
 ////                double fcswfdl = 0.0;
 ////                for (String meterid : fcswmeterids) {
@@ -371,7 +371,7 @@ public class AnalysisNewService {
 ////                //-------------------------------------------------------------------------------------------------------------------------------------------------
 ////                List<String> fcgwmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
 ////                        .filter(i -> (
-////                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功")
+////                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG")
 ////                        )).map(i -> i.getId()).collect(Collectors.toList());
 ////                double fcgwfdl = 0.0;
 ////                for (String meterid : fcgwmeterids) {
@@ -382,7 +382,7 @@ public class AnalysisNewService {
 //
 //                List<String> fdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
 //                        .filter(i -> (
-//                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+//                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
 //                        )).map(i -> i.getId()).collect(Collectors.toList());
 //                double generatingcapacity = 0;
 //                for (String meterid : fdls) {
@@ -537,7 +537,7 @@ public class AnalysisNewService {
                 //算出发电量
                 List<String> fdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double generatingcapacity = 0;
                 for (String meterid : fdls) {
@@ -559,14 +559,14 @@ public class AnalysisNewService {
                 double gwdl = 0;
                 Meterpoint fcswmeter = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功") && i.getProjectid().contains(project.getId())
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG") && i.getProjectid().contains(project.getId())
                         )).findFirst().get();
                 Meterpoint fcgwmeter = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功") && i.getProjectid().contains(project.getId())
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG") && i.getProjectid().contains(project.getId())
                         )).findFirst().get();
                 String[] lineids = fcswmeter.getLineid().split("\\|");
-                Double fcfdl = Arrays.stream(lineids).map(lineid -> wpmeterMap.get(project.getWindpowerstationid()).stream().filter(j -> j.getMetersort().equals("主") && j.getMetertype().equals("进线") && j.getDisplaytype().equals("正向有功") && j.getLineid().equals(lineid)).findFirst().get()).mapToDouble(linemeterpoint2 -> currentDay.stream().filter(currentBdz -> currentBdz.getMeterid().equals(linemeterpoint2.getId())).findFirst().get().getDayvaluemodify()).sum();
+                Double fcfdl = Arrays.stream(lineids).map(lineid -> wpmeterMap.get(project.getWindpowerstationid()).stream().filter(j -> j.getMetersort().equals("主") && j.getMetertype().equals("进线") && j.getUniformcode().equals("ZXYG") && j.getLineid().equals(lineid)).findFirst().get()).mapToDouble(linemeterpoint2 -> currentDay.stream().filter(currentBdz -> currentBdz.getMeterid().equals(linemeterpoint2.getId())).findFirst().get().getDayvaluemodify()).sum();
 
                 Double dayvaluesw = currentDay.stream().filter(currentBdz -> currentBdz.getMeterid().equals(fcswmeter.getId())).findFirst().get().getDayvaluemodify();
                 Double dayvaluegw = currentDay.stream().filter(currentBdz -> currentBdz.getMeterid().equals(fcgwmeter.getId())).findFirst().get().getDayvaluemodify();
@@ -576,7 +576,7 @@ public class AnalysisNewService {
                 double fczyb = 0;
                 List<String> fczybmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 for (String meterid : fczybmeterids) {
                     fczyb += currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().isPresent() ? currentDay.stream().filter(i -> i.getMeterid().equals(meterid)).findFirst().get().getDayvaluemodify().doubleValue() : 0.0;
@@ -757,7 +757,7 @@ public class AnalysisNewService {
                 List<Analysissubtablebottom> currentDay = currentDayBdz.stream().filter(i -> i.getWpid().equals(project.getWindpowerstationid())).collect(Collectors.toList());
                 List<String> fcfdlmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcfdl = 0.0;
                 for (String meterid : fcfdlmeterids) {
@@ -768,7 +768,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fcswmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcswfdl = 0.0;
                 for (String meterid : fcswmeterids) {
@@ -777,7 +777,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fcgwmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcgwfdl = 0.0;
                 for (String meterid : fcgwmeterids) {
@@ -786,7 +786,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fczybmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fczyb = 0.0;
                 for (String meterid : fczybmeterids) {
@@ -795,7 +795,7 @@ public class AnalysisNewService {
 
                 List<String> fdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double generatingcapacity = 0;
                 for (String meterid : fdls) {
@@ -917,7 +917,7 @@ public class AnalysisNewService {
                 List<Analysissubtablebottom> currentDay = currentDayBdz.stream().filter(i -> i.getWpid().equals(project.getWindpowerstationid())).collect(Collectors.toList());
                 List<String> fcfdlmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcfdl = 0.0;
                 for (String meterid : fcfdlmeterids) {
@@ -928,7 +928,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fcswmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcswfdl = 0.0;
                 for (String meterid : fcswmeterids) {
@@ -937,7 +937,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fcgwmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getDisplaytype().equals("反向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("出线") && i.getUniformcode().equals("FXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fcgwfdl = 0.0;
                 for (String meterid : fcgwmeterids) {
@@ -946,7 +946,7 @@ public class AnalysisNewService {
                 //-------------------------------------------------------------------------------------------------------------------------------------------------
                 List<String> fczybmeterids = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getDisplaytype().equals("正向有功")
+                                i.getMetersort().equals("主") && i.getMetertype().equals("站用变") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double fczyb = 0.0;
                 for (String meterid : fczybmeterids) {
@@ -955,7 +955,7 @@ public class AnalysisNewService {
 
                 List<String> fdls = wpmeterMap.get(project.getWindpowerstationid()).stream()
                         .filter(i -> (
-                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getDisplaytype().equals("正向有功")
+                                i.getProjectid().equals(project.getId()) && i.getMetersort().equals("主") && i.getMetertype().equals("进线") && i.getUniformcode().equals("ZXYG")
                         )).map(i -> i.getId()).collect(Collectors.toList());
                 double generatingcapacity = 0;
                 for (String meterid : fdls) {