修改停机记录列表接口

src/main/java/com/gyee/frame/controller/goodness/WindturbineDetailLineChartController.java

@@ -123,9 +123,24 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/bjjllist")
     @ResponseBody
-    public AjaxResult bjjllist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+    public AjaxResult bjjllist(Tablepar tablepar, String wtId, String recorddate) {
 
-        PageInfo<WarningRecords> resultList = warningRecordsService.getWarningRecordsList(tablepar, wtId, beginDate, endDate);
+        PageInfo<WarningRecords> resultList =new PageInfo<>();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.setTime(DateUtils.parseStrtoDate(recorddate));
+            Date beginDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            Date endDate = cal.getTime();
+
+            resultList = warningRecordsService.getWarningRecordsList(tablepar, wtId, beginDate, endDate);
+
+        }
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
@@ -138,9 +153,24 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/gzjllist")
     @ResponseBody
-    public AjaxResult gzjllist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+    public AjaxResult gzjllist(Tablepar tablepar, String wtId, String recorddate) {
+
+        PageInfo<ShutdowneventVo> resultList =new PageInfo<>();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.setTime(DateUtils.parseStrtoDate(recorddate));
+            Date beginDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            Date endDate = cal.getTime();
+
+            resultList = shutdownevent2Service.getShutdowneventList(tablepar, wtId, beginDate, endDate);
 
-        PageInfo<ShutdowneventVo> resultList = shutdownevent2Service.getShutdowneventList(tablepar, wtId, beginDate, endDate);
+        }
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {
@@ -153,9 +183,25 @@ public class WindturbineDetailLineChartController {
      */
     @PostMapping("/xdjllist")
     @ResponseBody
-    public AjaxResult xdjllist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+    public AjaxResult xdjllist(Tablepar tablepar, String wtId, String recorddate) {
+
+        PageInfo<Brownoutsevent2> resultList = new PageInfo<>();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.setTime(DateUtils.parseStrtoDate(recorddate));
+            Date beginDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            Date endDate = cal.getTime();
 
-        PageInfo<Brownoutsevent2> resultList = brownoutsevent2Service.getBrownoutsevent2List(tablepar, wtId, beginDate, endDate);
+             resultList = brownoutsevent2Service.getBrownoutsevent2List(tablepar, wtId, beginDate, endDate);
+
+
+        }
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {

src/main/java/com/gyee/frame/controller/goodness/WindturbineGoodnessDetailController.java

@@ -142,9 +142,23 @@ public class WindturbineGoodnessDetailController {
      */
     @PostMapping("/bjphlist")
     @ResponseBody
-    public AjaxResult bjphlist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+    public AjaxResult bjphlist(Tablepar tablepar, String wtId, String recorddate) {
+        List<StatisticalAnalysisWarningTopVo> resultList =new ArrayList<>();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate))
+        {
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.setTime(DateUtils.parseStrtoDate(recorddate));
+            Date beginDate = cal.getTime();
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            Date endDate = cal.getTime();
+           resultList = warningRecordsService.getWarningRecordsTop5(tablepar, wtId, beginDate, endDate);
 
-        List<StatisticalAnalysisWarningTopVo> resultList = warningRecordsService.getWarningRecordsTop5(tablepar, wtId, beginDate, endDate);
+        }
         if (resultList != null) {
             return AjaxResult.successData(AjaxStatus.success.code, resultList);
         } else {

src/main/java/com/gyee/frame/controller/goodness/WindturbinegoodnessController.java

@@ -3,15 +3,21 @@ package com.gyee.frame.controller.goodness;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.conf.AjaxStatus;
 import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.Windturbineanalysisday;
 import com.gyee.frame.model.auto.Windturbinegoodness;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.service.WindturbineanalysisdayService;
 import com.gyee.frame.service.goodness.WindturbinegoodnessService;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 单机性能分析列表
@@ -21,12 +27,15 @@ import javax.annotation.Resource;
 public class WindturbinegoodnessController {
     @Resource
     private WindturbinegoodnessService windturbinegoodnessService;
+    @Resource
+    private WindturbineanalysisdayService windturbineanalysisdayService;
+
 
     /**
-     * 获得单机性能分析列表信息
+     * 获得单机性能总览列表信息
      *
      * @param tablepar
-     * @param wtId
+     * @param wpId
      * @param recorddate
      * @return
      */
@@ -43,5 +52,28 @@ public class WindturbinegoodnessController {
     }
 
 
+    /**
+     * 获得单机性能总览历史列表信息
+     *
+     * @param tablepar
+     * @param wtId
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    @PostMapping("/goodhistorylist")
+    @ResponseBody
+    public AjaxResult goodhistorylist(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+        List<Windturbineanalysisday> resultList =new ArrayList<>();
+        if(StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) )
+        {
+            resultList = windturbineanalysisdayService.goodhistorylist(tablepar,wtId, DateUtils.parseDate(beginDate),  DateUtils.parseDate(endDate));
+        }
+        if (resultList != null) {
+            return AjaxResult.successData(AjaxStatus.success.code, resultList);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, resultList);
+        }
+    }
 
 }

src/main/java/com/gyee/frame/controller/outputspeed/OutputSpeedController.java

@@ -44,4 +44,25 @@ public class OutputSpeedController {
 
     }
 
+    /**切入切出历史列表**/
+    @PostMapping("/outputspeedhistorylist")
+    @ResponseBody
+    public AjaxResult outputspeedhistorylist(Tablepar tablepar, String wpId,String wtId, String beginDate,String endDate) {
+
+        List<Inputoroutputspeedtotal> vos=new ArrayList<>();
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) &&  StringUtils.notEmp(endDate))
+        {
+
+            vos=inputoroutputspeedtotalService.getInputoroutputspeedtotal(tablepar, wpId,wtId, DateUtils.parseDate(beginDate),DateUtils.parseDate(endDate));
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+
 }

src/main/java/com/gyee/frame/controller/singleanalysis/SingleAnalysisController.java

@@ -0,0 +1,104 @@
+package com.gyee.frame.controller.singleanalysis;
+
+import com.gyee.frame.common.conf.AjaxStatus;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.custom.SingleAnalysisVo;
+import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.service.singleanalysis.SingleAnalysisService;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.*;
+
+@Controller
+@RequestMapping("/singleanalysis")
+public class SingleAnalysisController {
+
+    @Autowired
+    private SingleAnalysisService singleAnalysisService;
+
+
+    @PostMapping("/singleanalysisMain")
+    @ResponseBody
+    public AjaxResult singleanalysisMain(Tablepar tablepar, String wpId, String year, String month) throws Exception {
+
+        List<SingleAnalysisVo> vos =new ArrayList<>();
+
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endDate = cal.getTime();
+
+            vos =singleAnalysisService.SingleAnalysisList(tablepar, wpId,beginDate,endDate);
+
+        }
+
+        if (null!=vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, vos);
+        }
+
+    }
+
+
+    @PostMapping("/singleanalysisSub")
+    @ResponseBody
+    public AjaxResult singleanalysisSub(String wtId, String year, String month) throws Exception {
+
+        Map<String,Object> map=new HashMap<>();
+
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(year) && StringUtils.notEmp(month)) {
+
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, 0);
+            cal.set(Calendar.MINUTE, 0);
+            cal.set(Calendar.SECOND, 0);
+
+            cal.set(Calendar.YEAR, Integer.valueOf(year));
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            Date beginDate = cal.getTime();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endDate = cal.getTime();
+
+            SingleAnalysisVo  byzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,beginDate,endDate);
+            cal.set(Calendar.YEAR, Integer.valueOf(year)-1);
+            cal.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+            beginDate = cal.getTime();
+            cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+            endDate = cal.getTime();
+
+            SingleAnalysisVo  tqzb =singleAnalysisService.SingleAnalysisListByWtId(wtId,beginDate,endDate);
+
+            SingleAnalysisVo  tbzb =singleAnalysisService.SingleAnalysisListByWtId(byzb,tqzb);
+
+            map.put("byzb",byzb);
+            map.put("tqzb",tqzb);
+            map.put("tbzb",tbzb);
+        }
+
+        if (null!=map) {
+            return AjaxResult.successData(AjaxStatus.success.code, map);
+        } else {
+            return AjaxResult.successData(AjaxStatus.emptyresultset.code, map);
+        }
+
+    }
+
+
+}

