计算调整

generationXK-service/src/main/java/com/gyee/generation/service/CoefficientService.java

@@ -29,135 +29,158 @@ public class CoefficientService {
 
     public Map<String, Map<String, Double>> coefficient(String wtId, Date currentDate) throws Exception {
 
-        Date beginDate = DateUtils.addDays(currentDate, -1);
 
 
-        Calendar c = Calendar.getInstance();
-        c.setTime(beginDate);
+            Date beginDate = DateUtils.addDays(currentDate, -1);
 
-        c.set(Calendar.DAY_OF_MONTH, 1);
-        Date monthbeginDate = c.getTime();
-        c.set(Calendar.MONTH, 0);
-        Date yearbeginDate = c.getTime();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String beginDateString = sdf.format(beginDate);
-        String monthbeginDateString = sdf.format(monthbeginDate);
-        String yearbeginDateString = sdf.format(yearbeginDate);
 
-        Date endDate = currentDate;
-        String endDateString = sdf.format(endDate);
-
-        Map<String, Map<String, Double>> resultmap = new HashMap<>();
-
-        ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
-
-
-        //****************************************年功率一致性统计********************************************************************/
-        List<ProEconActivePowerData> yearList;
-
-        List<ProEconActivePowerData> queryYear = new ArrayList<>();
-
-        ProEconActivePowerData po1 = new ProEconActivePowerData();
-        po1.setWindturbineId(wt.getId());
-        po1.setModelId(wt.getModelId());
-        po1.setWindpowerstationId(wt.getWindpowerstationId());
-        po1.setFrequency(1);
-        po1.setSpeed(StringUtils.round(1, 2));
-        po1.setPower(StringUtils.round(1, 2));
-        queryYear.add(po1);
-
-        yearList = calCoefficient(queryYear, wt);
-
-        //****************************************月功率一致性统计********************************************************************/
-
-        List<ProEconActivePowerData> monthList;
-        List<ProEconActivePowerData> queryMonth = new ArrayList<>();
-
-        List<TurbineInfoMin> infoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), monthbeginDateString, beginDateString);
-        // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
-        Map<String, List<TurbineInfoMin>> groupedByHour = infoMins.stream()
-                .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
-
-        // 计算每小时的平均pjfs和累加pjgl
-        for (Map.Entry<String, List<TurbineInfoMin>> entry : groupedByHour.entrySet()) {
-            String hour = entry.getKey();
-            List<TurbineInfoMin> hourData = entry.getValue();
-
-            // 计算每小时的平均风速 (pjfs) 和 累加pjgl
-            double avgPjfs = hourData.stream()
-                    .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
-                    .average()
-                    .orElse(0);
-
-            double totalPjgl = hourData.stream()
-                    .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
-                    .sum();
-
-            ProEconActivePowerData po = new ProEconActivePowerData();
-            po.setWindturbineId(wt.getId());
-            po.setModelId(wt.getModelId());
-            po.setWindpowerstationId(wt.getWindpowerstationId());
-            po.setFrequency(groupedByHour.size());
-            po.setSpeed(StringUtils.round(avgPjfs, 2));
-            po.setPower(StringUtils.round(totalPjgl, 2));
-            queryMonth.add(po);
-        }
+            Calendar c = Calendar.getInstance();
+            c.setTime(beginDate);
+
+            c.set(Calendar.DAY_OF_MONTH, 1);
+            Date monthbeginDate = c.getTime();
+            c.set(Calendar.MONTH, 0);
+            Date yearbeginDate = c.getTime();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String beginDateString = sdf.format(beginDate);
+            String monthbeginDateString = sdf.format(monthbeginDate);
+            String yearbeginDateString = sdf.format(yearbeginDate);
+
+            Date endDate = currentDate;
+            String endDateString = sdf.format(endDate);
+
+            Map<String, Map<String, Double>> resultmap = new HashMap<>();
+
+            ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
+
+//        if (wtId.equals("NX_FGS_HA_F_WT_0027_EQ")) {
+            //****************************************年功率一致性统计********************************************************************/
+            List<ProEconActivePowerData> yearList;
+
+            List<ProEconActivePowerData> queryYear = new ArrayList<>();
+
+            List<TurbineInfoMin> infoMinsy = turbineInfoMinService.selectByTurbineId(wt.getId(), yearbeginDateString, beginDateString);
+            // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+            Map<String, List<TurbineInfoMin>> groupedByHoury = infoMinsy.stream()
+                    .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+
+            // 计算每小时的平均pjfs和累加pjgl
+            for (Map.Entry<String, List<TurbineInfoMin>> entry : groupedByHoury.entrySet()) {
+                String hour = entry.getKey();
+                List<TurbineInfoMin> hourData = entry.getValue();
+
+                // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+                double avgPjfs = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                        .average()
+                        .orElse(0);
+
+                double totalPjgl = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                        .sum();
+
+                ProEconActivePowerData po1 = new ProEconActivePowerData();
+                po1.setWindturbineId(wt.getId());
+                po1.setModelId(wt.getModelId());
+                po1.setWindpowerstationId(wt.getWindpowerstationId());
+                po1.setFrequency(groupedByHoury.size());
+                po1.setSpeed(StringUtils.round(avgPjfs, 2));
+                po1.setPower(StringUtils.round(totalPjgl, 2));
+                queryYear.add(po1);
+            }
 
