Browse Source

修复经济运行bug

xieshengjie 2 years ago
parent
commit
70a2d792b7

+ 1 - 2
histroy/benchmarking-histroy-new/src/main/java/com/gyee/benchmarkinghistroy/init/CacheContext.java

@@ -115,8 +115,7 @@ public class CacheContext implements CommandLineRunner {
         wtpAimap = JSONObject.parseObject(wtString, new TypeReference<Map<String, Map<String, Windturbinetestingpointnew>>>() {
         });
 
-//        benchmarkingHistroyService.saveEquipmentdayinfo("2022-07-01","2022-07-03");
-//        benchmarkingHistroyService.saveEquipmentdaydetailed("2022-07-01","2022-07-03");
+
 
 
         log.info("-------------------------------缓存结束--------------------------------------");

+ 2 - 2
histroy/benchmarking-histroy-new/src/main/java/com/gyee/benchmarkinghistroy/service/benchmarking/BenchmarkingHistroyService.java

@@ -80,7 +80,7 @@ public class BenchmarkingHistroyService {
             Date begin = DateUtils.getStartOfDay(addDays);
             Date end = DateUtils.addSeconds(begin, 1);
 
-            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC")).forEach(wt->{
+            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC") && !i.getId().equals("DJY01_001")).forEach(wt->{
                 Map<String,Double> wtDataMap = new HashMap<>();
                 Map<String, Windturbinetestingpointnew> nmap = wtpAimap.get(wt.getId());
                 for (String uniformcode : uniformcodes) {
@@ -145,7 +145,7 @@ public class BenchmarkingHistroyService {
             Date addDays = DateUtils.addDays(date, 1);
             Date begin = DateUtils.getStartOfDay(addDays);
             Date end = DateUtils.addSeconds(begin, 1);
-            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC")).forEach(wt->{
+            wtls.stream().filter(i->i.getWindpowerstationid().endsWith("FDC") && !i.getId().equals("DJY01_001")).forEach(wt->{
                 Map<String,Double> wtDataMap = new HashMap<>();
                 Map<String, Windturbinetestingpointnew> nmap = wtpAimap.get(wt.getId());
                 for (String uniformcode : uniformcodes) {