测试功能接口并修复BUG

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

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

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

@@ -0,0 +1,312 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class WindTurbineInfoDay2 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.ID
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    private String windturbineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    private String windpowerstationid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.PROJECTID
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.LINEID
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.DAYCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    private BigDecimal daycoefficient;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.MONTHCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    private BigDecimal monthcoefficient;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column windturbineinfoday2.YEARCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    private BigDecimal yearcoefficient;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.ID
+     *
+     * @return the value of windturbineinfoday2.ID
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.ID
+     *
+     * @param id the value for windturbineinfoday2.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.WINDTURBINEID
+     *
+     * @return the value of windturbineinfoday2.WINDTURBINEID
+     *
+     * @mbg.generated
+     */
+    public String getWindturbineid() {
+        return windturbineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.WINDTURBINEID
+     *
+     * @param windturbineid the value for windturbineinfoday2.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 windturbineinfoday2.RECORDDATE
+     *
+     * @return the value of windturbineinfoday2.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.RECORDDATE
+     *
+     * @param recorddate the value for windturbineinfoday2.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 windturbineinfoday2.WINDPOWERSTATIONID
+     *
+     * @return the value of windturbineinfoday2.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public String getWindpowerstationid() {
+        return windpowerstationid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.WINDPOWERSTATIONID
+     *
+     * @param windpowerstationid the value for windturbineinfoday2.WINDPOWERSTATIONID
+     *
+     * @mbg.generated
+     */
+    public void setWindpowerstationid(String windpowerstationid) {
+        this.windpowerstationid = windpowerstationid == null ? null : windpowerstationid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.PROJECTID
+     *
+     * @return the value of windturbineinfoday2.PROJECTID
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.PROJECTID
+     *
+     * @param projectid the value for windturbineinfoday2.PROJECTID
+     *
+     * @mbg.generated
+     */
+    public void setProjectid(String projectid) {
+        this.projectid = projectid == null ? null : projectid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.LINEID
+     *
+     * @return the value of windturbineinfoday2.LINEID
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.LINEID
+     *
+     * @param lineid the value for windturbineinfoday2.LINEID
+     *
+     * @mbg.generated
+     */
+    public void setLineid(String lineid) {
+        this.lineid = lineid == null ? null : lineid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.DAYCOEFFICIENT
+     *
+     * @return the value of windturbineinfoday2.DAYCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDaycoefficient() {
+        return daycoefficient;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.DAYCOEFFICIENT
+     *
+     * @param daycoefficient the value for windturbineinfoday2.DAYCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public void setDaycoefficient(BigDecimal daycoefficient) {
+        this.daycoefficient = daycoefficient;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.MONTHCOEFFICIENT
+     *
+     * @return the value of windturbineinfoday2.MONTHCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getMonthcoefficient() {
+        return monthcoefficient;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.MONTHCOEFFICIENT
+     *
+     * @param monthcoefficient the value for windturbineinfoday2.MONTHCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public void setMonthcoefficient(BigDecimal monthcoefficient) {
+        this.monthcoefficient = monthcoefficient;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column windturbineinfoday2.YEARCOEFFICIENT
+     *
+     * @return the value of windturbineinfoday2.YEARCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getYearcoefficient() {
+        return yearcoefficient;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column windturbineinfoday2.YEARCOEFFICIENT
+     *
+     * @param yearcoefficient the value for windturbineinfoday2.YEARCOEFFICIENT
+     *
+     * @mbg.generated
+     */
+    public void setYearcoefficient(BigDecimal yearcoefficient) {
+        this.yearcoefficient = yearcoefficient;
+    }
+}

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

@@ -0,0 +1,911 @@
+package com.gyee.frame.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public class WindTurbineInfoDay2Example {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public WindTurbineInfoDay2Example() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table windturbineinfoday2
+     *
+     * @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 windturbineinfoday2
+     *
+     * @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 windturbineinfoday2
+     *
+     * @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 windturbineinfoday2
+     *
+     * @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 windturbineinfoday2
+     *
+     * @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));
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value.getTime()), property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
+            if (values == null || values.size() == 0) {
+                throw new RuntimeException("Value list for " + property + " cannot be null or empty");
+            }
+            List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
+            Iterator<Date> iter = values.iterator();
+            while (iter.hasNext()) {
+                dateList.add(new java.sql.Date(iter.next().getTime()));
+            }
+            addCriterion(condition, dateList, property);
+        }
+
+        protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer 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 andRecorddateIsNull() {
+            addCriterion("RECORDDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("RECORDDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterionForJDBCDate("RECORDDATE =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterionForJDBCDate("RECORDDATE <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterionForJDBCDate("RECORDDATE >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("RECORDDATE >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterionForJDBCDate("RECORDDATE <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterionForJDBCDate("RECORDDATE <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterionForJDBCDate("RECORDDATE in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterionForJDBCDate("RECORDDATE not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("RECORDDATE between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterionForJDBCDate("RECORDDATE not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNull() {
+            addCriterion("WINDPOWERSTATIONID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIsNotNull() {
+            addCriterion("WINDPOWERSTATIONID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidEqualTo(String value) {
+            addCriterion("WINDPOWERSTATIONID =", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotEqualTo(String value) {
+            addCriterion("WINDPOWERSTATIONID <>", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThan(String value) {
+            addCriterion("WINDPOWERSTATIONID >", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidGreaterThanOrEqualTo(String value) {
+            addCriterion("WINDPOWERSTATIONID >=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThan(String value) {
+            addCriterion("WINDPOWERSTATIONID <", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLessThanOrEqualTo(String value) {
+            addCriterion("WINDPOWERSTATIONID <=", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidLike(String value) {
+            addCriterion("WINDPOWERSTATIONID like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotLike(String value) {
+            addCriterion("WINDPOWERSTATIONID not like", value, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidIn(List<String> values) {
+            addCriterion("WINDPOWERSTATIONID in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotIn(List<String> values) {
+            addCriterion("WINDPOWERSTATIONID not in", values, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidBetween(String value1, String value2) {
+            addCriterion("WINDPOWERSTATIONID between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWindpowerstationidNotBetween(String value1, String value2) {
+            addCriterion("WINDPOWERSTATIONID not between", value1, value2, "windpowerstationid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNull() {
+            addCriterion("PROJECTID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIsNotNull() {
+            addCriterion("PROJECTID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidEqualTo(String value) {
+            addCriterion("PROJECTID =", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotEqualTo(String value) {
+            addCriterion("PROJECTID <>", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThan(String value) {
+            addCriterion("PROJECTID >", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidGreaterThanOrEqualTo(String value) {
+            addCriterion("PROJECTID >=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThan(String value) {
+            addCriterion("PROJECTID <", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLessThanOrEqualTo(String value) {
+            addCriterion("PROJECTID <=", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidLike(String value) {
+            addCriterion("PROJECTID like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotLike(String value) {
+            addCriterion("PROJECTID not like", value, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidIn(List<String> values) {
+            addCriterion("PROJECTID in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotIn(List<String> values) {
+            addCriterion("PROJECTID not in", values, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidBetween(String value1, String value2) {
+            addCriterion("PROJECTID between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectidNotBetween(String value1, String value2) {
+            addCriterion("PROJECTID not between", value1, value2, "projectid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNull() {
+            addCriterion("LINEID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIsNotNull() {
+            addCriterion("LINEID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidEqualTo(String value) {
+            addCriterion("LINEID =", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotEqualTo(String value) {
+            addCriterion("LINEID <>", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThan(String value) {
+            addCriterion("LINEID >", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidGreaterThanOrEqualTo(String value) {
+            addCriterion("LINEID >=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThan(String value) {
+            addCriterion("LINEID <", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLessThanOrEqualTo(String value) {
+            addCriterion("LINEID <=", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidLike(String value) {
+            addCriterion("LINEID like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotLike(String value) {
+            addCriterion("LINEID not like", value, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidIn(List<String> values) {
+            addCriterion("LINEID in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotIn(List<String> values) {
+            addCriterion("LINEID not in", values, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidBetween(String value1, String value2) {
+            addCriterion("LINEID between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andLineidNotBetween(String value1, String value2) {
+            addCriterion("LINEID not between", value1, value2, "lineid");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientIsNull() {
+            addCriterion("DAYCOEFFICIENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientIsNotNull() {
+            addCriterion("DAYCOEFFICIENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientEqualTo(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT =", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientNotEqualTo(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT <>", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientGreaterThan(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT >", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT >=", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientLessThan(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT <", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYCOEFFICIENT <=", value, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientIn(List<BigDecimal> values) {
+            addCriterion("DAYCOEFFICIENT in", values, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientNotIn(List<BigDecimal> values) {
+            addCriterion("DAYCOEFFICIENT not in", values, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYCOEFFICIENT between", value1, value2, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andDaycoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYCOEFFICIENT not between", value1, value2, "daycoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientIsNull() {
+            addCriterion("MONTHCOEFFICIENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientIsNotNull() {
+            addCriterion("MONTHCOEFFICIENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientEqualTo(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT =", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientNotEqualTo(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT <>", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientGreaterThan(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT >", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT >=", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientLessThan(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT <", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("MONTHCOEFFICIENT <=", value, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientIn(List<BigDecimal> values) {
+            addCriterion("MONTHCOEFFICIENT in", values, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientNotIn(List<BigDecimal> values) {
+            addCriterion("MONTHCOEFFICIENT not in", values, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MONTHCOEFFICIENT between", value1, value2, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonthcoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("MONTHCOEFFICIENT not between", value1, value2, "monthcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientIsNull() {
+            addCriterion("YEARCOEFFICIENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientIsNotNull() {
+            addCriterion("YEARCOEFFICIENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientEqualTo(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT =", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientNotEqualTo(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT <>", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientGreaterThan(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT >", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT >=", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientLessThan(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT <", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("YEARCOEFFICIENT <=", value, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientIn(List<BigDecimal> values) {
+            addCriterion("YEARCOEFFICIENT in", values, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientNotIn(List<BigDecimal> values) {
+            addCriterion("YEARCOEFFICIENT not in", values, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("YEARCOEFFICIENT between", value1, value2, "yearcoefficient");
+            return (Criteria) this;
+        }
+
+        public Criteria andYearcoefficientNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("YEARCOEFFICIENT not between", value1, value2, "yearcoefficient");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table windturbineinfoday2
+     *
+     * @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 windturbineinfoday2
+     *
+     * @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);
+        }
+    }
+}

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

@@ -160,4 +160,26 @@ public class InputoroutputspeedtotalService implements BaseService<Inputoroutput
 		return list;
 
 	}
+
+	public List<Inputoroutputspeedtotal> getInputoroutputspeedtotal(String wpId,Date beginDate,Date endDate) {
+
+
+		List<Inputoroutputspeedtotal> list = null;
+
+		if (StringUtils.notEmp(wpId) && StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+
+			InputoroutputspeedtotalExample example = new InputoroutputspeedtotalExample();
+			example.setOrderByClause("windturbineid asc");
+
+			InputoroutputspeedtotalExample.Criteria criteria =example.createCriteria();
+			criteria.andWindpowerstationidEqualTo(wpId);
+
+			criteria.andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThan(endDate);
+			list = inputoroutputspeedtotalMapper.selectByExample(example);
+
+
+		}
+		return list;
+
+	}
 }

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

@@ -0,0 +1,125 @@
+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.WindTurbineInfoDay2Mapper;
+import com.gyee.frame.model.auto.WindTurbineInfoDay2;
+import com.gyee.frame.model.auto.WindTurbineInfoDay2Example;
+import com.gyee.frame.util.DateUtils;
+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 WindTurbineInfoDay2Service implements BaseService<WindTurbineInfoDay2, WindTurbineInfoDay2Example> {
+	@Autowired
+	private WindTurbineInfoDay2Mapper windTurbineInfoDay2Mapper;
+	
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			WindTurbineInfoDay2Example example=new WindTurbineInfoDay2Example();
+			example.createCriteria().andIdIn(lista);
+			return windTurbineInfoDay2Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public WindTurbineInfoDay2 selectByPrimaryKey(String id) {
+				
+			return windTurbineInfoDay2Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(WindTurbineInfoDay2 record) {
+		return windTurbineInfoDay2Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(WindTurbineInfoDay2 record) {
+				
+//		//添加雪花主键id
+//		record.setId(SnowflakeIdWorker.getUUID());
+			
+				
+		return windTurbineInfoDay2Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(WindTurbineInfoDay2 record, WindTurbineInfoDay2Example example) {
+		
+		return windTurbineInfoDay2Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(WindTurbineInfoDay2 record, WindTurbineInfoDay2Example example) {
+		
+		return windTurbineInfoDay2Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<WindTurbineInfoDay2> selectByExample(WindTurbineInfoDay2Example example) {
+		
+		return windTurbineInfoDay2Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindTurbineInfoDay2Example example) {
+		
+		return windTurbineInfoDay2Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindTurbineInfoDay2Example example) {
+		
+		return windTurbineInfoDay2Mapper.deleteByExample(example);
+	}
+
+	public List<WindTurbineInfoDay2> getWindturbineinfo(String wtId, Date recorddate) {
+
+
+		List<com.gyee.frame.model.auto.WindTurbineInfoDay2> list=null;
+
+		if (StringUtils.notEmp(wtId) ) {
+
+			WindTurbineInfoDay2Example example=new WindTurbineInfoDay2Example();
+			example.setOrderByClause("recorddate DESC");
+
+			if(StringUtils.notEmp(recorddate)){
+
+				WindTurbineInfoDay2Example.Criteria criteria =example.createCriteria();
+
+				Date endDate= DateUtils.addDays(recorddate,1);
+				criteria.andRecorddateGreaterThanOrEqualTo(recorddate).andRecorddateLessThan(endDate);
+
+				criteria.andWindturbineidEqualTo(wtId);
+				list= windTurbineInfoDay2Mapper.selectByExample(example);
+			}else
+			{
+				list=new ArrayList<>();
+			}
+
+		}
+		return list;
+
+	}
+}

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

@@ -837,10 +837,16 @@ public class Windturbineinfoday3Service implements BaseService<Windturbineinfoda
             Windturbineinfoday3Example example = new Windturbineinfoday3Example();
             example.setOrderByClause("recorddate DESC");
 
+            Windturbineinfoday3Example.Criteria criteria=example.createCriteria();
+
+            if(StringUtils.notEmp(wpId))
+            {
+                criteria.andWindpowerstationidEqualTo(wpId);
+            }
             if (StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 
-               example.createCriteria().andWindpowerstationidLike("%FDC").andWindpowerstationidEqualTo(wpId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+                criteria.andWindpowerstationidLike("%FDC").andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
                 ls = windturbineinfoday3Mapper.selectByExample(example);
             } else {
                 ls = new ArrayList<>();

src/main/java/com/gyee/frame/service/leaderboard/LeaderboardService.java

@@ -247,7 +247,7 @@ public class LeaderboardService {
     public List<Windturbineinfoday3> utilizationList(Tablepar tablepar, String wpIds, Date beginDate, Date endDate, String type)  {
         List<Windturbineinfoday3> ls=new ArrayList<>();
 
-        if (StringUtils.notEmp(wpIds) && StringUtils.notEmp(type) &&  StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
+        if ( StringUtils.notEmp(type) &&  StringUtils.notEmp(beginDate) && StringUtils.notEmp(endDate)) {
 
 
             ls = windturbineinfoday3Service.utilizationList(tablepar, wpIds, beginDate, endDate, type);

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='ProjectPlan' domainObjectName='ProjectPlan'/>
+        <table tableName='WindTurbineInfoDay2' domainObjectName='WindTurbineInfoDay2'/>
 
     </context>
 </generatorConfiguration>

src/main/resources/mybatis/auto/WindTurbineInfoDay2Mapper.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.frame.mapper.auto.WindTurbineInfoDay2Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.WindTurbineInfoDay2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="INTEGER" property="id" />
+    <result column="WINDTURBINEID" jdbcType="VARCHAR" property="windturbineid" />
+    <result column="RECORDDATE" jdbcType="DATE" property="recorddate" />
+    <result column="WINDPOWERSTATIONID" jdbcType="VARCHAR" property="windpowerstationid" />
+    <result column="PROJECTID" jdbcType="VARCHAR" property="projectid" />
+    <result column="LINEID" jdbcType="VARCHAR" property="lineid" />
+    <result column="DAYCOEFFICIENT" jdbcType="DECIMAL" property="daycoefficient" />
+    <result column="MONTHCOEFFICIENT" jdbcType="DECIMAL" property="monthcoefficient" />
+    <result column="YEARCOEFFICIENT" jdbcType="DECIMAL" property="yearcoefficient" />
+  </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, RECORDDATE, WINDPOWERSTATIONID, PROJECTID, LINEID, DAYCOEFFICIENT, 
+    MONTHCOEFFICIENT, YEARCOEFFICIENT
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2Example" 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 windturbineinfoday2
+    <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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from windturbineinfoday2
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from windturbineinfoday2
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from windturbineinfoday2
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into windturbineinfoday2 (ID, WINDTURBINEID, RECORDDATE, 
+      WINDPOWERSTATIONID, PROJECTID, LINEID, 
+      DAYCOEFFICIENT, MONTHCOEFFICIENT, YEARCOEFFICIENT
+      )
+    values (#{id,jdbcType=INTEGER}, #{windturbineid,jdbcType=VARCHAR}, #{recorddate,jdbcType=DATE}, 
+      #{windpowerstationid,jdbcType=VARCHAR}, #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, 
+      #{daycoefficient,jdbcType=DECIMAL}, #{monthcoefficient,jdbcType=DECIMAL}, #{yearcoefficient,jdbcType=DECIMAL}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into windturbineinfoday2
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="windturbineid != null">
+        WINDTURBINEID,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID,
+      </if>
+      <if test="projectid != null">
+        PROJECTID,
+      </if>
+      <if test="lineid != null">
+        LINEID,
+      </if>
+      <if test="daycoefficient != null">
+        DAYCOEFFICIENT,
+      </if>
+      <if test="monthcoefficient != null">
+        MONTHCOEFFICIENT,
+      </if>
+      <if test="yearcoefficient != null">
+        YEARCOEFFICIENT,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="windturbineid != null">
+        #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=DATE},
+      </if>
+      <if test="windpowerstationid != null">
+        #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="daycoefficient != null">
+        #{daycoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="monthcoefficient != null">
+        #{monthcoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="yearcoefficient != null">
+        #{yearcoefficient,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from windturbineinfoday2
+    <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 windturbineinfoday2
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.windturbineid != null">
+        WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=DATE},
+      </if>
+      <if test="record.windpowerstationid != null">
+        WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectid != null">
+        PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lineid != null">
+        LINEID = #{record.lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.daycoefficient != null">
+        DAYCOEFFICIENT = #{record.daycoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="record.monthcoefficient != null">
+        MONTHCOEFFICIENT = #{record.monthcoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yearcoefficient != null">
+        YEARCOEFFICIENT = #{record.yearcoefficient,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 windturbineinfoday2
+    set ID = #{record.id,jdbcType=INTEGER},
+      WINDTURBINEID = #{record.windturbineid,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=DATE},
+      WINDPOWERSTATIONID = #{record.windpowerstationid,jdbcType=VARCHAR},
+      PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      LINEID = #{record.lineid,jdbcType=VARCHAR},
+      DAYCOEFFICIENT = #{record.daycoefficient,jdbcType=DECIMAL},
+      MONTHCOEFFICIENT = #{record.monthcoefficient,jdbcType=DECIMAL},
+      YEARCOEFFICIENT = #{record.yearcoefficient,jdbcType=DECIMAL}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update windturbineinfoday2
+    <set>
+      <if test="windturbineid != null">
+        WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=DATE},
+      </if>
+      <if test="windpowerstationid != null">
+        WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        PROJECTID = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        LINEID = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="daycoefficient != null">
+        DAYCOEFFICIENT = #{daycoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="monthcoefficient != null">
+        MONTHCOEFFICIENT = #{monthcoefficient,jdbcType=DECIMAL},
+      </if>
+      <if test="yearcoefficient != null">
+        YEARCOEFFICIENT = #{yearcoefficient,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.WindTurbineInfoDay2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update windturbineinfoday2
+    set WINDTURBINEID = #{windturbineid,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=DATE},
+      WINDPOWERSTATIONID = #{windpowerstationid,jdbcType=VARCHAR},
+      PROJECTID = #{projectid,jdbcType=VARCHAR},
+      LINEID = #{lineid,jdbcType=VARCHAR},
+      DAYCOEFFICIENT = #{daycoefficient,jdbcType=DECIMAL},
+      MONTHCOEFFICIENT = #{monthcoefficient,jdbcType=DECIMAL},
+      YEARCOEFFICIENT = #{yearcoefficient,jdbcType=DECIMAL}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

src/test/java/test/LeaderboardTest.java

@@ -1,14 +1,17 @@
 package test;
 
 import com.gyee.SpringbootStart;
+import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.leaderboard.LeaderboardController;
+import com.gyee.frame.model.auto.Windturbineinfoday3;
 import com.gyee.frame.model.custom.Tablepar;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 public class LeaderboardTest {
 
@@ -63,13 +66,13 @@ public class LeaderboardTest {
 //        }
 
 
-//        AjaxResult  ajaxResult =leaderboardController.utilizationList(tablepar,"MHS_FDC",beginDate,endDate,"3");
-//
-//        List<Windturbineinfoday3>   test2=(List<Windturbineinfoday3>)ajaxResult.get("data");
-//        for(Windturbineinfoday3 wtd:test2)
-//        {
-//            System.out.println(wtd.getDaydl2()+"----------------"+wtd.getDaylldl()+"----------------"+wtd.getDayspeed());
-//        }
+        AjaxResult ajaxResult =leaderboardController.utilizationList(tablepar,null,"2021-01-01","2021-01-03","0");
+
+        List<Windturbineinfoday3> test2=(List<Windturbineinfoday3>)ajaxResult.get("data");
+        for(Windturbineinfoday3 wtd:test2)
+        {
+            System.out.println(wtd.getDaydl2()+"----------------"+wtd.getDaylldl()+"----------------"+wtd.getDayspeed());
+        }
 
 
 //        AjaxResult ajaxResult =leaderboardController.querywarningStatistical(tablepar,"1",beginDate,endDate);
@@ -90,7 +93,7 @@ public class LeaderboardTest {
 //        }
 //
 //
-//        AjaxResult ajaxResult =leaderboardController.curvefittingmainList(tablepar,wpid,beginDate);
+//        AjaxResult ajaxResult =leaderboardController.curvefittingmainList(tablepar,wpid,"2021-01-01");
 //
 //        List<Curvefittingmain> test=(List<Curvefittingmain>)ajaxResult.get("data");
 //        for(Curvefittingmain wtd:test)
@@ -109,6 +112,17 @@ public class LeaderboardTest {
 //            System.out.println(wtd.getValue1()+"----------------"+wtd.getValue2()+"----------------"+wtd.getValue3());
 //        }
 
+
+//        AjaxResult ajaxResult2 =leaderboardController.curvefittingmonthmainList(tablepar,  "MHS_FDC",  "2021", "1");
+//
+//
+//        List<Curvefittingmonthmain> list=(List<Curvefittingmonthmain>)ajaxResult2.get("data");
+//
+//        for(Curvefittingmonthmain wtd:list)
+//        {
+//            System.out.println(wtd.getDeviationrate1()+"----------------"+wtd.getDeviationrate2()+"----------------"+wtd.getDeviationrate3());
+//        }
+
     }