+            yearList = calCoefficient(queryYear, wt);
+
+            //****************************************月功率一致性统计********************************************************************/
+
+            List<ProEconActivePowerData> monthList;
+            List<ProEconActivePowerData> queryMonth = new ArrayList<>();
+
+            List<TurbineInfoMin> infoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), monthbeginDateString, beginDateString);
+            // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+            Map<String, List<TurbineInfoMin>> groupedByHour = infoMins.stream()
+                    .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+
+            // 计算每小时的平均pjfs和累加pjgl
+            for (Map.Entry<String, List<TurbineInfoMin>> entry : groupedByHour.entrySet()) {
+                String hour = entry.getKey();
+                List<TurbineInfoMin> hourData = entry.getValue();
+
+                // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+                double avgPjfs = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                        .average()
+                        .orElse(0);
+
+                double totalPjgl = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                        .sum();
+
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(groupedByHour.size());
+                po.setSpeed(StringUtils.round(avgPjfs, 2));
+                po.setPower(StringUtils.round(totalPjgl, 2));
+                queryMonth.add(po);
+            }
 
-        monthList = calCoefficient(queryMonth, wt);
 
+            monthList = calCoefficient(queryMonth, wt);
 
-        //*****************************************日功率一致性统计********************************************************************/
 
+            //*****************************************日功率一致性统计********************************************************************/
 
-        List<ProEconActivePowerData> dayList;
 
+            List<ProEconActivePowerData> dayList;
 
-        List<ProEconActivePowerData> queryDay = new ArrayList<>();
 
-        List<TurbineInfoMin> dayinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
-        // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
-        Map<String, List<TurbineInfoMin>> daygroupedByHour = dayinfoMins.stream()
-                .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
+            List<ProEconActivePowerData> queryDay = new ArrayList<>();
 
