同步

web/runeconomy-jjyx/src/main/java/com/gyee/runeconomy/controller/performance/PerformanceCurvefittingController.java

@@ -11,7 +11,6 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

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

@@ -13,7 +13,6 @@ import com.gyee.runeconomy.model.fitting.ProEconInPowerCurveFitting;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingMonthService;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingService;
 import com.gyee.runeconomy.service.auto.IProEconWtCurveFittingYearService;
-import com.gyee.runeconomy.service.auto.IProEconWtPowerCurveFittingService;
 import com.gyee.runeconomy.util.redis.RedisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -5,7 +5,6 @@ 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;

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

@@ -7,8 +7,6 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.common.util.SortUtils;
 import com.gyee.common.vo.benchmark.DataVo;
-import com.gyee.common.vo.benchmark.WxsslVo;
-import com.gyee.common.vo.curve.CurveVo;
 import com.gyee.common.vo.threerate.PvVo;
 import com.gyee.runeconomy.dto.EchartDataVo;
 import com.gyee.runeconomy.dto.response.StationAnalysis;
@@ -1009,7 +1007,7 @@ public class WindturbinegoodnessService {
                 .map(ProBasicOrganizeTree::getId)
                 .collect(Collectors.toList());
 
-        List<String> emil = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> emils.contains(pbep.getNemCode()))
+        List<String> emil = CacheContext.proBasicEquipmentPointList.stream().filter(pbep -> emils.contains(pbep.getWindturbineId())&&"AIEMI002".equals(pbep.getUniformCode()))
                 .map(ProBasicEquipmentPoint::getNemCode).collect(Collectors.toList());
 
         Optional<ProBasicPowerstationPoint> sszglpbpp = CacheContext.proBasicPowerstationPoint.stream().filter(pbpp -> "SSZGL".equals(pbpp.getUniformCode()) && wpid.equals(pbpp.getWindpowerstationId())).findFirst();
@@ -1027,7 +1025,7 @@ public class WindturbinegoodnessService {
         double count = 0;
         Map<Long, PointData> gzpd = new HashMap<>();
         for (String em : emil) {
-            List<PointData> historyEmilDatas = edosUtil.getHistoryDatasSnap(em, Long.valueOf(beginDate), Long.valueOf(endDate), null, 15000L);
+            List<PointData> historyEmilDatas = edosUtil.getHistoryDatasSnap(em, DateUtils.parseDate(beginDate).getTime(), DateUtils.parseDate(endDate).getTime(), null, 900L);
             for (PointData pd : historyEmilDatas) {
                 if(i==0){
                     PointData data = new PointData();
@@ -1045,9 +1043,9 @@ public class WindturbinegoodnessService {
 
         List<PointData> historyEmilDatas = gzpd.values().stream().peek(g -> g.setPointValueInDouble(g.getPointValueInDouble() / finalI)).collect(Collectors.toList());
         Map<Long, PointData> collect1 = historyEmilDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
-        List<PointData> historySszglDatas = edosUtil.getHistoryDatasSnap(sszgl, Long.valueOf(beginDate), Long.valueOf(endDate), null, 900L);
+        List<PointData> historySszglDatas = edosUtil.getHistoryDatasSnap(sszgl, DateUtils.parseDate(beginDate).getTime(), DateUtils.parseDate(endDate).getTime(), null, 900L);
         Map<Long, PointData> collect2 = historySszglDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
-        List<PointData> historySsznhglzsDatas = edosUtil.getHistoryDatasSnap(ssznhglzs, Long.valueOf(beginDate), Long.valueOf(endDate), null, 900L);
+        List<PointData> historySsznhglzsDatas = edosUtil.getHistoryDatasSnap(ssznhglzs, DateUtils.parseDate(beginDate).getTime(), DateUtils.parseDate(endDate).getTime(), null, 900L);
         Map<Long, PointData> collect3 = historySsznhglzsDatas.stream().collect(Collectors.toMap(PointData::getPointTime, Function.identity()));
 
         List<StationAnalysis> lpds = new ArrayList<>();

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

@@ -417,7 +417,7 @@ public class SpecificService {
         }
         if (companys.endsWith("ZGS")){
             qw.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
-            qw1.in("foreign_key_id",CacheContext.wpls.stream().filter(wp->wp.getId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
+            qw1.in("foreign_key_id", CacheContext.wpls.stream().filter(wp->wp.getId().equals(companys)).map(wp->wp.getId()).collect(Collectors.toList()));
         }
         qw.eq("to_char(record_date,'yyyy-MM')",yearMonth);
         qw1.eq("to_char(record_date,'yyyy-MM')",yearMonth);