src/main/java/com/gyee/frame/mapper/auto/WindpowerinfodayMapper.java

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

src/main/java/com/gyee/frame/model/auto/WindTurbineInfoDay2.java

@@ -1,7 +1,6 @@
 package com.gyee.frame.model.auto;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 public class WindTurbineInfoDay2 implements Serializable {
@@ -66,7 +65,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal daycoefficient;
+    private Double daycoefficient;
 
     /**
      *
@@ -75,7 +74,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal monthcoefficient;
+    private Double monthcoefficient;
 
     /**
      *
@@ -84,7 +83,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    private BigDecimal yearcoefficient;
+    private Double yearcoefficient;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -246,7 +245,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getDaycoefficient() {
+    public Double getDaycoefficient() {
         return daycoefficient;
     }
 
@@ -258,7 +257,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public void setDaycoefficient(BigDecimal daycoefficient) {
+    public void setDaycoefficient(Double daycoefficient) {
         this.daycoefficient = daycoefficient;
     }
 
@@ -270,7 +269,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getMonthcoefficient() {
+    public Double getMonthcoefficient() {
         return monthcoefficient;
     }
 
@@ -282,7 +281,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public void setMonthcoefficient(BigDecimal monthcoefficient) {
+    public void setMonthcoefficient(Double monthcoefficient) {
         this.monthcoefficient = monthcoefficient;
     }
 
@@ -294,7 +293,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public BigDecimal getYearcoefficient() {
+    public Double getYearcoefficient() {
         return yearcoefficient;
     }
 
@@ -306,7 +305,7 @@ public class WindTurbineInfoDay2 implements Serializable {
      *
      * @mbg.generated
      */
-    public void setYearcoefficient(BigDecimal yearcoefficient) {
+    public void setYearcoefficient(Double yearcoefficient) {
         this.yearcoefficient = yearcoefficient;
     }
 }

src/main/java/com/gyee/frame/model/auto/WindTurbineInfoDay2Example.java

@@ -1,6 +1,5 @@
 package com.gyee.frame.model.auto;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
@@ -633,52 +632,52 @@ public class WindTurbineInfoDay2Example {
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientEqualTo(BigDecimal value) {
+        public Criteria andDaycoefficientEqualTo(Double value) {
             addCriterion("DAYCOEFFICIENT =", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientNotEqualTo(BigDecimal value) {
+        public Criteria andDaycoefficientNotEqualTo(Double value) {
             addCriterion("DAYCOEFFICIENT <>", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientGreaterThan(BigDecimal value) {
+        public Criteria andDaycoefficientGreaterThan(Double value) {
             addCriterion("DAYCOEFFICIENT >", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andDaycoefficientGreaterThanOrEqualTo(Double value) {
             addCriterion("DAYCOEFFICIENT >=", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientLessThan(BigDecimal value) {
+        public Criteria andDaycoefficientLessThan(Double value) {
             addCriterion("DAYCOEFFICIENT <", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andDaycoefficientLessThanOrEqualTo(Double value) {
             addCriterion("DAYCOEFFICIENT <=", value, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientIn(List<BigDecimal> values) {
+        public Criteria andDaycoefficientIn(List<Double> values) {
             addCriterion("DAYCOEFFICIENT in", values, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientNotIn(List<BigDecimal> values) {
+        public Criteria andDaycoefficientNotIn(List<Double> values) {
             addCriterion("DAYCOEFFICIENT not in", values, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andDaycoefficientBetween(Double value1, Double value2) {
             addCriterion("DAYCOEFFICIENT between", value1, value2, "daycoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andDaycoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andDaycoefficientNotBetween(Double value1, Double value2) {
             addCriterion("DAYCOEFFICIENT not between", value1, value2, "daycoefficient");
             return (Criteria) this;
         }
@@ -693,52 +692,52 @@ public class WindTurbineInfoDay2Example {
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientEqualTo(BigDecimal value) {
+        public Criteria andMonthcoefficientEqualTo(Double value) {
             addCriterion("MONTHCOEFFICIENT =", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientNotEqualTo(BigDecimal value) {
+        public Criteria andMonthcoefficientNotEqualTo(Double value) {
             addCriterion("MONTHCOEFFICIENT <>", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientGreaterThan(BigDecimal value) {
+        public Criteria andMonthcoefficientGreaterThan(Double value) {
             addCriterion("MONTHCOEFFICIENT >", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andMonthcoefficientGreaterThanOrEqualTo(Double value) {
             addCriterion("MONTHCOEFFICIENT >=", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientLessThan(BigDecimal value) {
+        public Criteria andMonthcoefficientLessThan(Double value) {
             addCriterion("MONTHCOEFFICIENT <", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andMonthcoefficientLessThanOrEqualTo(Double value) {
             addCriterion("MONTHCOEFFICIENT <=", value, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientIn(List<BigDecimal> values) {
+        public Criteria andMonthcoefficientIn(List<Double> values) {
             addCriterion("MONTHCOEFFICIENT in", values, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientNotIn(List<BigDecimal> values) {
+        public Criteria andMonthcoefficientNotIn(List<Double> values) {
             addCriterion("MONTHCOEFFICIENT not in", values, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andMonthcoefficientBetween(Double value1, Double value2) {
             addCriterion("MONTHCOEFFICIENT between", value1, value2, "monthcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andMonthcoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andMonthcoefficientNotBetween(Double value1, Double value2) {
             addCriterion("MONTHCOEFFICIENT not between", value1, value2, "monthcoefficient");
             return (Criteria) this;
         }
@@ -753,52 +752,52 @@ public class WindTurbineInfoDay2Example {
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientEqualTo(BigDecimal value) {
+        public Criteria andYearcoefficientEqualTo(Double value) {
             addCriterion("YEARCOEFFICIENT =", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientNotEqualTo(BigDecimal value) {
+        public Criteria andYearcoefficientNotEqualTo(Double value) {
             addCriterion("YEARCOEFFICIENT <>", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientGreaterThan(BigDecimal value) {
+        public Criteria andYearcoefficientGreaterThan(Double value) {
             addCriterion("YEARCOEFFICIENT >", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientGreaterThanOrEqualTo(BigDecimal value) {
+        public Criteria andYearcoefficientGreaterThanOrEqualTo(Double value) {
             addCriterion("YEARCOEFFICIENT >=", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientLessThan(BigDecimal value) {
+        public Criteria andYearcoefficientLessThan(Double value) {
             addCriterion("YEARCOEFFICIENT <", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientLessThanOrEqualTo(BigDecimal value) {
+        public Criteria andYearcoefficientLessThanOrEqualTo(Double value) {
             addCriterion("YEARCOEFFICIENT <=", value, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientIn(List<BigDecimal> values) {
+        public Criteria andYearcoefficientIn(List<Double> values) {
             addCriterion("YEARCOEFFICIENT in", values, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientNotIn(List<BigDecimal> values) {
+        public Criteria andYearcoefficientNotIn(List<Double> values) {
             addCriterion("YEARCOEFFICIENT not in", values, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andYearcoefficientBetween(Double value1, Double value2) {
             addCriterion("YEARCOEFFICIENT between", value1, value2, "yearcoefficient");
             return (Criteria) this;
         }
 
-        public Criteria andYearcoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+        public Criteria andYearcoefficientNotBetween(Double value1, Double value2) {
             addCriterion("YEARCOEFFICIENT not between", value1, value2, "yearcoefficient");
             return (Criteria) this;
         }

src/main/java/com/gyee/frame/model/custom/SingleAnalysisVo.java

@@ -0,0 +1,313 @@
+package com.gyee.frame.model.custom;
+
+public class SingleAnalysisVo implements java.io.Serializable {
+
+    /**
+     * @Fields serialVersionUID : TODO
+     */
+
+
+    private static final long serialVersionUID = 1L;
+    // Fields
+
+    private String id;
+    //风机编号
+    private String windturbineid;
+	//风机名称
+	private String windturbineName;
+    //风场编号
+    private String windPowerStationId;
+    //风场名称
+    private String windPowerStationName;
+    //发电量
+    private Double fdl;
+    //上网电量
+    private Double swdl;
+    //购网电量
+    private Double gwdl;
+    //风速
+    private Double fs;
+    //故障损失
+    private Double gzss;
+    //检修损失
+    private Double jxss;
+    //限电损失
+    private Double xdss;
+    //性能发损失
+    private Double xnss;
+    //受累损失
+    private Double slss;
+    //理论发电量
+    private Double llfdl;
+    //故障小时
+    private Double gzxs;
+    //检修小时
+    private Double jxxs;
+    //停机小时
+    private Double tjxs;
+    //中断小时
+    private Double zdxs;
+    //运行小时
+    private Double yxxs;
+    //利用小时
+    private Double lyxs;
+	//设备可利用率
+	private Double sbklyl;
+    //等效可利用系数
+    private Double dxklyxs;
+    //日历小时
+    private Double rlxs;
+    //小风切入
+    private Double xfqr;
+    //功率一致性系数
+    private Double glyzxxs;
+	//有效风时速
+    private Double yxfss;
+	//小风切入率合格率
+    private Double xfqrhgl;
+    //风机容量
+	private Double fjrl;
+	//静风频率
+	private Double jfpl;
+
+	public Double getJfpl() {
+		return jfpl;
+	}
+
+	public void setJfpl(Double jfpl) {
+		this.jfpl = jfpl;
+	}
+
+	public Double getXfqrhgl() {
+		return xfqrhgl;
+	}
+
+	public Double getFjrl() {
+		return fjrl;
+	}
+
+	public void setFjrl(Double fjrl) {
+		this.fjrl = fjrl;
+	}
+
+	public String getWindturbineName() {
+		return windturbineName;
+	}
+
+	public void setWindturbineName(String windturbineName) {
+		this.windturbineName = windturbineName;
+	}
+
+	public void setXfqrhgl(Double xfqrhgl) {
+		this.xfqrhgl = xfqrhgl;
+	}
+
+	public Double getYxfss() {
+		return yxfss;
+	}
+
+	public void setYxfss(Double yxfss) {
+		this.yxfss = yxfss;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getWindturbineid() {
+		return windturbineid;
+	}
+
+	public void setWindturbineid(String windturbineid) {
+		this.windturbineid = windturbineid;
+	}
+
+	public String getWindPowerStationId() {
+		return windPowerStationId;
+	}
+
+	public void setWindPowerStationId(String windPowerStationId) {
+		this.windPowerStationId = windPowerStationId;
+	}
+
+	public String getWindPowerStationName() {
+		return windPowerStationName;
+	}
+
+	public void setWindPowerStationName(String windPowerStationName) {
+		this.windPowerStationName = windPowerStationName;
+	}
+
+	public Double getFdl() {
+		return fdl;
+	}
+
+	public void setFdl(Double fdl) {
+		this.fdl = fdl;
+	}
+
+	public Double getSwdl() {
+		return swdl;
+	}
+
+	public void setSwdl(Double swdl) {
+		this.swdl = swdl;
+	}
+
+	public Double getGwdl() {
+		return gwdl;
+	}
+
+	public void setGwdl(Double gwdl) {
+		this.gwdl = gwdl;
+	}
+
+	public Double getFs() {
+		return fs;
+	}
+
+	public void setFs(Double fs) {
+		this.fs = fs;
+	}
+
+
+	public Double getGzss() {
+		return gzss;
+	}
+
+	public void setGzss(Double gzss) {
+		this.gzss = gzss;
+	}
+
+	public Double getJxss() {
+		return jxss;
+	}
+
+	public void setJxss(Double jxss) {
+		this.jxss = jxss;
+	}
+
+	public Double getXdss() {
+		return xdss;
+	}
+
+	public void setXdss(Double xdss) {
+		this.xdss = xdss;
+	}
+
+	public Double getXnss() {
+		return xnss;
+	}
+
+	public void setXnss(Double xnss) {
+		this.xnss = xnss;
+	}
+
+	public Double getSlss() {
+		return slss;
+	}
+
+	public void setSlss(Double slss) {
+		this.slss = slss;
+	}
+
+	public Double getLlfdl() {
+		return llfdl;
+	}
+
+	public void setLlfdl(Double llfdl) {
+		this.llfdl = llfdl;
+	}
+
+	public Double getGzxs() {
+		return gzxs;
+	}
+
+	public void setGzxs(Double gzxs) {
+		this.gzxs = gzxs;
+	}
+
+	public Double getJxxs() {
+		return jxxs;
+	}
+
+	public void setJxxs(Double jxxs) {
+		this.jxxs = jxxs;
+	}
+
+	public Double getTjxs() {
+		return tjxs;
+	}
+
+	public void setTjxs(Double tjxs) {
+		this.tjxs = tjxs;
+	}
+
+	public Double getZdxs() {
+		return zdxs;
+	}
+
+	public void setZdxs(Double zdxs) {
+		this.zdxs = zdxs;
+	}
+
+	public Double getYxxs() {
+		return yxxs;
+	}
+
+	public void setYxxs(Double yxxs) {
+		this.yxxs = yxxs;
+	}
+
+	public Double getLyxs() {
+		return lyxs;
+	}
+
+	public void setLyxs(Double lyxs) {
+		this.lyxs = lyxs;
+	}
+
+	public Double getSbklyl() {
+		return sbklyl;
+	}
+
+	public void setSbklyl(Double sbklyl) {
+		this.sbklyl = sbklyl;
+	}
+
+	public Double getDxklyxs() {
+		return dxklyxs;
+	}
+
+	public void setDxklyxs(Double dxklyxs) {
+		this.dxklyxs = dxklyxs;
+	}
+
+	public Double getRlxs() {
+		return rlxs;
+	}
+
+	public void setRlxs(Double rlxs) {
+		this.rlxs = rlxs;
+	}
+
+	public Double getXfqr() {
+		return xfqr;
+	}
+
+	public void setXfqr(Double xfqr) {
+		this.xfqr = xfqr;
+	}
+
+	public Double getGlyzxxs() {
+		return glyzxxs;
+	}
+
+	public void setGlyzxxs(Double glyzxxs) {
+		this.glyzxxs = glyzxxs;
+	}
+}

src/main/java/com/gyee/frame/service/Brownoutsevent2Service.java

@@ -8,7 +8,6 @@ import com.gyee.frame.mapper.auto.Brownoutsevent2Mapper;
 import com.gyee.frame.model.auto.Brownoutsevent2;
 import com.gyee.frame.model.auto.Brownoutsevent2Example;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,7 +97,7 @@ public class Brownoutsevent2Service implements BaseService<Brownoutsevent2, Brow
 	}
 
 
-	public PageInfo<Brownoutsevent2> getBrownoutsevent2List(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+	public PageInfo<Brownoutsevent2> getBrownoutsevent2List(Tablepar tablepar, String wtId, Date beginDate, Date endDate) {
 
 		Brownoutsevent2Example example = new Brownoutsevent2Example();
 
@@ -123,9 +122,8 @@ public class Brownoutsevent2Service implements BaseService<Brownoutsevent2, Brow
 
 		Brownoutsevent2Example.Criteria criteria = example.createCriteria();
 		if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
-			Date begin = DateUtils.parseStrtoDate(beginDate);
-			Date end = DateUtils.parseStrtoDate(endDate);;
-			criteria.andStoptimeGreaterThanOrEqualTo(begin).andStoptimeLessThan(end);
+
+			criteria.andStoptimeGreaterThanOrEqualTo(beginDate).andStoptimeLessThan(endDate);
 		}
 
 		if (StringUtils.notEmp(wtId)) {

src/main/java/com/gyee/frame/service/InputoroutputspeedtotalService.java

@@ -137,7 +137,7 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(String wtId,Date recorddate) {
 
 
-		List<Inputoroutputspeedtotal> list = null;
+		List<Inputoroutputspeedtotal> list =  new ArrayList<>();
 
 		if (StringUtils.notEmp(wtId) && StringUtils.notEmp(recorddate)) {
 
@@ -164,16 +164,79 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(String wpId,Date beginDate,Date endDate) {
 
 
-		List<Inputoroutputspeedtotal> list = null;
+		List<Inputoroutputspeedtotal> list =  new ArrayList<>();
 
 		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 			InputoroutputspeedtotalExample example = new InputoroutputspeedtotalExample();
-			example.setOrderByClause("windturbineid asc");
+			example.setOrderByClause(" windturbineidasc");
+
+			InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
+			criteria.andWindpowerstationidEqualTo(wpId);
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+			list = inputoroutputspeedtotalMapper.selectByExample(example);
+
+
+		}
+		return list;
+
+	}
+
+	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotalbyWtId(String wtId,Date beginDate,Date endDate) {
+
+
+		List<Inputoroutputspeedtotal> list =  new ArrayList<>();
+
+		if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			InputoroutputspeedtotalExample example = new InputoroutputspeedtotalExample();
+			example.setOrderByClause(" recorddate  asc");
+
+			InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
+			criteria.andWindturbineidEqualTo(wtId);
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+			list = inputoroutputspeedtotalMapper.selectByExample(example);
+
+
+		}
+		return list;
+
+	}
+
+	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(Tablepar tablepar,String wpId,String wtId,Date beginDate,Date endDate) {
+
+
+		List<Inputoroutputspeedtotal> list =  new ArrayList<>();
+
+		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			InputoroutputspeedtotalExample example = new InputoroutputspeedtotalExample();
+			if(StringUtils.isNotEmpty(tablepar.getOrderByColumn()))
+			{
+				StringBuilder sb=new StringBuilder();
+				sb.append(" ").append(tablepar.getOrderByColumn());
+				if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
+				{
+					sb.append(" ").append(tablepar.getIsAsc());
+				}else
+				{
+					sb.append(" asc ");
+				}
+				example.setOrderByClause(String.valueOf(sb));
+			}else {
+				example.setOrderByClause("windturbineid ASC");
+			}
 
 			InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
 			criteria.andWindpowerstationidEqualTo(wpId);
 
+			if(StringUtils.notEmp(wtId))
+			{
+				criteria.andWindturbineidEqualTo(wtId);
+			}
+
 			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
 			list = inputoroutputspeedtotalMapper.selectByExample(example);
 

src/main/java/com/gyee/frame/service/Shutdownevent2Service.java

@@ -9,7 +9,6 @@ import com.gyee.frame.mapper.auto.Shutdownevent2Mapper;
 import com.gyee.frame.model.auto.*;
 import com.gyee.frame.model.custom.ShutdowneventVo;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.SnowflakeIdWorker;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,7 +98,7 @@ public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdo
 		return shutdownevent2Mapper.deleteByExample(example);
 	}
 
-	public PageInfo<ShutdowneventVo> getShutdowneventList(Tablepar tablepar, String wtId, String beginDate, String endDate) {
+	public PageInfo<ShutdowneventVo> getShutdowneventList(Tablepar tablepar, String wtId, Date beginDate, Date endDate) {
 
 		Shutdownevent2Example example = new Shutdownevent2Example();
 
@@ -124,9 +123,7 @@ public class Shutdownevent2Service implements BaseService<Shutdownevent2, Shutdo
 
 		Shutdownevent2Example.Criteria criteria = example.createCriteria();
 		if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
-			Date begin = DateUtils.parseStrtoDate(beginDate);
-			Date end = DateUtils.parseStrtoDate(endDate);;
-			criteria.andStoptimeGreaterThanOrEqualTo(begin).andStoptimeLessThan(end);
+			criteria.andStoptimeGreaterThanOrEqualTo(beginDate).andStoptimeLessThan(endDate);
 		}
 
 		if (StringUtils.notEmp(wtId)) {

src/main/java/com/gyee/frame/service/WarningRecordsService.java

@@ -11,7 +11,6 @@ import com.gyee.frame.model.auto.WarningRecords;
 import com.gyee.frame.model.auto.WarningRecordsExample;
 import com.gyee.frame.model.custom.StatisticalAnalysisWarningTopVo;
 import com.gyee.frame.model.custom.Tablepar;
-import com.gyee.frame.util.DateUtils;
 import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -96,7 +95,7 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 		return warningRecordsMapper.deleteByExample(example);
 	}
 
-	public PageInfo<WarningRecords> getWarningRecordsList(Tablepar tablepar, String wtId, String beginDate,String endDate) {
+	public PageInfo<WarningRecords> getWarningRecordsList(Tablepar tablepar, String wtId, Date beginDate,Date endDate) {
 
 		WarningRecordsExample example = new WarningRecordsExample();
 
@@ -121,9 +120,8 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 
 		WarningRecordsExample.Criteria criteria = example.createCriteria();
 		if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
-			Date begin = DateUtils.parseStrtoDate(beginDate);
-			Date end = DateUtils.parseStrtoDate(endDate);;
-			criteria.andWarningtimeGreaterThanOrEqualTo(begin).andWarningtimeLessThan(end);
+
+			criteria.andWarningtimeGreaterThanOrEqualTo(beginDate).andWarningtimeLessThan(endDate);
 		}
 
 		if (StringUtils.notEmp(wtId)) {
@@ -151,7 +149,7 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 
 
 
-	public List<StatisticalAnalysisWarningTopVo> getWarningRecordsTop5(Tablepar tablepar, String wtId, String beginDate,String endDate) {
+	public List<StatisticalAnalysisWarningTopVo> getWarningRecordsTop5(Tablepar tablepar, String wtId, Date beginDate,Date endDate) {
 
 		List<StatisticalAnalysisWarningTopVo> sawlist=new ArrayList<>();
 		List<StatisticalAnalysisWarningTopVo> templist=new ArrayList<>();
@@ -159,9 +157,8 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 
 		WarningRecordsExample.Criteria criteria = example.createCriteria();
 		if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
-			Date begin = DateUtils.parseStrtoDate(beginDate);
-			Date end = DateUtils.parseStrtoDate(endDate);;
-			criteria.andWarningtimeGreaterThanOrEqualTo(begin).andWarningtimeLessThan(end);
+
+			criteria.andWarningtimeGreaterThanOrEqualTo(beginDate).andWarningtimeLessThan(endDate);
 		}
 
 		if (StringUtils.notEmp(wtId)) {

src/main/java/com/gyee/frame/service/WindTurbineInfoDay2Service.java

@@ -122,4 +122,49 @@ public class WindTurbineInfoDay2Service implements BaseService<WindTurbineInfoDa
 		return list;
 
 	}
+
+
+	public List<WindTurbineInfoDay2> getWindturbineinfoday2List(String wpId, Date beginDate, Date endDate) {
+
+
+		List<WindTurbineInfoDay2> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			WindTurbineInfoDay2Example example=new WindTurbineInfoDay2Example();
+			example.setOrderByClause("recorddate DESC");
+
+			WindTurbineInfoDay2Example.Criteria criteria =example.createCriteria();
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+			criteria.andWindpowerstationidEqualTo(wpId);
+			list= windTurbineInfoDay2Mapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
+
+	public List<WindTurbineInfoDay2> getWindturbineinfoday2ListBywtId(String wtId, Date beginDate, Date endDate) {
+
+
+		List<WindTurbineInfoDay2> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			WindTurbineInfoDay2Example example=new WindTurbineInfoDay2Example();
+			example.setOrderByClause("recorddate DESC");
+
+			WindTurbineInfoDay2Example.Criteria criteria =example.createCriteria();
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+			criteria.andWindturbineidEqualTo(wtId);
+			list= windTurbineInfoDay2Mapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
 }

src/main/java/com/gyee/frame/service/WindpowerinfodayService.java

@@ -0,0 +1,121 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindpowerinfodayMapper;
+import com.gyee.frame.model.auto.Windpowerinfoday;
+import com.gyee.frame.model.auto.WindpowerinfodayExample;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+@Service
+public class WindpowerinfodayService implements BaseService<Windpowerinfoday, WindpowerinfodayExample> {
+	@Autowired
+	private WindpowerinfodayMapper windpowerinfodayMapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			WindpowerinfodayExample example=new WindpowerinfodayExample();
+			example.createCriteria().andIdIn(lista);
+			return windpowerinfodayMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Windpowerinfoday selectByPrimaryKey(String id) {
+				
+			return windpowerinfodayMapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Windpowerinfoday record) {
+		return windpowerinfodayMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windpowerinfoday record) {
+				
+//		//添加雪花主键id
+//		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return windpowerinfodayMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Windpowerinfoday record, WindpowerinfodayExample example) {
+		
+		return windpowerinfodayMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Windpowerinfoday record, WindpowerinfodayExample example) {
+		
+		return windpowerinfodayMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windpowerinfoday> selectByExample(WindpowerinfodayExample example) {
+		
+		return windpowerinfodayMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindpowerinfodayExample example) {
+		
+		return windpowerinfodayMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindpowerinfodayExample example) {
+		
+		return windpowerinfodayMapper.deleteByExample(example);
+	}
+
+	public List<Windpowerinfoday> getWindpowerinfodayList(String wpId, Date beginDate,Date endDate) {
+
+
+		List<Windpowerinfoday> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate) ) {
+
+			WindpowerinfodayExample example=new WindpowerinfodayExample();
+			example.setOrderByClause("recorddate DESC");
+
+			WindpowerinfodayExample.Criteria criteria =example.createCriteria();
+
+
+			criteria.andLocationEqualTo("windpower");
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+			criteria.andWindpowerstationidEqualTo(wpId);
+
+			list= windpowerinfodayMapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
+
+
+}

src/main/java/com/gyee/frame/service/WindturbineanalysisdayService.java

@@ -5,7 +5,9 @@ import com.gyee.frame.common.support.Convert;
 import com.gyee.frame.mapper.auto.WindturbineanalysisdayMapper;
 import com.gyee.frame.model.auto.Windturbineanalysisday;
 import com.gyee.frame.model.auto.WindturbineanalysisdayExample;
+import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -121,6 +123,41 @@ public class WindturbineanalysisdayService implements BaseService<Windturbineana
 
 	}
 
+	public List<Windturbineanalysisday> goodhistorylist(Tablepar tablepar,String windturbineid, Date beginDate, Date endDate)  {
 
 
+		List<Windturbineanalysisday> list =new ArrayList<>();
+
+		WindturbineanalysisdayExample example=new WindturbineanalysisdayExample();
+		if(StringUtils.isNotEmpty(tablepar.getOrderByColumn()))
+		{
+			StringBuilder sb=new StringBuilder();
+			sb.append(" ").append(tablepar.getOrderByColumn());
+			if(StringUtils.isNotEmpty(tablepar.getIsAsc()))
+			{
+				sb.append(" ").append(tablepar.getIsAsc());
+			}else
+			{
+				sb.append(" asc ");
+			}
+			example.setOrderByClause(String.valueOf(sb));
+		}else {
+			example.setOrderByClause("windturbineid ASC");
+		}
+
+
+		WindturbineanalysisdayExample.Criteria criteria =example.createCriteria();
+
+
+		criteria.andWindturbineidEqualTo(windturbineid);
+
+
+		criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+
+		list= windturbineanalysisdayMapper.selectByExample(example);
+		return list;
+
+	}
+
 }

src/main/java/com/gyee/frame/service/Windturbineinfoday3Service.java

@@ -1421,4 +1421,48 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
 
         }
     }
+
+    public List<Windturbineinfoday3> getWindturbineinfoday3List(String wpId, Date beginDate, Date endDate) {
+
+
+        List<Windturbineinfoday3> list=new ArrayList<>();
+
+        if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+            Windturbineinfoday3Example example=new Windturbineinfoday3Example();
+            example.setOrderByClause("recorddate DESC");
+
+            Windturbineinfoday3Example.Criteria criteria =example.createCriteria();
+
+            criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+            criteria.andWindpowerstationidEqualTo(wpId);
+            list= windturbineinfoday3Mapper.selectByExample(example);
+
+        }
+        return list;
+
+    }
+
+    public List<Windturbineinfoday3> getWindturbineinfoday3ListBywtId(String wtId, Date beginDate, Date endDate) {
+
+
+        List<Windturbineinfoday3> list=new ArrayList<>();
+
+        if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+            Windturbineinfoday3Example example=new Windturbineinfoday3Example();
+            example.setOrderByClause("recorddate DESC");
+
+            Windturbineinfoday3Example.Criteria criteria =example.createCriteria();
+
+            criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+            criteria.andWindturbineidEqualTo(wtId);
+            list= windturbineinfoday3Mapper.selectByExample(example);
+
+        }
+        return list;
+
+    }
 }

src/main/java/com/gyee/frame/service/WindturbineinfodayService.java

@@ -251,4 +251,50 @@ public class WindturbineinfodayService implements BaseService<WindTurbineInfoDay
 		return list;
 
 	}
+
+
+	public List<WindTurbineInfoDay> getWindturbineinfodayList(String wpId,Date beginDate,Date endDate) {
+
+
+		List<WindTurbineInfoDay> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			WindTurbineInfoDayExample example=new WindTurbineInfoDayExample();
+			example.setOrderByClause("recorddate DESC");
+
+			WindTurbineInfoDayExample.Criteria criteria =example.createCriteria();
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+			criteria.andWindpowerstationidEqualTo(wpId);
+			list= windTurbineInfoDayMapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
+
+
+	public List<WindTurbineInfoDay> getWindturbineinfodayListByWtId(String wtId,Date beginDate,Date endDate) {
+
+
+		List<WindTurbineInfoDay> list=new ArrayList<>();
+
+		if (StringUtils.notEmp(wtId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			WindTurbineInfoDayExample example=new WindTurbineInfoDayExample();
+			example.setOrderByClause("recorddate DESC");
+
+			WindTurbineInfoDayExample.Criteria criteria =example.createCriteria();
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+
+			criteria.andWindturbineidEqualTo(wtId);
+			list= windTurbineInfoDayMapper.selectByExample(example);
+
+		}
+		return list;
+
+	}
 }

src/main/java/com/gyee/frame/service/WindturbinethewindinfoService.java

@@ -6,6 +6,7 @@ import com.gyee.frame.mapper.auto.WindturbinethewindinfoMapper;
 import com.gyee.frame.model.auto.Windturbinethewindinfo;
 import com.gyee.frame.model.auto.WindturbinethewindinfoExample;
 import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -112,4 +113,32 @@ public class WindturbinethewindinfoService implements BaseService<Windturbinethe
 
 	}
 
+
+	public List<Windturbinethewindinfo> getWindturbinethewindinfo(String wtId, Date beginDate, Date endDate) {
+
+
+		List<Windturbinethewindinfo> list = new ArrayList<>();
+
+		if ( StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			WindturbinethewindinfoExample example = new WindturbinethewindinfoExample();
+
+
+			WindturbinethewindinfoExample.Criteria criteria =example.createCriteria();
+
+
+			if(StringUtils.notEmp(wtId))
+			{
+				criteria.andWindturbineidEqualTo(wtId);
+			}
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+			list = windturbinethewindinfoMapper.selectByExample(example);
+
+
+		}
+		return list;
+
+	}
+
 }

src/main/resources/application-dev.yml

@@ -7,13 +7,13 @@ spring:
     druid:
      #主库数据源
      master:
-#        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
-#        username: root
-#        password: 123456
-        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
-        username: nxfdprod
-        password: gdnxfd123
-        driver-class-name: oracle.jdbc.driver.OracleDriver
+        url: jdbc:mysql://localhost:3306/springbootv2?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=convertToNull
+        username: root
+        password: 123456
+#        url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
+#        username: nxfdprod
+#        password: gdnxfd123
+#        driver-class-name: oracle.jdbc.driver.OracleDriver
 
      #备数据源 #关闭
      slave:

src/main/resources/mybatis-generator.xml

@@ -101,7 +101,7 @@
             <generatedKey column="id" sqlStatement="Mysql" identity="true"/>
         </table>-->
 
-        <table tableName='WindTurbineInfoDay2' domainObjectName='WindTurbineInfoDay2'/>
+        <table tableName='Windpowerinfoday' domainObjectName='Windpowerinfoday'/>
 
     </context>
 </generatorConfiguration>

src/test/java/test/SingleAnalysisTest.java

@@ -0,0 +1,72 @@
+package test;
+
+import com.gyee.SpringbootStart;
+import com.gyee.frame.common.spring.SpringUtils;
+import com.gyee.frame.controller.contrast.ContrastController;
+import com.gyee.frame.model.custom.Tablepar;
+import lombok.SneakyThrows;
+import org.springframework.boot.SpringApplication;
+
+public class SingleAnalysisTest {
+
+    @SneakyThrows
+    public static void main(String[] args) {
+
+        SpringApplication.run(SpringbootStart.class, args);
+
+
+
+
+        String wpId="MHS_FDC";
+        String year="2021";
+        String month="1";
+
+        ContrastController contrastController= SpringUtils.getBean("contrastController");
+//
+//        AjaxResult ajaxResult = dayBenchmarkingController.gadaylist(wpid,"2021-01-01");
+//
+//        List<Windturbineinfodaytop3> test=(List<Windturbineinfodaytop3>)ajaxResult.get("data");
+
+        Tablepar tablepar=new Tablepar();
+        tablepar.setPageNum(1);
+        tablepar.setPageSize(10);
+
+//        AjaxResult ajaxResult = contrastController.benchmarkPjList(tablepar,wpid,"","2021-01-01 00:00:00","2021-01-04 00:00:00");
+//
+//        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
+//        for(BenchMarkVo wtd:test)
+//        {
+//            System.out.println(wtd.getDxklylnum()+"----------------"+wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+//        }
+//        System.out.println("/***********************************************/");
+
+//        AjaxResult ajaxResult2 = contrastController.benchmarkLnList(tablepar,wpid,"","2021-01-01 00:00:00","2021-01-04 00:00:00");
+//
+//        List<BenchMarkVo> test2=(List<BenchMarkVo>)ajaxResult2.get("data");
+//        for(BenchMarkVo wtd:test2)
+//        {
+//            System.out.println(wtd.getDxklylnum()+"----------------"+wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+//        }
+//        System.out.println("/***********************************************/");
+
+//        AjaxResult ajaxResult = contrastController.findWpPowerOutChat(wpid,"2021-01-01 00:00:00","2021-01-04 00:00:00");
+//        List<DataVo> test=(List<DataVo>)ajaxResult.get("data");
+//        for(DataVo wtd:test)
+//        {
+//            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2());
+//        }
+
+//        AjaxResult ajaxResult = contrastController.benchmarkWtList(tablepar,wpid,null,"2021-01-01","2021-01-02");
+//
+//        List<BenchMarkVo> test=(List<BenchMarkVo>)ajaxResult.get("data");
+//        for(BenchMarkVo wtd:test)
+//        {
+//            System.out.println(wtd.getDxklyl()+"----------------"+wtd.getEdfshgl());
+//        }
+//        System.out.println(test);
+    }
+
+
+
+
+}