-        // 计算每小时的平均pjfs和累加pjgl
-        for (Map.Entry<String, List<TurbineInfoMin>> entry : daygroupedByHour.entrySet()) {
-            String hour = entry.getKey();
-            List<TurbineInfoMin> hourData = entry.getValue();
+            List<TurbineInfoMin> dayinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
+            // 使用 Stream API 按小时分组并计算平均风速和累加pjgl
+            Map<String, List<TurbineInfoMin>> daygroupedByHour = dayinfoMins.stream()
+                    .collect(Collectors.groupingBy(info -> info.getRecordDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH"))));
 
-            // 计算每小时的平均风速 (pjfs) 和 累加pjgl
-            double avgPjfs = hourData.stream()
-                    .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
-                    .average()
-                    .orElse(0);
+            // 计算每小时的平均pjfs和累加pjgl
+            for (Map.Entry<String, List<TurbineInfoMin>> entry : daygroupedByHour.entrySet()) {
+                String hour = entry.getKey();
+                List<TurbineInfoMin> hourData = entry.getValue();
 
-            double totalPjgl = hourData.stream()
-                    .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
-                    .sum();
+                // 计算每小时的平均风速 (pjfs) 和 累加pjgl
+                double avgPjfs = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjfs)  // 假设有getPjfs方法
+                        .average()
+                        .orElse(0);
 
-            ProEconActivePowerData po = new ProEconActivePowerData();
-            po.setWindturbineId(wt.getId());
-            po.setModelId(wt.getModelId());
-            po.setWindpowerstationId(wt.getWindpowerstationId());
-            po.setFrequency(groupedByHour.size());
-            po.setSpeed(StringUtils.round(avgPjfs, 2));
-            po.setPower(StringUtils.round(totalPjgl, 2));
-            queryDay.add(po);
-        }
-        dayList = calCoefficient(queryDay, wt);
+                double totalPjgl = hourData.stream()
+                        .mapToDouble(TurbineInfoMin::getPjgl)  // 假设有getPjgl方法
+                        .sum();
 
+                ProEconActivePowerData po = new ProEconActivePowerData();
+                po.setWindturbineId(wt.getId());
+                po.setModelId(wt.getModelId());
+                po.setWindpowerstationId(wt.getWindpowerstationId());
+                po.setFrequency(groupedByHour.size());
+                po.setSpeed(StringUtils.round(avgPjfs, 2));
+                po.setPower(StringUtils.round(totalPjgl, 2));
+                queryDay.add(po);
+            }
+            dayList = calCoefficient(queryDay, wt);
 
-        Double resultYear = coefficient(yearList, currentDate, wt.getId());
-        Double resultMonth = coefficient(monthList, currentDate, wt.getId());
-        Double resultDay = coefficient(dayList, currentDate, wt.getId());
 
-        Map<String, Double> tempmap = new HashMap<>();
-        tempmap.put("year", resultYear);
-        tempmap.put("month", resultMonth);
-        tempmap.put("day", resultDay);
-        resultmap.put(wt.getId(), tempmap);
+            Double resultYear = coefficient(yearList, currentDate, wt.getId());
+            Double resultMonth = coefficient(monthList, currentDate, wt.getId());
+            Double resultDay = coefficient(dayList, currentDate, wt.getId());
 
-        return resultmap;
+            Map<String, Double> tempmap = new HashMap<>();
+            tempmap.put("year", resultYear);
+            tempmap.put("month", resultMonth);
+            tempmap.put("day", resultDay);
+            resultmap.put(wt.getId(), tempmap);
+//        }
+            return resultmap;
     }
 
 

generationXK-service/src/main/java/com/gyee/generation/service/GoodnessOfFitService.java

@@ -10,10 +10,12 @@ import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProEconWtCurveFittingMonth;
+import com.gyee.generation.model.auto.TurbineInfoMin;
 import com.gyee.generation.model.vo.CurveType;
 import com.gyee.generation.model.vo.FitClassVo;
 import com.gyee.generation.model.vo.StatData;
 import com.gyee.generation.service.auto.IProEconWtCurveFittingMonthService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.StringUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
@@ -21,6 +23,7 @@ import com.gyee.generation.util.redis.RedisService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Executor;
 
