首页bug修复,清洗分析bug修复

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/Economic/EconomicService.java

@@ -80,9 +80,9 @@ public class EconomicService {
 
         BigDecimal num1 = new BigDecimal("100");
         if (companyId.startsWith("JS_RGN") && type.equals("-1")) {
-            qyls = station1ls.stream().filter(wp -> wp != null && "JS_RGN-1".contains(wp.getForeignKeyId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
+            qyls = station1ls.stream().filter(wp -> "JS_RGN-1".equals(wp.getForeignKeyId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
         } else if (companyId.startsWith("JS_RGN") && type.equals("-2")) {
-            qyls = station1ls.stream().filter(wp ->wp != null && "JS_RGN-2".contains(wp.getForeignKeyId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
+            qyls = station1ls.stream().filter(wp ->"JS_RGN-2".equals(wp.getForeignKeyId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
         } else {
             qyls = station1ls.stream().filter(wp -> wp.getForeignKeyId().contains(companyId) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
         }
@@ -90,18 +90,20 @@ public class EconomicService {
 
         //列表
         if (companyId.startsWith("JS_RGN") && type.equals("-1")) {
-            gsls = station1ls.stream().filter(wp -> wp != null && "JS_RGN-1".contains(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
+            gsls = station1ls.stream().filter(wp -> "JS_RGN-1".equals(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
             trls = treels.stream().filter(wp -> wp.getId().endsWith("ZGS")).collect(Collectors.toList());
         } else if (companyId.startsWith("JS_RGN") && type.equals("-2")) {
-            gsls = station1ls.stream().filter(wp -> "JS_RGN-2".contains(wp.getRegionId()) && wp.getRecordDate().equals(date)).collect(Collectors.toList());
+            gsls = station1ls.stream()
+                    .filter(wp ->"JS_RGN-2".equals(wp.getRegionId()) && date.equals(wp.getRecordDate()))
+                    .collect(Collectors.toList());
             trls = treels.stream().filter(wp -> wp != null && wp.getId().endsWith("ZGS")).collect(Collectors.toList());
 
         //statype判断
         } else if (companyId.startsWith("JS_RGN") && statype.equals("-1")) {
-            gsls = station1ls.stream().filter(wp -> wp != null && "JS_RGN-1".contains(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
+            gsls = station1ls.stream().filter(wp -> "JS_RGN-1".equals(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
             trls = treels.stream().filter(wp -> wp.getId().endsWith("STA")).collect(Collectors.toList());
         } else if (companyId.startsWith("JS_RGN") && statype.equals("-2")) {
-            gsls = station1ls.stream().filter(wp -> wp != null && "JS_RGN-2".contains(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
+            gsls = station1ls.stream().filter(wp -> "JS_RGN-2".equals(wp.getRegionId()) && date.equals(wp.getRecordDate())).collect(Collectors.toList());
             trls = treels.stream().filter(wp -> wp.getId().endsWith("STA")).collect(Collectors.toList());
         } else {
             gsls = station1ls.stream().filter(wp -> wp.getForeignKeyId().contains("STA") && date.equals(wp.getRecordDate())).collect(Collectors.toList());

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/goodness/WindturbinegoodnessService.java

@@ -1220,14 +1220,14 @@ public class WindturbinegoodnessService {
         Long startTs = DateUtils.parseDate1(beginDate).getTime() / 1000;
         Long endTs = DateUtils.parseDate1(endDate).getTime() / 1000;
 
-        List<ProBasicEquipmentBranchPoint> dl = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "ZLDL".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
-        List<ProBasicEquipmentBranchPoint> dy = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "ZLDY".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
+        List<ProBasicEquipmentBranchPoint> dl = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "AIZLDL".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
+        List<ProBasicEquipmentBranchPoint> dy = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "AIZLDY".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
         //String inverterId = dl.get(0).getEquipmentId();
         //List<ProBasicEquipmentBranchPoint> inverter = CacheContext.proBasicEquipmentBranchPointList.stream().filter(pbqbp -> "SSZNHGLZS".equals(pbqbp.getUniformCode()) && branch.equals(pbqbp.getWindturbineId())).collect(Collectors.toList());
 
-        List<PointData> historydlDatasRaw = edosUtil.getHistoryDatasRaw(dl.get(0).getNemCode(), startTs, endTs);
+        List<PointData> historydlDatasRaw = edosUtil.getHistoryDatasSnap(dl.get(0).getNemCode(), startTs, endTs,null,900L);
         Map<Long, PointData> dlMap = historydlDatasRaw.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
-        List<PointData> historydyDatasRaw = edosUtil.getHistoryDatasRaw(dy.get(0).getNemCode(), startTs, endTs);
+        List<PointData> historydyDatasRaw = edosUtil.getHistoryDatasSnap(dy.get(0).getNemCode(), startTs, endTs,null,900L);
         Map<Long, PointData> dyMap = historydyDatasRaw.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
         List<CleanAnalysis> lca = new ArrayList<>();