bug修复

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

@@ -86,12 +86,12 @@ public class PerformanceCurvefittingService {
             resultMap.put("list", tempList);
             resultMap.put("chanrt", tempList.stream().filter(i ->  (i.getSpeed()%Double.valueOf(0.5))==0).collect(Collectors.toList()));
         }else {
-            List<ProEconInPowerCurveFitting> collect = CacheContext.inPowerCurveFittingList.stream().filter(wpcf -> windturbineIds.contains(wpcf.getInverterId())).collect(Collectors.toList());
+            List<ProEconInPowerCurveFitting> collect = CacheContext.inPowerCurveFittingList.stream().filter(wpcf -> windturbineIds.contains(wpcf.getInverterId())).limit(3).collect(Collectors.toList());
             List<CurveVo> tempList = new ArrayList<>();
             for (ProEconInPowerCurveFitting fitting : collect) {
                 CurveVo vo = new CurveVo();
                 vo.setWtid(fitting.getInverterId());
-                vo.setNemCode(wtmap.get(fitting.getInverterId()).getAname());
+                vo.setNemCode(wtmap.get(fitting.getInverterId()).getNemName());
                 vo.setSpeed(fitting.getIllumination());
                 vo.setTheorypower(fitting.getActualPower());
                 vo.setEnsurepower(fitting.getActualPower());

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconEquipmentInfoDayTopServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.common.model.StringUtils;
 import com.gyee.common.util.DateUtils;
 import com.gyee.common.vo.healthmanager.CompareVo;
+import com.gyee.common.vo.threerate.PvVo;
 import com.gyee.runeconomy.init.CacheContext;
 import com.gyee.runeconomy.mapper.auto.ProEconEquipmentInfoDayTopMapper;
 import com.gyee.runeconomy.model.auto.ProBasicOrganizeTree;
@@ -66,9 +67,18 @@ public class ProEconEquipmentInfoDayTopServiceImpl extends ServiceImpl<ProEconEq
 
         qw.lambda().orderByAsc(ProEconEquipmentInfoDayTop::getWindturbineId);
         List<ProEconEquipmentInfoDayTop> list = baseMapper.selectList(qw);
-        list.stream().forEach(i->{
-            i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getAname());
+        list.forEach(i->{
+            i.setNemCode(CacheContext.wtmap.get(i.getWindturbineId()).getNemName());
         });
+
+        list = list.stream().filter(wv -> {
+            boolean b = false;
+            if (com.gyee.common.model.StringUtils.isNotEmpty(wv.getNemCode())) {
+                b = wv.getNemCode().contains("逆变器") || wv.getNemCode().contains("风机");
+            }
+            return b;
+        }).collect(Collectors.toList());
+
         return list;
     }
 

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/service/bmk/BenchmarkingService.java

@@ -190,11 +190,11 @@ public class BenchmarkingService {
                 vo.setOrdernum(CacheContext.pjmap.get(i.getProjectId().trim()).getOrderNum());
             } else if (sttype.equals("3")) {
                 vo.setId(i.getLineId());
-                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getAname());
+                vo.setName(CacheContext.lnmap.get(i.getLineId().trim()).getNemName());
                 vo.setOrdernum(CacheContext.lnmap.get(i.getLineId().trim()).getOrderNum());
             } else {
                 vo.setId(i.getWindturbineId());
-                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getAname());
+                vo.setName(CacheContext.wtmap.get(i.getWindturbineId().trim()).getNemName());
                 vo.setOrdernum(CacheContext.wtmap.get(i.getWindturbineId().trim()).getOrderNum());
             }
             vo.setSjfdl(BigDecimalUtils.divide(new BigDecimal(i.getRfdl()), new BigDecimal(10000), 2).doubleValue());
@@ -295,6 +295,9 @@ public class BenchmarkingService {
             qw.groupBy("windturbine_id");
         }
         List<ProEconEquipmentInfoDay1> list = proEconEquipmentInfoDay1Service.list(qw);
+        list = list.stream().filter(a -> a.getWindpowerstationId() != null || a.getProjectId() != null ||
+                a.getLineId() != null || a.getWindturbineId() != null ).collect(Collectors.toList());
+
         AtomicReference<Double> llfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> sjfdl = new AtomicReference<>((double) 0);
         AtomicReference<Double> pjfs = new AtomicReference<>((double) 0);

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

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName : WindturbinegoodnessService
@@ -907,7 +908,7 @@ public class WindturbinegoodnessService {
         equipmentInfoDay6s.getRecords().forEach(i -> {
             PvVo vo = new PvVo();
             vo.setWtid(i.getWindturbineId());
-            vo.setWtname(wtmap.get(i.getWindturbineId()).getAname());
+            vo.setWtname(wtmap.get(i.getWindturbineId()).getNemName());
             vo.setModel(modelMap.get(wtmap.get(i.getWindturbineId()).getModelId()).getAname());
             vo.setRxtxl(DoubleUtils.keepPrecision(i.getRxtxl(), 2));
             vo.setRlsl(DoubleUtils.keepPrecision(i.getRlsl(), 2));
@@ -929,7 +930,15 @@ public class WindturbinegoodnessService {
             SortUtils.sort(resultList, target, SortUtils.DESC);
         }
 
-        pvVoPage.setRecords(resultList);
+        List<PvVo> collect = resultList.stream().filter(wv -> {
+            boolean b = false;
+            if (com.gyee.common.model.StringUtils.isNotEmpty(wv.getWtname())) {
+                b = wv.getWtname().contains("逆变器") || wv.getWtname().contains("风机");
+            }
+            return b;
+        }).collect(Collectors.toList());
+
+        pvVoPage.setRecords(collect);
         pvVoPage.setTotal(equipmentInfoDay6s.getTotal());
         pvVoPage.setPages(equipmentInfoDay6s.getPages());
         pvVoPage.setCurrent(equipmentInfoDay6s.getCurrent());