@@ -35,7 +38,8 @@ public class GoodnessOfFitService {
     private IProEconWtCurveFittingMonthService proEconWtCurveFittingMonthService;
     @Resource
     private RedisService redisService;
-
+    @Resource
+    private ITurbineInfoMinService turbineInfoMinService;
 
     public Map<String, Map<String, Double>> goodnessOfFit(String wtId, Date nowDate) throws Exception {
 
@@ -55,155 +59,200 @@ public class GoodnessOfFitService {
         c.set(Calendar.MONTH, 0);
         Date startDateY = c.getTime();
 
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String beginDateString = sdf.format(startDate);
+        String endDateString = sdf.format(endDate);
+        String startDateMString = sdf.format(startDateM);
+        String startDateYString = sdf.format(startDateY);
+
+
         Map<String, Map<String, Double>> resultmap = new HashMap<>();
 
         Map<String, FitClassVo> theMapY = new HashMap<>();
         Map<String, FitClassVo> theMapM = new HashMap<>();
         Map<String, FitClassVo> theMapD = new HashMap<>();
+//        if (wtId.equals("NX_FGS_HA_F_WT_0027_EQ")) {
+            List<FitClassVo> theList = new ArrayList<>();
 
-        List<FitClassVo> theList = new ArrayList<>();
-
-        List<ProEconWtCurveFittingMonth> powerList = new ArrayList<>();
-
-
-        if (redisService.hasKey(CurveType.monthCurve.id + "_" + wtId)) {
-            String cp0String = redisService.get(CurveType.monthCurve.id + "_" + wtId);
-            powerList = JSONObject.parseObject(cp0String, new TypeReference<List<ProEconWtCurveFittingMonth>>() {
-            });
-        } else {
-            QueryWrapper<ProEconWtCurveFittingMonth> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("year", year).eq("month", month).eq("windturbine_id", wtId);
-            powerList = proEconWtCurveFittingMonthService.list(queryWrapper);
-        }
-        ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
-
-
-        List<FitClassVo> fitsD = new ArrayList<>();
-        List<FitClassVo> fitsM = new ArrayList<>();
-        List<FitClassVo> fitsY = new ArrayList<>();
+            List<ProEconWtCurveFittingMonth> powerList = new ArrayList<>();
 
 
-        //月数据筛选日分钟间隔
-        Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
-        ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
-        List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-        ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
-        List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), startDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = glls.get(i);
-                FitClassVo po = new FitClassVo();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                fitsD.add(po);
-            }
-        }
-
-        //月数据筛选15分钟间隔
-        fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDateM.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
-        glls = edosUtil.getHistStat(glpoint.getNemCode(), startDateM.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = glls.get(i);
-                FitClassVo po = new FitClassVo();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                fitsM.add(po);
+            if (redisService.hasKey(CurveType.monthCurve.id + "_" + wtId)) {
+                String cp0String = redisService.get(CurveType.monthCurve.id + "_" + wtId);
+                powerList = JSONObject.parseObject(cp0String, new TypeReference<List<ProEconWtCurveFittingMonth>>() {
+                });
+            } else {
+                QueryWrapper<ProEconWtCurveFittingMonth> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("year", year).eq("month", month).eq("windturbine_id", wtId);
+                powerList = proEconWtCurveFittingMonthService.list(queryWrapper);
             }
-        }
-        //年数据筛选15分钟间隔
-        fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDateY.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
-        glls = edosUtil.getHistStat(glpoint.getNemCode(), startDateY.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
-
-        if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
-            for (int i = 0; i < fsls.size(); i++) {
-                PointData fspd = fsls.get(i);
-                PointData glpd = glls.get(i);
-                FitClassVo po = new FitClassVo();
-                po.setWindturbineId(wt.getId());
-                po.setModelId(wt.getModelId());
-                po.setWindpowerstationId(wt.getWindpowerstationId());
-
-                po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
-                po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
-                fitsY.add(po);
+            ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
+
+
+            List<FitClassVo> fitsD = new ArrayList<>();
+            List<FitClassVo> fitsM = new ArrayList<>();
+            List<FitClassVo> fitsY = new ArrayList<>();
+
+
+            //月数据筛选日分钟间隔
+//            Map<String, ProBasicEquipmentPoint> wtpointmap = CacheContext.wtpAimap.get(wt.getId());
+//            ProBasicEquipmentPoint fspoint = wtpointmap.get(ContantXk.CJ_SSFS);
+//            List<PointData> fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+//
+//            ProBasicEquipmentPoint glpoint = wtpointmap.get(ContantXk.CJ_SSGL);
+//            List<PointData> glls = edosUtil.getHistStat(glpoint.getNemCode(), startDate.getTime() / 1000, endDate.getTime() / 1000, null, 900L, StatData.AVG.getValue());
+            List<TurbineInfoMin> dayinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
+            if (!dayinfoMins.isEmpty()) {
+                for (TurbineInfoMin min : dayinfoMins) {
+                    FitClassVo po = new FitClassVo();
+                    po.setWindturbineId(wt.getId());
+                    po.setModelId(wt.getModelId());
+                    po.setWindpowerstationId(wt.getWindpowerstationId());
+
+                    po.setSpeed(StringUtils.round(min.getPjfs(), 2));
+                    po.setPower(StringUtils.round(min.getPjgl(), 2));
+                    fitsD.add(po);
+                }
             }
-        }
-
-        buildList(theMapY, theList, wt.getWindpowerstationId(), fitsY, powerList);
-        buildList(theMapM, theList, wt.getWindpowerstationId(), fitsM, powerList);
-        buildList(theMapD, theList, wt.getWindpowerstationId(), fitsD, powerList);
-
-
-        for (FitClassVo item : theList) {
-            double rnew = 0;
-            double speed = 0;
-
-            if (item.getEpower() != 0) {
-                rnew = (double) Math.sqrt((double) (item.getPower() / item.getEpower()));
+//            if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+//                for (int i = 0; i < fsls.size(); i++) {
+//                    PointData fspd = fsls.get(i);
+//                    PointData glpd = glls.get(i);
+//                    FitClassVo po = new FitClassVo();
+//                    po.setWindturbineId(wt.getId());
+//                    po.setModelId(wt.getModelId());
+//                    po.setWindpowerstationId(wt.getWindpowerstationId());
+//
+//                    po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+//                    po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+//                    fitsD.add(po);
+//                }
+//            }
+
+
+            //月数据筛选15分钟间隔
+//            fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDateM.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
+//            glls = edosUtil.getHistStat(glpoint.getNemCode(), startDateM.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L, StatData.AVG.getValue());
+            List<TurbineInfoMin> monthinfoMins = turbineInfoMinService.selectByTurbineId(wt.getId(), startDateMString, endDateString);
+            if (!monthinfoMins.isEmpty()) {
+                for (TurbineInfoMin min : monthinfoMins) {
+                    FitClassVo po = new FitClassVo();
+                    po.setWindturbineId(wt.getId());
+                    po.setModelId(wt.getModelId());
+                    po.setWindpowerstationId(wt.getWindpowerstationId());
+                    po.setSpeed(StringUtils.round(min.getPjfs(), 2));
+                    po.setPower(StringUtils.round(min.getPjgl(), 2));
+                    fitsM.add(po);
+                }
             }
-            if (item.getNumber() != 0) {
-                speed = item.getSpeed() / item.getNumber();
+//            if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+//                for (int i = 0; i < fsls.size(); i++) {
+//                    PointData fspd = fsls.get(i);
+//                    PointData glpd = glls.get(i);
+//                    FitClassVo po = new FitClassVo();
+//                    po.setWindturbineId(wt.getId());
+//                    po.setModelId(wt.getModelId());
+//                    po.setWindpowerstationId(wt.getWindpowerstationId());
+//
+//                    po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+//                    po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+//                    fitsM.add(po);
+//                }
+//            }
+
+            //年数据筛选15分钟间隔
+//            fsls = edosUtil.getHistStat(fspoint.getNemCode(), startDateY.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
+//            glls = edosUtil.getHistStat(glpoint.getNemCode(), startDateY.getTime() / 1000, endDate.getTime() / 1000, null, 60 * 60L * 6, StatData.AVG.getValue());
+
+            List<TurbineInfoMin> yearMins = turbineInfoMinService.selectByTurbineId(wt.getId(), startDateYString, endDateString);
+            if (!yearMins.isEmpty()) {
+                for (TurbineInfoMin min : yearMins) {
+                    FitClassVo po = new FitClassVo();
+                    po.setWindturbineId(wt.getId());
+                    po.setModelId(wt.getModelId());
+                    po.setWindpowerstationId(wt.getWindpowerstationId());
+                    po.setSpeed(StringUtils.round(min.getPjfs(), 2));
+                    po.setPower(StringUtils.round(min.getPjgl(), 2));
+                    fitsY.add(po);
+                }
             }
-            item.setSpeed(speed);
-            item.setPower(rnew);
-        }
-
 
-        theMapD.forEach((key, value) -> {
-            if (resultmap.containsKey(key)) {
-                Map<String, Double> tempmap = resultmap.get(key);
-                tempmap.put("day", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
-            } else {
-                Map<String, Double> tempmap = new HashMap<>();
-                tempmap.put("day", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
+//            if (!fsls.isEmpty() && !glls.isEmpty() && fsls.size() == glls.size()) {
+//                for (int i = 0; i < fsls.size(); i++) {
+//                    PointData fspd = fsls.get(i);
+//                    PointData glpd = glls.get(i);
+//                    FitClassVo po = new FitClassVo();
+//                    po.setWindturbineId(wt.getId());
+//                    po.setModelId(wt.getModelId());
+//                    po.setWindpowerstationId(wt.getWindpowerstationId());
+//
+//                    po.setSpeed(StringUtils.round(fspd.getPointValueInDouble(), 2));
+//                    po.setPower(StringUtils.round(glpd.getPointValueInDouble(), 2));
+//                    fitsY.add(po);
+//                }
+//            }
+
+            buildList(theMapY, theList, wt.getWindpowerstationId(), fitsY, powerList);
+            buildList(theMapM, theList, wt.getWindpowerstationId(), fitsM, powerList);
+            buildList(theMapD, theList, wt.getWindpowerstationId(), fitsD, powerList);
+
+
+            for (FitClassVo item : theList) {
+                double rnew = 0;
+                double speed = 0;
+
+                if (item.getEpower() != 0) {
+                    rnew = (double) Math.sqrt((double) (item.getPower() / item.getEpower()));
+                }
+                if (item.getNumber() != 0) {
+                    speed = item.getSpeed() / item.getNumber();
+                }
+                item.setSpeed(speed);
+                item.setPower(rnew);
             }
 
-        });
 
-        theMapM.forEach((key, value) -> {
+            theMapD.forEach((key, value) -> {
+                if (resultmap.containsKey(key)) {
+                    Map<String, Double> tempmap = resultmap.get(key);
+                    tempmap.put("day", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                } else {
+                    Map<String, Double> tempmap = new HashMap<>();
+                    tempmap.put("day", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                }
 
-            if (resultmap.containsKey(key)) {
-                Map<String, Double> tempmap = resultmap.get(key);
-                tempmap.put("month", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
-            } else {
-                Map<String, Double> tempmap = new HashMap<>();
-                tempmap.put("month", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
-            }
+            });
 
-        });
+            theMapM.forEach((key, value) -> {
 
-        theMapY.forEach((key, value) -> {
-            if (resultmap.containsKey(key)) {
-                Map<String, Double> tempmap = resultmap.get(key);
-                tempmap.put("year", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
-            } else {
-                Map<String, Double> tempmap = new HashMap<>();
-                tempmap.put("year", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
-                resultmap.put(key, tempmap);
-            }
+                if (resultmap.containsKey(key)) {
+                    Map<String, Double> tempmap = resultmap.get(key);
+                    tempmap.put("month", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                } else {
+                    Map<String, Double> tempmap = new HashMap<>();
+                    tempmap.put("month", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                }
 
-        });
+            });
 
+            theMapY.forEach((key, value) -> {
+                if (resultmap.containsKey(key)) {
+                    Map<String, Double> tempmap = resultmap.get(key);
+                    tempmap.put("year", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                } else {
+                    Map<String, Double> tempmap = new HashMap<>();
+                    tempmap.put("year", value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(), 2));
+                    resultmap.put(key, tempmap);
+                }
+
+            });
 
+//        }
         return resultmap;
     }
 

generationXK-service/src/main/java/com/gyee/generation/service/WindturbineGoodnessService.java

@@ -7,6 +7,7 @@ import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
 import com.gyee.generation.model.auto.ProEconWindturbineGoodness;
 import com.gyee.generation.service.auto.IProEconEquipmentInfoDay1Service;
 import com.gyee.generation.service.auto.IProEconWindturbineGoodnessService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
 import com.gyee.generation.task.thread.GoodnessOfFitThread;
 import com.gyee.generation.util.DateUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,7 +31,8 @@ public class WindturbineGoodnessService {
 
     @Resource
     private IProEconEquipmentInfoDay1Service proEconEquipmentInfoDay1Service;
-
+    @Resource
+    private ITurbineInfoMinService turbineInfoMinService;
 
     @Resource
     @Qualifier("applicationTaskExecutor")
@@ -88,7 +90,7 @@ public class WindturbineGoodnessService {
         final CountDownLatch latch = new CountDownLatch(+CacheContext.wtfdls.size());
         for (int i = 0; i < CacheContext.wtfdls.size(); i++) {
             new Thread(new GoodnessOfFitThread(executor, i, recordDate, coefficientService,
-                    goodnessOfFitService,
+                    goodnessOfFitService,turbineInfoMinService,
                     equipmentInfoDay1Map, vos, latch)).start();
 
             // proEconWindturbineGoodnessService.save(po);

generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/TurbineInfoMinServiceImpl.java

@@ -32,6 +32,7 @@ public class TurbineInfoMinServiceImpl extends ServiceImpl<TurbineInfoMinMapper,
         QueryWrapper<TurbineInfoMin> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().ge(TurbineInfoMin::getRecordDate, startDate)
                 .le(TurbineInfoMin::getRecordDate, endDate);
+        queryWrapper.lambda().eq(TurbineInfoMin::getTurbineId, turbineId);
 
         // 获取数据
         List<TurbineInfoMin> infoMins = baseMapper.selectList(queryWrapper);

generationXK-service/src/main/java/com/gyee/generation/task/thread/GoodnessOfFitThread.java

@@ -4,6 +4,7 @@ import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
 import com.gyee.generation.model.auto.ProEconWindturbineGoodness;
 import com.gyee.generation.service.CoefficientService;
 import com.gyee.generation.service.GoodnessOfFitService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,10 +32,11 @@ public class GoodnessOfFitThread implements Runnable {
     private List<ProEconWindturbineGoodness> vos;
 
     private CountDownLatch latch;
+    private ITurbineInfoMinService turbineInfoMinService;
 
     public GoodnessOfFitThread(Executor executor, int i, Date recordDate, CoefficientService coefficientService,
                                GoodnessOfFitService goodnessOfFitService,
-                               Map<String, ProEconEquipmentInfoDay1> equipmentInfoDay1Map, List<ProEconWindturbineGoodness> vos,
+                               ITurbineInfoMinService turbineInfoMinService, Map<String, ProEconEquipmentInfoDay1> equipmentInfoDay1Map, List<ProEconWindturbineGoodness> vos,
                                CountDownLatch latch) {
         this.executor = executor;
         this.i = i;
@@ -42,6 +44,7 @@ public class GoodnessOfFitThread implements Runnable {
         this.coefficientService = coefficientService;
         this.goodnessOfFitService = goodnessOfFitService;
         this.equipmentInfoDay1Map = equipmentInfoDay1Map;
+        this.turbineInfoMinService = turbineInfoMinService;
         this.vos = vos;
         this.latch = latch;
     }
@@ -52,7 +55,7 @@ public class GoodnessOfFitThread implements Runnable {
         String task = "task@ " + i;
         logger.info("功率一致性系数创建任务并提交到线程池中：" + i);
         FutureTask<String> futureTask = new FutureTask<String>(new GoodnessOfFitThreadPool(task, i, recordDate, coefficientService,
-                goodnessOfFitService,
+                goodnessOfFitService,turbineInfoMinService,
                 equipmentInfoDay1Map, vos));
 
         executor.execute(futureTask);

generationXK-service/src/main/java/com/gyee/generation/task/thread/GoodnessOfFitThreadPool.java

@@ -4,19 +4,20 @@ import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.ProBasicEquipment;
 import com.gyee.generation.model.auto.ProEconEquipmentInfoDay1;
 import com.gyee.generation.model.auto.ProEconWindturbineGoodness;
+import com.gyee.generation.model.auto.TurbineInfoMin;
 import com.gyee.generation.model.vo.WpType;
 import com.gyee.generation.service.CoefficientService;
 import com.gyee.generation.service.GoodnessOfFitService;
+import com.gyee.generation.service.auto.ITurbineInfoMinService;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.concurrent.Callable;
 
 public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
@@ -36,10 +37,10 @@ public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
 
     private Map<String, ProEconEquipmentInfoDay1> equipmentInfoDay1Map;
     private List<ProEconWindturbineGoodness> vos;
-
+    private ITurbineInfoMinService turbineInfoMinService;
 
     public GoodnessOfFitThreadPool(Object tasks, int i, Date recordDate, CoefficientService coefficientService,
-                                   GoodnessOfFitService goodnessOfFitService,
+                                   GoodnessOfFitService goodnessOfFitService,ITurbineInfoMinService turbineInfoMinService,
                                    Map<String, ProEconEquipmentInfoDay1> equipmentInfoDay1Map, List<ProEconWindturbineGoodness> vos
     ) {
 
@@ -48,6 +49,7 @@ public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
         this.recordDate = recordDate;
         this.coefficientService = coefficientService;
         this.goodnessOfFitService = goodnessOfFitService;
+        this.turbineInfoMinService = turbineInfoMinService;
         this.equipmentInfoDay1Map = equipmentInfoDay1Map;
         this.vos = vos;
 
@@ -78,6 +80,23 @@ public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
                 System.out.println(e.getMessage());
             }
 
+            Date beginDate = DateUtils.addDays(recordDate, -1);
+
+
+            Calendar c = Calendar.getInstance();
+            c.setTime(beginDate);
+
+            c.set(Calendar.DAY_OF_MONTH, 1);
+            Date monthbeginDate = c.getTime();
+            c.set(Calendar.MONTH, 0);
+            Date yearbeginDate = c.getTime();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String beginDateString = sdf.format(beginDate);
+            String monthbeginDateString = sdf.format(monthbeginDate);
+            String yearbeginDateString = sdf.format(yearbeginDate);
+
+            Date endDate = recordDate;
+            String endDateString = sdf.format(endDate);
 
             ProEconWindturbineGoodness po = new ProEconWindturbineGoodness();
             po.setModelId(wt.getModelId());
@@ -101,16 +120,60 @@ public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
             po.setMonthSpeed(0.0);
             po.setYearSpeed(0.0);
 
-            if (equipmentInfoDay1Map.containsKey(wt.getId())) {
-                ProEconEquipmentInfoDay1 ed1 = equipmentInfoDay1Map.get(wt.getId());
-                po.setDaySpeed(ed1.getRpjfs());
-                po.setMonthSpeed(ed1.getYpjfs());
-                po.setYearSpeed(ed1.getNpjfs());
-            } else {
-                po.setDaySpeed(0.0);
-                po.setMonthSpeed(0.0);
-                po.setYearSpeed(0.0);
+
+            double dayfs = 0.0;
+            double monthfs = 0.0;
+            double yearfs = 0.0;
+
+            List<TurbineInfoMin> infoMinsday = turbineInfoMinService.selectByTurbineId(wt.getId(), beginDateString, endDateString);
+
+            if (infoMinsday.size()>0){
+                OptionalDouble optionalAverage = infoMinsday.stream()
+                        .map(TurbineInfoMin::getPjfs)
+                        .filter(Objects::nonNull) // 过滤掉 null 值
+                        .mapToDouble(Double::doubleValue)
+                        .average();
+
+                dayfs = optionalAverage.orElse(0.0); // 如果没有值，返回默认值 0.0
+            }
+
+            List<TurbineInfoMin> infoMinsmonth = turbineInfoMinService.selectByTurbineId(wt.getId(), monthbeginDateString, endDateString);
+
+            if (infoMinsmonth.size()>0){
+                OptionalDouble optionalAverage = infoMinsmonth.stream()
+                        .map(TurbineInfoMin::getPjfs)
+                        .filter(Objects::nonNull) // 过滤掉 null 值
+                        .mapToDouble(Double::doubleValue)
+                        .average();
+
+                monthfs = optionalAverage.orElse(0.0); // 如果没有值，返回默认值 0.0
             }
+            List<TurbineInfoMin> infoMinsyear = turbineInfoMinService.selectByTurbineId(wt.getId(), yearbeginDateString, endDateString);
+
+            if (infoMinsyear.size()>0){
+                OptionalDouble optionalAverage = infoMinsyear.stream()
+                        .map(TurbineInfoMin::getPjfs)
+                        .filter(Objects::nonNull) // 过滤掉 null 值
+                        .mapToDouble(Double::doubleValue)
+                        .average();
+
+                yearfs = optionalAverage.orElse(0.0); // 如果没有值，返回默认值 0.0
+            }
+
+//            if (equipmentInfoDay1Map.containsKey(wt.getId())) {
+//                ProEconEquipmentInfoDay1 ed1 = equipmentInfoDay1Map.get(wt.getId());
+//                po.setDaySpeed(ed1.getRpjfs());
+//                po.setMonthSpeed(ed1.getYpjfs());
+//                po.setYearSpeed(ed1.getNpjfs());
+//            } else {
+//                po.setDaySpeed(0.0);
+//                po.setMonthSpeed(0.0);
+//                po.setYearSpeed(0.0);
+//            }
+
+            po.setDaySpeed(dayfs);
+            po.setMonthSpeed(monthfs);
+            po.setYearSpeed(yearfs);
 
             if (fitMap.containsKey(wt.getId())) {
                 Map<String, Double> map = fitMap.get(wt.getId());