曲线偏差率分析

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

@@ -341,11 +341,19 @@ 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();
@@ -355,8 +363,7 @@ public class EquipmentInfo5Service {
                     }
 
                     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());
                             double zhcs = DateUtils.hoursDiff2(begin, end);
@@ -416,7 +423,7 @@ 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))) {
 

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

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

@@ -738,30 +738,16 @@ 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 join = String.join(",", pointids);
         String url = baseURL + "/latest";
-//        if (pointIdString.startsWith("GF-")) {
-//            url = baseURL2 + "/latest?null=0";
-//        }
         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()) {
@@ -781,7 +767,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 +789,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 +798,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/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/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/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/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("windturbineId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbineId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbineId =", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbineId <>", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbineId >", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbineId >=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbineId <", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbineId <=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbineId like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbineId not like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbineId in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbineId not in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbineId between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbineId 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("recordDate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("recordDate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("recordDate =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("recordDate <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("recordDate >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("recordDate >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("recordDate <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("recordDate <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("recordDate in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("recordDate not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("recordDate between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("recordDate 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("windturbineId is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIsNotNull() {
+            addCriterion("windturbineId is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidEqualTo(String value) {
+            addCriterion("windturbineId =", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotEqualTo(String value) {
+            addCriterion("windturbineId <>", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThan(String value) {
+            addCriterion("windturbineId >", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidGreaterThanOrEqualTo(String value) {
+            addCriterion("windturbineId >=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThan(String value) {
+            addCriterion("windturbineId <", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLessThanOrEqualTo(String value) {
+            addCriterion("windturbineId <=", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidLike(String value) {
+            addCriterion("windturbineId like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotLike(String value) {
+            addCriterion("windturbineId not like", value, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidIn(List<String> values) {
+            addCriterion("windturbineId in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotIn(List<String> values) {
+            addCriterion("windturbineId not in", values, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidBetween(String value1, String value2) {
+            addCriterion("windturbineId between", value1, value2, "windturbineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindturbineidNotBetween(String value1, String value2) {
+            addCriterion("windturbineId not between", value1, value2, "windturbineid");
+            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, "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 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/service/auto/impl/CurvefittingmainService.java

@@ -0,0 +1,273 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.common.model.Convert;
+import com.gyee.runeconomy.config.BaseService;
+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.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(" deviationrate2 DESC");
+
+
+		CurvefittingmainExample.Criteria criteria =example.createCriteria();
+
+		criteria.andWindturbineidIn(wtIds);
+		Date endDate= DateUtils.addDays(recorddate,1);
+		criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+		list=curvefittingmainMapper.selectByExample(example);
+
+		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,278 @@
+package com.gyee.runeconomy.service.auto.impl;
+
+import com.gyee.common.model.Convert;
+import com.gyee.runeconomy.config.BaseService;
+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.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(" deviationrate2 DESC");
+
+
+			CurvefittingmonthmainExample.Criteria criteria =example.createCriteria();
+
+			criteria.andWindturbineidIn(wtIds);
+			criteria.andYearEqualTo(year);
+			criteria.andMonthEqualTo(month);
+
+			list=curvefittingmonthmainMapper.selectByExample(example);
+
+			list=sortCurvefittingmonthmainList(tablepar, list);
+		}
+
+
+		return list;
+
+	}
+
+	public  List<Curvefittingmonthmain> sortCurvefittingmonthmainList(Tablepar tablepar,List<Curvefittingmonthmain> ls)
+	{
+
+		if (null !=tablepar && StringUtils.notEmp(tablepar.getOrderByColumn())) {
+
+			switch (tablepar.getOrderByColumn()) {
+				case "windturbineid":
+					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/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;
+
 
     /**
      * 指标率相应类
@@ -136,6 +137,13 @@ public class EconomyPointHomePageService {
      */
     private Map<String, GeneratingCapacityVo> generatingCapacity15min = new HashMap<>();
 
+    private BigDecimal weekFdlCal = null;
+    private BigDecimal yfdlCal = null;
+    private BigDecimal yllfdlCal = null;
+    private BigDecimal nfdlCal = null;
+    private BigDecimal nllfdlCal = null;
+    private LocalDate lastCalDate;
+
 
     /**
      * 经济运行首页聚合方法
@@ -1824,10 +1832,6 @@ public class EconomyPointHomePageService {
         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("年发电量");
 
@@ -1891,47 +1895,392 @@ public class EconomyPointHomePageService {
     }
 
 
+//    public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
+//        LocalDate currentDate = LocalDate.now();
+//        Integer month = LocalDate.now().getMonthValue();
+//        int year = LocalDate.now().getYear();
+//        Map<String, Object> allmap = new HashMap<>();
+//        PlanDataVo pd = new PlanDataVo();
+//        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;
+//        }
+//        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);
+//
+//        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());
+//        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";
+//        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<PowertrendVo> xdl = new ArrayList<>();
+//        List<PowertrendVo> ssdl = new ArrayList<>();
+//        List<PowertrendVo> fdl = new ArrayList<>();
+//        PowertrendVo ptxdl = new PowertrendVo();
+//        PowertrendVo ptssdl = new PowertrendVo();
+//        PowertrendVo ptfdl = new PowertrendVo();
+//        ptxdl.setTitle("限电量");
+//        ptssdl.setTitle("损失电量");
+//        ptfdl.setTitle("发电量");
+//        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);
+//        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());
+//            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()));
+//                }
+//            }
+//            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()))))))))))));
+//                }
+//            }
+//            for (ValueVo vv : vefdl) {
+//                if (vv.getText().equals(text)) {
+//                    vv.setValue(day1s2.get(0).getYfdl());
+//                }
+//            }
+//
+//        }
+//        ptxdl.setValue(vexdl);
+//        ptssdl.setValue(vessdl);
+//        ptfdl.setValue(vefdl);
+//        xdl.add(ptxdl);
+//        ssdl.add(ptssdl);
+//        fdl.add(ptfdl);
+//
+//        PowertrendVo ptxdl2 = new PowertrendVo();
+//        PowertrendVo ptssdl2 = new PowertrendVo();
+//        PowertrendVo ptfdl2 = new PowertrendVo();
+//        ptxdl2.setTitle("去年同期限电量");
+//        ptssdl2.setTitle("去年同期损失电量");
+//        ptfdl2.setTitle("去年同期发电量");
+//        ptxdl.setYAxisIndex(0);
+//        ptssdl.setYAxisIndex(0);
+//        ptfdl.setYAxisIndex(0);
+//        if (null == lastYear || 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));
+//            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());
+//                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);
+//            }
+//            ptxdl2.setValue(vxdl2);
+//            ptssdl2.setValue(vssdl2);
+//            ptxdl2.setValue(vfdl2);
+//        }
+//        xdl.add(ptxdl2);
+//        ssdl.add(ptssdl2);
+//        fdl.add(ptfdl2);
+//
+//        allmap.put("Powertrend", xdl);
+//        allmap.put("Powerloss", ssdl);
+//        allmap.put("Powersend", fdl);
+//        return allmap;
+//    }
+
+
+//    public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
+//        LocalDate currentDate = LocalDate.now();
+//        Integer month = LocalDate.now().getMonthValue();
+//        int year = LocalDate.now().getYear();
+//        Map<String, Object> allmap = new HashMap<>();
+//        PlanDataVo pd = new PlanDataVo();
+//        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;
+//        }
+//        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);
+//
+//        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());
+//        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";
+//        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<PowertrendVo> xdl = new ArrayList<>();
+//        List<PowertrendVo> ssdl = new ArrayList<>();
+//        List<PowertrendVo> fdl = new ArrayList<>();
+//        PowertrendVo ptxdl = new PowertrendVo();
+//        PowertrendVo ptssdl = new PowertrendVo();
+//        PowertrendVo ptfdl = new PowertrendVo();
+//        ptxdl.setTitle("限电量");
+//        ptssdl.setTitle("损失电量");
+//        ptfdl.setTitle("发电量");
+//        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);
+//        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());
+//            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()));
+//                }
+//            }
+//            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()))))))))))));
+//                }
+//            }
+//            for (ValueVo vv : vefdl) {
+//                if (vv.getText().equals(text)) {
+//                    vv.setValue(day1s2.get(0).getYfdl());
+//                }
+//            }
+//
+//        }
+//        ptxdl.setValue(vexdl);
+//        ptssdl.setValue(vessdl);
+//        ptfdl.setValue(vefdl);
+//        xdl.add(ptxdl);
+//        ssdl.add(ptssdl);
+//        fdl.add(ptfdl);
+//
+//        PowertrendVo ptxdl2 = new PowertrendVo();
+//        PowertrendVo ptssdl2 = new PowertrendVo();
+//        PowertrendVo ptfdl2 = new PowertrendVo();
+//        ptxdl2.setTitle("去年同期限电量");
+//        ptssdl2.setTitle("去年同期损失电量");
+//        ptfdl2.setTitle("去年同期发电量");
+//        ptxdl.setYAxisIndex(0);
+//        ptssdl.setYAxisIndex(0);
+//        ptfdl.setYAxisIndex(0);
+//        if (null == lastYear || 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));
+//            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());
+//                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);
+//            }
+//            ptxdl2.setValue(vxdl2);
+//            ptssdl2.setValue(vssdl2);
+//            ptxdl2.setValue(vfdl2);
+//        }
+//        xdl.add(ptxdl2);
+//        ssdl.add(ptssdl2);
+//        fdl.add(ptfdl2);
+//
+//        allmap.put("Powertrend", xdl);
+//        allmap.put("Powerloss", ssdl);
+//        allmap.put("Powersend", fdl);
+//        return allmap;
+//    }
+
+
     public Map<String, Object> getHomeMiddle(String companyId) throws ParseException {
-        LocalDate currentDate = LocalDate.now();
         Integer month = LocalDate.now().getMonthValue();
         int year = LocalDate.now().getYear();
         Map<String, Object> allmap = new HashMap<>();
         PlanDataVo pd = new PlanDataVo();
+        //计划发电量
         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()) {
+        if (pp.isEmpty()) {
             return allmap;
         }
         pd.setZfdljh(pp.get(0).getGeneratingCapacity() / 4);
-        double sum = day1s.stream().map(ProEconPowerstationInfoDay1::getRfdl).mapToDouble(BigDecimal::doubleValue).sum();
-        pd.setZfdlsj(sum);
+        pd.setZfdlsj(weekFdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
         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());
+        pd.setYfdlsj(yfdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
         Double yjd = calDivide(pd.getYfdlsj(), pd.getYfdljh());
         pd.setYjd(yjd * 100);
         pd.setYwcl(yjd);
@@ -1940,37 +2289,30 @@ public class EconomyPointHomePageService {
                 .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());
+        pd.setNfdlsj(nfdlCal.add(new BigDecimal(generatingCapacity15min.get("日发电量").getValue())).doubleValue());
+        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 +2325,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));
                 }
             }
 
@@ -2036,10 +2382,10 @@ public class EconomyPointHomePageService {
             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));
+            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;
@@ -2049,11 +2395,15 @@ public class EconomyPointHomePageService {
                 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());
+                vexdl2.setValue(day1s4.stream().map(TurbineInfoDay::getXdss).reduce(BigDecimal.ZERO, BigDecimal::add));
+                vessdl2.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)))));
+                vefdl2.setValue(day1s4.stream().map(TurbineInfoDay::getRfdl).reduce(BigDecimal.ZERO, BigDecimal::add));
                 vxdl2.add(vexdl2);
                 vssdl2.add(vessdl2);
                 vfdl2.add(vefdl2);
@@ -2092,7 +2442,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));
@@ -2210,6 +2560,7 @@ public class EconomyPointHomePageService {
     public Map<String, Object> getGeneratingCapacity(String companyId) {
         Map<String, Object> allmap = new HashMap<>();
         QueryWrapper<StationInfoMin> qw = new QueryWrapper<>();
+        DecimalFormat df = new DecimalFormat("#.##");
         qw.lambda().ge(StationInfoMin::getRecordDate, LocalDateTime.now().toLocalDate().atStartOfDay())
                 .le(StationInfoMin::getRecordDate, LocalDateTime.now())
                 .orderByDesc(StationInfoMin::getRecordDate)
@@ -2267,30 +2618,34 @@ public class EconomyPointHomePageService {
             ls.add(nfdl);
             generatingCapacity15min.put(nfdl.getName(), nfdl);
         } else {
+            if (null == lastCalDate || !lastCalDate.equals(LocalDate.now()) || null == yfdlCal) {
+                calFdl();
+            }
             StationInfoMin day1 = day1s.get(0);
             GeneratingCapacityVo rfdl = new GeneratingCapacityVo();
             rfdl.setName("日发电量");
-            rfdl.setValue(day1.getRfdl());
+            rfdl.setValue(new BigDecimal(day1.getRfdl()).setScale(2, RoundingMode.HALF_UP).doubleValue());
             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));
+            yfdl.setValue(yfdlCal.add(new BigDecimal(rfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            yfdl.setTotal(calDivide(yllfdlCal.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.add(new BigDecimal(yfdl.getValue())).doubleValue());
+            nfdl.setValue(nfdlCal.add(new BigDecimal(yfdl.getValue())).setScale(2, RoundingMode.HALF_UP).doubleValue());
+            nfdl.setTotal(calDivide(nllfdlCal.add(new BigDecimal(yfdl.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 +2724,52 @@ public class EconomyPointHomePageService {
         return allmap;
     }
 
+
+    private void calFdl() {
+        LocalDate currentDate = LocalDate.now();
+//        int year = currentDate.getYear();
+//        int month = currentDate.getMonthValue();
+        DecimalFormat df = new DecimalFormat("#.##");
+        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");
+        currentqw.select("station_id,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
+                .ge("record_date", LocalDate.now().with(TemporalAdjusters.firstDayOfYear())) // 大于等于今年的第一天
+                .lt("record_date", LocalDate.now().atStartOfDay().toLocalDate()) // 小于今天0点的日期
+                .like("station_id", "_FDC_%") // 模糊查询 station_id
+                .groupBy("station_id");
+        List<TurbineInfoDay> monthData = iTurbineInfoDayService.list(currentqw);
+        yfdlCal = new BigDecimal(df.format(monthData.get(0).getRfdl()));
+        yllfdlCal = new BigDecimal(df.format(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");
+        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", LocalDate.now().plusDays(1).atStartOfDay().toLocalDate())  // 小于明天0点的日期
+                .like("station_id", "_FDC_%")  // 模糊查询 station_id
+                .groupBy("station_id");
+        List<TurbineInfoDay> yearData = iTurbineInfoDayService.list(currentqw);
+        nfdlCal = new BigDecimal(df.format(yearData.get(0).getRfdl()));
+        nllfdlCal = new BigDecimal(df.format(yearData.get(0).getLlfdl()));
+        currentqw.clear();
+        currentqw.select("station_id,SUM(rfdl) AS rfdl,sum(llfdl) as llfdl")
+                .ge("record_date", LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY)))  // 大于等于本周一的日期
+                .lt("record_date", LocalDate.now().atStartOfDay().toLocalDate())  // 小于今天0点的日期
+                .like("station_id", "_FDC_")  // 模糊查询 station_id
+                .groupBy("station_id");
+        List<TurbineInfoDay> weekData = iTurbineInfoDayService.list(currentqw);
+        if (null == weekData || weekData.isEmpty()) {
+            weekFdlCal = new BigDecimal("0");
+        } else {
+            weekFdlCal = new BigDecimal(df.format(weekData.get(0).getRfdl()));
+        }
+        lastCalDate = LocalDate.now();
+    }
+
 }

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 join = String.join(",", pointids);
         String url = baseURL + "/latest";
         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="windturbineId" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="monthDeviationRate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="yearDeviationRate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standardDeviationRate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="recordDate" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="deviationRate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviationRate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviationRate3" 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, windturbineId, monthDeviationRate, yearDeviationRate, standardDeviationRate, 
+    recordDate, deviationRate1, deviationRate2, deviationRate3
+  </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 curvefittingmain
+    <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, windturbineId, monthDeviationRate, 
+      yearDeviationRate, standardDeviationRate, 
+      recordDate, deviationRate1, deviationRate2, 
+      deviationRate3)
+    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="windturbineid != null">
+        windturbineId,
+      </if>
+      <if test="monthdeviationrate != null">
+        monthDeviationRate,
+      </if>
+      <if test="yeardeviationrate != null">
+        yearDeviationRate,
+      </if>
+      <if test="standarddeviationrate != null">
+        standardDeviationRate,
+      </if>
+      <if test="recorddate != null">
+        recordDate,
+      </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="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="monthdeviationrate != 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">
+        windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.monthdeviationrate != null">
+        monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yeardeviationrate != null">
+        yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.standarddeviationrate != null">
+        standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.recorddate != null">
+        recordDate = #{record.recorddate,jdbcType=TIMESTAMP},
+      </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 curvefittingmain
+    set id = #{record.id,jdbcType=VARCHAR},
+      windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+      monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      recordDate = #{record.recorddate,jdbcType=TIMESTAMP},
+      deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+      deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+      deviationRate3 = #{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">
+        windturbineId = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="monthdeviationrate != null">
+        monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="yeardeviationrate != null">
+        yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="recorddate != null">
+        recordDate = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deviationrate1 != null">
+        deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        deviationRate3 = #{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 windturbineId = #{windturbineid,jdbcType=VARCHAR},
+      monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+      yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+      standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+      recordDate = #{recorddate,jdbcType=TIMESTAMP},
+      deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+      deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+      deviationRate3 = #{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="windturbineId" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="year" jdbcType="VARCHAR" property="year" />
+    <result column="month" jdbcType="VARCHAR" property="month" />
+    <result column="monthDeviationRate" jdbcType="DECIMAL" property="monthdeviationrate" />
+    <result column="yearDeviationRate" jdbcType="DECIMAL" property="yeardeviationrate" />
+    <result column="standardDeviationRate" jdbcType="DECIMAL" property="standarddeviationrate" />
+    <result column="deviationRate1" jdbcType="DECIMAL" property="deviationrate1" />
+    <result column="deviationRate2" jdbcType="DECIMAL" property="deviationrate2" />
+    <result column="deviationRate3" 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, windturbineId, year, month, monthDeviationRate, yearDeviationRate, standardDeviationRate, 
+    deviationRate1, deviationRate2, deviationRate3
+  </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 curvefittingmonthmain
+    <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, windturbineId, year, 
+      month, monthDeviationRate, yearDeviationRate, 
+      standardDeviationRate, deviationRate1, 
+      deviationRate2, deviationRate3)
+    values (#{id,jdbcType=VARCHAR}, #{windturbineid,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="windturbineid != null">
+        windturbineId,
+      </if>
+      <if test="year != null">
+        year,
+      </if>
+      <if test="month != null">
+        month,
+      </if>
+      <if test="monthdeviationrate != null">
+        monthDeviationRate,
+      </if>
+      <if test="yeardeviationrate != null">
+        yearDeviationRate,
+      </if>
+      <if test="standarddeviationrate != 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="windturbineid != null">
+        #{windturbineid,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="yeardeviationrate != null">
+        #{yeardeviationrate,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.windturbineid != null">
+        windturbineId = #{record.windturbineid,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">
+        monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yeardeviationrate != null">
+        yearDeviationRate = #{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},
+      windturbineId = #{record.windturbineid,jdbcType=VARCHAR},
+      year = #{record.year,jdbcType=VARCHAR},
+      month = #{record.month,jdbcType=VARCHAR},
+      monthDeviationRate = #{record.monthdeviationrate,jdbcType=DECIMAL},
+      yearDeviationRate = #{record.yeardeviationrate,jdbcType=DECIMAL},
+      standardDeviationRate = #{record.standarddeviationrate,jdbcType=DECIMAL},
+      deviationRate1 = #{record.deviationrate1,jdbcType=DECIMAL},
+      deviationRate2 = #{record.deviationrate2,jdbcType=DECIMAL},
+      deviationRate3 = #{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">
+        windturbineId = #{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">
+        monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="yeardeviationrate != null">
+        yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="standarddeviationrate != null">
+        standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate1 != null">
+        deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate2 != null">
+        deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+      </if>
+      <if test="deviationrate3 != null">
+        deviationRate3 = #{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 windturbineId = #{windturbineid,jdbcType=VARCHAR},
+      year = #{year,jdbcType=VARCHAR},
+      month = #{month,jdbcType=VARCHAR},
+      monthDeviationRate = #{monthdeviationrate,jdbcType=DECIMAL},
+      yearDeviationRate = #{yeardeviationrate,jdbcType=DECIMAL},
+      standardDeviationRate = #{standarddeviationrate,jdbcType=DECIMAL},
+      deviationRate1 = #{deviationrate1,jdbcType=DECIMAL},
+      deviationRate2 = #{deviationrate2,jdbcType=DECIMAL},
+      deviationRate3 = #{deviationrate3,jdbcType=DECIMAL}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>