添加风向统一编码

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbineDetailLineChartController.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.controller.goodness;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.DataVo;
@@ -26,7 +27,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 风机区间图表功能展示
@@ -118,10 +118,13 @@ public class WindturbineDetailLineChartController {
     public R getInputSmall(String wtId, String recorddate) throws Exception {
         Date date = DateUtils.parseDate(recorddate);
         double inputsmall=0.0;
-        List<ProEconInOrOutSpeedTotal> ls = proEconInOrOutSpeedTotalService.list().stream().filter(i->
-                i.getWindturbineId().equals(wtId)
-                && i.getRecordDate().compareTo(DateUtils.truncate(date))==0
-        ).collect(Collectors.toList());
+        QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("windturbine_id",wtId).eq("record_date",date);
+        List<ProEconInOrOutSpeedTotal> ls = proEconInOrOutSpeedTotalService.list(queryWrapper);
+//                .stream().filter(i->
+//                i.getWindturbineId().equals(wtId)
+//                && i.getRecordDate().compareTo(DateUtils.truncate(date))==0
+//        ).collect(Collectors.toList());
         if(!ls.isEmpty())
         {
             ProEconInOrOutSpeedTotal is=ls.get(0);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbineDetailPieChartAController.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.controller.goodness;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.util.DateUtils;
 import com.gyee.runeconomy.dto.DataVo;
 import com.gyee.runeconomy.dto.R;
@@ -20,7 +21,6 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 单机性能分析列表
@@ -54,10 +54,14 @@ public class WindturbineDetailPieChartAController {
         if (StringUtils.notEmp(recorddate) && StringUtils.notEmp(wtId) && StringUtils.notEmp(type)) {
 
             Date date= DateUtils.parseDate(recorddate);
-            List<ProEconInOrOutSpeedTotal2> ls = proEconInOrOutSpeedTotal2Service.list().stream().filter(i->
-                    i.getWindturbineId().equals(wtId)
-            && i.getRecordDate().compareTo(DateUtils.truncate(date)) ==0
-            ).collect(Collectors.toList());
+
+            QueryWrapper<ProEconInOrOutSpeedTotal2> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).eq("record_date",date);
+            List<ProEconInOrOutSpeedTotal2> ls = proEconInOrOutSpeedTotal2Service.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindturbineId().equals(wtId)
+//            && i.getRecordDate().compareTo(DateUtils.truncate(date)) ==0
+//            ).collect(Collectors.toList());
 
             if (!ls.isEmpty()) {
 

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/goodness/WindturbineGoodnessDetailController.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.controller.goodness;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.runeconomy.dto.DataVo;
@@ -25,7 +26,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 风机明细信息页面
@@ -68,9 +68,12 @@ public class WindturbineGoodnessDetailController {
         if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
 
             Date date=DateUtils.parseDate(recorddate);
-            List<ProEconWtAlysisDay>  wtadls=proEconWtAlysisDayService.list().stream().filter(i->i.getWindturbineId().equals(wtId )
-           && i.getRecordDate().compareTo(date)==0
-            ).collect(Collectors.toList());
+            QueryWrapper<ProEconWtAlysisDay> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("record_date",date).eq("windturbine_id",wtId);
+            List<ProEconWtAlysisDay>  wtadls=proEconWtAlysisDayService.list(queryWrapper);
+//                    .stream().filter(i->i.getWindturbineId().equals(wtId )
+//           && i.getRecordDate().compareTo(date)==0
+//            ).collect(Collectors.toList());
 
             if(!wtadls.isEmpty())
             {
@@ -146,10 +149,15 @@ public class WindturbineGoodnessDetailController {
 
             int year=cal.get(Calendar.YEAR);
             int month=cal.get(Calendar.MONTH)+1;
-            List<ProEconWtCurveFittingMonth> wcls = proEconWtCurveFittingMonthService.list().stream().filter(i->
-                    i.getWindturbineId().equals(wtId)
-                    && i.getYear().equals(String.valueOf(year)) && i.getMonth().equals(String.valueOf(month))
-            ).collect(Collectors.toList());
+
+            QueryWrapper<ProEconWtCurveFittingMonth> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).eq("year",year).eq("month",month);
+
+            List<ProEconWtCurveFittingMonth> wcls = proEconWtCurveFittingMonthService.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindturbineId().equals(wtId)
+//                    && i.getYear().equals(String.valueOf(year)) && i.getMonth().equals(String.valueOf(month))
+//            ).collect(Collectors.toList());
             if (!wcls.isEmpty()) {
                 if (wtmap.containsKey(wtId)) {
                     ProBasicEquipment wt = wtmap.get(wtId);
@@ -205,10 +213,14 @@ public class WindturbineGoodnessDetailController {
         if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
 
             Date date = DateUtils.parseDate(recorddate);
-            List<ProEconWtwindDayInfo> wtdls = proEconWtwindDayInfoService.list().stream().filter(i->
-                    i.getWindturbineId().equals(wtId)
-                    && i.getRecordDate().compareTo(date) ==0
-            ).collect(Collectors.toList());
+
+            QueryWrapper<ProEconWtwindDayInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).eq("record_date",date);
+            List<ProEconWtwindDayInfo> wtdls = proEconWtwindDayInfoService.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindturbineId().equals(wtId)
+//                    && i.getRecordDate().compareTo(date) ==0
+//            ).collect(Collectors.toList());
 
 
             if (!wtdls.isEmpty()) {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/dto/ZllglDTO.java

@@ -1,14 +0,0 @@
-package com.gyee.runeconomy.dto;
-
-import lombok.Data;
-
-@Data
-public class ZllglDTO {
-
-    private String id;
-    private String modelId;
-    private double speed;
-    private double theoryPower;
-    private double ensurePower;
-
-}

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

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.runeconomy.model.auto.ProEconWpwindDayInfo;
@@ -9,7 +10,6 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service
 public class WpwindDayInfoService {
@@ -28,10 +28,14 @@ public class WpwindDayInfoService {
 
         if (StringUtils.notEmp(wpId) && StringUtils.notEmp(recorddate)) {
 
-            list = proEconWpwindDayInfoService.list().stream().filter(i->
-                    i.getWindpowerstationId().equals(wpId)
-                            && i.getRecordDate().compareTo(DateUtils.truncate(recorddate)) ==0
-            ).collect(Collectors.toList());
+            QueryWrapper<ProEconWpwindDayInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windpowerstation_id",wpId)
+                                .eq("record_date",DateUtils.truncate(recorddate));
+            list = proEconWpwindDayInfoService.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindpowerstationId().equals(wpId)
+//                            && i.getRecordDate().compareTo(DateUtils.truncate(recorddate)) ==0
+//            ).collect(Collectors.toList());
 
 
         }

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

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.runeconomy.model.auto.ProEconWtwindDayInfo;
@@ -12,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 public class WtwindDayInfoService {
@@ -32,11 +32,13 @@ public class WtwindDayInfoService {
 
 
         if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
-
-            list = proEconWtwindDayInfoService.list().stream().filter(i->
-                    i.getWindturbineId().equals(wtId)
-                            && i.getRecordDate().compareTo(DateUtils.truncate(recorddate)) ==0
-            ).collect(Collectors.toList());
+            QueryWrapper<ProEconWtwindDayInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).eq("record_date",DateUtils.truncate(recorddate));
+            list = proEconWtwindDayInfoService.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindturbineId().equals(wtId)
+//                            && i.getRecordDate().compareTo(DateUtils.truncate(recorddate)) ==0
+//            ).collect(Collectors.toList());
 
 
         }
@@ -51,12 +53,14 @@ public class WtwindDayInfoService {
         List<ProEconWtwindDayInfo> list = new ArrayList<>();
 
         if ( StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
-
-            list = proEconWtwindDayInfoService.list().stream().filter(i->
-                    i.getWindturbineId().equals(wtId)
-                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
-                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
-            ).collect(Collectors.toList());
+            QueryWrapper<ProEconWtwindDayInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).ge("record_date",DateUtils.truncate(beginDate)).le("record_date",DateUtils.truncate(endDate));
+            list = proEconWtwindDayInfoService.list(queryWrapper);
+//                    .stream().filter(i->
+//                    i.getWindturbineId().equals(wtId)
+//                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
+//                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
+//            ).collect(Collectors.toList());
 
 
         }

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/singleanalysis/SingleAnalysisService.java

@@ -1,5 +1,6 @@
 package com.gyee.runeconomy.service.singleanalysis;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.model.auto.*;
@@ -35,21 +36,27 @@ public class SingleAnalysisService {
         List<ProEconInOrOutSpeedTotal> iostls=null;
         if(StringUtils.notEmp(wpId))
         {
-            iostls= proEconInOrOutSpeedTotalService.list()
-                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                            && i.getCompanyId().equals(cmId)
-                            && i.getTypes().equals(type)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("types",type).eq("record_date",recordDate)
+                    .eq("company_id",cmId).eq("windpowerstation_id",wpId);
+            iostls= proEconInOrOutSpeedTotalService.list(queryWrapper);
+//                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+//                            && i.getCompanyId().equals(cmId)
+//                            && i.getTypes().equals(type)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }else
         {
-            iostls= proEconInOrOutSpeedTotalService.list()
-                    .stream().filter(i-> i.getCompanyId().equals(cmId)
-                            && i.getTypes().equals(type)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("types",type).eq("record_date",recordDate)
+                    .eq("company_id",cmId);
+            iostls= proEconInOrOutSpeedTotalService.list(queryWrapper);
+//                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+//                            && i.getTypes().equals(type)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }
 
         //List转map
@@ -64,19 +71,25 @@ public class SingleAnalysisService {
         List<ProEconEquipmentInfoDay1> iostls=null;
         if(StringUtils.notEmp(wpId))
         {
-            iostls= proEconEquipmentInfoDay1Service.list()
-                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                            && i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("types",type).eq("record_date",recordDate)
+                    .eq("company_id",cmId).eq("windpowerstation_id",wpId);
+            iostls= proEconEquipmentInfoDay1Service.list(queryWrapper);
+//                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+//                            && i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }else
         {
-            iostls= proEconEquipmentInfoDay1Service.list()
-                    .stream().filter(i-> i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("types",type).eq("record_date",recordDate)
+                    .eq("company_id",cmId);
+            iostls= proEconEquipmentInfoDay1Service.list(queryWrapper);
+//                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }
 
         //List转map
@@ -90,20 +103,26 @@ public class SingleAnalysisService {
 
         if(StringUtils.notEmp(wpId))
         {
-            iostls= proEconEquipmentInfoDay2Service.list()
-                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                            && i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("types",type).eq("record_date",recordDate)
+                    .eq("company_id",cmId).eq("windpowerstation_id",wpId);
+            iostls= proEconEquipmentInfoDay2Service.list(queryWrapper);
+//                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+//                            && i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }else
         {
-            iostls= proEconEquipmentInfoDay2Service.list()
-                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                            && i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("record_date",recordDate)
+                    .eq("company_id",cmId);
+            iostls= proEconEquipmentInfoDay2Service.list(queryWrapper);
+//                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+//                            && i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }
         //List转map
         Map<String, ProEconEquipmentInfoDay2> iostmap=iostls.stream().
@@ -114,13 +133,16 @@ public class SingleAnalysisService {
 
 
         List<ProEconPowerstationInfoDay5> iostls=null;
-        iostls= proEconPowerstationInfoDay5Service.list()
-                .stream().filter(i->
-                        i.getCompanyId() !=null
-                                && i.getCompanyId().equals(cmId)
-                                && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",recordDate).isNotNull("company_id")
+                .eq("company_id",cmId);
+        iostls= proEconPowerstationInfoDay5Service.list(queryWrapper);
+//                .stream().filter(i->
+//                        i.getCompanyId() !=null
+//                                && i.getCompanyId().equals(cmId)
+//                                && i.getRecordDate().compareTo(recordDate) == 0
+//                )
+//                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconPowerstationInfoDay5> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconPowerstationInfoDay5::getWindpowerstationId, Function.identity(), (key1, key2) -> key2));
@@ -133,19 +155,25 @@ public class SingleAnalysisService {
         List<ProEconEquipmentInfoDay4> iostls= null;
         if(StringUtils.notEmp(wpId))
         {
-            iostls= proEconEquipmentInfoDay4Service.list()
-                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
-                            && i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("record_date",recordDate)
+                    .eq("company_id",cmId).eq("windpowerstation_id",wpId);
+            iostls= proEconEquipmentInfoDay4Service.list(queryWrapper);
+//                    .stream().filter(i->i.getWindpowerstationId().equals(wpId)
+//                            && i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }else
         {
-            iostls= proEconEquipmentInfoDay4Service.list()
-                    .stream().filter(i-> i.getCompanyId().equals(cmId)
-                            && i.getRecordDate().compareTo(recordDate) == 0
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("record_date",recordDate)
+                    .eq("company_id",cmId).eq("windpowerstation_id",wpId);
+            iostls= proEconEquipmentInfoDay4Service.list(queryWrapper);
+//                    .stream().filter(i-> i.getCompanyId().equals(cmId)
+//                            && i.getRecordDate().compareTo(recordDate) == 0
+//                    )
+//                    .collect(Collectors.toList());
         }
         //List转map
         Map<String, ProEconEquipmentInfoDay4> iostmap=iostls.stream().
@@ -157,11 +185,14 @@ public class SingleAnalysisService {
     private Map<String, ProEconInOrOutSpeedTotal> queryInOrOutSpeedTotalByWt(String wtId, Date recordDate) {
 
 
-        List<ProEconInOrOutSpeedTotal> iostls= proEconInOrOutSpeedTotalService.list()
-                .stream().filter(i->i.getWindturbineId().equals(wtId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",recordDate)
+                .eq("windturbine_id",wtId);
+        List<ProEconInOrOutSpeedTotal> iostls= proEconInOrOutSpeedTotalService.list(queryWrapper);
+//                .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                        && i.getRecordDate().compareTo(recordDate) == 0
+//                )
+//                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconInOrOutSpeedTotal> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconInOrOutSpeedTotal::getWindturbineId, Function.identity(), (key1, key2) -> key2));
@@ -170,12 +201,14 @@ public class SingleAnalysisService {
 
     private Map<String, ProEconEquipmentInfoDay1> queryEquipmentInfoDay1ByWt(String wtId,  Date recordDate) {
 
-
-        List<ProEconEquipmentInfoDay1> iostls= proEconEquipmentInfoDay1Service.list()
-                .stream().filter(i->i.getWindturbineId().equals(wtId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",recordDate)
+                .eq("windturbine_id",wtId);
+        List<ProEconEquipmentInfoDay1> iostls= proEconEquipmentInfoDay1Service.list(queryWrapper);
+//                .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                        && i.getRecordDate().compareTo(recordDate) == 0
+//                )
+//                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconEquipmentInfoDay1> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay1::getWindturbineId, Function.identity(), (key1, key2) -> key2));
@@ -183,12 +216,14 @@ public class SingleAnalysisService {
     }
     private Map<String, ProEconEquipmentInfoDay2> queryEquipmentInfoDay2ByWt(String wtId,  Date recordDate) {
 
-
-        List<ProEconEquipmentInfoDay2> iostls= proEconEquipmentInfoDay2Service.list()
-                .stream().filter(i->i.getWindturbineId().equals(wtId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",recordDate)
+                .eq("windturbine_id",wtId);
+        List<ProEconEquipmentInfoDay2> iostls= proEconEquipmentInfoDay2Service.list(queryWrapper);
+//                .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                        && i.getRecordDate().compareTo(recordDate) == 0
+//                )
+//                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconEquipmentInfoDay2> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay2::getWindturbineId, Function.identity(), (key1, key2) -> key2));
@@ -198,12 +233,14 @@ public class SingleAnalysisService {
 
     private Map<String, ProEconEquipmentInfoDay4> queryEquipmentInfoDay4ByWt(String wtId, Date recordDate) {
 
-
-        List<ProEconEquipmentInfoDay4> iostls= proEconEquipmentInfoDay4Service.list()
-                .stream().filter(i->i.getWindturbineId().equals(wtId)
-                        && i.getRecordDate().compareTo(recordDate) == 0
-                )
-                .collect(Collectors.toList());
+        QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("record_date",recordDate)
+                .eq("windturbine_id",wtId);
+        List<ProEconEquipmentInfoDay4> iostls= proEconEquipmentInfoDay4Service.list(queryWrapper);
+//                .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                        && i.getRecordDate().compareTo(recordDate) == 0
+//                )
+//                .collect(Collectors.toList());
         //List转map
         Map<String, ProEconEquipmentInfoDay4> iostmap=iostls.stream().
                 collect(Collectors.toMap(ProEconEquipmentInfoDay4::getWindturbineId, Function.identity(), (key1, key2) -> key2));
@@ -735,13 +772,15 @@ public class SingleAnalysisService {
             Map<String,Map<Long,ProEconEquipmentInfoDay1>> day1map=new HashMap<>();
             Map<String,Map<Long,ProEconEquipmentInfoDay2>> day2map=new HashMap<>();
 
-
-            List<ProEconEquipmentInfoDay1> wtday1ls = proEconEquipmentInfoDay1Service.list()
-                    .stream().filter(i->i.getWindturbineId() !=null && i.getWindturbineId().equals(wtId)
-                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
-                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("windturbine_id",wtId).ge("record_date",beginDate)
+           .le("record_date",endDate);
+            List<ProEconEquipmentInfoDay1> wtday1ls = proEconEquipmentInfoDay1Service.list(queryWrapper);
+//                    .stream().filter(i->i.getWindturbineId() !=null && i.getWindturbineId().equals(wtId)
+//                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
+//                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
+//                    )
+//                    .collect(Collectors.toList());
            if(!wtday1ls.isEmpty())
            {
                for(ProEconEquipmentInfoDay1 wtday1:wtday1ls)
@@ -759,12 +798,15 @@ public class SingleAnalysisService {
                    }
                }
            }
-            List<ProEconEquipmentInfoDay2> wtday2ls = proEconEquipmentInfoDay2Service.list()
-                    .stream().filter(i->i.getWindturbineId().equals(wtId)
-                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
-                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("windturbine_id",wtId).ge("record_date",beginDate)
+                    .le("record_date",endDate);
+            List<ProEconEquipmentInfoDay2> wtday2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
+//                    .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
+//                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
+//                    )
+//                    .collect(Collectors.toList());
             if(!wtday2ls.isEmpty())
             {
                 for(ProEconEquipmentInfoDay2 wtday2:wtday2ls)
@@ -782,12 +824,15 @@ public class SingleAnalysisService {
                     }
                 }
             }
-            List<ProEconEquipmentInfoDay4> wtday4ls = proEconEquipmentInfoDay4Service.list()
-                    .stream().filter(i->i.getWindturbineId().equals(wtId)
-                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
-                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
-                    )
-                    .collect(Collectors.toList());
+            QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper4 = new QueryWrapper<>();
+            queryWrapper4.eq("windturbine_id",wtId).ge("record_date",beginDate)
+                    .le("record_date",endDate);
+            List<ProEconEquipmentInfoDay4> wtday4ls = proEconEquipmentInfoDay4Service.list(queryWrapper4);
+//                    .stream().filter(i->i.getWindturbineId().equals(wtId)
+//                            && ( i.getRecordDate().compareTo(beginDate)==0 || i.getRecordDate().after(beginDate))
+//                            && (i.getRecordDate().compareTo(endDate)==0 || i.getRecordDate().before(endDate))
+//                    )
+//                    .collect(Collectors.toList());
             ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
             ProBasicPowerstation wp = CacheContext.wpmap.get(wt.getWindpowerstationId());
 

web/runeconomy-xk/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
 #    active: jn
-    active: yun
+    active: xk
 #    active: xk