Merge branch 'master' of http://124.70.43.205:3000/wangb/runeconomy-nx

generationXK-service/pom.xml

@@ -114,12 +114,12 @@
             <version>3.17</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.1.1</version>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>cn.hutool</groupId>-->
+<!--            <artifactId>hutool-all</artifactId>-->
+<!--            <version>5.1.1</version>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.taosdata.jdbc</groupId>
             <artifactId>taos-jdbcdriver</artifactId>
@@ -175,6 +175,12 @@
             <version>11.9.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+
         <!--        <dependency>-->
         <!--            <groupId>com.gyee</groupId>-->
         <!--            <artifactId>data-adapter</artifactId>-->

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/EquipmentInfo5Service.java

@@ -341,24 +341,34 @@ public class EquipmentInfo5Service {
             }
 
 
-            if (speedDataList != null && statusDataList != null && statusDataList.size() == speedDataList.size() && !speedDataList.isEmpty()) {
+//            if (speedDataList != null && statusDataList != null && statusDataList.size() == speedDataList.size() && !speedDataList.isEmpty()) {
+            if (speedDataList != null && statusDataList != null && (statusDataList.size() - speedDataList.size() < 3) && !speedDataList.isEmpty()) {
 
                 double laststatus = -1;
                 Date begin = new Date();
-                for (int i = 0; i < speedDataList.size(); i++) {
+                int w = 0;
+                int q = speedDataList.size() - statusDataList.size();
+                if (q >= 0) {
+                    w = statusDataList.size();
+                } else {
+                    w = speedDataList.size();
+                }
+                for (int i = 0; i < w; i++) {
 
                     double status = statusDataList.get(i).getPointValueInDouble();
-                    double speed = speedDataList.get(i).getPointValueInDouble();
+//                    double speed = speedDataList.get(i).getPointValueInDouble();
+                    double speed = speedDataList.get(w-i).getPointValueInDouble();
                     if (i == 0) {
-                        begin = new Date(speedDataList.get(i).getPointTime());
+//                        begin = new Date(speedDataList.get(i).getPointTime());
+                        begin = new Date(speedDataList.get(w-i).getPointTime());
                         laststatus = status;
                     }
 
                     if (speed <= 3.0) {
-                        if (laststatus != status &&
-                                (status == stateDescription1.get(3.0) || status == stateDescription2.get(3.0))) {
+                        if (laststatus != status && (status == stateDescription1.get(3.0) || status == stateDescription2.get(3.0))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {
@@ -416,11 +426,12 @@ public class EquipmentInfo5Service {
 
                         laststatus = status;
                         begin = new Date(speedDataList.get(i).getPointTime());
-                    } else if (speed <= 4.0 && speed > 3.0) {
+                    } else if (speed <= 4.0) {
                         if (laststatus != status &&
                                 (status == stateDescription1.get(3.5) || status == stateDescription2.get(3.5))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {
@@ -484,7 +495,8 @@ public class EquipmentInfo5Service {
                         if (laststatus != status &&
                                 (status == stateDescription1.get(4.0) || status == stateDescription2.get(4.0))) {
 
-                            Date end = new Date(speedDataList.get(i).getPointTime());
+//                            Date end = new Date(speedDataList.get(i).getPointTime());
+                            Date end = new Date(speedDataList.get(w-i).getPointTime());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
                             if (zhcs < 0.25)//5分钟
                             {

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/WindPowerInfo1Service.java

@@ -1,9 +1,12 @@
-package com.gyee.generation.service;//package com.gyee.generation.service;
+package com.gyee.generation.service;
 
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
+import com.gyee.generation.feign.AdapterApi;
 import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.PointData2;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.CompanyType;
 import com.gyee.generation.model.vo.Location;
@@ -12,6 +15,7 @@ import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.statisticcs.Initial;
+import com.xxl.job.core.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.net.URI;
 import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
@@ -74,6 +79,14 @@ public class WindPowerInfo1Service {
     @Resource
     private IProEconEquipmentInfoJsService iProEconEquipmentInfoJsService;
 
+    @Resource
+    private AdapterApi adapter;
+
+
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
+
 
     /**
      * 计算区域日信息
@@ -1341,6 +1354,49 @@ public class WindPowerInfo1Service {
     }
 
 
+    public void writeGfHistory(Date date) throws Exception {
+        String s2 = "2024-12-11 23:55:00";
+        String[] split = gf.split(",");
+        List<String> str = new ArrayList<>(Arrays.asList(split));
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = simpleDateFormat.parse(s2);
+        long time = date1.getTime();
+        for (long i = time; i < 1735106823000L; i += 86400000) {
+            List<ProEconAnalysisSubtableBottom> ls = new ArrayList<>();
+            for (String s : str) {
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), s, i);
+                ProEconAnalysisSubtableBottom pb = new ProEconAnalysisSubtableBottom();
+                pb.setRecordDate(new Date(i));
+                String[] split1 = s.split("\\.");
+                if ("曙光储能电站".equals(split1[2]) || "宁东33光伏场站".equals(split1[2])) {
+                    pb.setWpid("GJNY_NXGS_SGB_GDC_STA");
+                } else if ("霞光储能电站".equals(split1[2]) || "宁东32光伏场站".equals(split1[2])) {
+                    pb.setWpid("GJNY_NXGS_XGB_GDC_STA");
+                } else if ("电度表".equals(split1[3])) {
+                    pb.setWpid("NX_FGS_HA_FDC_STA");
+                } else if ("区域集控".equals(split1[0]) && "惠安风场".equals(split1[1])) {
+                    pb.setWpid("NX_FGS_HA_FDC_STA");
+                } else {
+                    pb.setWpid("GJNY_NXGS_QZB_GDC_STA");
+                }
+                pb.setMeterId(s);
+                pb.setMeterName(s);
+                pb.setStopCode(historySection.get(s).getDoubleValue());
+                pb.setStopCodeModify(historySection.get(s).getDoubleValue());
+                ls.add(pb);
+            }
+            try {
+                boolean b = iProEconAnalysisSubtableBottomService.batchAdd(ls);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 执行时间：00:00:00,04:00:00,08:00:00,12:00:00,16:00:00,20:00:00,
+     */
     public void writeReport1(Date date) throws Exception {
         String[] split = repInfo1.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));
@@ -1366,12 +1422,56 @@ public class WindPowerInfo1Service {
         }
         try {
             boolean b = stationInfoHourService.saveBatch(shs);
+            System.out.println("成功");
         } catch (Exception e) {
             e.printStackTrace();
         }
 
     }
 
+    public void writeReportHistory(Date date) throws Exception {
+//        String[] dateTime = {"2024-12-13 08:00:00","2024-12-13 12:00:00", "2024-12-13 16:00:00", "2024-12-13 20:00:00"};
+        String[] dateTime = {"2024-12-25 00:00:00", "2024-12-25 04:00:00", "2024-12-25 08:00:00", "2024-12-24 20:00:00"};
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String[] split = repInfo1.split(",");
+        List<String> ls = new ArrayList<>(Arrays.asList(split));
+        for (String s : dateTime) {
+            Date date1 = simpleDateFormat.parse(s);
+            long timestamp = date1.getTime();
+//            for (long i = timestamp; i < 1735033631000L; i += 86400000) {
+            List<StationInfoHour> shs = new ArrayList<>();
+            for (String l : ls) {
+//                    Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, i);
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);
+                if (null == historySection || historySection.isEmpty()) {
+                    return;
+                }
+                StationInfoHour sh = new StationInfoHour();
+//                        sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i),ZoneId.systemDefault()));
+                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()));
+                sh.setWpid("NX_FGS_HA_FDC_STA");
+                sh.setMeterId(l);
+                sh.setMeterName(l);
+                sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                shs.add(sh);
+
+            }
+            try {
+                boolean b = stationInfoHourService.saveBatch(shs);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+//            }
+        }
+
+    }
+
+
+    /**
+     * 执行时间：01:00:00,05:00:00,09:00:00,13:00:00,17:00:00,21:00:00,
+     */
     public void writeReport2(Date date) throws Exception {
         String[] split = repInfo2.split(",");
         List<String> ls = new ArrayList<>(Arrays.asList(split));
@@ -1404,6 +1504,43 @@ public class WindPowerInfo1Service {
 
     }
 
+    public void writeReportHistory2(Date date) throws Exception {
+//        String[] dateTime = {"2024-12-13 01:00:00", "2024-12-13 05:00:00", "2024-12-13 09:00:00","2024-12-13 13:00:00", "2024-12-13 17:00:00", "2024-12-13 21:00:00"};
+        String[] dateTime = {"2024-12-27 01:00:00", "2024-12-27 05:00:00", "2024-12-27 09:00:00","2024-12-27 13:00:00", "2024-12-27 17:00:00", "2024-12-27 21:00:00"};
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String[] split = repInfo2.split(",");
+        List<String> ls = new ArrayList<>(Arrays.asList(split));
+        for (String s : dateTime) {
+            Date date1 = simpleDateFormat.parse(s);
+            long timestamp = date1.getTime();
+            for (long i = timestamp; i < 1736287200000L; i += 86400000) {
+            List<StationInfoHour> shs = new ArrayList<>();
+            for (String l : ls) {
+                Map<String, PointData2> historySection = adapter.getHistorySection(goldenUri(), l, timestamp);
+                if (null == historySection || historySection.isEmpty()) {
+                    return;
+                }
+                StationInfoHour sh = new StationInfoHour();
+                sh.setRecordDate(LocalDateTime.ofInstant(Instant.ofEpochMilli(i), ZoneId.systemDefault()));
+                sh.setWpid("NX_FGS_HA_FDC_STA");
+                sh.setMeterId(l);
+                sh.setMeterName(l);
+                sh.setCode(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                sh.setCodeModify(BigDecimal.valueOf(historySection.get(l).getDoubleValue()));
+                shs.add(sh);
+
+            }
+            try {
+                boolean b = stationInfoHourService.saveBatch(shs);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        }
+
+    }
+
 
     public void writeReport3(Date date) throws Exception {
         QueryWrapper<ProBaseBackfill> qw = new QueryWrapper<>();
@@ -1412,7 +1549,7 @@ public class WindPowerInfo1Service {
         List<ProEconEquipmentInfoJs> jss = new ArrayList<>();
         LocalDate now = LocalDate.now();
         QueryWrapper<ProEconEquipmentInfoJs> qw2 = new QueryWrapper<>();
-        qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now);
+        qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now).eq(ProEconEquipmentInfoJs::getMeterId, "AI0001");
         List<ProEconEquipmentInfoJs> projss = iProEconEquipmentInfoJsService.list(qw2);
         if (null != projss && !projss.isEmpty()) {
             List<String> meter = projss.stream().map(ProEconEquipmentInfoJs::getMeterId).collect(Collectors.toList());
@@ -1425,7 +1562,7 @@ public class WindPowerInfo1Service {
             ProEconEquipmentInfoJs js = new ProEconEquipmentInfoJs();
             js.setRecordDate(now);
             js.setWpid(backfill.getStation());
-            js.setMeterId(backfill.getCode());
+            js.setMeterId("AI0001");
             js.setMeterName(backfill.getCode());
             jss.add(js);
         }
@@ -1439,6 +1576,42 @@ public class WindPowerInfo1Service {
     }
 
 
+    public void writeReportHistory3(Date date) throws Exception {
+        QueryWrapper<ProBaseBackfill> qw = new QueryWrapper<>();
+        qw.lambda().eq(ProBaseBackfill::getType, "AI0001");
+        List<ProBaseBackfill> backfills = iProBaseBackfillService.list(qw);
+        List<ProEconEquipmentInfoJs> jss = new ArrayList<>();
+        String[] dateTime = { "2025-01-09"};
+        for (String s : dateTime) {
+            LocalDate now = LocalDate.parse(s);
+            QueryWrapper<ProEconEquipmentInfoJs> qw2 = new QueryWrapper<>();
+            qw2.lambda().eq(ProEconEquipmentInfoJs::getRecordDate, now).eq(ProEconEquipmentInfoJs::getMeterId, "AI0001");
+            List<ProEconEquipmentInfoJs> projss = iProEconEquipmentInfoJsService.list(qw2);
+            if (null != projss && !projss.isEmpty()) {
+                List<String> meter = projss.stream().map(ProEconEquipmentInfoJs::getMeterId).collect(Collectors.toList());
+                backfills = backfills.stream().filter(bf -> !meter.contains(bf.getCode())).collect(Collectors.toList());
+            }
+            if (null == backfills || backfills.isEmpty()) {
+                return;
+            }
+            for (ProBaseBackfill backfill : backfills) {
+                ProEconEquipmentInfoJs js = new ProEconEquipmentInfoJs();
+                js.setRecordDate(now);
+                js.setWpid(backfill.getStation());
+                js.setMeterId("AI0001");
+                js.setMeterName(backfill.getCode());
+                jss.add(js);
+            }
+            try {
+                boolean b = iProEconEquipmentInfoJsService.saveBatch(jss);
+                System.out.println(b);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
 }
 
 

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/service/realtimelibrary/AccessStatusService.java

@@ -170,7 +170,8 @@ public class AccessStatusService {
             List<ProBasicEquipment> proBasicEquipments = wpwtmap.get(wp.getId());
             List<String> pointIds = new ArrayList<>();
             proBasicEquipments.stream().forEach(wt -> {
-                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.SBZT);
+//                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.SBZT);
+                ProBasicEquipmentPoint equipmentPoint = wtpAimap.get(wt.getId()).get(ContantXk.MXZT);
                 pointIds.add(equipmentPoint.getNemCode());
             });
             double zt = 1;

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

@@ -246,7 +246,7 @@ public class SaticSchedulePgTask {
                 System.out.println("执行用时" + DateUtils.secondsDiff(begin, end) + "秒");
                 System.out.println("停机记录调度调度程序执行结束!。。。。。。");
 
-                Thread.sleep(200);
+                Thread.sleep(2000);
             }
 
 
@@ -1755,6 +1755,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport1(date);
+//        windPowerInfo1Service.writeReportHistory(date);
 
     }
 
@@ -1766,6 +1767,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport2(date);
+//        windPowerInfo1Service.writeReportHistory2(date);
 
     }
 
@@ -1778,7 +1780,7 @@ public class SaticSchedulePgTask {
 
         Date date = new Date();
         windPowerInfo1Service.writeReport3(date);
-
+//        windPowerInfo1Service.writeReportHistory3(date);
     }
 
 }

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());

generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 
 /**
@@ -738,32 +740,17 @@ public class EdosUtil implements IEdosUtil {
 
 
     @Override
-//    public List<PointData> getRealData(String... pointids) throws Exception {
     public List<PointData> getRealData(List<String> pointids) throws Exception {
-
-//        String pointIdString = StringUtil.join(pointids, ",");
-//        Optional<String> keys = Optional.ofNullable(pointIdString);
-        String url = baseURL + "/latest";
-//        if (pointIdString.startsWith("GF-")) {
-//            url = baseURL2 + "/latest?null=0";
-//        }
+        String join = String.join(",", pointids);
+        String url = baseURL + "/latests";
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
-
             // 将请求体和头部信息整合到HttpEntity中
-            HttpEntity<List<String>> requestEntity = new HttpEntity<>(pointids,headers);
-
+            HttpEntity<String> requestEntity = new HttpEntity<>(join,headers);
             // 发起POST请求
             ResponseEntity<JSONObject> resp = restTemplate.exchange(url,HttpMethod.POST,requestEntity,JSONObject.class);
-//            if (keys.isPresent())
-//                url = url + "&keys=" + keys.get();
-//            else {
-//                return ErrorRequest.RequestListError(pointids.toString());
-//            }
-//            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
             JSONObject jsonObject = resp.getBody();
-
             if (jsonObject != null&&!jsonObject.isEmpty()) {
                 //对结果进行有序返回
                 int len = pointids.size();
@@ -781,7 +768,6 @@ public class EdosUtil implements IEdosUtil {
                     } else {
                         result.add(pointDataHashMap.get(pointids.get(i)));
                     }
-
                 }
                 Iterator<String> sIterator = jsonObject.keySet().iterator();
                 while (sIterator.hasNext()) {
@@ -804,9 +790,6 @@ public class EdosUtil implements IEdosUtil {
                     } else if (jsonData.containsKey("stringValue")) {
                         pointValue = jsonData.getString("stringValue");
                     }
-                    //                    pointData.setPointValue(pointValue);
-                    //                    pointData.setPointValueInDouble(Double.parseDouble(pointValue));
-
                     if (pointValue.equals("true")) {
                         pointData.setPointValueInDouble(1.0);
                     } else if (pointValue.equals("false")) {
@@ -816,9 +799,7 @@ public class EdosUtil implements IEdosUtil {
                         pointData.setPointValueInDouble(StringUtils.round(value, 4));
                     }
 
-
                     pointData.setPointValue(pointValue);
-                    // //System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
                 }
                 return result;
 

runeconomy-xk/pom.xml

@@ -190,6 +190,25 @@
             <version>2.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <version>2.2.3.RELEASE</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.openfeign/feign-httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>11.10</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
+
+
     </dependencies>
     <build>
         <plugins>

runeconomy-xk/src/main/java/com/gyee/RunEconomyApplication.java

@@ -6,6 +6,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.system.ApplicationHome;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -17,6 +18,7 @@ import java.net.UnknownHostException;
 @Log4j2
 @SpringBootApplication
 @EnableScheduling
+@EnableFeignClients
 @MapperScan("com.gyee.runeconomy.mapper")
 public class RunEconomyApplication {
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/config/AjaxStatus.java

@@ -0,0 +1,13 @@
+package com.gyee.runeconomy.config;
+
+public enum  AjaxStatus {
+    success(200),
+    error(500),
+    logineroor(501),
+    loginexpire(502);
+
+    public int code;
+    AjaxStatus(int c) {
+        code = c;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/config/BaseService.java

@@ -0,0 +1,34 @@
+package com.gyee.runeconomy.config;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+/**
+ * 抽象类BaseService
+* @ClassName: BaseService
+* @Description: Service实现这个
+* @author gyee
+* @date 2018年6月3日
+*
+ */
+public interface BaseService<T,T2> {
+	
+    int deleteByPrimaryKey(String id);
+
+    int insertSelective(T record);
+
+    T selectByPrimaryKey(String id);
+   
+    int updateByPrimaryKeySelective(T record);
+    
+    int updateByExampleSelective(@Param("record") T record, @Param("example") T2 example);
+
+    int updateByExample(@Param("record") T record, @Param("example") T2 example);
+    
+    List<T> selectByExample(T2 example);
+
+    long countByExample(T2 example);
+
+    int deleteByExample(T2 example);
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/CommonController.java

@@ -74,11 +74,19 @@ public class CommonController {
 
         List<ProBasicEquipmentPoint> resultList = new ArrayList<>();
 
-        String[] split = unifromcodes.split(",");
-        Arrays.stream(split).forEach(s -> {
-            resultList.add(equipmentPointMap.get(s));
-        });
-
+//        String[] split = unifromcodes.split(",");
+//        Arrays.stream(split).forEach(s -> {
+//            resultList.add(equipmentPointMap.get(s));
+//        });
+
+
+        if (equipmentPointMap != null) {
+            String[] split = unifromcodes.split(",");
+            resultList = Arrays.stream(split)
+                    .map(equipmentPointMap::get)  // 获取对应的 ProBasicEquipmentPoint
+                    .filter(Objects::nonNull)    // 过滤掉 null 值
+                    .collect(Collectors.toList());
+        }
         if (StringUtils.isNotNull(resultList)) {
             return R.data(ResultMsg.ok(resultList));
         } else {
@@ -242,7 +250,9 @@ public class CommonController {
         List<String> pointList = new ArrayList<>();
 
         String[] points = pointIds.split(",");
-
+        if (points == null || points.length == 0 || Arrays.stream(points).allMatch(String::isEmpty)) {
+            return R.error(ResultMsg.error());
+        }
         Arrays.stream(points).forEach(p -> {
             pointList.add(p);
         });

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/LeaderboardController.java

@@ -0,0 +1,674 @@
+package com.gyee.runeconomy.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.gyee.runeconomy.config.AjaxStatus;
+import com.gyee.runeconomy.dto.AjaxResult;
+import com.gyee.runeconomy.dto.SawVo;
+import com.gyee.runeconomy.model.auto.Curvefittingmain;
+import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
+import com.gyee.runeconomy.model.vo.Tablepar;
+import com.gyee.runeconomy.service.auto.impl.LeaderboardService;
+import com.gyee.runeconomy.util.DateUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Controller
+@RequestMapping("/leaderboard")
+@Api(value = "排行榜功能",tags =  "排行榜功能")
+public class LeaderboardController {
+    @Resource
+    private LeaderboardService leaderboardService;
+
+    /**查询拟合优度列表**/
+//    @PostMapping("/fittingtoplist")
+//    @ResponseBody
+//    @ApiOperation(value = "查询拟合优度列表", notes = "查询拟合优度列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult fittingtoplist(@RequestBody Tablepar tablepar, String wpIps, String beginDate, String endDate) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<StatisticalAnalysisTopVo> vos= leaderboardService.getRnewTopDate(wpIps, beginDate_d, endDate_d);
+//
+//        for (StatisticalAnalysisTopVo vo : vos) {
+//            if (vo.getPower() > 1) {
+//                vo.setPower(1.0);
+//            }
+//        }
+//
+//        if (tablepar.getOrderByColumn().equals("power")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getPower().compareTo(arg1.getPower());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getPower().compareTo(arg0.getPower());
+//                    }
+//
+//                });
+//            }
+//        } else if (tablepar.getOrderByColumn().equals("speed")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+//                    }
+//
+//                });
+//            }
+//        }
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+
+    /**查询拟合优度图表**/
+//    @GetMapping("/fittingtopchart")
+//    @ResponseBody
+//    @ApiOperation(value = "查询拟合优度图表", notes = "查询拟合优度图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "wtIds", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult fittingtopchart(String wtIds, String beginDate, String endDate) throws Exception {
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        Map<String, List> map =new HashMap<>();
+//        if (StringUtils.notEmp(wtIds) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+//            map = leaderboardService.fittingtopchart(wtIds, beginDate_d, endDate_d);
+//        }
+//
+//        if (map != null && !map.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, map);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, map);
+//        }
+//    }
+
+    /**查询总发电量排行列表**/
+//    @PostMapping("/totalPowerCapacityTopList")
+//    @ResponseBody
+//    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult totalPowerCapacityTopList(@RequestBody Tablepar tablepar, String wpIps, String beginDate, String endDate) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<StatisticalAnalysisTopVo> vos= leaderboardService.totalPowerCapacityTopList(wpIps, beginDate_d, endDate_d);
+//
+//
+//        if (tablepar.getOrderByColumn().equals("power")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getPower().compareTo(arg1.getPower());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getPower().compareTo(arg0.getPower());
+//                    }
+//
+//                });
+//            }
+//        } else if (tablepar.getOrderByColumn().equals("speed")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+//                    }
+//
+//                });
+//            }
+//        } else if (tablepar.getOrderByColumn().equals("generatingcapacity")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+//                    }
+//
+//                });
+//            }
+//        }
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+
+    /**查询利用率排行榜列表**/
+//    @PostMapping("/utilizationList")
+//    @ResponseBody
+//    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult utilizationList(@RequestBody Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//
+//        List<Windturbineinfoday3> vos= leaderboardService.utilizationList(tablepar, wpId, beginDate_d, endDate_d, type);
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+    /**查询损失率排行榜列表**/
+//    @PostMapping("/lossList")
+//    @ResponseBody
+//    @ApiOperation(value = "查询损失率排行榜列表", notes = "查询损失率排行榜列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult lossList(@RequestBody Tablepar tablepar, String wpId, String beginDate, String endDate,String type) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<Windturbineinfoday3> vos= leaderboardService.lossList(tablepar, wpId, beginDate_d, endDate_d, type);
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+    /**查询负荷率排行榜列表**/
+//    @PostMapping("/loadfactortoplist")
+//    @ResponseBody
+//    @ApiOperation(value = "查询负荷率排行榜列表", notes = "查询负荷率排行榜列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult loadfactortoplist(@RequestBody Tablepar tablepar,String type, String wpId, String beginDate, String endDate) {
+//
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<StatisticalAnalysisTopVo> vos= leaderboardService.loadfactortoplist(type, wpId, beginDate_d, endDate_d);
+//
+//        if (null!=tablepar.getOrderByColumn() && tablepar.getOrderByColumn().equals("power")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getPower().compareTo(arg1.getPower());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getPower().compareTo(arg0.getPower());
+//                    }
+//
+//                });
+//            }
+//        } else if (null!=tablepar.getOrderByColumn() &&tablepar.getOrderByColumn().equals("speed")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+//                    }
+//
+//                });
+//            }
+//        } else if (null!=tablepar.getOrderByColumn() &&tablepar.getOrderByColumn().equals("generatingcapacity")) {
+//            if (tablepar.getIsAsc().equals("asc")) {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg0.getSpeed().compareTo(arg1.getSpeed());
+//                    }
+//
+//                });
+//
+//            } else {
+//                Collections.sort(vos, new Comparator<StatisticalAnalysisTopVo>() {
+//                    public int compare(StatisticalAnalysisTopVo arg0, StatisticalAnalysisTopVo arg1) {
+//                        return arg1.getSpeed().compareTo(arg0.getSpeed());
+//                    }
+//
+//                });
+//            }
+//        }
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+    /**查询报警排行榜列表**/
+//    @PostMapping("/querywarningStatistical")
+//    @ResponseBody
+//    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult querywarningStatistical(@RequestBody Tablepar tablepar, String type, String beginDate, String endDate) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<SawVo> vos= leaderboardService.getWarningTopDate( tablepar, type, beginDate_d, endDate_d);
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+
+    /**查询报警排行榜图表**/
+//    @GetMapping("/querywarningStatisticalPie")
+//    @ResponseBody
+//    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+//    @ApiImplicitParams({
+//
+//            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult querywarningStatisticalPie(String type,  String beginDate, String endDate) {
+//
+//        Date beginDate_d=null;
+//        Date endDate_d=null;
+//        if (StringUtils.isNotEmpty(beginDate))
+//        {
+//            beginDate_d= DateUtils.parseDate(beginDate);
+//        }
+//        if (StringUtils.isNotEmpty(endDate))
+//        {
+//            endDate_d= DateUtils.parseDate(endDate);
+//        }
+//        List<SawVo> vos=
+//                leaderboardService.getWarningTopDatePercentage( type, beginDate_d, endDate_d);
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//
+//    }
+/*******************************************************************************************************************************/
+    /**查询日曲线偏差率列表**/
+    @PostMapping("/curvefittingmainList")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线偏差率列表", notes = "查询日曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvefittingmainList(@RequestBody Tablepar tablepar, String wpId, String recorddate) {
+        List<Curvefittingmain> vos=new ArrayList<>();
+        if (StringUtils.isNotEmpty(recorddate))
+        {
+            Date  date= DateUtils.parseDate(recorddate);
+            vos= leaderboardService.curvefittingmainList( tablepar, wpId, date);
+
+        }
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+    }
+
+    /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
+//    @GetMapping("/getCurvechatAjax")
+//    @ResponseBody
+//    @ApiOperation(value = "查询日曲线", notes = "查询日曲线")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult getCurvechatAjax(String type,String wtId,  String recorddate) {
+//        Map<String, Object> vos=new HashMap<>();
+//        if (StringUtils.isNotEmpty(recorddate))
+//        {
+//            Date  date= DateUtils.parseDate(recorddate);
+//            vos= leaderboardService.getCurvechatAjax( type,wtId, date);
+//        }
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+
+    /**查询日曲线同比图表**/
+//    @GetMapping("/curvechatAjaxtb")
+//    @ResponseBody
+//    @ApiOperation(value = "查询日曲线同比图表", notes = "查询日曲线同比图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curvechatAjaxtb(String type,String wtId,  String recorddate) {
+//
+//        Map<String, Object> vos=new HashMap<>();
+//        if (StringUtils.isNotEmpty(recorddate))
+//        {
+//            Date  date= DateUtils.parseDate(recorddate);
+//           vos= leaderboardService.curvechatAjaxtb( type,wtId, date);
+//        }
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+    /**查询日曲线环比图表**/
+//    @GetMapping("/curvechatAjaxhb")
+//    @ResponseBody
+//    @ApiOperation(value = "查询日曲线环比图表", notes = "查询日曲线环比图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curvechatAjaxhb(String type,String wtId,  String recorddate) {
+//        Map<String, Object> vos=new HashMap<>();
+//        if (StringUtils.isNotEmpty(recorddate))
+//        {
+//            Date  date= DateUtils.parseDate(recorddate);
+//            vos= leaderboardService.curvechatAjaxhb( type,wtId, date);
+//        }
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+    /**查询日曲线标杆图表**/
+//    @GetMapping("/curvechatAjaxbg")
+//    @ResponseBody
+//    @ApiOperation(value = "查询日曲线标杆图表", notes = "查询日曲线标杆图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curvechatAjaxbg(String type,String wtId,  String recorddate) {
+//        Map<String, Object> vos=new HashMap<>();
+//        if (StringUtils.isNotEmpty(recorddate))
+//        {
+//            Date  date= DateUtils.parseDate(recorddate);
+//            vos= leaderboardService.curvechatAjaxbg( type,wtId, date);
+//        }
+//
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+
+    /*******************************************************************************************************************************/
+    /**查询月曲线偏差率列表**/
+    @PostMapping("/curvefittingmonthmainList")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线偏差率列表", notes = "查询月曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvefittingmonthmainList(@RequestBody Tablepar tablepar, String wpId, String year,String month) {
+
+        List<Curvefittingmonthmain> vos= leaderboardService.curvefittingmonthmainList( tablepar, wpId, year, month);
+
+        if (vos != null && !vos.isEmpty()) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        }
+    }
+
+    /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
+//    @GetMapping("/curveMonthchatAjax")
+//    @ResponseBody
+//    @ApiOperation(value = "查询月曲线偏差率", notes = "查询月曲线偏差率")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curveMonthchatAjax(String type,String wtId,  String year,String month) {
+//
+//        Map<String, Object> vos= leaderboardService.curveMonthchatAjax( type,wtId, year, month);
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+
+    /**查询月曲线同比图表**/
+//    @GetMapping("/curveMonthchatAjaxtb")
+//    @ResponseBody
+//    @ApiOperation(value = "查询月曲线同比图表", notes = "查询月曲线同比图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curveMonthchatAjaxtb(String type,String wtId, String year,String month) {
+//
+//        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxtb( type,wtId, year, month);
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+    /**查询月曲线环比图表**/
+//    @GetMapping("/curveMonthchatAjaxhb")
+//    @ResponseBody
+//    @ApiOperation(value = "查询月曲线环比图表", notes = "查询月曲线环比图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curveMonthchatAjaxhb(String type,String wtId,  String year,String month) {
+//
+//        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxhb( type,wtId, year, month);
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+    /**查询月曲线标杆图表**/
+//    @GetMapping("/curveMonthchatAjaxbg")
+//    @ResponseBody
+//    @ApiOperation(value = "查询月曲线标杆图表", notes = "查询月曲线标杆图表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+//            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+//
+//    public AjaxResult curveMonthchatAjaxbg(String type,String wtId,  String year,String month) {
+//
+//        Map<String, Object> vos= leaderboardService.curveMonthchatAjaxbg( type,wtId, year, month);
+//
+//        if (vos != null && !vos.isEmpty()) {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        } else {
+//            return AjaxResult.successData(AjaxStatus.success.code, vos);
+//        }
+//    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/WindDirection/WindDirectionController.java

@@ -56,6 +56,18 @@ public class WindDirectionController {
     }
 
     /**
+     * 气象单机偏差分析
+
+     * @return
+     */
+    @GetMapping("/weatherMachine")
+    public JSONObject weathermachine(String wpid) throws Exception {
+
+        Object o = windMachineService.weathermachine(wpid);
+        return JsonResult.successData(ResultCode.SUCCESS, o);
+    }
+
+    /**
      * 单机偏差分析计算
 
      * @return

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Windresourceanalysis/WindresourceanalysisController.java

@@ -8,6 +8,7 @@ import com.gyee.runeconomy.dto.pewpVo;
 import com.gyee.runeconomy.dto.result.JsonResult;
 import com.gyee.runeconomy.dto.result.ResultCode;
 import com.gyee.runeconomy.service.Windresourceanalysis.WindresourceanalysisService;
+import com.gyee.runeconomy.service.Windresourceanalysis.WindresourceanalysisService2;
 import com.gyee.runeconomy.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +31,9 @@ public class WindresourceanalysisController {
     @Resource
     private WindresourceanalysisService windresourceanalysisService;
 
+    @Resource
+    private WindresourceanalysisService2 windresourceanalysisService2;
+
     @GetMapping("/fdanalysis")
     @ResponseBody
     @ApiOperation(value = "pr分析", notes = "pr分析")
@@ -129,7 +133,8 @@ public class WindresourceanalysisController {
     @ResponseBody
     public JSONObject fsRoses(String wpid, @RequestParam(value = "mode", required = false) Integer mode, String Data) throws Exception {
         mode = mode == null ? 0 : mode;
-        Object o = windresourceanalysisService.fxRoses(wpid, mode, Data);
+//        Object o = windresourceanalysisService.fxRoses(wpid, mode, Data);
+        Object o = windresourceanalysisService2.fxRoses(wpid, mode, Data);
         return JsonResult.successData(ResultCode.SUCCESS, o);
     }
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/homepage/EconomyHomePageController.java

@@ -139,7 +139,7 @@ public class EconomyHomePageController {
     @GetMapping(value = "/generating-capacity")
     @ApiOperation(value = "首页-发电量", notes = "首页-发电量")
     public ResultMsg getHomeGeneratingCapacity2(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
-
+        economyPointHomePageService.calFdl();
         Map<String, Object> map = economyPointHomePageService.getGeneratingCapacity(companyId);
         if (null != map) {
             return ResultMsg.ok(map);
@@ -167,7 +167,7 @@ public class EconomyHomePageController {
     @GetMapping(value = "/home-right")
     @ApiOperation(value = "首页-右侧模块", notes = "首页-右侧模块")
     public ResultMsg getHomeRight(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
-
+        economyPointHomePageService.calFdl();
         Map<String, Object> map = economyPointHomePageService.getHomeRight(companyId);
         if (null != map) {
             return ResultMsg.ok(map);
@@ -184,6 +184,7 @@ public class EconomyHomePageController {
     @ApiOperation(value = "首页-中间模块", notes = "首页-中间模块")
     public ResultMsg getHomeMiddle(@RequestParam(value = "companyId", required = false) String companyId) throws Exception {
 
+        economyPointHomePageService.calFdl();
         Map<String, Object> map = economyPointHomePageService.getHomeMiddle(companyId);
         if (null != map) {
             return ResultMsg.ok(map);

runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/monitor/MatrixController.java

@@ -3,10 +3,18 @@ package com.gyee.runeconomy.controller.monitor;/*
 @date   2023/3/28-8:43
 */
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.common.model.StringUtils;
 import com.gyee.runeconomy.dto.AjaxResult;
 import com.gyee.runeconomy.dto.R;
 import com.gyee.runeconomy.dto.ResultMsg;
+import com.gyee.runeconomy.dto.result.JsonResult;
+import com.gyee.runeconomy.dto.result.ResultCode;
+import com.gyee.runeconomy.model.auto.ProEconAlarmType;
+import com.gyee.runeconomy.model.vo.PoliceVo;
+import com.gyee.runeconomy.service.auto.IProEconAlarmTypeService;
+import com.gyee.runeconomy.service.monitor.AlarmService;
 import com.gyee.runeconomy.service.monitor.MatrixService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -27,7 +36,11 @@ public class MatrixController {
     @Resource
     private MatrixService matrixService;
 
+    @Resource
+    private IProEconAlarmTypeService proEconAlarmTypeService;
 
+    @Resource
+    private AlarmService alarmService;
     /**
      * 基础矩阵
      *
@@ -56,19 +69,56 @@ public class MatrixController {
     @GetMapping("/detailed")
     @ResponseBody
     @ApiOperation(value = "明细矩阵", notes = "明细矩阵")
-    public R detailed(@RequestParam(value = "type", required = true) String type,
+    public JSONObject detailed(@RequestParam(value = "type", required = true) String type,
                       @RequestParam(value = "company", required = true) String company) throws Exception {
 
         Map<String, Object> resultMap = matrixService.matrixMX(company, type);
         if (StringUtils.isNotNull(resultMap)) {
-            return R.data(ResultMsg.ok(resultMap));
+            return JsonResult.successData(ResultCode.SUCCESS, resultMap);
         } else {
-            return R.error(ResultMsg.error());
+            return JsonResult.error();
+        }
+    }
+
+    /**
+     * 明细矩阵弹窗-报警分类
+     *
+     * @return
+     */
+    @GetMapping("/alarmtype")
+    @ResponseBody
+    @ApiOperation(value = "报警分类", notes = "报警分类")
+    public JSONObject alarmtype(@RequestParam(value = "wtid", required = true) String wtid) throws Exception {
+        Map<String, Object> resultMap = alarmService.flAlarm(wtid);
+
+        if (StringUtils.isNotNull(resultMap)) {
+            return JsonResult.successData(ResultCode.SUCCESS, resultMap);
+        } else {
+            return JsonResult.error();
         }
     }
 
 
     /**
+     *  明细矩阵弹窗-报警信息
+     *
+     * @return
+     */
+    @GetMapping("/alarm")
+    @ResponseBody
+    @ApiOperation(value = "报警信息", notes = "报警信息")
+    public JSONObject alarm(@RequestParam(value = "type", required = true) String type,
+                      @RequestParam(value = "wtid", required = true) String wtid) throws Exception {
+
+        List<PoliceVo.AlarmDetails> resultMap = alarmService.Alarm(type,wtid);
+        if (StringUtils.isNotNull(resultMap)) {
+            return JsonResult.successData(ResultCode.SUCCESS, resultMap);
+        } else {
+            return JsonResult.error();
+        }
+    }
+
+    /**
      * 单场矩阵
      *
      * @return

runeconomy-xk/src/main/java/com/gyee/runeconomy/init/CacheContext.java

@@ -88,8 +88,6 @@ public class CacheContext implements CommandLineRunner {
     @Resource
     private ITemperatureinfoService iTemperatureinfoService;
 
-    @Resource
-    private ITurbineInfoDayService iTurbineInfoDayService;
 
     @Resource
     GyeeConfig config;
@@ -189,11 +187,6 @@ public class CacheContext implements CommandLineRunner {
 
     public static Map<String, List<ProBasicModelPower>> modelPowerDetailNewMap = new HashMap<>();
 
-    public static BigDecimal yfdl = null;
-    public static BigDecimal yllfdl = null;
-    public static BigDecimal nfdl = null;
-    public static BigDecimal nllfdl = null;
-
 
     @Override
     public void run(String... args) throws Exception {
@@ -688,38 +681,11 @@ public class CacheContext implements CommandLineRunner {
         cacheNewModelPower();
         cacheNewPoints();
         initTemperatureInfo();
-        cacheYNfdl();
 
         logger.info("缓存结束------------------------------------------------------------");
     }
 
 
-    private void cacheYNfdl() {
-        LocalDate currentDate = LocalDate.now(); // 获取当前日期
-        int year = currentDate.getYear(); // 获取年份
-        int month = currentDate.getMonthValue();
-        QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
-                .apply("to_char(record_date,'yyyy-MM') = {0}",year + "-" + String.format("%02d",month))
-                .like("station_id","_FDC_")
-                .groupBy("to_char(record_date,'yyyy-MM'),station_id");
-        List<TurbineInfoDay> monthData = iTurbineInfoDayService.list(currentqw);
-        yfdl = monthData.get(0).getRfdl();
-        yllfdl = monthData.get(0).getLlfdl();
-        currentqw.clear();
-        currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
-                .ge("record_date",LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).minusMonths(1)) // 大于等于上个月的第一天
-                .lt("record_date",LocalDate.now().with(TemporalAdjusters.firstDayOfMonth())) // 小于本月的第一天
-                .like("station_id","_FDC_%") // 模糊查询 station_id
-                .groupBy("station_id");
-        List<TurbineInfoDay> yearData = iTurbineInfoDayService.list(currentqw);
-        nfdl = yearData.get(0).getRfdl();
-        nllfdl = yearData.get(0).getLlfdl();
-        System.out.println();
-//        stations.forEach(s->);
-    }
-
-
     private void cacheNewModelPower() {
         List<ProBasicModelPower> lsMPD = proBasicModelPowerService.list();
         modelPowerDetailNewMap.putAll(lsMPD.stream().collect(Collectors.groupingBy(u -> u.getModelId())));

runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/CurvefittingmainMapper.java

@@ -0,0 +1,97 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import java.util.List;
+
+import com.gyee.runeconomy.model.auto.Curvefittingmain;
+import com.gyee.runeconomy.model.auto.CurvefittingmainExample;
+import org.apache.ibatis.annotations.Param;
+
+public interface CurvefittingmainMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    long countByExample(CurvefittingmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CurvefittingmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int insert(Curvefittingmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Curvefittingmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    List<Curvefittingmain> selectByExample(CurvefittingmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    Curvefittingmain selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Curvefittingmain record, @Param("example") CurvefittingmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Curvefittingmain record, @Param("example") CurvefittingmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Curvefittingmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Curvefittingmain record);
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/mapper/auto/CurvefittingmonthmainMapper.java

@@ -0,0 +1,97 @@
+package com.gyee.runeconomy.mapper.auto;
+
+import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
+import com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CurvefittingmonthmainMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    long countByExample(CurvefittingmonthmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CurvefittingmonthmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int insert(Curvefittingmonthmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Curvefittingmonthmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    List<Curvefittingmonthmain> selectByExample(CurvefittingmonthmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    Curvefittingmonthmain selectByPrimaryKey(String id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Curvefittingmonthmain record, @Param("example") CurvefittingmonthmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Curvefittingmonthmain record, @Param("example") CurvefittingmonthmainExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Curvefittingmonthmain record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Curvefittingmonthmain record);
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/PointData.java

@@ -0,0 +1,120 @@
+package com.gyee.runeconomy.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.gyee.runeconomy.util.realtimesource.timeseries.TsDataType;
+
+import java.util.Date;
+
+/**
+ * 测点数据
+ */
+public class PointData {
+    /**
+     * 时间戳
+     */
+    private long ts;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date time;
+    private String tagName;
+    /**
+     * 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Double doubleValue;
+    /**
+     * Boolean 数据
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Boolean booleanValue;
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+//    @JsonSetter(nulls = Nulls.SKIP)
+    private Long longValue;
+
+    public PointData() {
+    }
+
+    public PointData(Date time, double doubleValue) {
+        this.time = time;
+        this.doubleValue = doubleValue;
+    }
+
+    public long getTs() {
+        if (ts == 0 && time != null) {
+            return time.getTime();
+        }
+        return ts;
+    }
+
+    public void setTs(long ts) {
+        this.ts = ts;
+    }
+
+    @JsonIgnore
+    public TsDataType getDataType() {
+        if (booleanValue != null && booleanValue) {
+            return TsDataType.BOOLEAN;
+        } else if (longValue != null && longValue != 0) {
+            return TsDataType.LONG;
+        }
+        return TsDataType.DOUBLE;
+    }
+
+    public Boolean getBooleanValue() {
+        return booleanValue;
+    }
+
+    public Boolean isBooleanValue() {
+        return booleanValue;
+    }
+
+    public void setBooleanValue(boolean booleanValue) {
+        this.booleanValue = booleanValue;
+    }
+
+    public Long getLongValue() {
+        return longValue;
+    }
+
+    public void setLongValue(long longValue) {
+        this.longValue = longValue;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+
+    public Double getDoubleValue() {
+        return doubleValue;
+    }
+
+    public void setDoubleValue(double doubleValue) {
+        this.doubleValue = doubleValue;
+    }
+
+    @JsonIgnore
+    public Double getValue() {
+        if (booleanValue != null && booleanValue) {
+            return 1.0;
+        } else if (longValue != null && longValue != 0) {
+            doubleValue = Double.valueOf(longValue);
+        }
+        return doubleValue;
+    }
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/Curvefittingmain.java

@@ -0,0 +1,312 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Curvefittingmain implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal monthdeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal yeardeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal standarddeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.recordDate
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate3;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.id
+     *
+     * @return the value of curvefittingmain.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.id
+     *
+     * @param id the value for curvefittingmain.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.windturbineId
+     *
+     * @return the value of curvefittingmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.windturbineId
+     *
+     * @param windturbineid the value for curvefittingmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    public void setWindturbineid(String windturbineid) {
+        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.monthDeviationRate
+     *
+     * @return the value of curvefittingmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMonthdeviationrate() {
+        return monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.monthDeviationRate
+     *
+     * @param monthdeviationrate the value for curvefittingmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setMonthdeviationrate(BigDecimal monthdeviationrate) {
+        this.monthdeviationrate = monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.yearDeviationRate
+     *
+     * @return the value of curvefittingmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getYeardeviationrate() {
+        return yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.yearDeviationRate
+     *
+     * @param yeardeviationrate the value for curvefittingmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setYeardeviationrate(BigDecimal yeardeviationrate) {
+        this.yeardeviationrate = yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.standardDeviationRate
+     *
+     * @return the value of curvefittingmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getStandarddeviationrate() {
+        return standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.standardDeviationRate
+     *
+     * @param standarddeviationrate the value for curvefittingmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setStandarddeviationrate(BigDecimal standarddeviationrate) {
+        this.standarddeviationrate = standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.recordDate
+     *
+     * @return the value of curvefittingmain.recordDate
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.recordDate
+     *
+     * @param recorddate the value for curvefittingmain.recordDate
+     *
+     * @mbg.generated
+     */
+    public void setRecorddate(Date recorddate) {
+        this.recorddate = recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.deviationRate1
+     *
+     * @return the value of curvefittingmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate1() {
+        return deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.deviationRate1
+     *
+     * @param deviationrate1 the value for curvefittingmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate1(BigDecimal deviationrate1) {
+        this.deviationrate1 = deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.deviationRate2
+     *
+     * @return the value of curvefittingmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate2() {
+        return deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.deviationRate2
+     *
+     * @param deviationrate2 the value for curvefittingmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate2(BigDecimal deviationrate2) {
+        this.deviationrate2 = deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmain.deviationRate3
+     *
+     * @return the value of curvefittingmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate3() {
+        return deviationrate3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmain.deviationRate3
+     *
+     * @param deviationrate3 the value for curvefittingmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate3(BigDecimal deviationrate3) {
+        this.deviationrate3 = deviationrate3;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/CurvefittingmainExample.java

@@ -0,0 +1,864 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CurvefittingmainExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public CurvefittingmainExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNull() {
+            addCriterion("windturbine_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbine_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbine_id =", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbine_id <>", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbine_id >", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbine_id >=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbine_id <", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbine_id <=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbine_id like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbine_id not like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbine_id in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbine_id not in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbine_id between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbine_id not between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNull() {
+            addCriterion("monthDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNotNull() {
+            addCriterion("monthDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate =", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate <>", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("monthDeviationRate >", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate >=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThan(BigDecimal value) {
+            addCriterion("monthDeviationRate <", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate <=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIn(List<BigDecimal> values) {
+            addCriterion("monthDeviationRate in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("monthDeviationRate not in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("monthDeviationRate between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("monthDeviationRate not between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNull() {
+            addCriterion("yearDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNotNull() {
+            addCriterion("yearDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate =", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate <>", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("yearDeviationRate >", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate >=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThan(BigDecimal value) {
+            addCriterion("yearDeviationRate <", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate <=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIn(List<BigDecimal> values) {
+            addCriterion("yearDeviationRate in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("yearDeviationRate not in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("yearDeviationRate between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("yearDeviationRate not between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNull() {
+            addCriterion("standardDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNotNull() {
+            addCriterion("standardDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate =", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate <>", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("standardDeviationRate >", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate >=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThan(BigDecimal value) {
+            addCriterion("standardDeviationRate <", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate <=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIn(List<BigDecimal> values) {
+            addCriterion("standardDeviationRate in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("standardDeviationRate not in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("standardDeviationRate between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("standardDeviationRate not between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("record_date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("record_date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("record_date =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("record_date <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("record_date >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("record_date >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("record_date <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("record_date <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("record_date in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("record_date not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("record_date between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("record_date not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNull() {
+            addCriterion("deviationRate1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNotNull() {
+            addCriterion("deviationRate1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1EqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 =", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 <>", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate1 >", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 >=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThan(BigDecimal value) {
+            addCriterion("deviationRate1 <", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 <=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1In(List<BigDecimal> values) {
+            addCriterion("deviationRate1 in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate1 not in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate1 between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate1 not between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNull() {
+            addCriterion("deviationRate2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNotNull() {
+            addCriterion("deviationRate2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2EqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 =", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 <>", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate2 >", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 >=", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThan(BigDecimal value) {
+            addCriterion("deviationRate2 <", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 <=", value, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2In(List<BigDecimal> values) {
+            addCriterion("deviationRate2 in", values, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate2 not in", values, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate2 between", value1, value2, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate2 not between", value1, value2, "deviationrate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNull() {
+            addCriterion("deviationRate3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNotNull() {
+            addCriterion("deviationRate3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3EqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 =", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 <>", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate3 >", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 >=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThan(BigDecimal value) {
+            addCriterion("deviationRate3 <", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 <=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3In(List<BigDecimal> values) {
+            addCriterion("deviationRate3 in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate3 not in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate3 between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate3 not between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmain
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/Curvefittingmonthmain.java

@@ -0,0 +1,344 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class Curvefittingmonthmain implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.id
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.year
+     *
+     * @mbg.generated
+     */
+    private String year;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.month
+     *
+     * @mbg.generated
+     */
+    private String month;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal monthdeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal yeardeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal standarddeviationrate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate1;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate2;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column curvefittingmonthmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    private BigDecimal deviationrate3;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.id
+     *
+     * @return the value of curvefittingmonthmain.id
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.id
+     *
+     * @param id the value for curvefittingmonthmain.id
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.windturbineId
+     *
+     * @return the value of curvefittingmonthmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.windturbineId
+     *
+     * @param windturbineid the value for curvefittingmonthmain.windturbineId
+     *
+     * @mbg.generated
+     */
+    public void setWindturbineid(String windturbineid) {
+        this.windturbineid = windturbineid == null ? null : windturbineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.year
+     *
+     * @return the value of curvefittingmonthmain.year
+     *
+     * @mbg.generated
+     */
+    public String getYear() {
+        return year;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.year
+     *
+     * @param year the value for curvefittingmonthmain.year
+     *
+     * @mbg.generated
+     */
+    public void setYear(String year) {
+        this.year = year == null ? null : year.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.month
+     *
+     * @return the value of curvefittingmonthmain.month
+     *
+     * @mbg.generated
+     */
+    public String getMonth() {
+        return month;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.month
+     *
+     * @param month the value for curvefittingmonthmain.month
+     *
+     * @mbg.generated
+     */
+    public void setMonth(String month) {
+        this.month = month == null ? null : month.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.monthDeviationRate
+     *
+     * @return the value of curvefittingmonthmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMonthdeviationrate() {
+        return monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.monthDeviationRate
+     *
+     * @param monthdeviationrate the value for curvefittingmonthmain.monthDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setMonthdeviationrate(BigDecimal monthdeviationrate) {
+        this.monthdeviationrate = monthdeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.yearDeviationRate
+     *
+     * @return the value of curvefittingmonthmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getYeardeviationrate() {
+        return yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.yearDeviationRate
+     *
+     * @param yeardeviationrate the value for curvefittingmonthmain.yearDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setYeardeviationrate(BigDecimal yeardeviationrate) {
+        this.yeardeviationrate = yeardeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.standardDeviationRate
+     *
+     * @return the value of curvefittingmonthmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getStandarddeviationrate() {
+        return standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.standardDeviationRate
+     *
+     * @param standarddeviationrate the value for curvefittingmonthmain.standardDeviationRate
+     *
+     * @mbg.generated
+     */
+    public void setStandarddeviationrate(BigDecimal standarddeviationrate) {
+        this.standarddeviationrate = standarddeviationrate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.deviationRate1
+     *
+     * @return the value of curvefittingmonthmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate1() {
+        return deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.deviationRate1
+     *
+     * @param deviationrate1 the value for curvefittingmonthmain.deviationRate1
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate1(BigDecimal deviationrate1) {
+        this.deviationrate1 = deviationrate1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.deviationRate2
+     *
+     * @return the value of curvefittingmonthmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate2() {
+        return deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.deviationRate2
+     *
+     * @param deviationrate2 the value for curvefittingmonthmain.deviationRate2
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate2(BigDecimal deviationrate2) {
+        this.deviationrate2 = deviationrate2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column curvefittingmonthmain.deviationRate3
+     *
+     * @return the value of curvefittingmonthmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDeviationrate3() {
+        return deviationrate3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column curvefittingmonthmain.deviationRate3
+     *
+     * @param deviationrate3 the value for curvefittingmonthmain.deviationRate3
+     *
+     * @mbg.generated
+     */
+    public void setDeviationrate3(BigDecimal deviationrate3) {
+        this.deviationrate3 = deviationrate3;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/CurvefittingmonthmainExample.java

@@ -0,0 +1,943 @@
+package com.gyee.runeconomy.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CurvefittingmonthmainExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public CurvefittingmonthmainExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNull() {
+            addCriterion("windturbine_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbine_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbine_id =", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbine_id <>", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbine_id >", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbine_id >=", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbine_id <", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbine_id <=", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbine_id like", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbine_id not like", value, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbine_id in", values, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbine_id not in", values, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbine_id between", value1, value2, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbine_id not between", value1, value2, "windturbine_id");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNull() {
+            addCriterion("year is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIsNotNull() {
+            addCriterion("year is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearEqualTo(String value) {
+            addCriterion("year =", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotEqualTo(String value) {
+            addCriterion("year <>", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThan(String value) {
+            addCriterion("year >", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearGreaterThanOrEqualTo(String value) {
+            addCriterion("year >=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThan(String value) {
+            addCriterion("year <", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLessThanOrEqualTo(String value) {
+            addCriterion("year <=", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearLike(String value) {
+            addCriterion("year like", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotLike(String value) {
+            addCriterion("year not like", value, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearIn(List<String> values) {
+            addCriterion("year in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotIn(List<String> values) {
+            addCriterion("year not in", values, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearBetween(String value1, String value2) {
+            addCriterion("year between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearNotBetween(String value1, String value2) {
+            addCriterion("year not between", value1, value2, "year");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNull() {
+            addCriterion("month is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIsNotNull() {
+            addCriterion("month is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthEqualTo(String value) {
+            addCriterion("month =", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotEqualTo(String value) {
+            addCriterion("month <>", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThan(String value) {
+            addCriterion("month >", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthGreaterThanOrEqualTo(String value) {
+            addCriterion("month >=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThan(String value) {
+            addCriterion("month <", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLessThanOrEqualTo(String value) {
+            addCriterion("month <=", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthLike(String value) {
+            addCriterion("month like", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotLike(String value) {
+            addCriterion("month not like", value, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthIn(List<String> values) {
+            addCriterion("month in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotIn(List<String> values) {
+            addCriterion("month not in", values, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthBetween(String value1, String value2) {
+            addCriterion("month between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthNotBetween(String value1, String value2) {
+            addCriterion("month not between", value1, value2, "month");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNull() {
+            addCriterion("monthDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIsNotNull() {
+            addCriterion("monthDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate =", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate <>", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("monthDeviationRate >", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate >=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThan(BigDecimal value) {
+            addCriterion("monthDeviationRate <", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("monthDeviationRate <=", value, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateIn(List<BigDecimal> values) {
+            addCriterion("monthDeviationRate in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("monthDeviationRate not in", values, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("monthDeviationRate between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthdeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("monthDeviationRate not between", value1, value2, "monthdeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNull() {
+            addCriterion("yearDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIsNotNull() {
+            addCriterion("yearDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate =", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate <>", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("yearDeviationRate >", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate >=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThan(BigDecimal value) {
+            addCriterion("yearDeviationRate <", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("yearDeviationRate <=", value, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateIn(List<BigDecimal> values) {
+            addCriterion("yearDeviationRate in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("yearDeviationRate not in", values, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("yearDeviationRate between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andYeardeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("yearDeviationRate not between", value1, value2, "yeardeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNull() {
+            addCriterion("standardDeviationRate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIsNotNull() {
+            addCriterion("standardDeviationRate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate =", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate <>", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThan(BigDecimal value) {
+            addCriterion("standardDeviationRate >", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate >=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThan(BigDecimal value) {
+            addCriterion("standardDeviationRate <", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("standardDeviationRate <=", value, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateIn(List<BigDecimal> values) {
+            addCriterion("standardDeviationRate in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotIn(List<BigDecimal> values) {
+            addCriterion("standardDeviationRate not in", values, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("standardDeviationRate between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andStandarddeviationrateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("standardDeviationRate not between", value1, value2, "standarddeviationrate");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNull() {
+            addCriterion("deviationRate1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1IsNotNull() {
+            addCriterion("deviationRate1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1EqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 =", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 <>", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate1 >", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 >=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThan(BigDecimal value) {
+            addCriterion("deviationRate1 <", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate1 <=", value, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1In(List<BigDecimal> values) {
+            addCriterion("deviationRate1 in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate1 not in", values, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate1 between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate1NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate1 not between", value1, value2, "deviationrate1");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNull() {
+            addCriterion("deviationRate2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2IsNotNull() {
+            addCriterion("deviationRate2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2EqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 =", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 <>", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate2 >", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 >=", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThan(BigDecimal value) {
+            addCriterion("deviationRate2 <", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate2 <=", value, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2In(List<BigDecimal> values) {
+            addCriterion("deviationRate2 in", values, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate2 not in", values, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate2 between", value1, value2, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate2NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate2 not between", value1, value2, "deviation_rate2");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNull() {
+            addCriterion("deviationRate3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3IsNotNull() {
+            addCriterion("deviationRate3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3EqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 =", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 <>", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThan(BigDecimal value) {
+            addCriterion("deviationRate3 >", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 >=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThan(BigDecimal value) {
+            addCriterion("deviationRate3 <", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("deviationRate3 <=", value, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3In(List<BigDecimal> values) {
+            addCriterion("deviationRate3 in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotIn(List<BigDecimal> values) {
+            addCriterion("deviationRate3 not in", values, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate3 between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviationrate3NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("deviationRate3 not between", value1, value2, "deviationrate3");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table curvefittingmonthmain
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/auto/TurbineInfoDay.java

@@ -1,30 +1,23 @@
 package com.gyee.runeconomy.model.auto;
 
-import java.math.BigDecimal;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author author
- * @since 2024-11-18
+ * @author gfhd
+ * @since 2024-05-29
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("turbine_info_day")
 public class TurbineInfoDay implements Serializable {
 
@@ -32,165 +25,44 @@ public class TurbineInfoDay implements Serializable {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
-    @TableField("station_id")
     private String stationId;
-
-    @TableField("project_id")
     private String projectId;
-
-    @TableField("line_id")
     private String lineId;
-
-    @TableField("turbine_id")
     private String turbineId;
-
-    @TableField("record_date")
     private Date recordDate;
-
-    @TableField("rfdl")
     private BigDecimal rfdl;
-
-    /**
-     * 计划检修损失
-     */
-    @TableField("jhjxss")
     private BigDecimal jhjxss;
-
-    /**
-     * 非计划检修损失
-     */
-    @TableField("fjhjxss")
     private BigDecimal fjhjxss;
-
-    /**
-     * 限电损失
-     */
-    @TableField("xdss")
     private BigDecimal xdss;
-
-    /**
-     * 受累损失
-     */
-    @TableField("slss")
     private BigDecimal slss;
-
-    /**
-     * 性能损失
-     */
-    @TableField("xnss")
     private BigDecimal xnss;
-
-    /**
-     * 理论发电量
-     */
-    @TableField("llfdl")
-    private BigDecimal llfdl;
-
-    @TableField("pjfs")
-    private BigDecimal pjfs;
-
-    /**
-     * 额定风速
-     */
-    @TableField("edfs")
-    private BigDecimal edfs;
-
-    /**
-     * 小风切入风速
-     */
-    @TableField("xfqrfs")
-    private BigDecimal xfqrfs;
-
-    @TableField("hjwd")
-    private BigDecimal hjwd;
-
-    /**
-     * 待机损失
-     */
-    @TableField("djss")
+    private Double llfdl;
+    private Double pjfs;
+    private Double edfs;
+    private Double xfqrfs;
+    private Double hjwd;
     private BigDecimal djss;
-
-    /**
-     * 故障损失
-     */
-    @TableField("gzss")
     private BigDecimal gzss;
-
-    /**
-     * 待机分钟
-     */
-    @TableField("dj_min")
-    private BigDecimal djMin;
-
-    /**
-     * 停机分钟
-     */
-    @TableField("tj_min")
-    private BigDecimal tjMin;
-
-    /**
-     * 运行分钟
-     */
-    @TableField("yx_min")
-    private BigDecimal yxMin;
-
-    /**
-     * 故障分钟
-     */
-    @TableField("gz_min")
-    private BigDecimal gzMin;
-
-    /**
-     * 检修分钟
-     */
-    @TableField("jx_min")
-    private BigDecimal jxMin;
-
-    /**
-     * 限电分钟
-     */
-    @TableField("xd_min")
-    private BigDecimal xdMin;
-
-    /**
-     * 离线分钟
-     */
-    @TableField("lx_min")
-    private BigDecimal lxMin;
-
-    /**
-     * 待机次数
-     */
-    @TableField("djcs")
-    private Integer djcs;
-
-    @TableField("tjcs")
+    private Double djMin;
+    private Double tjMin;
+    private Double yxMin;
+    private Double gzMin;
+    private Double jxMin;
+    private Double xdMin;
+    private Double lxMin;
+    private Long djcs;
     private Integer tjcs;
-
-    @TableField("yxcs")
-    private Integer yxcs;
-
-    @TableField("gzcs")
-    private Integer gzcs;
-
-    @TableField("jxcs")
-    private Integer jxcs;
-
-    @TableField("xdcs")
-    private Integer xdcs;
-
-    @TableField("lxcs")
-    private Integer lxcs;
-
-    @TableField("fx")
-    private BigDecimal fx;
-
-    @TableField("yxfss")
-    private BigDecimal yxfss;
-
-
-    @TableField("jfpl")
-    private BigDecimal jfpl;
-
+    private Long yxcs;
+    private Long gzcs;
+    private Long jxcs;
+    private Long xdcs;
+    private Long lxcs;
+    private Double jfpl;
+    private Double glyzxxs;
+    private Double fx;
+    private Double yxfss;
+    private Double lyxs;
+    private Double klyl;
+    private Double fnlyl;
+    private Double bll;
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/vo/PoliceVo.java

@@ -0,0 +1,415 @@
+package com.gyee.runeconomy.model.vo;
+
+import java.util.List;
+
+public class PoliceVo {
+
+    // 内部类 Data，用于表示 JSON 中的 data 部分
+    public static class Data {
+        private Integer total;  // total 字段
+        private List<AlarmDetails> ls;  // ls 字段，表示报警详细信息的列表
+
+        // Getter 和 Setter 方法
+        public Integer getTotal() {
+            return total;
+        }
+
+        public void setTotal(Integer total) {
+            this.total = total;
+        }
+
+        public List<AlarmDetails> getLs() {
+            return ls;
+        }
+
+        public void setLs(List<AlarmDetails> ls) {
+            this.ls = ls;
+        }
+    }
+
+    // 内部类 AlarmDetails，用于表示报警的详细信息
+    public static class AlarmDetails {
+        private String tbName;
+        private String alarmId;
+        private String alarmType;
+        private String characteristic;
+        private String components;
+        private Boolean confirmed;
+        private String description;
+        private String deviceId;
+        private String devicename;
+        private String deviceType;
+        private Boolean enabled;
+        private String lineid;
+        private String linename;
+        private String modelId;
+        private String projectid;
+        private String projectname;
+        private Integer rank;
+        private Boolean resettable;
+        private String stationid;
+        private String stationname;
+        private String subcomponents;
+        private String suffix;
+        private String tagid;
+        private Integer triggertype;
+        private String uniformcode;
+        private String superTableName;
+        private Long ts;
+        private Integer val;
+        private String oval;
+        private Long endts;
+        private Integer timelong;
+        private String name;
+        private String nemCode;
+        private String faultCause;
+        private String resolvent;
+        private String wpName;
+        private String code;
+        private String wpId;
+        private String faultType;
+        private String id;
+
+        // Getter 和 Setter 方法
+        public String getTbName() {
+            return tbName;
+        }
+
+        public void setTbName(String tbName) {
+            this.tbName = tbName;
+        }
+
+        public String getAlarmId() {
+            return alarmId;
+        }
+
+        public void setAlarmId(String alarmId) {
+            this.alarmId = alarmId;
+        }
+
+        public String getAlarmType() {
+            return alarmType;
+        }
+
+        public void setAlarmType(String alarmType) {
+            this.alarmType = alarmType;
+        }
+
+        public String getCharacteristic() {
+            return characteristic;
+        }
+
+        public void setCharacteristic(String characteristic) {
+            this.characteristic = characteristic;
+        }
+
+        public String getComponents() {
+            return components;
+        }
+
+        public void setComponents(String components) {
+            this.components = components;
+        }
+
+        public Boolean getConfirmed() {
+            return confirmed;
+        }
+
+        public void setConfirmed(Boolean confirmed) {
+            this.confirmed = confirmed;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getDeviceId() {
+            return deviceId;
+        }
+
+        public void setDeviceId(String deviceId) {
+            this.deviceId = deviceId;
+        }
+
+        public String getDevicename() {
+            return devicename;
+        }
+
+        public void setDevicename(String devicename) {
+            this.devicename = devicename;
+        }
+
+        public String getDeviceType() {
+            return deviceType;
+        }
+
+        public void setDeviceType(String deviceType) {
+            this.deviceType = deviceType;
+        }
+
+        public Boolean getEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(Boolean enabled) {
+            this.enabled = enabled;
+        }
+
+        public String getLineid() {
+            return lineid;
+        }
+
+        public void setLineid(String lineid) {
+            this.lineid = lineid;
+        }
+
+        public String getLinename() {
+            return linename;
+        }
+
+        public void setLinename(String linename) {
+            this.linename = linename;
+        }
+
+        public String getModelId() {
+            return modelId;
+        }
+
+        public void setModelId(String modelId) {
+            this.modelId = modelId;
+        }
+
+        public String getProjectid() {
+            return projectid;
+        }
+
+        public void setProjectid(String projectid) {
+            this.projectid = projectid;
+        }
+
+        public String getProjectname() {
+            return projectname;
+        }
+
+        public void setProjectname(String projectname) {
+            this.projectname = projectname;
+        }
+
+        public Integer getRank() {
+            return rank;
+        }
+
+        public void setRank(Integer rank) {
+            this.rank = rank;
+        }
+
+        public Boolean getResettable() {
+            return resettable;
+        }
+
+        public void setResettable(Boolean resettable) {
+            this.resettable = resettable;
+        }
+
+        public String getStationid() {
+            return stationid;
+        }
+
+        public void setStationid(String stationid) {
+            this.stationid = stationid;
+        }
+
+        public String getStationname() {
+            return stationname;
+        }
+
+        public void setStationname(String stationname) {
+            this.stationname = stationname;
+        }
+
+        public String getSubcomponents() {
+            return subcomponents;
+        }
+
+        public void setSubcomponents(String subcomponents) {
+            this.subcomponents = subcomponents;
+        }
+
+        public String getSuffix() {
+            return suffix;
+        }
+
+        public void setSuffix(String suffix) {
+            this.suffix = suffix;
+        }
+
+        public String getTagid() {
+            return tagid;
+        }
+
+        public void setTagid(String tagid) {
+            this.tagid = tagid;
+        }
+
+        public Integer getTriggertype() {
+            return triggertype;
+        }
+
+        public void setTriggertype(Integer triggertype) {
+            this.triggertype = triggertype;
+        }
+
+        public String getUniformcode() {
+            return uniformcode;
+        }
+
+        public void setUniformcode(String uniformcode) {
+            this.uniformcode = uniformcode;
+        }
+
+        public String getSuperTableName() {
+            return superTableName;
+        }
+
+        public void setSuperTableName(String superTableName) {
+            this.superTableName = superTableName;
+        }
+
+        public Long getTs() {
+            return ts;
+        }
+
+        public void setTs(Long ts) {
+            this.ts = ts;
+        }
+
+        public Integer getVal() {
+            return val;
+        }
+
+        public void setVal(Integer val) {
+            this.val = val;
+        }
+
+        public String getOval() {
+            return oval;
+        }
+
+        public void setOval(String oval) {
+            this.oval = oval;
+        }
+
+        public Long getEndts() {
+            return endts;
+        }
+
+        public void setEndts(Long endts) {
+            this.endts = endts;
+        }
+
+        public Integer getTimelong() {
+            return timelong;
+        }
+
+        public void setTimelong(Integer timelong) {
+            this.timelong = timelong;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getNemCode() {
+            return nemCode;
+        }
+
+        public void setNemCode(String nemCode) {
+            this.nemCode = nemCode;
+        }
+
+        public String getFaultCause() {
+            return faultCause;
+        }
+
+        public void setFaultCause(String faultCause) {
+            this.faultCause = faultCause;
+        }
+
+        public String getResolvent() {
+            return resolvent;
+        }
+
+        public void setResolvent(String resolvent) {
+            this.resolvent = resolvent;
+        }
+
+        public String getWpName() {
+            return wpName;
+        }
+
+        public void setWpName(String wpName) {
+            this.wpName = wpName;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+
+        public String getWpId() {
+            return wpId;
+        }
+
+        public void setWpId(String wpId) {
+            this.wpId = wpId;
+        }
+
+        public String getFaultType() {
+            return faultType;
+        }
+
+        public void setFaultType(String faultType) {
+            this.faultType = faultType;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+    }
+
+    // PoliceVo 的字段
+    private Integer code;  // code 字段
+    private Data data;     // data 字段，类型是 Data
+
+    // Getter 和 Setter 方法
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public Data getData() {
+        return data;
+    }
+
+    public void setData(Data data) {
+        this.data = data;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/ApiClient.java

@@ -43,7 +43,7 @@ public class ApiClient {
                                String deviceType,String components, String alarmId, String isclose, String pageNum,String pageSize) {
         try {
             // 构建 URL
-            String baseUrl = "http://172.16.12.101:6015/alarm/history/findAlarmlist";
+            String baseUrl = "http://10.220.1.11:6015/alarm/history/findAlarmlist";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
             String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
                     baseUrl,

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/ReportService.java

@@ -155,12 +155,26 @@ public class ReportService {
                 .mapToDouble(t -> t.getGzss() == null ? 0 : Math.round(t.getGzss().doubleValue() * 100.0) / 100.0)
                 .sum(); // 去年同期故障损失电量
 
+
         double currentDispatchLossPower = turbineList.stream()
-                .mapToDouble(t -> t.getXdss() == null ? 0 : Math.round(t.getXdss().doubleValue() * 100.0) / 100.0)
-                .sum(); // 本月调度限电损失电量
+                .mapToDouble(t -> t.getXdss() == null ? 0 : new BigDecimal(t.getXdss().doubleValue())
+                        .setScale(2, BigDecimal.ROUND_HALF_UP) // 保留两位小数并四舍五入
+                        .doubleValue())
+                .sum();
+        currentDispatchLossPower = new BigDecimal(currentDispatchLossPower)
+                .setScale(2, BigDecimal.ROUND_HALF_UP) // 确保最后的结果保留两位小数
+                .doubleValue();// 本月调度限电损失电量
+
+
         double lastYearDispatchLossPower = tqturbineList.stream()
-                .mapToDouble(t -> t.getXdss() == null ? 0 : Math.round(t.getXdss().doubleValue() * 100.0) / 100.0)
-                .sum(); // 去年同期调度限电损失电量
+                .mapToDouble(t -> t.getXdss() == null ? 0 : new BigDecimal(t.getXdss().doubleValue())
+                        .setScale(2, BigDecimal.ROUND_HALF_UP) // 保留两位小数并四舍五入
+                        .doubleValue())
+                .sum();
+        lastYearDispatchLossPower = new BigDecimal(lastYearDispatchLossPower)
+                .setScale(2, BigDecimal.ROUND_HALF_UP) // 确保最后的结果保留两位小数
+                .doubleValue();// 去年同期调度限电损失电量
+
 
         double currentPlannedMaintenanceLossPower = turbineList.stream()
                 .mapToDouble(t -> t.getJhjxss() == null ? 0 : Math.round(t.getJhjxss().doubleValue() * 100.0) / 100.0)

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/Deviation.java

@@ -4,9 +4,10 @@ public class Deviation {
     // 计算风速偏差率
     public static double calculateSpeedDeviation(double fanSpeed, double towerSpeed) {
         if (towerSpeed == 0) {
-            throw new IllegalArgumentException("Tower speed cannot be zero.");
+            towerSpeed = 1;
         }
-        return Math.abs(towerSpeed - fanSpeed) / towerSpeed * 100;
+        double deviation = Math.abs(towerSpeed - fanSpeed) / towerSpeed * 100;
+        return Double.parseDouble(String.format("%.2f", deviation));  // 保留两位小数
     }
 
     // 计算风向差值
@@ -15,6 +16,7 @@ public class Deviation {
         if (difference > 180) {
             difference = 360 - difference;
         }
-        return difference;
+        return Double.parseDouble(String.format("%.2f", difference));  // 保留两位小数
     }
+
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WindDirection/WindMachineService.java

@@ -161,4 +161,147 @@ public class WindMachineService {
 
         return monthlyData;
     }
+
+    /**
+     * 气象单机偏差分析
+     * @param wpid
+     * @return
+     * @throws Exception
+     */
+    public Object weathermachine(String wpid) throws Exception {
+        // 获取当前日期
+        int currentYear = LocalDate.now().getYear();
+
+        List<ProBasicEquipment> collect = CacheContext.wtls.stream()
+                .filter(wt -> wpid.equals(wt.getWindpowerstationId()))
+                .collect(Collectors.toList());
+
+        Map<String, List> monthlyData = new LinkedHashMap<>();
+
+
+        // 风机循环：每台风机每个月一个 WindData 对象
+        for (ProBasicEquipment eq : collect) {
+
+            // 获取当前年份的开始日期（1月1日）
+            LocalDate startOfYear = LocalDate.of(currentYear, 1, 1);
+
+            // 获取当前年份的结束日期（12月31日）
+            LocalDate endOfYear = LocalDate.of(currentYear, 12, 31);
+
+            // 使用 DateTimeFormatter 格式化日期为字符串
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+            // 转换为字符串
+            String startOfYearStr = startOfYear.format(formatter);
+            String endOfYearStr = endOfYear.format(formatter);
+
+            List<TurbineInfoDay> turbineList = turbineInfoDayService.getTurbineList(eq.getId(), startOfYearStr, endOfYearStr);
+            List<StationInfoDay> infoDays = stationInfoDayService.getTurbineList(wpid, startOfYearStr, endOfYearStr);
+            List<String> zb = new ArrayList<>();
+            zb.add("fsavg");
+            zb.add("cftfsavg");
+            zb.add("fspc");
+            zb.add("fxavg");
+            zb.add("cftfxavg");
+            zb.add("fxpc");
+
+            for (String z : zb) {
+                // 循环从1月到12月
+                List<Double> result = new ArrayList<>();
+                String zbwz = "";
+                for (int month = 1; month <= 12; month++) {
+                    // 过滤 turbineList 中的记录，筛选出对应月份的数据
+                    int finalMonth = month;
+                    List<TurbineInfoDay> filteredList = turbineList.stream()
+                            .filter(turbine -> {
+                                // 获取 turbineInfoDay 的 recordDate（类型为 LocalDate）
+                                Date dateFromTurbine = turbine.getRecordDate();
+
+                                // 将 Date 转换为 LocalDate
+                                ZonedDateTime zonedDateTime = dateFromTurbine.toInstant().atZone(ZoneId.systemDefault());
+                                LocalDate recordDate = zonedDateTime.toLocalDate();
+
+                                // 获取记录的月份（注意，月份从 1 开始，1 表示1月）
+                                int recordMonth = recordDate.getMonthValue();
+
+                                // 判断记录的月份是否等于给定的 time
+                                return recordMonth == finalMonth;  // 比较 int 类型的月份和 time 变量
+                            })
+                            .collect(Collectors.toList());
+
+                    List<StationInfoDay> dayfilteredList = infoDays.stream()
+                            .filter(turbine -> {
+                                // 获取 turbineInfoDay 的 recordDate（类型为 LocalDate）
+                                LocalDate dateFromTurbine = turbine.getRecordDate();
+
+                                // 获取记录的月份（注意，月份从 1 开始，1 表示1月）
+                                int recordMonth = dateFromTurbine.getMonthValue();
+
+                                // 判断记录的月份是否等于给定的 time
+                                return recordMonth == finalMonth;  // 比较 int 类型的月份和 time 变量
+                            })
+                            .collect(Collectors.toList());
+
+                    // 风速
+                    double fsaverage = filteredList.stream()
+                            .mapToDouble(turbineInfoDay -> Optional.ofNullable(turbineInfoDay.getPjfs()).map(Number::doubleValue).orElse(0.0))
+                            .average()
+                            .orElse(0.0);  // 默认值0.0
+
+                    // 风向
+                    double fxaverage = filteredList.stream()
+                            .mapToDouble(turbineInfoDay -> Optional.ofNullable(turbineInfoDay.getFx()).map(Number::doubleValue).orElse(0.0))
+                            .average()
+                            .orElse(0.0);  // 默认值0.0
+
+                    // 测风塔风速
+                    double cftfsaverage = dayfilteredList.stream()
+                            .mapToDouble(turbineInfoDay -> Optional.ofNullable(turbineInfoDay.getCftfs()).map(Number::doubleValue).orElse(0.0))
+                            .average()
+                            .orElse(0.0); // 默认值0.0
+
+                    // 测风塔风向
+                    double cftfxaverage = dayfilteredList.stream()
+                            .mapToDouble(turbineInfoDay -> Optional.ofNullable(turbineInfoDay.getCftfx()).map(Number::doubleValue).orElse(0.0))
+                            .average()
+                            .orElse(0.0);  // 默认值0.0
+
+
+                    double zbsj = 0.0;
+
+                    if (z.toString().equals("fsavg")) {
+                        // 保留两位小数并转换回 double
+                        zbsj = Double.parseDouble(String.format("%.2f", fsaverage));
+                        zbwz = "风速";
+                    } else if (z.toString().equals("fxavg")) {
+                        zbsj = Double.parseDouble(String.format("%.2f", fxaverage));
+                        zbwz = "风向";
+                    } else if (z.toString().equals("cftfsavg")) {
+                        zbsj = Double.parseDouble(String.format("%.2f", cftfsaverage));
+                        zbwz = "测风塔风速";
+                    } else if (z.toString().equals("cftfxavg")) {
+                        zbsj = Double.parseDouble(String.format("%.2f", cftfxaverage));
+                        zbwz = "测风塔风向";
+                    } else if (z.toString().equals("fspc")) {
+                        zbsj = Deviation.calculateSpeedDeviation(
+                                fsaverage,
+                                cftfsaverage
+                        );
+                        zbwz = "风速偏差";
+                    } else if (z.toString().equals("fxpc")) {
+                        zbsj = Deviation.calculateDirectionDeviation(
+                                fxaverage,
+                                cftfxaverage
+                        );
+                        zbwz = "风向偏差";
+                    }
+                    result.add(zbsj);
+                }
+                monthlyData.put(eq.getAname() + zbwz, result);
+            }
+
+        }
+
+        return monthlyData;
+    }
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Windresourceanalysis/WindresourceanalysisService2.java

@@ -0,0 +1,190 @@
+package com.gyee.runeconomy.service.Windresourceanalysis;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.runeconomy.dto.WindspeedVo;
+import com.gyee.runeconomy.dto.speed.PowerPointData;
+import com.gyee.runeconomy.dto.speed.WindDirectionALG;
+import com.gyee.runeconomy.feign.AdapterApi;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.PointData;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstation;
+import com.gyee.runeconomy.model.auto.ProBasicPowerstationPoint;
+import com.gyee.runeconomy.model.auto.ProBasicWeatherStation;
+import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
+import com.gyee.runeconomy.service.auto.IProEconPowerstationInfoDay1Service;
+import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WindresourceanalysisService2 {
+
+    @Resource
+    private IProEconPowerstationInfoDay1Service proEconPowerstationInfoDay1Service;
+
+    @Resource
+    private IProBasicPowerstationPointService proBasicPowerstationPointService;
+
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private AdapterApi adapterApi;
+
+    public URI goldenUri() {
+        return URI.create("http://10.220.1.8:8011/ts");
+    }
+
+
+
+    /**
+     * 风向玫瑰图\风向频率玫瑰图
+     *
+     * @param wpid 预处理数据的id
+     * @param mode 0:单台风机  1:多台风机合并
+     * @return
+     */
+    public Object fxRoses(String wpid, int mode, String Data) throws Exception {
+
+        List<ProBasicWeatherStation> wplsf = CacheContext.weawpls.stream().filter(w -> w.getWindpowerstationId().equals(wpid)).collect(Collectors.toList());
+
+        //转换时间为Date类型
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(Data);
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+
+        Date startTime = calendar.getTime();
+
+        Calendar calendar1 = Calendar.getInstance();
+        calendar1.setTime(date);
+
+        // 获取当前日期
+        Calendar today = Calendar.getInstance();
+        today.set(Calendar.HOUR_OF_DAY, 0);
+        today.set(Calendar.MINUTE, 0);
+        today.set(Calendar.SECOND, 0);
+
+        // 判断是否是当天
+        if (calendar1.get(Calendar.YEAR) == today.get(Calendar.YEAR) &&
+                calendar1.get(Calendar.DAY_OF_YEAR) == today.get(Calendar.DAY_OF_YEAR)) {
+            // 当天，设置endTime为当前时间
+            Date now = new Date();
+            calendar1.setTime(now);
+        } else {
+            // 非当天，设置endTime为传入的date的23:59:59
+            calendar1.set(Calendar.HOUR_OF_DAY, 23);
+            calendar1.set(Calendar.MINUTE, 59);
+            calendar1.set(Calendar.SECOND, 59);
+        }
+        Date endTime = calendar1.getTime();
+
+        ProBasicPowerstationPoint pjfs = null;
+        ProBasicPowerstationPoint pjfx = null;
+
+        List<WindspeedVo> vos = new ArrayList<>();
+
+        for (ProBasicWeatherStation ww : wplsf) {
+            if (ww.getId().contains("GJYF02")) continue;
+
+            pjfs = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFS70);
+            pjfx = proBasicPowerstationPointService.getPowerstationPoint(ww.getId(), ContantXk.FCCFTFX70);
+
+            List<ProBasicPowerstation> collect = CacheContext.wplsf.stream().filter(c -> c.getId().equals(ww.getWindpowerstationId())).collect(Collectors.toList());
+
+            if (pjfs.getNemCode() != null && !pjfs.getNemCode().equals("INITIAL")) {
+
+                List<PointData> pjfsls = adapterApi.getHistorySnap(goldenUri(), pjfs.getNemCode(), startTime.getTime(), endTime.getTime(), 900);
+                List<PointData> pjfxls = adapterApi.getHistorySnap(goldenUri(), pjfx.getNemCode(), startTime.getTime(), endTime.getTime(), 900);
+                double temp1 = 0;
+                for (int i = 0; i < pjfsls.size(); i++) {
+                    WindspeedVo vo = new WindspeedVo();
+                    temp1 = pjfsls.get(i).getDoubleValue();
+                    vo.setWpid(ww.getId());
+                    vo.setHours(pjfsls.get(i).getTs());
+                    vo.setPjfs(temp1);
+                    vos.add(vo);
+                }
+
+                if (pjfxls != null && pjfxls.size() > 1) {
+                    vos.stream().forEach(i -> {
+                        Optional<PointData> optional = pjfxls.stream()
+                                .filter(j -> j.getTime().equals(i.getHours()))
+                                .findFirst();
+                        if (optional.isPresent()) {
+                            PointData tqinfoday = optional.get();
+                            i.setPjfx(tqinfoday.getDoubleValue());
+                        }
+                    });
+                }
+            }
+
+        }
+
+        List<Object> result = new ArrayList<>();
+        if (mode == 0) {
+
+            Map<String, Object> map = new HashMap<>();
+            List<PowerPointData> ls = new ArrayList<>();
+            for (WindspeedVo v : vos) {
+                PowerPointData data = new PowerPointData();
+                data.setFx(v.getPjfx());
+                data.setSpeed(v.getPjfs());
+                ls.add(data);
+            }
+            map.put("wt", wpid);
+            map.put("roses", WindDirectionALG.fxRoses(ls));
+            map.put("count", WindDirectionALG.fxCountRoses(ls));
+            //                map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+            //                map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+            result.add(map);
+
+        }
+        if (mode == 1) {
+            List<PowerPointData> ls = new ArrayList<>();
+            for (WindspeedVo obj : vos)
+                ls.addAll(csvParse(obj));
+            Map<String, Object> map = new HashMap<>();
+            map.put("wt", "merge");
+            map.put("roses", WindDirectionALG.fxRoses(ls));
+            map.put("count", WindDirectionALG.fxCountRoses(ls));
+            //            map.put("radar", WindDirectionALG.fxRadarRoses(ls));
+            //            map.put("frequency", WindDirectionALG.windDeviationPoint(ls));
+            result.add(map);
+        }
+
+        return result;
+    }
+
+    /**
+     * csv 文件解析成对象
+     *
+     * @param obj
+     * @return
+     */
+    private List<PowerPointData> csvParse(WindspeedVo obj) {
+        List<PowerPointData> ls = new ArrayList<>();
+        //        List<String> content = FileUtil.readFile(obj.getPath(), true);
+        //        for (int i = 1; i < content.size(); i++){
+        //            String[] split = content.get(i).split(",");
+        PowerPointData data = new PowerPointData();
+        //            if (data.getSpeed() < 0 || data.getPower() < 0)
+        //                continue;
+        data.setWtId(obj.getWpid());
+        data.setFx(obj.getPjfx());
+        data.setSpeed(obj.getPjfs());
+        ls.add(data);
+        //        }
+        return ls;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconAlarmTypeService.java

@@ -3,6 +3,8 @@ package com.gyee.runeconomy.service.auto;
 import com.gyee.runeconomy.model.auto.ProEconAlarmType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 自定义类型 服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IProEconAlarmTypeService extends IService<ProEconAlarmType> {
 
+    List<ProEconAlarmType> bylist (String wtid);
+    List<ProEconAlarmType> bylists ();
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/CurvefittingmainService.java

@@ -0,0 +1,283 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.common.model.Convert;
+import com.gyee.runeconomy.config.BaseService;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.mapper.auto.CurvefittingmainMapper;
+import com.gyee.runeconomy.model.auto.Curvefittingmain;
+import com.gyee.runeconomy.model.auto.CurvefittingmainExample;
+import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.vo.Tablepar;
+import com.gyee.runeconomy.util.DateUtils;
+import com.gyee.runeconomy.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+
+@Service
+public class CurvefittingmainService implements BaseService<Curvefittingmain, CurvefittingmainExample> {
+	@Resource
+	private CurvefittingmainMapper curvefittingmainMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista= Convert.toListStrArray(ids);
+			CurvefittingmainExample example=new CurvefittingmainExample();
+			example.createCriteria().andIdIn(lista);
+			return curvefittingmainMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Curvefittingmain selectByPrimaryKey(String id) {
+				
+			return curvefittingmainMapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Curvefittingmain record) {
+		return curvefittingmainMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Curvefittingmain record) {
+				
+		//添加雪花主键id
+//		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return curvefittingmainMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Curvefittingmain record, CurvefittingmainExample example) {
+		
+		return curvefittingmainMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Curvefittingmain record, CurvefittingmainExample example) {
+		
+		return curvefittingmainMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Curvefittingmain> selectByExample(CurvefittingmainExample example) {
+		
+		return curvefittingmainMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(CurvefittingmainExample example) {
+		
+		return curvefittingmainMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(CurvefittingmainExample example) {
+		
+		return curvefittingmainMapper.deleteByExample(example);
+	}
+
+
+	public List<Curvefittingmain> getCurvefittingmainList(Tablepar tablepar, List<String> wtIds, Date recorddate)  {
+
+		List<Curvefittingmain> list =new ArrayList<>();
+
+		CurvefittingmainExample example=new CurvefittingmainExample();
+		example.setOrderByClause(" deviation_rate2 DESC");
+
+
+		CurvefittingmainExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWindturbineidIn(wtIds);
+		Date endDate= DateUtils.addDays(recorddate,1);
+		criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+		list=curvefittingmainMapper.selectByExample(example);
+
+		for (Curvefittingmain curvefittingmain : list) {
+			for (ProBasicEquipment wtl : CacheContext.wtls) {
+				if (curvefittingmain.getWindturbineid().equals(wtl.getId())) {
+					curvefittingmain.setWindturbineid(wtl.getNemCode());
+				}
+			}
+		}
+		list=sortCurvefittingmainList(tablepar, list);
+
+		return list;
+
+	}
+
+	public  List<Curvefittingmain> sortCurvefittingmainList(Tablepar tablepar,List<Curvefittingmain> ls)
+	{
+
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "windturbineid":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getWindturbineid().compareTo(o2.getWindturbineid());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getWindturbineid().compareTo(o1.getWindturbineid());
+							}
+
+						});
+					}
+					break;
+				case "monthdeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getMonthdeviationrate().compareTo(o2.getMonthdeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getMonthdeviationrate().compareTo(o1.getMonthdeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "yeardeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getYeardeviationrate().compareTo(o2.getYeardeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getYeardeviationrate().compareTo(o1.getYeardeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "standarddeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getStandarddeviationrate().compareTo(o2.getStandarddeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getStandarddeviationrate().compareTo(o1.getStandarddeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate1":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate1().compareTo(o2.getDeviationrate1());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate1().compareTo(o1.getDeviationrate1());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate2":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate2().compareTo(o2.getDeviationrate2());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate2().compareTo(o1.getDeviationrate2());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate3":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o1.getDeviationrate3().compareTo(o2.getDeviationrate3());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmain>() {
+							// 升序排序
+							public int compare(Curvefittingmain o1, Curvefittingmain o2) {
+								return o2.getDeviationrate3().compareTo(o1.getDeviationrate3());
+							}
+
+						});
+					}
+					break;
+				default:
+
+					break;
+			}
+
+		}
+		return ls;
+	}
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/CurvefittingmonthmainService.java

@@ -0,0 +1,286 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.common.model.Convert;
+import com.gyee.runeconomy.config.BaseService;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.mapper.auto.CurvefittingmonthmainMapper;
+import com.gyee.runeconomy.model.auto.Curvefittingmonthmain;
+import com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.vo.Tablepar;
+import com.gyee.runeconomy.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+
+@Service
+public class CurvefittingmonthmainService implements BaseService<Curvefittingmonthmain, CurvefittingmonthmainExample> {
+	@Resource
+	private CurvefittingmonthmainMapper curvefittingmonthmainMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+
+			List<String> lista= Convert.toListStrArray(ids);
+			CurvefittingmonthmainExample example=new CurvefittingmonthmainExample();
+			example.createCriteria().andIdIn(lista);
+			return curvefittingmonthmainMapper.deleteByExample(example);
+
+
+	}
+
+
+	@Override
+	public Curvefittingmonthmain selectByPrimaryKey(String id) {
+
+			return curvefittingmonthmainMapper.selectByPrimaryKey(id);
+
+	}
+
+
+	@Override
+	public int updateByPrimaryKeySelective(Curvefittingmonthmain record) {
+		return curvefittingmonthmainMapper.updateByPrimaryKeySelective(record);
+	}
+
+
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Curvefittingmonthmain record) {
+
+		//添加雪花主键id
+//		record.setId(SnowflakeIdWorker.getUUID());
+
+
+		return curvefittingmonthmainMapper.insertSelective(record);
+	}
+
+
+	@Override
+	public int updateByExampleSelective(Curvefittingmonthmain record, CurvefittingmonthmainExample example) {
+
+		return curvefittingmonthmainMapper.updateByExampleSelective(record, example);
+	}
+
+
+	@Override
+	public int updateByExample(Curvefittingmonthmain record, CurvefittingmonthmainExample example) {
+
+		return curvefittingmonthmainMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Curvefittingmonthmain> selectByExample(CurvefittingmonthmainExample example) {
+
+		return curvefittingmonthmainMapper.selectByExample(example);
+	}
+
+
+	@Override
+	public long countByExample(CurvefittingmonthmainExample example) {
+
+		return curvefittingmonthmainMapper.countByExample(example);
+	}
+
+
+	@Override
+	public int deleteByExample(CurvefittingmonthmainExample example) {
+
+		return curvefittingmonthmainMapper.deleteByExample(example);
+	}
+
+	public List<Curvefittingmonthmain> getCurvefittingmonthmainList(Tablepar tablepar, List<String> wtIds, String year, String month)  {
+
+		List<Curvefittingmonthmain> list =new ArrayList<>();
+
+		if(StringUtils.notEmp(wtIds) && StringUtils.notEmp(year) && StringUtils.notEmp(month))
+		{
+			CurvefittingmonthmainExample example=new CurvefittingmonthmainExample();
+			example.setOrderByClause(" deviation_rate2 DESC");
+
+
+			CurvefittingmonthmainExample.Criteria criteria =example.createCriteria();
+
+			criteria.andWindturbineidIn(wtIds);
+			criteria.andYearEqualTo(year);
+			criteria.andMonthEqualTo(month);
+
+			list=curvefittingmonthmainMapper.selectByExample(example);
+
+			for (Curvefittingmonthmain curvefittingmonthmain : list) {
+				for (ProBasicEquipment wtl : CacheContext.wtls) {
+					if (curvefittingmonthmain.getWindturbineid().equals(wtl.getId())) {
+						curvefittingmonthmain.setWindturbineid(wtl.getNemCode());
+					}
+				}
+			}
+			list=sortCurvefittingmonthmainList(tablepar, list);
+		}
+
+		return list;
+	}
+
+
+	public  List<Curvefittingmonthmain> sortCurvefittingmonthmainList(Tablepar tablepar,List<Curvefittingmonthmain> ls)
+	{
+		tablepar.setOrderByColumn("windturbine_id");
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "windturbine_id":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getWindturbineid().compareTo(o2.getWindturbineid());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getWindturbineid().compareTo(o1.getWindturbineid());
+							}
+
+						});
+					}
+					break;
+				case "monthdeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getMonthdeviationrate().compareTo(o2.getMonthdeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getMonthdeviationrate().compareTo(o1.getMonthdeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "yeardeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getYeardeviationrate().compareTo(o2.getYeardeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getYeardeviationrate().compareTo(o1.getYeardeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "standarddeviationrate":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getStandarddeviationrate().compareTo(o2.getStandarddeviationrate());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getStandarddeviationrate().compareTo(o1.getStandarddeviationrate());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate1":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate1().compareTo(o2.getDeviationrate1());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate1().compareTo(o1.getDeviationrate1());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate2":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate2().compareTo(o2.getDeviationrate2());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate2().compareTo(o1.getDeviationrate2());
+							}
+
+						});
+					}
+					break;
+				case "deviationrate3":
+					if (tablepar.getIsAsc().equals("asc")) {
+
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o1.getDeviationrate3().compareTo(o2.getDeviationrate3());
+							}
+
+						});
+					} else   {
+						Collections.sort(ls, new Comparator<Curvefittingmonthmain>() {
+							// 升序排序
+							public int compare(Curvefittingmonthmain o1, Curvefittingmonthmain o2) {
+								return o2.getDeviationrate3().compareTo(o1.getDeviationrate3());
+							}
+
+						});
+					}
+					break;
+				default:
+
+					break;
+			}
+
+		}
+		return ls;
+	}
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconAlarmTypeServiceImpl.java

@@ -1,11 +1,18 @@
 package com.gyee.runeconomy.service.auto.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
 import com.gyee.runeconomy.model.auto.ProEconAlarmType;
 import com.gyee.runeconomy.mapper.auto.ProEconAlarmTypeMapper;
 import com.gyee.runeconomy.service.auto.IProEconAlarmTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 自定义类型 服务实现类
@@ -17,4 +24,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProEconAlarmTypeServiceImpl extends ServiceImpl<ProEconAlarmTypeMapper, ProEconAlarmType> implements IProEconAlarmTypeService {
 
+    @Override
+    public List<ProEconAlarmType> bylist(String wtid) {
+        List<ProBasicEquipment> collect = CacheContext.wtls.stream().filter(wt -> wtid.equals(wt.getId())).collect(Collectors.toList());
+        String model = "WT2000D121H85";
+        if (collect != null || collect.size() > 0) {
+            model = collect.get(0).getModelId();
+        }
+        model="alertrule_category";
+        QueryWrapper<ProEconAlarmType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ProEconAlarmType::getCategory,model);
+        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(queryWrapper);
+        return proEconAlarmTypes;
+    }
+
+    @Override
+    public List<ProEconAlarmType> bylists() {
+        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(null);
+        return proEconAlarmTypes;
+    }
 }

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

@@ -1540,8 +1540,8 @@ public class BenchmarkingService {
             if (null == i.getRecordDate()) {
                 vo.setDate(null);
             } else {
-//                Date date = Date.from(i.getRecordDate().atStartOfDay(ZoneId.systemDefault()).toInstant());
-//                vo.setDate(date);
+                Date date = i.getRecordDate();
+                vo.setDate(date);
             }
             vo.setFdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getRfdl())), 2));
             vo.setLlfdl(DoubleUtils.keepPrecision(Double.valueOf(String.valueOf(i.getLlfdl())), 2));

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/homepage/EconomyPointHomePageService.java

@@ -11,6 +11,7 @@ import com.gyee.runeconomy.model.StationInfoMin;
 import com.gyee.runeconomy.model.auto.*;
 import com.gyee.runeconomy.model.vo.*;
 import com.gyee.runeconomy.service.auto.*;
+import org.hibernate.query.criteria.internal.expression.function.AggregationFunction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,10 +21,7 @@ import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Month;
-import java.time.ZoneOffset;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
@@ -75,6 +73,9 @@ public class EconomyPointHomePageService {
     @Resource
     private IStationInfoDayService iStationInfoDayService;
 
+    @Resource
+    private ITurbineInfoDayService iTurbineInfoDayService;
+
 
     /**
      * 指标率相应类
@@ -135,6 +136,13 @@ public class EconomyPointHomePageService {
      * 15分钟发电量
      */
     private Map<String, GeneratingCapacityVo> generatingCapacity15min = new HashMap<>();
+    private Map<String, BigDecimal> yfdlCal = new HashMap<>();
+    private Map<String, BigDecimal> yllfdlCal = new HashMap<>();
+    private Map<Integer, BigDecimal> nfdlCal = new HashMap<>();
+    private Map<Integer, BigDecimal> nllfdlCal = new HashMap<>();
+    private LocalDate lastCalDate;
+
+    private Map<LocalDate, BigDecimal> fnlyl = new HashMap<>();
 
 
     /**
@@ -1562,274 +1570,13 @@ public class EconomyPointHomePageService {
     }
 
 
-//    public Map<String, Object> getGeneratingCapacity2(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        List<GeneratingCapacityVo> ls = new ArrayList<>();
-//        LocalDate now = LocalDate.now();
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
-//            rfdl.setName("日发电量");
-//            rfdl.setValue(day1.getRfdl());
-//            rfdl.setTotal(day1.getRllfdl());
-//            BigDecimal rbfb = (day1.getRfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getRllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getRllfdl().divide(day1.getRfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            rfdl.setBfb(rbfb);
-//            ls.add(rfdl);
-//
-//            GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
-//            yfdl.setName("月发电量");
-//            yfdl.setValue(day1.getYfdl());
-//            yfdl.setTotal(day1.getYllfdl());
-//            BigDecimal ybfb = (day1.getYfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getYllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getYllfdl().divide(day1.getYfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            yfdl.setBfb(ybfb);
-//            ls.add(yfdl);
-//
-//            GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
-//            nfdl.setName("年发电量");
-//            nfdl.setValue(day1.getNfdl().divide(new BigDecimal(1000)));
-//            nfdl.setTotal(day1.getNllfdl().divide(new BigDecimal(1000)));
-//            BigDecimal nbfb = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNllfdl().divide(day1.getNfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            rfdl.setBfb(rbfb);
-//            nfdl.setBfb(nbfb);
-//            ls.add(nfdl);
-//
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            List<ColumnVo> ls1 = new ArrayList<>();
-//            ColumnVo cl1 = new ColumnVo();
-//            cl1.setName("指标名称");
-//            cl1.setField("wtId");
-//            ColumnVo cl2 = new ColumnVo();
-//            cl2.setName(String.valueOf(LocalDate.now().getYear()));
-//            cl2.setField("recodedate");
-//            ColumnVo cl3 = new ColumnVo();
-//            cl3.setName(String.valueOf(LocalDate.now().getYear() - 1));
-//            cl3.setField("recodedate2");
-//            ColumnVo cl4 = new ColumnVo();
-//            cl4.setName("涨跌%");
-//            cl4.setField("operation");
-//            ls1.add(cl1);
-//            ls1.add(cl2);
-//            ls1.add(cl3);
-//            ls1.add(cl4);
-//
-//            List<ComparetqVo> ls2 = new ArrayList<>();
-//            ComparetqVo cv = new ComparetqVo();
-//            cv.setWtId("发电量");
-//            cv.setRecodedate(String.valueOf(day1.getNfdl().divide(new BigDecimal(1000))));
-//            cv.setRecodedate2(String.valueOf(0));
-//            cv.setOperation("100");
-//            ComparetqVo cv1 = new ComparetqVo();
-//            cv1.setWtId("上网电量");
-//            cv1.setRecodedate(String.valueOf(0.00));
-//            cv1.setRecodedate2(String.valueOf(0));
-//            cv1.setOperation("0");
-//            ComparetqVo cv2 = new ComparetqVo();
-//            cv2.setWtId("网购电量");
-//            cv2.setRecodedate(String.valueOf(0.00));
-//            cv2.setRecodedate2(String.valueOf(0));
-//            cv2.setOperation("0");
-//            ComparetqVo cv3 = new ComparetqVo();
-//            cv3.setWtId("损失电量");
-//            cv3.setRecodedate(String.valueOf(0.00));
-//            cv3.setRecodedate2(String.valueOf(0));
-//            cv3.setOperation("0");
-//            ComparetqVo cv4 = new ComparetqVo();
-//            cv4.setWtId("场用电量");
-//            cv4.setRecodedate(String.valueOf(0.00));
-//            cv4.setRecodedate2(String.valueOf(0));
-//            cv4.setOperation("0");
-//            ls2.add(cv);
-//            ls2.add(cv1);
-//            ls2.add(cv2);
-//            ls2.add(cv3);
-//            ls2.add(cv4);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            allmap.put("fdl", ls);
-//            allmap.put("zbtqdb", zbtqdb);
-//        }
-//
-//        return allmap;
-//    }
-
-
-//    public Map<String, Object> getHomeRight(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        LocalDate now = LocalDate.now();
-//        Date currentDate = DateUtils.getCurrentDate();
-//        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-//        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        Map<String, Object> sbklyl = new HashMap<>();
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls1 = getTitle(title);
-//            String[] title2 = {"排名", "名称", "设备利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls3 = getTitle(title2);
-//            List<HomeRightVo> ls2 = new ArrayList<>();
-//            HomeRightVo hv = new HomeRightVo();
-//            hv.setIndex("1");
-//            hv.setName("惠安风场");
-//            BigDecimal fnlyl = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNfdl().divide(day1.getNllfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            hv.setFnlyl(String.valueOf(fnlyl));
-//            hv.setYearTq("0");
-//            hv.setOperation(String.valueOf(fnlyl));
-//            ls2.add(hv);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            sbklyl.put("column", ls3);
-//            allmap.put("fnlyl", zbtqdb);
-//
-//        }
-//
-//        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-//        for (ProEconPowerstationInfoDay2 day2 : list) {
-//            List<HomeRightVo> ls3 = new ArrayList<>();
-//            HomeRightVo hv2 = new HomeRightVo();
-//            hv2.setIndex("1");
-//            hv2.setName("惠安风场");
-//            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-//            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-//            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-//            hv2.setFnlyl(String.valueOf(ysbklyl));
-//            hv2.setYearTq("0");
-//            hv2.setOperation(String.valueOf(ysbklyl));
-//            ls3.add(hv2);
-//            sbklyl.put("data", ls3);
-//            allmap.put("sbklyl", sbklyl);
-//        }
-//
-//        Map<String, Object> lgxzkh = new HashMap<>();
-//        String[] title = {"排名", "名称", "考核分数", "去年同期%", "涨跌%"};
-//        List<ColumnVo> ls1 = getTitle(title);
-//        List<HomeRightVo> ls2 = new ArrayList<>();
-//        HomeRightVo hv = new HomeRightVo();
-//        hv.setIndex("1");
-//        hv.setName("惠安风场");
-//        hv.setFnlyl("98");
-//        hv.setYearTq("0");
-//        hv.setOperation("100");
-//        ls2.add(hv);
-//
-//        lgxzkh.put("column", ls1);
-//        lgxzkh.put("data", ls2);
-//        allmap.put("lgxzkh", lgxzkh);
-//
-//        return allmap;
-//
-//    }
-
-//    public Map<String, Object> getHomeRight(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        LocalDate now = LocalDate.now();
-//        Date currentDate = DateUtils.getCurrentDate();
-//        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-//        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
-//        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-//        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-//        Map<String, Object> sbklyl = new HashMap<>();
-//        for (ProEconPowerstationInfoDay1 day1 : day1s) {
-//            Map<String, Object> zbtqdb = new HashMap<>();
-//            String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls1 = getTitle(title);
-//            String[] title2 = {"排名", "名称", "设备利用率%", "去年同期%", "涨跌%"};
-//            List<ColumnVo> ls3 = getTitle(title2);
-//            List<HomeRightVo> ls2 = new ArrayList<>();
-//            HomeRightVo hv = new HomeRightVo();
-//            hv.setIndex("1");
-//            hv.setName("惠安风场");
-//            BigDecimal fnlyl = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-//                    ? BigDecimal.ZERO
-//                    : day1.getNfdl().divide(day1.getNllfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-//            hv.setFnlyl(String.valueOf(fnlyl));
-//            hv.setYearTq("0");
-//            hv.setOperation(String.valueOf(fnlyl));
-//            ls2.add(hv);
-//
-//            zbtqdb.put("column", ls1);
-//            zbtqdb.put("data", ls2);
-//            sbklyl.put("column", ls3);
-//            allmap.put("fnlyl", zbtqdb);
-//
-//        }
-//
-//        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-//        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-//                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-//        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-//        for (ProEconPowerstationInfoDay2 day2 : list) {
-//            List<HomeRightVo> ls3 = new ArrayList<>();
-//            HomeRightVo hv2 = new HomeRightVo();
-//            hv2.setIndex("1");
-//            hv2.setName("惠安风场");
-//            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-//            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-//            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-//            hv2.setFnlyl(String.valueOf(ysbklyl));
-//            hv2.setYearTq("0");
-//            hv2.setOperation(String.valueOf(ysbklyl));
-//            ls3.add(hv2);
-//            sbklyl.put("data", ls3);
-//            allmap.put("sbklyl", sbklyl);
-//        }
-//
-//        Map<String, Object> lgxzkh = new HashMap<>();
-//        String[] title = {"排名", "名称", "考核分数", "去年同期%", "涨跌%"};
-//        List<ColumnVo> ls1 = getTitle(title);
-//        List<HomeRightVo> ls2 = new ArrayList<>();
-//        HomeRightVo hv = new HomeRightVo();
-//        hv.setIndex("1");
-//        hv.setName("惠安风场");
-//        hv.setFnlyl("98");
-//        hv.setYearTq("0");
-//        hv.setOperation("100");
-//        ls2.add(hv);
-//
-//        lgxzkh.put("column", ls1);
-//        lgxzkh.put("data", ls2);
-//        allmap.put("lgxzkh", lgxzkh);
-//
-//        return allmap;
-//
-//    }
-
-
     public Map<String, Object> getHomeRight(String companyId) {
         Map<String, Object> allmap = new HashMap<>();
-        LocalDate now = LocalDate.now();
-        Date currentDate = DateUtils.getCurrentDate();
-        Date monthFirst = DateUtils.getMonthFirst(currentDate);
-        double hoursDiff = DateUtils.hoursDiff2(currentDate, monthFirst);
-        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, now)
-                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
         Map<String, Object> sbklyl = new HashMap<>();
-        GeneratingCapacityVo genCap = generatingCapacity15min.get("年发电量");
+        LocalDate nowStart = LocalDate.now().with(TemporalAdjusters.firstDayOfYear());
+        LocalDate nowEnd = LocalDate.now();
+        LocalDate lastYearStartDate = LocalDate.now().minusYears(1).with(TemporalAdjusters.firstDayOfYear());
+        LocalDate lastYearEndDate = LocalDate.now().minusYears(1).atStartOfDay().toLocalDate();
 
         Map<String, Object> zbtqdb = new HashMap<>();
         String[] title = {"排名", "名称", "风能利用率%", "去年同期%", "涨跌%"};
@@ -1839,11 +1586,32 @@ public class EconomyPointHomePageService {
         List<HomeRightVo> ls2 = new ArrayList<>();
         HomeRightVo hv = new HomeRightVo();
         hv.setIndex("1");
-        hv.setName("惠安风场");
-        Double fnlyl = calDivide(genCap.getValue(), genCap.getTotal());
-        hv.setFnlyl(String.valueOf(fnlyl));
-        hv.setYearTq("0");
-        hv.setOperation(String.valueOf(fnlyl));
+        hv.setName(CacheContext.wplsf.get(0).getName());
+
+        List<TurbineInfoDay> currentResults1 = getFnlyl("*", nowStart, nowEnd);
+        if (null == currentResults1 || currentResults1.isEmpty()) {
+            hv.setFnlyl("0.00");
+        } else {
+            List<TurbineInfoDay> currentResults = getFnlyl("AVG(fnlyl) AS fnlyl", nowStart, nowEnd);
+            hv.setFnlyl(String.format("%.2f", currentResults.get(0).getFnlyl()));
+        }
+        List<TurbineInfoDay> lastYearResults1 = getFnlyl("*", lastYearStartDate, lastYearEndDate);
+        if (null == lastYearResults1 || lastYearResults1.isEmpty()) {
+            hv.setYearTq("0.00");
+        } else {
+            List<TurbineInfoDay> lastYearResults = getFnlyl("AVG(fnlyl) AS fnlyl", lastYearStartDate, lastYearEndDate);
+            hv.setYearTq(String.format("%.2f", lastYearResults.get(0).getFnlyl()));
+        }
+        if (Double.parseDouble(hv.getFnlyl()) == 0 && Double.parseDouble(hv.getYearTq()) == 0) {
+            hv.setOperation("0.00");
+        } else if (Double.parseDouble(hv.getYearTq()) == 0) {
+            hv.setOperation("100");
+        } else if (Double.parseDouble(hv.getFnlyl()) == 0) {
+            hv.setOperation("-100");
+        } else {
+            Double operation = calDivide(Double.parseDouble(hv.getFnlyl()) - Double.parseDouble(hv.getYearTq()), Double.valueOf(hv.getYearTq()));
+            hv.setOperation(String.valueOf(operation));
+        }
         ls2.add(hv);
 
         zbtqdb.put("column", ls1);
@@ -1851,27 +1619,50 @@ public class EconomyPointHomePageService {
         sbklyl.put("column", ls3);
         allmap.put("fnlyl", zbtqdb);
 
-        QueryWrapper<ProEconPowerstationInfoDay2> qw2 = new QueryWrapper<>();
-        qw2.lambda().eq(ProEconPowerstationInfoDay2::getRecordDate, now)
-                .eq(ProEconPowerstationInfoDay2::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay2> list = iProEconPowerstationInfoDay2Service.list(qw2);
-        for (ProEconPowerstationInfoDay2 day2 : list) {
-            List<HomeRightVo> ls4 = new ArrayList<>();
-            HomeRightVo hv2 = new HomeRightVo();
-            hv2.setIndex("1");
-            hv2.setName("惠安风场");
-            BigDecimal hoursDiffDecimal = BigDecimal.valueOf(hoursDiff);
-            BigDecimal result = hoursDiffDecimal.subtract(day2.getNhjgztjxs()).subtract(day2.getNhjjxtjxs());
-            BigDecimal ysbklyl = result.divide(hoursDiffDecimal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
-            hv2.setFnlyl(String.valueOf(ysbklyl));
-            hv2.setYearTq("0");
-            hv2.setOperation(String.valueOf(ysbklyl));
-            ls4.add(hv2);
-            sbklyl.put("data", ls4);
-            allmap.put("sbklyl", sbklyl);
+        List<HomeRightVo> ls4 = new ArrayList<>();
+        HomeRightVo hv2 = new HomeRightVo();
+        hv2.setIndex("1");
+        hv2.setName(CacheContext.wplsf.get(0).getName());
+
+        List<TurbineInfoDay> currentSbResults1 = getFnlyl("*", nowStart, nowEnd);
+        if (null == currentSbResults1 || currentSbResults1.isEmpty()) {
+            hv2.setFnlyl("0.00");
+        } else {
+            List<TurbineInfoDay> currentSbResults = getFnlyl("AVG(klyl) AS klyl", nowStart, nowEnd);
+            hv2.setFnlyl(String.format("%.2f", currentSbResults.get(0).getKlyl()));
+        }
+        List<TurbineInfoDay> lastYearQwSb1 = getFnlyl("*", lastYearStartDate, lastYearEndDate);
+        if (null == lastYearQwSb1 || lastYearQwSb1.isEmpty()) {
+            hv2.setYearTq("0.00");
+        } else {
+            List<TurbineInfoDay> lastYearQwSb = getFnlyl("AVG(klyl) AS klyl", lastYearStartDate, lastYearEndDate);
+            hv2.setYearTq(String.format("%.2f", lastYearQwSb.get(0).getKlyl()));
+        }
+        if (Double.parseDouble(hv2.getFnlyl()) == 0 && Double.parseDouble(hv2.getYearTq()) == 0) {
+            hv2.setOperation("0.00");
+        } else if (Double.parseDouble(hv2.getYearTq()) == 0) {
+            hv2.setOperation("100");
+        } else if (Double.parseDouble(hv2.getFnlyl()) == 0) {
+            hv2.setOperation("-100");
+        } else {
+            Double aDouble1 = calDivide(Double.parseDouble(hv2.getFnlyl()) - Double.parseDouble(hv2.getYearTq()), Double.valueOf(hv2.getYearTq()));
+            hv2.setOperation(String.valueOf(aDouble1));
         }
+        ls4.add(hv2);
+        sbklyl.put("data", ls4);
+        allmap.put("sbklyl", sbklyl);
+
         return allmap;
+    }
+
 
+    private List<TurbineInfoDay> getFnlyl(String select, LocalDate start, LocalDate end) {
+        QueryWrapper<TurbineInfoDay> currentQw = new QueryWrapper<>();
+        currentQw.clear();
+        currentQw.select(select)
+                .ge("record_date", start)
+                .lt("record_date", end);
+        return iTurbineInfoDayService.list(currentQw);
     }
 
 
@@ -1892,46 +1683,34 @@ public class EconomyPointHomePageService {
 
 
     public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
-        LocalDate currentDate = LocalDate.now();
+        double rfdl = generatingCapacity15min.get("日发电量").getValue();
         Integer month = LocalDate.now().getMonthValue();
         int year = LocalDate.now().getYear();
         Map<String, Object> allmap = new HashMap<>();
         PlanDataVo pd = new PlanDataVo();
+        Double week = getWeekFdlCal();
+        pd.setZfdlsj(week);
+        String s = year + "-" + month;
+        BigDecimal monCache = yfdlCal.get(s);
+        pd.setYfdlsj(monCache.add(new BigDecimal(rfdl)).doubleValue());
+        BigDecimal yearCache = nfdlCal.get(year);
+        pd.setNfdlsj(yearCache.add(new BigDecimal(rfdl)).doubleValue());
+        //计划发电量
         List<ProBasicProjectPlan> list = iProBasicProjectPlanService.list();
-
-        QueryWrapper<ProEconPowerstationInfoDay1> qw1 = new QueryWrapper<>();
-        qw1.lambda().eq(ProEconPowerstationInfoDay1::getRecordDate, currentDate)
-                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay1> days1 = proEconPowerstationInfoDay1Service.list(qw1);
-
-        LocalDate startOfWeek = currentDate.with(TemporalAdjusters.previousOrSame(java.time.DayOfWeek.MONDAY));// 本周周一日期
-        LocalDate endOfWeek = currentDate.with(TemporalAdjusters.nextOrSame(java.time.DayOfWeek.SUNDAY));
-        QueryWrapper<ProEconPowerstationInfoDay1> qw = new QueryWrapper<>();
-        qw.lambda().between(ProEconPowerstationInfoDay1::getRecordDate, startOfWeek, endOfWeek)
-                .eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay1> day1s = proEconPowerstationInfoDay1Service.list(qw);
-        if (null == day1s || day1s.isEmpty()) {
-            pd.setZfdlsj(0.00);
-            pd.setYfdlsj(0.00);
-            pd.setNfdlsj(0.00);
-            return allmap;
-        }
-
         List<ProBasicProjectPlan> pp = list.stream()
                 .filter(ls -> String.valueOf(month).equals(ls.getMonth())
                         && ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId))
                 .collect(Collectors.toList());
-        if (null == pp || pp.isEmpty()) {
-            return allmap;
+        if (pp.isEmpty()) {
+            pd.setZfdljh(0.0);
+            pd.setYfdljh(0.0);
+        } else {
+            pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
+            pd.setYfdljh(pp.get(0).getGeneratingCapacity());
         }
-        pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
-        double sum = day1s.stream().map(ProEconPowerstationInfoDay1::getRfdl).mapToDouble(BigDecimal::doubleValue).sum();
-        pd.setZfdlsj(sum);
         Double zjd = calDivide(pd.getZfdlsj(), pd.getZfdljh());
         pd.setZjd(zjd * 100);
         pd.setZwcl(zjd);
-        pd.setYfdljh(pp.get(0).getGeneratingCapacity());
-        pd.setYfdlsj(days1.get(0).getYfdl().doubleValue());
         Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
         pd.setYjd(yjd * 100);
         pd.setYwcl(yjd);
@@ -1939,38 +1718,34 @@ public class EconomyPointHomePageService {
         List<ProBasicProjectPlan> pp2 = list.stream()
                 .filter(ls -> ls.getYear().equals(String.valueOf(year)) && ls.getProjectId().equals(companyId) && ls.getMonth() == null)
                 .collect(Collectors.toList());
-        pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
-        pd.setNfdlsj(days1.get(0).getNfdl().doubleValue() / 1000);
-        Double njd = calDivide(pd.getNfdlsj() / 1000, pd.getNfdljh());
+        if (pp2.isEmpty()) {
+            pd.setNfdljh(0.0);
+        } else {
+            pd.setNfdljh(pp2.get(0).getGeneratingCapacity());
+        }
+        Double njd = calDivide(pd.getNfdlsj(), pd.getNfdljh());
         pd.setNjd(njd * 100);
         pd.setNwcl(njd);
         allmap.put("planData", pd);
 
-        QueryWrapper<ProEconPowerstationInfoDay1> qw2 = new QueryWrapper<>();
-        qw2.lambda().eq(ProEconPowerstationInfoDay1::getForeignKeyId, companyId);
-        List<ProEconPowerstationInfoDay1> days3 = proEconPowerstationInfoDay1Service.list(qw2);
-
-        Map<Date, List<ProEconPowerstationInfoDay1>> date = days3.stream().collect(Collectors.groupingBy(ProEconPowerstationInfoDay1::getRecordDate));
-        Set<Integer> year2 = new TreeSet<>();
-        for (Date date1 : date.keySet()) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(date1);
-            int year3 = calendar.get(Calendar.YEAR);
-            year2.add(year3);
-        }
-        int yy = year2.iterator().next();
-        String start = yy + "-01-01";
-        String end = yy + "-12-31";
-        String start2 = yy - 1 + "-01-01";
-        String end2 = yy - 1 + "-12-31";
+        QueryWrapper<TurbineInfoDay> qw2 = new QueryWrapper<>();
+        qw2.lambda().eq(TurbineInfoDay::getStationId, companyId);
+        List<TurbineInfoDay> days3 = iTurbineInfoDayService.list(qw2);
+
+        int yearThis = LocalDate.now().getYear();
+        int yearLast = yearThis - 1;
+        String start = yearThis + "-01-01";
+        String end = yearThis + "-12-31";
+        String start2 = yearLast + "-01-01";
+        String end2 = yearLast + "-12-31";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date start1 = sdf.parse(start);
         Date end1 = sdf.parse(end);
         Date start3 = sdf.parse(start2);
         Date end3 = sdf.parse(end2);
-        List<ProEconPowerstationInfoDay1> thisYear = days3.stream().filter(rec -> rec.getRecordDate().after(start1) && rec.getRecordDate().before(end1)).collect(Collectors.toList());
-        List<ProEconPowerstationInfoDay1> lastYear = days3.stream().filter(rec -> rec.getRecordDate().after(start3) && rec.getRecordDate().before(end3)).collect(Collectors.toList());
-        Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap = thisYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
+        List<TurbineInfoDay> thisYear = days3.stream().filter(rec -> rec.getRecordDate().after(start1) && rec.getRecordDate().before(end1)).collect(Collectors.toList());
+        List<TurbineInfoDay> lastYear = days3.stream().filter(rec -> rec.getRecordDate().after(start3) && rec.getRecordDate().before(end3)).collect(Collectors.toList());
+        Map<Integer, List<TurbineInfoDay>> day1sMap = thisYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
         List<PowertrendVo> xdl = new ArrayList<>();
         List<PowertrendVo> ssdl = new ArrayList<>();
         List<PowertrendVo> fdl = new ArrayList<>();
@@ -1983,30 +1758,34 @@ public class EconomyPointHomePageService {
         ptxdl.setYAxisIndex(0);
         ptssdl.setYAxisIndex(0);
         ptfdl.setYAxisIndex(0);
-        List<ValueVo> vexdl = value(year, month);
-        List<ValueVo> vessdl = value(year, month);
-        List<ValueVo> vefdl = value(year, month);
+        List<ValueVo> vexdl = value(year, 12);
+        List<ValueVo> vessdl = value(year, 12);
+        List<ValueVo> vefdl = value(year, 12);
         for (Integer mon : day1sMap.keySet()) {
-            List<ProEconPowerstationInfoDay1> day1s1 = day1sMap.get(mon);
-            List<ProEconPowerstationInfoDay1> day1s2 = day1s1.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
+            List<TurbineInfoDay> day1s1 = day1sMap.get(mon);
+            List<TurbineInfoDay> day1s2 = day1s1.stream().sorted(Comparator.comparing(TurbineInfoDay::getRecordDate).reversed()).collect(Collectors.toList());
             LocalDate localDate = day1s2.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
             int year1 = localDate.getYear();
             String text = year1 + "-" + mon;
             for (ValueVo vv : vexdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYxdtjssdl()));
+                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add));
                 }
             }
             for (ValueVo vv : vessdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.get(0).getYgzssdl().add(day1s2.get(0).getYcnslgzssdl().add(day1s2.get(0).getYjxssdl().add(day1s2.get(0).getYcnsljxssdl()
-                            .add(day1s2.get(0).getYdjssdl().add(day1s2.get(0).getYqxjclssdl().add(day1s2.get(0).getYsdtjssdl().add(day1s2.get(0).getYxnssdl()
-                                    .add(day1s2.get(0).getYxdtjssdl().add(day1s2.get(0).getYxdjclssdl().add(day1s2.get(0).getYcwsldwssdl().add(day1s2.get(0).getYcwsltqssdl()))))))))))));
+                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                            .add(day1s2.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                                    .add(day1s2.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                                            .add(day1s2.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                            .add(day1s2.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                            .add(day1s2.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                            .add(day1s2.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add)))));
                 }
             }
             for (ValueVo vv : vefdl) {
                 if (vv.getText().equals(text)) {
-                    vv.setValue(day1s2.get(0).getYfdl());
+                    vv.setValue(day1s2.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add));
                 }
             }
 
@@ -2027,40 +1806,47 @@ public class EconomyPointHomePageService {
         ptxdl.setYAxisIndex(0);
         ptssdl.setYAxisIndex(0);
         ptfdl.setYAxisIndex(0);
-        if (null == lastYear || lastYear.isEmpty()) {
+        if (lastYear.isEmpty()) {
             List<ValueVo> value = value(year - 1, month);
             ptxdl2.setValue(value);
             ptssdl2.setValue(value);
             ptfdl2.setValue(value);
         } else {
-            List<ValueVo> vxdl2 = new ArrayList<>();
-            List<ValueVo> vssdl2 = new ArrayList<>();
-            List<ValueVo> vfdl2 = new ArrayList<>();
-            Map<Integer, List<ProEconPowerstationInfoDay1>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
+            List<ValueVo> vxdl2 = value(year - 1, 12);
+            List<ValueVo> vssdl2 = value(year - 1, 12);
+            List<ValueVo> vfdl2 = value(year - 1, 12);
+            Map<Integer, List<TurbineInfoDay>> day1sMap2 = lastYear.stream().collect(Collectors.groupingBy(record -> record.getRecordDate().getMonth() + 1));
             for (Integer mon2 : day1sMap2.keySet()) {
-                List<ProEconPowerstationInfoDay1> day1s3 = day1sMap2.get(mon2);
-                List<ProEconPowerstationInfoDay1> day1s4 = day1s3.stream().sorted(Comparator.comparing(ProEconPowerstationInfoDay1::getRecordDate).reversed()).collect(Collectors.toList());
+                List<TurbineInfoDay> day1s3 = day1sMap2.get(mon2);
+                List<TurbineInfoDay> day1s4 = day1s3.stream().sorted(Comparator.comparing(TurbineInfoDay::getRecordDate).reversed()).collect(Collectors.toList());
                 LocalDate localDate = day1s3.get(0).getRecordDate().toInstant().atZone(ZoneOffset.UTC).toLocalDate();
                 int year1 = localDate.getYear();
                 String text = year1 + "-" + mon2;
-                ValueVo vexdl2 = new ValueVo();
-                ValueVo vessdl2 = new ValueVo();
-                ValueVo vefdl2 = new ValueVo();
-                vexdl2.setText(text);
-                vessdl2.setText(text);
-                vefdl2.setText(text);
-                vexdl2.setValue(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYxdtjssdl()));
-                vessdl2.setValue(day1s4.get(0).getYgzssdl().add(day1s4.get(0).getYcnslgzssdl().add(day1s4.get(0).getYjxssdl().add(day1s4.get(0).getYcnsljxssdl()
-                        .add(day1s4.get(0).getYdjssdl().add(day1s4.get(0).getYqxjclssdl().add(day1s4.get(0).getYsdtjssdl().add(day1s4.get(0).getYxnssdl()
-                                .add(day1s4.get(0).getYxdtjssdl().add(day1s4.get(0).getYxdjclssdl().add(day1s4.get(0).getYcwsldwssdl().add(day1s4.get(0).getYcwsltqssdl()))))))))))));
-                vefdl2.setValue(day1s4.get(0).getYfdl());
-                vxdl2.add(vexdl2);
-                vssdl2.add(vessdl2);
-                vfdl2.add(vefdl2);
+                for (ValueVo vv : vxdl2) {
+                    if (vv.getText().equals(text)) {
+                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    }
+                }
+                for (ValueVo vv : vssdl2) {
+                    if (vv.getText().equals(text)) {
+                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                                .add(day1s4.stream().map(TurbineInfoDay::getJhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                                        .add(day1s4.stream().map(TurbineInfoDay::getFjhjxss).reduce(BigDecimal.ZERO, BigDecimal::add)
+                                                .add(day1s4.stream().map(TurbineInfoDay::getSlss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                                .add(day1s4.stream().map(TurbineInfoDay::getXnss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                                .add(day1s4.stream().map(TurbineInfoDay::getDjss).reduce(BigDecimal.ZERO, BigDecimal::add))
+                                                .add(day1s4.stream().map(TurbineInfoDay::getGzss).reduce(BigDecimal.ZERO, BigDecimal::add)))));
+                    }
+                }
+                for (ValueVo vv : vfdl2) {
+                    if (vv.getText().equals(text)) {
+                        vv.setValue(day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    }
+                }
             }
             ptxdl2.setValue(vxdl2);
             ptssdl2.setValue(vssdl2);
-            ptxdl2.setValue(vfdl2);
+            ptfdl2.setValue(vfdl2);
         }
         xdl.add(ptxdl2);
         ssdl.add(ptssdl2);
@@ -2092,7 +1878,7 @@ public class EconomyPointHomePageService {
 
     private List<ValueVo> value(int year, int month) {
         List<ValueVo> lv = new ArrayList<>();
-        for (int i = 1; i < month; i++) {
+        for (int i = 1; i <= month; i++) {
             ValueVo vo = new ValueVo();
             vo.setText(year + "-" + i);
             vo.setValue(new BigDecimal(0));
@@ -2103,110 +1889,6 @@ public class EconomyPointHomePageService {
     }
 
 
-//    public Map<String, Object> getGeneratingCapacity(String companyId) {
-//        Map<String, Object> allmap = new HashMap<>();
-//        List<GeneratingCapacityVo> ls = new ArrayList<>();
-//        LocalDate now = LocalDate.now();
-//        LocalDate tomorrow = LocalDate.now().plusDays(1);
-//        QueryWrapper<StationInfoMin> qw = new QueryWrapper<>();
-//        qw.lambda().between(StationInfoMin::getRecordDate, now,tomorrow)
-//                .eq(StationInfoMin::getStationId, companyId)
-//                .orderByDesc(StationInfoMin::getRecordDate);
-//        List<StationInfoMin> day1s = iStationInfoMinService.list(qw);
-//        StationInfoMin day1 = day1s.get(0);
-//        GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
-//            rfdl.setName("日发电量");
-////            rfdl.setValue(day1.getRfdl());
-////            rfdl.setTotal(day1.getRllfdl());
-////            Double rbfb = (day1.getRfdl()== 0 || day1.getRllfdl() == 0)
-////                    ? 0.0
-////                    : calDivide(day1.getRllfdl(), day1.getRfdl());
-////            rfdl.setBfb(rbfb);
-//            ls.add(rfdl);
-//
-//            GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
-//            yfdl.setName("月发电量");
-////            yfdl.setValue(day1.getYfdl());
-////            yfdl.setTotal(day1.getYllfdl());
-////            BigDecimal ybfb = (day1.getYfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getYllfdl().compareTo(BigDecimal.ZERO) == 0)
-////                    ? BigDecimal.ZERO
-////                    : day1.getYllfdl().divide(day1.getYfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-////            rfdl.setBfb(rbfb);
-////            yfdl.setBfb(ybfb);
-////            ls.add(yfdl);
-////
-////            GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
-////            nfdl.setName("年发电量");
-////            nfdl.setValue(day1.getNfdl().divide(new BigDecimal(1000)));
-////            nfdl.setTotal(day1.getNllfdl().divide(new BigDecimal(1000)));
-////            BigDecimal nbfb = (day1.getNfdl().compareTo(BigDecimal.ZERO) == 0 || day1.getNllfdl().compareTo(BigDecimal.ZERO) == 0)
-////                    ? BigDecimal.ZERO
-////                    : day1.getNllfdl().divide(day1.getNfdl(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-////            rfdl.setBfb(rbfb);
-////            nfdl.setBfb(nbfb);
-////            ls.add(nfdl);
-////
-////            Map<String, Object> zbtqdb = new HashMap<>();
-////            List<ColumnVo> ls1 = new ArrayList<>();
-////            ColumnVo cl1 = new ColumnVo();
-////            cl1.setName("指标名称");
-////            cl1.setField("wtId");
-////            ColumnVo cl2 = new ColumnVo();
-////            cl2.setName(String.valueOf(LocalDate.now().getYear()));
-////            cl2.setField("recodedate");
-////            ColumnVo cl3 = new ColumnVo();
-////            cl3.setName(String.valueOf(LocalDate.now().getYear() - 1));
-////            cl3.setField("recodedate2");
-////            ColumnVo cl4 = new ColumnVo();
-////            cl4.setName("涨跌%");
-////            cl4.setField("operation");
-////            ls1.add(cl1);
-////            ls1.add(cl2);
-////            ls1.add(cl3);
-////            ls1.add(cl4);
-////
-////            List<ComparetqVo> ls2 = new ArrayList<>();
-////            ComparetqVo cv = new ComparetqVo();
-////            cv.setWtId("发电量");
-////            cv.setRecodedate(String.valueOf(day1.getNfdl().divide(new BigDecimal(1000))));
-////            cv.setRecodedate2(String.valueOf(0));
-////            cv.setOperation("100");
-////            ComparetqVo cv1 = new ComparetqVo();
-////            cv1.setWtId("上网电量");
-////            cv1.setRecodedate(String.valueOf(0.00));
-////            cv1.setRecodedate2(String.valueOf(0));
-////            cv1.setOperation("0");
-////            ComparetqVo cv2 = new ComparetqVo();
-////            cv2.setWtId("网购电量");
-////            cv2.setRecodedate(String.valueOf(0.00));
-////            cv2.setRecodedate2(String.valueOf(0));
-////            cv2.setOperation("0");
-////            ComparetqVo cv3 = new ComparetqVo();
-////            cv3.setWtId("损失电量");
-////            cv3.setRecodedate(String.valueOf(0.00));
-////            cv3.setRecodedate2(String.valueOf(0));
-////            cv3.setOperation("0");
-////            ComparetqVo cv4 = new ComparetqVo();
-////            cv4.setWtId("场用电量");
-////            cv4.setRecodedate(String.valueOf(0.00));
-////            cv4.setRecodedate2(String.valueOf(0));
-////            cv4.setOperation("0");
-////            ls2.add(cv);
-////            ls2.add(cv1);
-////            ls2.add(cv2);
-////            ls2.add(cv3);
-////            ls2.add(cv4);
-////
-////            zbtqdb.put("column", ls1);
-////            zbtqdb.put("data", ls2);
-////            allmap.put("fdl", ls);
-////            allmap.put("zbtqdb", zbtqdb);
-//
-//
-//        return allmap;
-//    }
-
-
     public Map<String, Object> getGeneratingCapacity(String companyId) {
         Map<String, Object> allmap = new HashMap<>();
         QueryWrapper<StationInfoMin> qw = new QueryWrapper<>();
@@ -2270,27 +1952,30 @@ public class EconomyPointHomePageService {
             StationInfoMin day1 = day1s.get(0);
             GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
             rfdl.setName("日发电量");
-            rfdl.setValue(day1.getRfdl());
+            rfdl.setValue(Double.valueOf(String.format("%.2f", day1.getRfdl())));
             Double llgl = day1.getLlgl();
             rfdl.setTotal(calDivide(llgl, 4.0));
             Double rbfb = calDivide(rfdl.getValue(), rfdl.getTotal());
-            rfdl.setBfb(rbfb * 100);
+            rfdl.setBfb(new BigDecimal(rbfb * 100).setScale(2, RoundingMode.HALF_UP).doubleValue());
             ls.add(rfdl);
             generatingCapacity15min.put(rfdl.getName(), rfdl);
             GeneratingCapacityVo yfdl = new GeneratingCapacityVo();
             yfdl.setName("月发电量");
-            yfdl.setValue(CacheContext.yfdl.add(new BigDecimal(rfdl.getValue())).doubleValue());
-            yfdl.setTotal(calDivide(CacheContext.yllfdl.add(new BigDecimal(rfdl.getTotal())).doubleValue(), 4.0));
+
+            String s = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
+            BigDecimal monCache = yfdlCal.get(s);
+            yfdl.setValue(monCache.add(new BigDecimal(rfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            yfdl.setTotal(calDivide(yllfdlCal.get(s).add(new BigDecimal(rfdl.getTotal())).doubleValue(), 4.0));
             Double ybfb = calDivide(yfdl.getValue(), yfdl.getTotal());
-            yfdl.setBfb(ybfb * 100);
+            yfdl.setBfb(new BigDecimal(ybfb).setScale(2, RoundingMode.HALF_UP).doubleValue());
             ls.add(yfdl);
             generatingCapacity15min.put(yfdl.getName(), yfdl);
             GeneratingCapacityVo nfdl = new GeneratingCapacityVo();
             nfdl.setName("年发电量");
-            nfdl.setValue(CacheContext.nfdl.add(new BigDecimal(yfdl.getValue())).doubleValue());
-            nfdl.setTotal(calDivide(CacheContext.nllfdl.add(new BigDecimal(yfdl.getTotal())).doubleValue(), 4.0));
+            nfdl.setValue(nfdlCal.get(LocalDate.now().getYear()).add(new BigDecimal(rfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            nfdl.setTotal(calDivide(nllfdlCal.get(LocalDate.now().getYear()).add(new BigDecimal(rfdl.getTotal())).doubleValue(), 4.0));
             Double nbfb = calDivide(nfdl.getValue(), nfdl.getTotal());
-            nfdl.setBfb(nbfb * 100);
+            nfdl.setBfb(new BigDecimal(nbfb).setScale(2, RoundingMode.HALF_UP).doubleValue());
             ls.add(nfdl);
             generatingCapacity15min.put(nfdl.getName(), nfdl);
         }
@@ -2369,4 +2054,57 @@ public class EconomyPointHomePageService {
         return allmap;
     }
 
+
+    /**
+     * 缓存月、年发电量
+     */
+    public void calFdl() {
+        if (null != lastCalDate || LocalDate.now().equals(lastCalDate) || !yfdlCal.isEmpty()) {
+            return;
+        }
+        DecimalFormat df = new DecimalFormat("#.##");
+        LocalDate yesterday = LocalDate.now().atStartOfDay().toLocalDate();
+        QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
+        currentqw.select("station_id,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
+                .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfYear())) // 大于等于今年的第一天
+                .lt("record_date", yesterday) // 小于今天0点的日期
+                .like("station_id", "_FDC_%")
+                .groupBy("station_id");
+        List<TurbineInfoDay> yearData = iTurbineInfoDayService.list(currentqw);
+        Integer intYear = LocalDate.now().getYear();
+        nfdlCal.put(intYear, new BigDecimal(df.format(yearData.get(0).getRfdl())));
+        nllfdlCal.put(intYear, new BigDecimal(df.format(yearData.get(0).getLlfdl())));
+        currentqw.clear();
+        currentqw.select("station_id,MAX(record_date) AS record_date,SUM(rfdl) AS rfdl,SUM(llfdl) as llfdl")
+                .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()))  // 大于等于本月的第一天
+                .lt("record_date", yesterday)  // 小于今天0点的日期
+                .like("station_id", "_FDC_%")
+                .groupBy("station_id");
+        List<TurbineInfoDay> monthData = iTurbineInfoDayService.list(currentqw);
+        String yearAndMonth = LocalDate.now().getYear() + "-" + LocalDate.now().getMonthValue();
+        yfdlCal.put(yearAndMonth, new BigDecimal(df.format(monthData.get(0).getRfdl())));
+        yllfdlCal.put(yearAndMonth, new BigDecimal(df.format(monthData.get(0).getLlfdl())));
+        currentqw.clear();
+        lastCalDate = LocalDate.now();
+    }
+
+
+    private Double getWeekFdlCal() {
+        LocalDate week = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY));
+        LocalDate yesterday = LocalDate.now().atStartOfDay().toLocalDate();
+        if (week.equals(LocalDate.now())) {
+            return generatingCapacity15min.get("日发电量").getValue();
+        }
+        QueryWrapper<TurbineInfoDay> currentqw = new QueryWrapper<>();
+        currentqw.select("station_id,SUM(rfdl) AS rfdl")
+                .ge("record_date", LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)))  // 大于等于本周一的日期
+                .lt("record_date", yesterday)
+                .groupBy("station_id");
+        List<TurbineInfoDay> weekData = iTurbineInfoDayService.list(currentqw);
+        if (null == weekData || weekData.isEmpty()) {
+            return 0.0;
+        }
+        return weekData.get(0).getRfdl().add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue();
+    }
+
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/AlarmService.java

@@ -0,0 +1,210 @@
+package com.gyee.runeconomy.service.monitor;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gyee.runeconomy.dto.AlarmDataParser;
+import com.gyee.runeconomy.init.CacheContext;
+import com.gyee.runeconomy.model.auto.ProBasicEquipment;
+import com.gyee.runeconomy.model.auto.ProEconAlarmType;
+import com.gyee.runeconomy.model.vo.PoliceVo;
+import com.gyee.runeconomy.service.EarlyWarning.ApiClient;
+import com.gyee.runeconomy.service.auto.IProEconAlarmTypeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class AlarmService {
+
+    @Resource
+    private IProEconAlarmTypeService proEconAlarmTypeService;
+
+    ApiClient client = new ApiClient();
+
+    public  List<PoliceVo.AlarmDetails> Alarm(String type,String wtid) throws Exception {
+
+        Map<String, Object> map = new HashMap<>();
+        // 获取当天零点时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date startDate = calendar.getTime();
+
+        // 获取当前时间
+        Date endDate = new Date();
+
+        // 格式化时间为字符串
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startTime = sdf.format(startDate);
+        String endTime = sdf.format(endDate);
+
+        List<PoliceVo.AlarmDetails> list = new ArrayList<>();
+
+        List<ProBasicEquipment> equipments = CacheContext.wtls.stream()
+                .filter(a -> wtid.equals(a.getId())).collect(Collectors.toList());
+
+        String modelId = "WT2000D121H85";
+        String station = "NX_FGS_HA_FDC_STA";
+        if (equipments.size() > 0) {
+            modelId = equipments.get(0).getModelId();
+            station = equipments.get(0).getWindpowerstationId();
+        }
+
+
+//        startTime = "2024-12-12 00:00:00";
+        String result = client.getgzFromApi(
+                startTime,
+                endTime,
+                "windturbine",
+                station,
+                wtid,
+                "",
+                modelId,
+                "windturbine",
+                type,
+                "",
+                "",
+                "1",
+                "1000"
+        );
+
+
+        // 解析预警数据
+        try {
+            // 调用parseJson方法解析JSON
+            PoliceVo policeVo = parseJson(result);
+
+            if (policeVo != null) {
+
+                // 输出解析后的对象，检查内容
+                List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
+                for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
+                    list.add(alarm1);
+                }
+            }
+        } catch (IOException e){
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    public Map<String, Object> flAlarm(String wtid) throws Exception {
+        List<ProEconAlarmType> bylist = proEconAlarmTypeService.bylist(wtid);
+        Map<String, Object> map = new HashMap<>();
+        // 获取当天零点时间
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        Date startDate = calendar.getTime();
+
+        // 获取当前时间
+        Date endDate = new Date();
+
+        // 格式化时间为字符串
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String startTime = sdf.format(startDate);
+        String endTime = sdf.format(endDate);
+
+        List<PoliceVo.AlarmDetails> zslist = new ArrayList<>();
+
+        List<ProBasicEquipment> equipments = CacheContext.wtls.stream()
+                .filter(a -> wtid.equals(a.getId())).collect(Collectors.toList());
+
+        String modelId = "WT2000D121H85";
+        String station = "NX_FGS_HA_FDC_STA";
+        if (equipments.size() > 0) {
+            modelId = equipments.get(0).getModelId();
+            station = equipments.get(0).getWindpowerstationId();
+        }
+
+        String zsresult = client.getgzFromApi(
+                startTime,
+                endTime,
+                "windturbine",
+                station,
+                wtid,
+                "",
+                modelId,
+                "windturbine",
+                "",
+                "",
+                "",
+                "1",
+                "1000"
+        );
+        // 解析所有类别预警数据
+        try {
+            // 调用parseJson方法解析JSON
+            PoliceVo policeVo = parseJson(zsresult);
+
+            if (policeVo != null) {
+
+                // 输出解析后的对象，检查内容
+                List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
+                for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
+                    zslist.add(alarm1);
+                }
+            }
+        } catch (IOException e){
+            e.printStackTrace();
+        }
+
+        List<ProEconAlarmType> bylists = proEconAlarmTypeService.bylists();
+
+        Map<String, Long> componentCountMap = zslist.stream()
+                .collect(Collectors.groupingBy(
+                        PoliceVo.AlarmDetails::getComponents, // 分组条件：按照 components 字段
+                        Collectors.counting()                // 统计数量
+                ));
+
+        // 创建一个 name 到 nemcode 的映射
+        Map<String, String> nameToNemcodeMap = bylists.stream()
+                .collect(Collectors.toMap(
+                        ProEconAlarmType::getName,    // key: name 字段
+                        ProEconAlarmType::getNemCode // value: nemcode 字段
+                ));
+
+        // 创建一个新的 Map 存储替换后的结果
+        Map<String, Long> updatedComponentCountMap = new HashMap<>();
+
+
+        // 遍历 componentCountMap
+        componentCountMap.forEach((key, value) -> {
+            // 检查是否能匹配到 nemcode
+            if (nameToNemcodeMap.containsKey(key)) {
+                // 如果匹配，使用 nemcode 替换 key
+                updatedComponentCountMap.put(nameToNemcodeMap.get(key), value);
+            } else {
+                // 如果未匹配，保留原来的 key
+                updatedComponentCountMap.put(key, value);
+            }
+        });
+        Long zscount = (long) zslist.size();
+        updatedComponentCountMap.put("zs",zscount);
+        map.put("data",bylist);
+        map.put("count",updatedComponentCountMap);
+        return map;
+    }
+
+
+    public static PoliceVo parseJson(String json) throws IOException {
+        // 创建ObjectMapper实例
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        // 设置ObjectMapper来忽略未知的属性
+        objectMapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+        // 解析JSON并转换为PoliceVo对象
+        PoliceVo policeVo = objectMapper.readValue(json, PoliceVo.class);
+
+        return policeVo;
+    }
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/DeviceDetailsService.java

@@ -104,7 +104,7 @@ public class DeviceDetailsService {
         codes.add(equipmentPointMap.get(ContantXk.RXDJCLSSDL).getNemCode());
         codes.add(equipmentPointMap.get(ContantXk.RCWSLDWSSDL).getNemCode());
         codes.add(equipmentPointMap.get(ContantXk.RCWSLTQSSDL).getNemCode());
-        codes.add(equipmentPointMap.get(ContantXk.SBZT).getNemCode());
+        codes.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
         List<PointData> realData = edosUtil.getRealData(codes);
         if (StringUtils.isNotEmpty(realData)) {
             resultMap.put("rfdl", realData.get(0).getPointValueInDouble());
@@ -131,6 +131,7 @@ public class DeviceDetailsService {
         Map<String, ProBasicEquipment> wtmap = CacheContext.wtmap;
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
         qw.lambda().eq(ProEconTestingPoint::getModel, wtmap.get(wtid).getModelId()).eq(ProEconTestingPoint::getLogicalUnitId, part);
+        qw.lambda().eq(ProEconTestingPoint::getSpare3,"1");
         List<ProEconTestingPoint> list = proEconTestingPointService.list(qw);
         resultMap.put("AI", list.stream().filter(i -> i.getUniformCode().startsWith("AI")).collect(Collectors.toList()));
         resultMap.put("DI", list.stream().filter(i -> i.getUniformCode().startsWith("DI")).collect(Collectors.toList()));

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MatrixService.java

@@ -22,6 +22,7 @@ import com.gyee.runeconomy.service.auto.IProBasicPowerstationPointService;
 import com.gyee.runeconomy.service.auto.impl.ProEconManufacturerServiceImpl;
 import com.gyee.runeconomy.util.StringUtils;
 import com.gyee.runeconomy.util.realtimesource.IEdosUtil;
+import com.gyee.runeconomy.util.realtimesource.feign.RemoteServiceBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -52,10 +53,14 @@ public class MatrixService {
     @Resource
     private ProEconManufacturerServiceImpl proEconManufacturerService;
 
+    @Resource
+    private RemoteServiceBuilder remoteService;
+
     public Map<String, Object> matrixMX(String company, String type) throws Exception {
 
-        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
-        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+//        HttpServletRequest request = ((ServletRequestAttributes) (RequestContextHolder.currentRequestAttributes())).getRequest();
+//        List<ProBasicPowerstation> wpls = tokenService.getWpls(request);
+        List<ProBasicPowerstation> wpls = CacheContext.wpls;
 
         Map<String, Double> modelpower = CacheContext.modelpower;
 
@@ -74,7 +79,8 @@ public class MatrixService {
         Map<String, Map<String, ProBasicPowerstationPoint>> subwppointmap = CacheContext.subwppointmap;
 
 
-        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
+//        List<ProBasicSubStation> subwpls = tokenService.getSubwpls(request);
+        List<ProBasicSubStation> subwpls = CacheContext.subwpls;
 
         List<MatrixPowerVo> powerVos = new ArrayList<>();
         AtomicInteger jrts = new AtomicInteger();
@@ -101,6 +107,7 @@ public class MatrixService {
             List<MatrixVo> volist = new ArrayList<>();
             List<String> wpPoints = new ArrayList<>();
             List<String> wtPoints = new ArrayList<>();
+            List<String> wtmxPoints = new ArrayList<>();
             List<String> wtPoints1 = new ArrayList<>();
             Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(wp.getId());
             wpPoints.add(pointMap.get(ContantXk.DJTSMX).getNemCode());
@@ -117,20 +124,15 @@ public class MatrixService {
             wpPoints.add(pointMap.get(ContantXk.CWSLTQTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.LXTSMX).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.TXZDTSMX).getNemCode());
-            //            if (wp.getWindType().equals("-1")) {
-            //                wpPoints.add(pointMap.get(ContantXk.SSPJFS).getNemCode());
-            //            } else if (wp.getWindType().equals("-2")) {
-            //                wpPoints.add(pointMap.get(ContantXk.GCGZQD).getNemCode());
-            //            }
-
             wpPoints.add(pointMap.get(ContantXk.SSZBZGL).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZNHGLZS).getNemCode());
             wpPoints.add(pointMap.get(ContantXk.SSZGL).getNemCode());
-            //            wpPoints.add(pointMap.get(ContantXk.TPOINT_WP_YCGL).getNemCode());
+
             List<ProBasicEquipment> equipments = wpwtmap.get(wp.getId());
             equipments.stream().forEach(wt -> {
                 Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
                 wtPoints.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
+                wtmxPoints.add(equipmentPointMap.get(ContantXk.MXZT).getNemCode());
                 wtPoints.add(equipmentPointMap.get(ContantXk.SSQFZT).getNemCode());
                 wtPoints.add(equipmentPointMap.get(ContantXk.RQFDL).getNemCode());
             });
@@ -148,13 +150,10 @@ public class MatrixService {
             });
             try {
 
-                //                if(wp.getId().equals("SXJ_KGDL_HSM_FDC_STA"))
-                //                {
-                //                    System.out.println("");
-                //                }
-                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
                 List<PointData> wtRealdatas = edosUtil.getRealData(wtPoints);
+                List<PointData> wtmxRealdatas = edosUtil.getRealData(wtmxPoints);
                 List<PointData> wtRealdatas1 = edosUtil.getRealData(wtPoints1);
+//                List<PointData> wpRealdatas = edosUtil.getRealData(wpPoints);
 
 
                 MatrixPowerVo powerVo = new MatrixPowerVo();
@@ -167,17 +166,48 @@ public class MatrixService {
                     powerVo.setCzlx("-2");
                 }
                 powerVo.setJrts(wp.getJrwindQuantityHs() + wp.getJrwindQuantityLd() + wp.getJrquantityJz() + wp.getJrquantityZc());
-                powerVo.setDjts(wpRealdatas.get(0).getPointValueInDouble() + wpRealdatas.get(1).getPointValueInDouble());
-                powerVo.setBwts(wpRealdatas.get(2).getPointValueInDouble() + wpRealdatas.get(3).getPointValueInDouble());
-                powerVo.setGzts(wpRealdatas.get(4).getPointValueInDouble() + wpRealdatas.get(5).getPointValueInDouble());
-                powerVo.setJxts(wpRealdatas.get(6).getPointValueInDouble() + wpRealdatas.get(7).getPointValueInDouble());
-                powerVo.setXdts(wpRealdatas.get(8).getPointValueInDouble() + wpRealdatas.get(9).getPointValueInDouble());
-                powerVo.setSlts(wpRealdatas.get(10).getPointValueInDouble() + wpRealdatas.get(11).getPointValueInDouble());
-                powerVo.setLxts(wpRealdatas.get(12).getPointValueInDouble() + wpRealdatas.get(13).getPointValueInDouble());
-
-                powerVo.setBzgl(wpRealdatas.get(14).getPointValueInDouble());
-                powerVo.setLlgl(wpRealdatas.get(15).getPointValueInDouble());
-                powerVo.setSjgl(wpRealdatas.get(16).getPointValueInDouble());
+                //0 待机
+                //1 停机
+                //2 发电
+                //4 故障
+                //6 检修
+                //8 限电
+                //12 离线
+                Double bwts = 0.0;
+                Double djts = 0.0;
+                Double tjts = 0.0;
+                Double gzts = 0.0;
+                Double jxts = 0.0;
+                Double xdts = 0.0;
+                Double lxts = 0.0;
+                for (PointData zt : wtmxRealdatas){
+                    if (zt.getPointValueInDouble() == 2.0){
+                        bwts++;
+                    } else if (zt.getPointValueInDouble() == 0.0){
+                        djts++;
+                    } else if (zt.getPointValueInDouble() == 4.0){
+                        gzts++;
+                    } else if (zt.getPointValueInDouble() == 6.0){
+                        jxts++;
+                    } else if (zt.getPointValueInDouble() == 8.0){
+                        xdts++;
+                    } else if (zt.getPointValueInDouble() == 12.0){
+                        lxts++;
+                    } else if (zt.getPointValueInDouble() == 1.0){
+                        tjts++;
+                    }
+                }
+                powerVo.setBwts(bwts);
+                powerVo.setDjts(djts);
+                powerVo.setGzts(gzts);
+                powerVo.setJxts(jxts);
+                powerVo.setXdts(xdts);
+                powerVo.setSlts(tjts);
+                powerVo.setLxts(lxts);
+
+                powerVo.setBzgl(0.0);
+                powerVo.setLlgl(0.0);
+                powerVo.setSjgl(0.0);
 
                 if (wp.getWindType().equals("-1")) {
                     PointData speed = edosUtil.getRealData(pointMap.get(ContantXk.SSPJFS).getNemCode());
@@ -187,13 +217,6 @@ public class MatrixService {
                     powerVo.setSpped(StringUtils.round(speed.getPointValueInDouble(), 2));
                 }
 
-
-                //                powerVo.setSpped(wpRealdatas.get(14).getPointValueInDouble());
-                //                powerVo.setBzgl(wpRealdatas.get(15).getPointValueInDouble());
-                //                powerVo.setLlgl(wpRealdatas.get(16).getPointValueInDouble());
-                //                powerVo.setSjgl(wpRealdatas.get(17).getPointValueInDouble());
-                //                powerVo.setYcgl(wpRealdatas.get(18).getPointValueInDouble());
-
                 AtomicReference<Double> cxgl = new AtomicReference<>((double) 0);
                 AtomicReference<Double> agc = new AtomicReference<>((double) 0);
                 AtomicReference<Double> ycgl = new AtomicReference<>((double) 0);
@@ -205,16 +228,6 @@ public class MatrixService {
                     ProBasicPowerstationPoint agcPoint = powerstationPointMap.get(ContantXk.TPOINT_WP_AGC);
 
 
-                    //                    ycgl.updateAndGet(v -> {
-                    //                        try {
-                    //                            return new Double((double) (v + edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble()));
-                    //                        } catch (Exception e) {
-                    //                            e.printStackTrace();
-                    //                        }
-                    //                        return v;
-                    //                    });
-
-
                     cxgl.updateAndGet(v -> {
                         try {
                             return new Double((double) (v + edosUtil.getRealData(cxglPoint).getPointValueInDouble()));
@@ -231,14 +244,6 @@ public class MatrixService {
                         }
                         return v;
                     });
-                    //                    ycgl.updateAndGet(v -> {
-                    //                        try {
-                    //                            return new Double((double) (v + edosUtil.getHistMatrix(ycglPoint.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble()));
-                    //                        } catch (Exception e) {
-                    //                            e.printStackTrace();
-                    //                        }
-                    //                        return v;
-                    //                    });
                 });
 
                 QueryWrapper<ProBasicPowerPoint> qw = new QueryWrapper<>();
@@ -260,58 +265,54 @@ public class MatrixService {
                     }
                 }
 
-                //                ProBasicPowerstationPoint ycglPoint = pointService.getPowerstationPoint.get(ContantXk.GLYC);
-
-                List<List<PowercurveVo>> ls = new ArrayList<>();
 
                 ProBasicPowerstationPoint ycglcd = null;
 
                 double sum = 0.0;
-                for (ProBasicPowerPoint pp : qyls) {
-
-                    if (wp.getId().contains("MLJ_FDC_STA")) continue;
-                    ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
-
-                    double aDouble = 0.0;
-                    try {
-                        aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
-                        powerVo.setYcgl(aDouble + sum);
-                        sum += aDouble;
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
-                    }
-                }
+//                for (ProBasicPowerPoint pp : qyls) {
+//
+//                    if (wp.getId().contains("MLJ_FDC_STA")) continue;
+//                    ycglcd = proBasicPowerstationPointService.getPowerstationPoint(pp.getWindpowerstationId(), ContantXk.GLYC);
+//
+//                    double aDouble = 0.0;
+//                    try {
+//                        aDouble = edosUtil.getHistMatrix(ycglcd.getNemCode(), new Date().getTime() / 1000).getPointValueInDouble();
+//                        powerVo.setYcgl(aDouble + sum);
+//                        sum += aDouble;
+//                    } catch (Exception e) {
+//                        throw new RuntimeException(e);
+//                    }
+//                }
                 powerVo.setCxgl(cxgl.get());
                 powerVo.setAgc(agc.get());
                 //                powerVo.setYcgl(ycgl.get());
                 jrts.addAndGet(powerVo.getJrts());
-                dfts.addAndGet((int) wpRealdatas.get(0).getPointValueInDouble());
-                sdtj.addAndGet((int) wpRealdatas.get(1).getPointValueInDouble());
-                zcyx.addAndGet((int) wpRealdatas.get(2).getPointValueInDouble());
-                jclyx.addAndGet((int) wpRealdatas.get(3).getPointValueInDouble());
-                gztj.addAndGet((int) wpRealdatas.get(4).getPointValueInDouble());
-                gzsl.addAndGet((int) wpRealdatas.get(5).getPointValueInDouble());
-                jxtj.addAndGet((int) wpRealdatas.get(6).getPointValueInDouble());
-                jxsl.addAndGet((int) wpRealdatas.get(7).getPointValueInDouble());
-                xdtj.addAndGet((int) wpRealdatas.get(8).getPointValueInDouble());
-                xdjcl.addAndGet((int) wpRealdatas.get(9).getPointValueInDouble());
-                dwsl.addAndGet((int) wpRealdatas.get(10).getPointValueInDouble());
-                hjsl.addAndGet((int) wpRealdatas.get(11).getPointValueInDouble());
-                lx.addAndGet((int) wpRealdatas.get(12).getPointValueInDouble());
-                wz.addAndGet((int) wpRealdatas.get(13).getPointValueInDouble());
+                dfts.addAndGet(0);
+                sdtj.addAndGet(0);
+                zcyx.addAndGet(0);
+                jclyx.addAndGet(0);
+                gztj.addAndGet(0);
+                gzsl.addAndGet(0);
+                jxtj.addAndGet(0);
+                jxsl.addAndGet(0);
+                xdtj.addAndGet(0);
+                xdjcl.addAndGet(0);
+                dwsl.addAndGet(0);
+                hjsl.addAndGet(0);
+                lx.addAndGet(0);
+                wz.addAndGet(0);
                 int index = 3;
                 for (int j = 0; j < equipments.size(); j++) {
 
-                    //                    if(equipments.get(j).getId().equals("SXJ_KGDL_HSM_F_WT_0047_EQ"))
-                    //                    {
-                    //                        System.out.println("");
-                    //                    }
                     MatrixVo vo = new MatrixVo();
                     vo.setWtid(equipments.get(j).getId());
                     vo.setWtname(equipments.get(j).getAname());
                     vo.setStatus(wtRealdatas.get(j * index).getPointValueInDouble());
-                    vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble(), 2));
-
+                    if (equipments.get(j).getProjectId().equals("NX_FGS_HAF02_EG")) {
+                        vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble() / 1000, 2));
+                    } else {
+                        vo.setPower(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index).getPointValueInDouble(), 2));
+                    }
                     if (equipments.get(j).getEquipmentCategory() == -1) {
                         vo.setSpeed(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index + 1).getPointValueInDouble(), 2));
                         vo.setTransfer(DoubleUtils.keepPrecision(wtRealdatas1.get(j * index + 2).getPointValueInDouble(), 2));
@@ -340,27 +341,6 @@ public class MatrixService {
         SortUtils.sort(powerVos, "orderNum", SortUtils.ASC);
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("jrts", jrts.doubleValue());
-        dataMap.put("dfts", dfts.doubleValue());
-        dataMap.put("sdtj", sdtj.doubleValue());
-        dataMap.put("djts", dfts.doubleValue() + sdtj.doubleValue());
-        dataMap.put("zcyx", zcyx.doubleValue());
-        dataMap.put("jclyx", jclyx.doubleValue());
-        dataMap.put("bwts", zcyx.doubleValue() + jclyx.doubleValue());
-        dataMap.put("gztj", gztj.doubleValue());
-        dataMap.put("gzsl", gzsl.doubleValue());
-        dataMap.put("gzts", gztj.doubleValue() + gzsl.doubleValue());
-        dataMap.put("jxtj", jxtj.doubleValue());
-        dataMap.put("jxsl", jxsl.doubleValue());
-        dataMap.put("jxts", jxtj.doubleValue() + jxsl.doubleValue());
-        dataMap.put("xdtj", xdtj.doubleValue());
-        dataMap.put("xdjcl", xdjcl.doubleValue());
-        dataMap.put("xdts", xdtj.doubleValue() + xdjcl.doubleValue());
-        dataMap.put("dwsl", dwsl.doubleValue());
-        dataMap.put("hjsl", hjsl.doubleValue());
-        dataMap.put("slts", dwsl.doubleValue() + hjsl.doubleValue());
-        dataMap.put("lx", lx.doubleValue());
-        dataMap.put("wz", wz.doubleValue());
-        dataMap.put("lxz", lx.doubleValue() + wz.doubleValue());
         dataMap.put("qf0", DoubleUtils.keepPrecision(qf0.get(), 2));
         dataMap.put("qf1", DoubleUtils.keepPrecision(qf1.get(), 2));
         dataMap.put("qf2", DoubleUtils.keepPrecision(qf2.get(), 2));

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/threerate/ThreeRateService.java

@@ -139,20 +139,30 @@ public class ThreeRateService {
         List<ProEconFaultLiminatedefects> faulteliminatedefectsList = proEconFaultLiminatedefectsService.list(qw);
         AtomicReference<Long> gzCount = new AtomicReference<>((long) 0);
         AtomicReference<Long> xqCount = new AtomicReference<>((long) 0);
-        faulteliminatedefectsList.stream().forEach(i -> {
-            gzCount.updateAndGet(v -> new Long((long) (v + i.getFaultCount())));
-            xqCount.updateAndGet(v -> new Long((long) (v + i.getRightCount())));
+        if (null == faulteliminatedefectsList || faulteliminatedefectsList.isEmpty()) {
             QxjslDTO vo = new QxjslDTO();
+            vo.setOrdernum(0);
+            vo.setWpid("惠安风电");
+            vo.setGzCount(0L);
+            vo.setXqCount(0L);
+            vo.setXqjsl(0.0);
+            resultList.add(vo);
+        }else {
+            faulteliminatedefectsList.stream().forEach(i -> {
+                gzCount.updateAndGet(v -> new Long((long) (v + i.getFaultCount())));
+                xqCount.updateAndGet(v -> new Long((long) (v + i.getRightCount())));
+                QxjslDTO vo = new QxjslDTO();
 
-            vo.setOrdernum(station.get(i.getWindpowerstationId()));
+                vo.setOrdernum(station.get(i.getWindpowerstationId()));
 
 
-            vo.setWpid(CacheContext.wpmap.get(i.getWindpowerstationId()).getName());
-            vo.setGzCount(i.getFaultCount().longValue());
-            vo.setXqCount(i.getRightCount().longValue());
-            vo.setXqjsl(i.getFaultCount() != 0 ? DoubleUtils.getRoundingNum(((double) (i.getRightCount()) / (double) (i.getFaultCount()) * 100.0), 2) : 0.0);
-            resultList.add(vo);
-        });
+                vo.setWpid(CacheContext.wpmap.get(i.getWindpowerstationId()).getName());
+                vo.setGzCount(i.getFaultCount().longValue());
+                vo.setXqCount(i.getRightCount().longValue());
+                vo.setXqjsl(i.getFaultCount() != 0 ? DoubleUtils.getRoundingNum(((double) (i.getRightCount()) / (double) (i.getFaultCount()) * 100.0), 2) : 0.0);
+                resultList.add(vo);
+            });
+        }
         QxjslDTO vo = new QxjslDTO();
         vo.setWpid("合计");
 
@@ -163,7 +173,7 @@ public class ThreeRateService {
         vo.setGzCount(gzCount.get());
         vo.setXqCount(xqCount.get());
         vo.setXqjsl(gzCount.get() != 0 ? DoubleUtils.getRoundingNum(((double) (xqCount.get()) / (double) (gzCount.get()) * 100.0), 2) : 0.0);
-
+        resultList.add(vo);
         SortUtils.sort(resultList, "ordernum", SortUtils.ASC);
 
 

runeconomy-xk/src/main/java/com/gyee/runeconomy/task/AnalysisTask.java

@@ -0,0 +1,33 @@
+package com.gyee.runeconomy.task;
+
+import com.gyee.runeconomy.service.EarlyWarning.EarlyWarningReliableService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+@EnableAsync  // 启用异步方法执行
+public class AnalysisTask {
+    private static final Logger logger = LoggerFactory.getLogger(AnalysisTask.class);
+
+    @Autowired
+    private EarlyWarningReliableService earlyWarningReliableService;
+    // 每日1点 - 日曲线偏差
+    @Async
+    @Scheduled(cron = "0 0 1 1/1 * ?")
+    public void rqxpc() {
+        try {
+            logger.info("预警报告计算开始运行");
+            earlyWarningReliableService.Electricity();
+            logger.info("预警报告计算运行完成");
+        } catch (Exception e) {
+            logger.error("预警报告计算运行失败", e);
+        }
+    }
+
+}

runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -357,10 +357,123 @@ public class EdosUtil implements IEdosUtil {
     }
 
 
+    @Override
+    public List<PointData> getHistoryDatasSnap(String pointid, Long beginDate, Long endDate, Integer pried) throws Exception {
+            if (StringUtils.notEmp(pointid) && !initialcode.equals(pointid)) {
+                Optional<String> tagName = Optional.ofNullable(pointid);
+                Optional<Long> startTs = Optional.ofNullable(beginDate * 1000);
+                Optional<Long> endTs = Optional.ofNullable(endDate * 1000);
+
+                //通过时间区间和时间间隔获取点数
+                int finalInterval;
+                if (pried != null)
+                    finalInterval = pried;
+                else
+                    return ErrorRequest.RequestListError(pointid);
+                Optional<Integer> interval = Optional.ofNullable(finalInterval);
+
+                try {
+                    String url = baseURL + "/history/snap?null=0";
+                    if (pointid.startsWith("GF-")) {
+                        url = baseURL2 + "/history/snap?null=0";
+                    }
+                    //tagName 或thingType，thingId，uniformCode可以确定一个标签点
+                    if (tagName.isPresent())
+                        url = url + "&tagName=" + tagName.get();
+
+                    if (startTs.isPresent())
+                        url = url + "&startTs=" + startTs.get();
+                    if (endTs.isPresent())
+                        url = url + "&endTs=" + endTs.get();
+                    if (interval.isPresent())
+                        url = url + "&interval=" + interval.get();
+
+                    ResponseEntity<JSONArray> resp = restTemplate.getForEntity(url, JSONArray.class);
+                    JSONArray jsonArray = resp.getBody();
+                    if (jsonArray != null) {
+                        List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray, tagName.get());
+                        List<PointData> resultList = new ArrayList<>();
+
+                        if (list.isEmpty()) {
+
+                            getHistsnapSameTiem(pointid, beginDate, Long.valueOf(pried), resultList);
+                        } else {
+                            for (PointData snapItem : list) {
+                                long subTime = snapItem.getPointTime() - pried;
+                                //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+                                // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+                                // 则代表该时间节点快照有效，否则为0
+                                String rawUrl = baseURL + "/history/section?null=0&tagNames=" + pointid + "&ts=" + snapItem.getPointTime();
+                                if (pointid.startsWith("GF-")) {
+                                    rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + pointid + "&ts=" + snapItem.getPointTime();
+                                }
+                                ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+                                JSONObject jsonObjectSection = sectionResp.getBody();
+
+                                if (jsonObjectSection != null) {
+                                    List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+                                    if (sectionlist.size() > 0) {
+                                        if (sectionlist.get(0).getPointTime() <= snapItem.getPointTime()) {
+                                            resultList.add(snapItem);
+                                        } else {
+                                            PointData data = new PointData();
+                                            data.setEdnaId(pointid);
+                                            data.setPointTime(snapItem.getPointTime());
+                                            data.setPointValue("0");
+                                            data.setPointName("1");
+                                            data.setPointValueInDouble(0.0);
+                                            resultList.add(data);
+                                        }
+                                    } else {
+                                        PointData data = new PointData();
+                                        data.setEdnaId(pointid);
+                                        data.setPointTime(0l);
+                                        data.setPointValue("0");
+                                        data.setPointName("1");
+                                        data.setPointValueInDouble(0.0);
+                                        resultList.add(data);
+                                    }
+                                } else {
+                                    PointData data = new PointData();
+                                    data.setEdnaId(pointid);
+                                    data.setPointTime(0l);
+                                    data.setPointValue("0");
+                                    data.setPointName("1");
+                                    data.setPointValueInDouble(0.0);
+                                    resultList.add(data);
+                                }
+                            }
+                        }
+
+                        return resultList;
+                    } else {
+                        return ErrorRequest.RequestListError(pointid);
+                    }
+
+                } catch (HttpClientErrorException exception) {
+                    if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                        //System.out.println("404请求错误");
+                        return ErrorRequest.RequestListError(pointid);
+                    } else {
+                        throw exception;
+                    }
+                }
+            } else {
+                List<PointData> pols = new ArrayList<>();
+                PointData po = new PointData();
+                po.setEdnaId(pointid);
+                po.setPointValueInDouble(0.0);
+                po.setPointTime(0l);
+                pols.add(po);
+                return pols;
+            }
+
+        }
+
+
     private void getHistsnapSameTiem(String pointid, Long beginDate, Long pried,
                                      List<PointData> resultList) {
 
-
         long subTime = beginDate - pried;
         String rawUrl = baseURL + "/history/section?null=0&tagNames=" + pointid + "&ts=" + beginDate;
         if (pointid.startsWith("GF-")) {
@@ -853,14 +966,15 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public List<PointData> getRealData(List<String> pointids) throws Exception {
-
-        String url = baseURL + "/latest";
+        String join = String.join(",", pointids);
+        String url = baseURL + "/latests";
         try {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
 
             // 将请求体和头部信息整合到HttpEntity中
-            HttpEntity<List<String>> requestEntity = new HttpEntity<>(pointids,headers);
+//            HttpEntity<List<String>> requestEntity = new HttpEntity<>(pointids,headers);
+            HttpEntity<String> requestEntity = new HttpEntity<>(join,headers);
 
             // 发起POST请求
             ResponseEntity<JSONObject> resp = restTemplate.exchange(url,HttpMethod.POST,requestEntity,JSONObject.class);

runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/IEdosUtil.java

@@ -1,6 +1,5 @@
 package com.gyee.runeconomy.util.realtimesource;
 
-
 import com.gyee.common.model.DNAStatVal;
 import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
@@ -68,6 +67,8 @@ public interface IEdosUtil {
      */
     public List<PointData> getHistoryDatasSnap(ProBasicPowerstationPoint point, Long beginDate, Long endDate, Long count, Long pried) throws Exception;
 
+    public List<PointData> getHistoryDatasSnap(String point, Long beginDate, Long endDate, Integer pried) throws Exception;
+
     /**
      * 通过风场测点获得测点历史存储数据，存多少取多少
      *
@@ -304,4 +305,5 @@ public interface IEdosUtil {
     public List<PointData> getHistMatrix(List<String> nameList, long tTime) throws Exception;
 
     public PointData getHistMatrix(String id, long tTime) throws Exception;
+
 }

runeconomy-xk/src/main/resources/mapper/CurvefittingmainMapper.xml

@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.runeconomy.mapper.auto.CurvefittingmainMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.runeconomy.model.auto.Curvefittingmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="windturbine_id" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="month_deviation_rate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="year_deviation_rate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standard_deviation_rate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="record_date" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="deviation_rate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviation_rate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviation_rate3" jdbcType="DECIMAL" property="deviationrate3" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, windturbine_id, month_deviation_rate, year_deviation_rate, standard_deviation_rate,
+    record_date, deviation_rate1, deviation_rate2, deviation_rate3
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmainExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pro_econ_curve_fitting_main
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from curvefittingmain
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from curvefittingmain
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmainExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from curvefittingmain
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into curvefittingmain (id, windturbine_id, month_deviation_rate, 
+      year_deviation_rate, standard_deviation_rate, 
+      record_date, deviation_rate1, deviation_rate2,
+    deviation_rate3)
+    values (#{id,jdbcType=VARCHAR}, #{windturbineid,jdbcType=VARCHAR}, #{monthdeviationrate,jdbcType=DECIMAL}, 
+      #{yeardeviationrate,jdbcType=DECIMAL}, #{standarddeviationrate,jdbcType=DECIMAL}, 
+      #{recorddate,jdbcType=TIMESTAMP}, #{deviationrate1,jdbcType=DECIMAL}, #{deviationrate2,jdbcType=DECIMAL}, 
+      #{deviationrate3,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into curvefittingmain
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="windturbine_id != null">
+        windturbineId,
+      </if>
+      <if test="month_deviation_rate != null">
+        monthDeviationRate,
+      </if>
+      <if test="yeardeviationrate != null">
+        year_deviation_rate,
+      </if>
+      <if test="standarddeviationrate != null">
+        standard_deviation_rate,
+      </if>
+      <if test="recorddate != null">
+        record_date,
+      </if>
+      <if test="deviationrate1 != null">
+        deviation_rate1,
+      </if>
+      <if test="deviationrate2 != null">
+        deviation_rate2,
+      </if>
+      <if test="deviationrate3 != null">
+        deviation_rate3,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbine_id != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="month_deviation_rate != null">
+        #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="yeardeviationrate != null">
+        #{yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviationrate1 != null">
+        #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        #{deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmainExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from curvefittingmain
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmain
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbineid != null">
+        windturbine_id = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.monthdeviationrate != null">
+        month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yeardeviationrate != null">
+        year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.standarddeviationrate != null">
+        standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.recorddate != null">
+        record_date = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.deviationrate1 != null">
+        deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviationrate2 != null">
+        deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviationrate3 != null">
+        deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmain
+    set id = #{record.id,jdbcType=VARCHAR},
+    windturbine_id = #{record.windturbineid,jdbcType=VARCHAR},
+    month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      record_date = #{record.recorddate,jdbcType=TIMESTAMP},
+    deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmain
+    <set>
+      <if test="windturbineid != null">
+        windturbine_id = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="monthdeviationrate != null">
+        month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="yeardeviationrate != null">
+        year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="recorddate != null">
+        record_date = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviationrate1 != null">
+        deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmain
+    set windturbine_id = #{windturbineid,jdbcType=VARCHAR},
+    month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+      standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+      record_date = #{recorddate,jdbcType=TIMESTAMP},
+    deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

runeconomy-xk/src/main/resources/mapper/CurvefittingmonthmainMapper.xml

@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gyee.runeconomy.mapper.auto.CurvefittingmonthmainMapper">
+  <resultMap id="BaseResultMap" type="com.gyee.runeconomy.model.auto.Curvefittingmonthmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="windturbine_id" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="year" jdbcType="VARCHAR" property="year" />
+    <result column="month" jdbcType="VARCHAR" property="month" />
+    <result column="month_deviation_rate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="year_deviation_rate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standard_deviation_rate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="deviation_rate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviation_rate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviation_rate3" jdbcType="DECIMAL" property="deviationrate3" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, windturbine_id, year, month, month_deviation_rate, year_deviation_rate, standard_deviation_rate,
+    deviation_rate1, deviation_rate2, deviation_rate3
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pro_econ_curve_fitt_month_main
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from curvefittingmonthmain
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from curvefittingmonthmain
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from curvefittingmonthmain
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmonthmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into curvefittingmonthmain (id, windturbine_id, year, 
+      month, month_deviation_rate, year_deviation_rate,
+    standard_deviation_rate, deviation_rate1,
+    deviation_rate2, deviation_rate3)
+    values (#{id,jdbcType=VARCHAR}, #{windturbine_id,jdbcType=VARCHAR}, #{year,jdbcType=VARCHAR},
+      #{month,jdbcType=VARCHAR}, #{monthdeviationrate,jdbcType=DECIMAL}, #{yeardeviationrate,jdbcType=DECIMAL},
+      #{standarddeviationrate,jdbcType=DECIMAL}, #{deviationrate1,jdbcType=DECIMAL}, 
+      #{deviationrate2,jdbcType=DECIMAL}, #{deviationrate3,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmonthmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into curvefittingmonthmain
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="windturbine_id != null">
+        windturbine_id,
+      </if>
+      <if test="year != null">
+        year,
+      </if>
+      <if test="month != null">
+        month,
+      </if>
+      <if test="monthdeviationrate != null">
+        month_deviation_rate,
+      </if>
+      <if test="year_deviation_rate != null">
+        yearDeviationRate,
+      </if>
+      <if test="standard_deviation_rate != null">
+        standardDeviationRate,
+      </if>
+      <if test="deviationrate1 != null">
+        deviationRate1,
+      </if>
+      <if test="deviationrate2 != null">
+        deviationRate2,
+      </if>
+      <if test="deviationrate3 != null">
+        deviationRate3,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="windturbine_id != null">
+        #{windturbine_id,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        #{year,jdbcType=VARCHAR},
+      </if>
+      <if test="month != null">
+        #{month,jdbcType=VARCHAR},
+      </if>
+      <if test="monthdeviationrate != null">
+        #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="year_deviation_rate != null">
+        #{year_deviation_rate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate1 != null">
+        #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        #{deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.runeconomy.model.auto.CurvefittingmonthmainExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from curvefittingmonthmain
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmonthmain
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.windturbine_id != null">
+        windturbine_id = #{record.windturbine_id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.year != null">
+        year = #{record.year,jdbcType=VARCHAR},
+      </if>
+      <if test="record.month != null">
+        month = #{record.month,jdbcType=VARCHAR},
+      </if>
+      <if test="record.monthdeviationrate != null">
+        month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.year_deviation_rate != null">
+        year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.standarddeviationrate != null">
+        standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviationrate1 != null">
+        deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviationrate2 != null">
+        deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="record.deviationrate3 != null">
+        deviationRate3 = #{record.deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmonthmain
+    set id = #{record.id,jdbcType=VARCHAR},
+      windturbine_id = #{record.windturbine_id,jdbcType=VARCHAR},
+      year = #{record.year,jdbcType=VARCHAR},
+      month = #{record.month,jdbcType=VARCHAR},
+      month_deviation_rate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+    standard_deviation_rate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+    deviation_rate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{record.deviationrate3,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmonthmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmonthmain
+    <set>
+      <if test="windturbineid != null">
+        windturbine_id = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="year != null">
+        year = #{year,jdbcType=VARCHAR},
+      </if>
+      <if test="month != null">
+        month = #{month,jdbcType=VARCHAR},
+      </if>
+      <if test="monthdeviationrate != null">
+        month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="yeardeviationrate != null">
+        year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate1 != null">
+        deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.runeconomy.model.auto.Curvefittingmonthmain">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update curvefittingmonthmain
+    set windturbine_id = #{windturbine_id,jdbcType=VARCHAR},
+      year = #{year,jdbcType=VARCHAR},
+      month = #{month,jdbcType=VARCHAR},
+      month_deviation_rate = #{monthdeviationrate,jdbcType=DECIMAL},
+      year_deviation_rate = #{yeardeviationrate,jdbcType=DECIMAL},
+    standard_deviation_rate = #{standarddeviationrate,jdbcType=DECIMAL},
+    deviation_rate1 = #{deviationrate1,jdbcType=DECIMAL},
+    deviation_rate2 = #{deviationrate2,jdbcType=DECIMAL},
+    deviation_rate3 = #{deviationrate3,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>