Merge branch 'master' of http://49.4.49.126:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/SpringbootStart.java

@@ -23,11 +23,11 @@ public class SpringbootStart {
 
         InitialRedis initialRedis=new InitialRedis();
 //        System.out.println("初始化开始！");
-        initialRedis.intialWindturbinepowercurvefitting();
-        initialRedis.intialWpScatter();
-        initialRedis.intialPjScatter();
-        initialRedis.intialLnScatter();
-        initialRedis.intialWtScatter();
+//        initialRedis.intialWindturbinepowercurvefitting();
+//        initialRedis.intialWpScatter();
+//        initialRedis.intialPjScatter();
+//        initialRedis.intialLnScatter();
+//        initialRedis.intialWtScatter();
 //        System.out.println("初始化完成！");
     }
 }

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

@@ -0,0 +1,106 @@
+package com.gyee.frame.mapper.auto;
+
+import com.gyee.frame.model.auto.Analysissubtablebottom;
+import com.gyee.frame.model.auto.AnalysissubtablebottomExample;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
+public interface AnalysissubtablebottomMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysissubtablebottomExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysissubtablebottomExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int insert(Analysissubtablebottom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int insertSelective(Analysissubtablebottom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    List<Analysissubtablebottom> selectByExample(AnalysissubtablebottomExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    Analysissubtablebottom selectByPrimaryKey(Short id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") Analysissubtablebottom record, @Param("example") AnalysissubtablebottomExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") Analysissubtablebottom record, @Param("example") AnalysissubtablebottomExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(Analysissubtablebottom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(Analysissubtablebottom record);
+
+    /**
+     * 更具时间获取日上网电量
+     * @return
+     */
+    List<Map> selectByRecorddateGrop(@Param("startTs")String startTs, @Param("endTs")String endTs, @Param("wpid")String wpid,@Param("point")String [] point);
+}

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

@@ -0,0 +1,345 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Analysissubtablebottom implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.ID
+     *
+     * @mbg.generated
+     */
+    private Short id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.TID
+     *
+     * @mbg.generated
+     */
+    private Short tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.WPID
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.METERID
+     *
+     * @mbg.generated
+     */
+    private String meterid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.METERNAME
+     *
+     * @mbg.generated
+     */
+    private String metername;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.STOPCODE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal stopcode;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.STOPCODEMODIFY
+     *
+     * @mbg.generated
+     */
+    private BigDecimal stopcodemodify;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.DAYVALUE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal dayvalue;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ANALYSISSUBTABLEBOTTOM.DAYVALUEMODIFY
+     *
+     * @mbg.generated
+     */
+    private BigDecimal dayvaluemodify;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.ID
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.ID
+     *
+     * @mbg.generated
+     */
+    public Short getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.ID
+     *
+     * @param id the value for ANALYSISSUBTABLEBOTTOM.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(Short id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.TID
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.TID
+     *
+     * @mbg.generated
+     */
+    public Short getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.TID
+     *
+     * @param tid the value for ANALYSISSUBTABLEBOTTOM.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(Short tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.RECORDDATE
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.RECORDDATE
+     *
+     * @param recorddate the value for ANALYSISSUBTABLEBOTTOM.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 ANALYSISSUBTABLEBOTTOM.WPID
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.WPID
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.WPID
+     *
+     * @param wpid the value for ANALYSISSUBTABLEBOTTOM.WPID
+     *
+     * @mbg.generated
+     */
+    public void setWpid(String wpid) {
+        this.wpid = wpid == null ? null : wpid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.METERID
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.METERID
+     *
+     * @mbg.generated
+     */
+    public String getMeterid() {
+        return meterid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.METERID
+     *
+     * @param meterid the value for ANALYSISSUBTABLEBOTTOM.METERID
+     *
+     * @mbg.generated
+     */
+    public void setMeterid(String meterid) {
+        this.meterid = meterid == null ? null : meterid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.METERNAME
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.METERNAME
+     *
+     * @mbg.generated
+     */
+    public String getMetername() {
+        return metername;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.METERNAME
+     *
+     * @param metername the value for ANALYSISSUBTABLEBOTTOM.METERNAME
+     *
+     * @mbg.generated
+     */
+    public void setMetername(String metername) {
+        this.metername = metername == null ? null : metername.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.STOPCODE
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.STOPCODE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getStopcode() {
+        return stopcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.STOPCODE
+     *
+     * @param stopcode the value for ANALYSISSUBTABLEBOTTOM.STOPCODE
+     *
+     * @mbg.generated
+     */
+    public void setStopcode(BigDecimal stopcode) {
+        this.stopcode = stopcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.STOPCODEMODIFY
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.STOPCODEMODIFY
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getStopcodemodify() {
+        return stopcodemodify;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.STOPCODEMODIFY
+     *
+     * @param stopcodemodify the value for ANALYSISSUBTABLEBOTTOM.STOPCODEMODIFY
+     *
+     * @mbg.generated
+     */
+    public void setStopcodemodify(BigDecimal stopcodemodify) {
+        this.stopcodemodify = stopcodemodify;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.DAYVALUE
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.DAYVALUE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDayvalue() {
+        return dayvalue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.DAYVALUE
+     *
+     * @param dayvalue the value for ANALYSISSUBTABLEBOTTOM.DAYVALUE
+     *
+     * @mbg.generated
+     */
+    public void setDayvalue(BigDecimal dayvalue) {
+        this.dayvalue = dayvalue;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ANALYSISSUBTABLEBOTTOM.DAYVALUEMODIFY
+     *
+     * @return the value of ANALYSISSUBTABLEBOTTOM.DAYVALUEMODIFY
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDayvaluemodify() {
+        return dayvaluemodify;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ANALYSISSUBTABLEBOTTOM.DAYVALUEMODIFY
+     *
+     * @param dayvaluemodify the value for ANALYSISSUBTABLEBOTTOM.DAYVALUEMODIFY
+     *
+     * @mbg.generated
+     */
+    public void setDayvaluemodify(BigDecimal dayvaluemodify) {
+        this.dayvaluemodify = dayvaluemodify;
+    }
+}

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

@@ -0,0 +1,934 @@
+package com.gyee.frame.model.auto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AnalysissubtablebottomExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public AnalysissubtablebottomExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @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 ANALYSISSUBTABLEBOTTOM
+     *
+     * @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 ANALYSISSUBTABLEBOTTOM
+     *
+     * @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 ANALYSISSUBTABLEBOTTOM
+     *
+     * @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 ANALYSISSUBTABLEBOTTOM
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Short value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Short value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Short value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Short value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Short value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Short value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Short> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Short> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Short value1, Short value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Short value1, Short value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNull() {
+            addCriterion("TID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNotNull() {
+            addCriterion("TID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidEqualTo(Short value) {
+            addCriterion("TID =", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotEqualTo(Short value) {
+            addCriterion("TID <>", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThan(Short value) {
+            addCriterion("TID >", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThanOrEqualTo(Short value) {
+            addCriterion("TID >=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThan(Short value) {
+            addCriterion("TID <", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThanOrEqualTo(Short value) {
+            addCriterion("TID <=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIn(List<Short> values) {
+            addCriterion("TID in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotIn(List<Short> values) {
+            addCriterion("TID not in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidBetween(Short value1, Short value2) {
+            addCriterion("TID between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotBetween(Short value1, Short value2) {
+            addCriterion("TID not between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNull() {
+            addCriterion("RECORDDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIsNotNull() {
+            addCriterion("RECORDDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateEqualTo(Date value) {
+            addCriterion("RECORDDATE =", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotEqualTo(Date value) {
+            addCriterion("RECORDDATE <>", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThan(Date value) {
+            addCriterion("RECORDDATE >", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateGreaterThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE >=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThan(Date value) {
+            addCriterion("RECORDDATE <", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateLessThanOrEqualTo(Date value) {
+            addCriterion("RECORDDATE <=", value, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateIn(List<Date> values) {
+            addCriterion("RECORDDATE in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotIn(List<Date> values) {
+            addCriterion("RECORDDATE not in", values, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecorddateNotBetween(Date value1, Date value2) {
+            addCriterion("RECORDDATE not between", value1, value2, "recorddate");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNull() {
+            addCriterion("WPID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIsNotNull() {
+            addCriterion("WPID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidEqualTo(String value) {
+            addCriterion("WPID =", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotEqualTo(String value) {
+            addCriterion("WPID <>", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThan(String value) {
+            addCriterion("WPID >", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidGreaterThanOrEqualTo(String value) {
+            addCriterion("WPID >=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThan(String value) {
+            addCriterion("WPID <", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLessThanOrEqualTo(String value) {
+            addCriterion("WPID <=", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidLike(String value) {
+            addCriterion("WPID like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotLike(String value) {
+            addCriterion("WPID not like", value, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidIn(List<String> values) {
+            addCriterion("WPID in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotIn(List<String> values) {
+            addCriterion("WPID not in", values, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidBetween(String value1, String value2) {
+            addCriterion("WPID between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andWpidNotBetween(String value1, String value2) {
+            addCriterion("WPID not between", value1, value2, "wpid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridIsNull() {
+            addCriterion("METERID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridIsNotNull() {
+            addCriterion("METERID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridEqualTo(String value) {
+            addCriterion("METERID =", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridNotEqualTo(String value) {
+            addCriterion("METERID <>", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridGreaterThan(String value) {
+            addCriterion("METERID >", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridGreaterThanOrEqualTo(String value) {
+            addCriterion("METERID >=", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridLessThan(String value) {
+            addCriterion("METERID <", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridLessThanOrEqualTo(String value) {
+            addCriterion("METERID <=", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridLike(String value) {
+            addCriterion("METERID like", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridNotLike(String value) {
+            addCriterion("METERID not like", value, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridIn(List<String> values) {
+            addCriterion("METERID in", values, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridNotIn(List<String> values) {
+            addCriterion("METERID not in", values, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridBetween(String value1, String value2) {
+            addCriterion("METERID between", value1, value2, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeteridNotBetween(String value1, String value2) {
+            addCriterion("METERID not between", value1, value2, "meterid");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameIsNull() {
+            addCriterion("METERNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameIsNotNull() {
+            addCriterion("METERNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameEqualTo(String value) {
+            addCriterion("METERNAME =", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameNotEqualTo(String value) {
+            addCriterion("METERNAME <>", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameGreaterThan(String value) {
+            addCriterion("METERNAME >", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameGreaterThanOrEqualTo(String value) {
+            addCriterion("METERNAME >=", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameLessThan(String value) {
+            addCriterion("METERNAME <", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameLessThanOrEqualTo(String value) {
+            addCriterion("METERNAME <=", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameLike(String value) {
+            addCriterion("METERNAME like", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameNotLike(String value) {
+            addCriterion("METERNAME not like", value, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameIn(List<String> values) {
+            addCriterion("METERNAME in", values, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameNotIn(List<String> values) {
+            addCriterion("METERNAME not in", values, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameBetween(String value1, String value2) {
+            addCriterion("METERNAME between", value1, value2, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andMeternameNotBetween(String value1, String value2) {
+            addCriterion("METERNAME not between", value1, value2, "metername");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeIsNull() {
+            addCriterion("STOPCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeIsNotNull() {
+            addCriterion("STOPCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeEqualTo(BigDecimal value) {
+            addCriterion("STOPCODE =", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeNotEqualTo(BigDecimal value) {
+            addCriterion("STOPCODE <>", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeGreaterThan(BigDecimal value) {
+            addCriterion("STOPCODE >", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("STOPCODE >=", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeLessThan(BigDecimal value) {
+            addCriterion("STOPCODE <", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("STOPCODE <=", value, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeIn(List<BigDecimal> values) {
+            addCriterion("STOPCODE in", values, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeNotIn(List<BigDecimal> values) {
+            addCriterion("STOPCODE not in", values, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("STOPCODE between", value1, value2, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodeNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("STOPCODE not between", value1, value2, "stopcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyIsNull() {
+            addCriterion("STOPCODEMODIFY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyIsNotNull() {
+            addCriterion("STOPCODEMODIFY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyEqualTo(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY =", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyNotEqualTo(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY <>", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyGreaterThan(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY >", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY >=", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyLessThan(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY <", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("STOPCODEMODIFY <=", value, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyIn(List<BigDecimal> values) {
+            addCriterion("STOPCODEMODIFY in", values, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyNotIn(List<BigDecimal> values) {
+            addCriterion("STOPCODEMODIFY not in", values, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("STOPCODEMODIFY between", value1, value2, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andStopcodemodifyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("STOPCODEMODIFY not between", value1, value2, "stopcodemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueIsNull() {
+            addCriterion("DAYVALUE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueIsNotNull() {
+            addCriterion("DAYVALUE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUE =", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueNotEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUE <>", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueGreaterThan(BigDecimal value) {
+            addCriterion("DAYVALUE >", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUE >=", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueLessThan(BigDecimal value) {
+            addCriterion("DAYVALUE <", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUE <=", value, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueIn(List<BigDecimal> values) {
+            addCriterion("DAYVALUE in", values, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueNotIn(List<BigDecimal> values) {
+            addCriterion("DAYVALUE not in", values, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYVALUE between", value1, value2, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvalueNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYVALUE not between", value1, value2, "dayvalue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyIsNull() {
+            addCriterion("DAYVALUEMODIFY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyIsNotNull() {
+            addCriterion("DAYVALUEMODIFY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY =", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyNotEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY <>", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyGreaterThan(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY >", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY >=", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyLessThan(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY <", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("DAYVALUEMODIFY <=", value, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyIn(List<BigDecimal> values) {
+            addCriterion("DAYVALUEMODIFY in", values, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyNotIn(List<BigDecimal> values) {
+            addCriterion("DAYVALUEMODIFY not in", values, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYVALUEMODIFY between", value1, value2, "dayvaluemodify");
+            return (Criteria) this;
+        }
+
+        public Criteria andDayvaluemodifyNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("DAYVALUEMODIFY not between", value1, value2, "dayvaluemodify");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ANALYSISSUBTABLEBOTTOM
+     *
+     * @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 ANALYSISSUBTABLEBOTTOM
+     *
+     * @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/AnalysissubtablebottomService.java

@@ -0,0 +1,74 @@
+package com.gyee.frame.service;
+
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.mapper.auto.AnalysissubtablebottomMapper;
+import com.gyee.frame.model.auto.Analysissubtablebottom;
+import com.gyee.frame.model.auto.AnalysissubtablebottomExample;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.xml.ws.ServiceMode;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AnalysissubtablebottomService implements BaseService<Analysissubtablebottom, AnalysissubtablebottomExample> {
+
+    @Resource
+    private AnalysissubtablebottomMapper analysissubtablebottomMapper;
+
+
+
+    @Override
+    public int deleteByPrimaryKey(String id) {
+        return 0;
+    }
+
+    @Override
+    public int insertSelective(Analysissubtablebottom record) {
+        return 0;
+    }
+
+    @Override
+    public Analysissubtablebottom selectByPrimaryKey(String id) {
+        return null;
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(Analysissubtablebottom record) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExampleSelective(Analysissubtablebottom record, AnalysissubtablebottomExample example) {
+        return 0;
+    }
+
+    @Override
+    public int updateByExample(Analysissubtablebottom record, AnalysissubtablebottomExample example) {
+        return 0;
+    }
+
+    @Override
+    public List<Analysissubtablebottom> selectByExample(AnalysissubtablebottomExample example) {
+        return null;
+    }
+
+    @Override
+    public long countByExample(AnalysissubtablebottomExample example) {
+        return 0;
+    }
+
+    @Override
+    public int deleteByExample(AnalysissubtablebottomExample example) {
+        return 0;
+    }
+
+
+    public  List<Map> selectByRecorddateGrop(String  startTs, String endTs,String wpid,String [] point){
+        List<Map> map = analysissubtablebottomMapper.selectByRecorddateGrop(startTs,endTs,wpid,point);
+        return map;
+    }
+}

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

@@ -193,7 +193,9 @@ public class WarningRecordsService implements BaseService<WarningRecords, Warnin
 				List<WarningRecords> ls=entry.getValue();
 
 				Warning2 warning= InitialRunner.warningmap.get(entry.getKey());
-
+				if(null == warning){
+					continue;
+				}
 				SawVo item = new SawVo();
 				item.setNum(i++);
 				item.setName(warning.getChinesetext());

src/main/java/com/gyee/frame/service/export/GoldenService.java

@@ -6,6 +6,7 @@ import com.gyee.frame.common.exception.QiNiuException;
 import com.gyee.frame.common.exception.enums.QiNiuErrorEnum;
 import com.gyee.frame.common.feign.RemoteServiceBuilder;
 import com.gyee.frame.model.custom.export.TsPointData;
+import com.gyee.frame.service.AnalysissubtablebottomService;
 import com.gyee.frame.service.WindTurbineTestingPointAiService;
 import com.gyee.frame.service.WindturbineService;
 import com.gyee.frame.util.DateUtils;
@@ -14,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
@@ -35,6 +38,9 @@ public class GoldenService {
     @Resource
     private WindTurbineTestingPointAiService windService;
 
+    @Resource
+    private AnalysissubtablebottomService analysissubtablebottomService;
+
     /**
      * 一天的时间戳
      */
@@ -111,13 +117,13 @@ public class GoldenService {
             }
 
             // 返回结果处理
-            for (Future<Map<String, List<Object>>> future: list){
+            for (Future<Map<String, List<Object>>> future : list) {
                 Map<String, List<Object>> wtMap = future.get();
                 for (Map.Entry<String, List<Object>> entry : wtMap.entrySet()) {
                     map.put(entry.getKey(), entry.getValue());
                 }
             }
-            
+
         } catch (Exception e) {
             log.error(e.getMessage());
             throw new QiNiuException(QiNiuErrorEnum.ERROR_DATA);
@@ -198,10 +204,20 @@ public class GoldenService {
         try {
             // 上网电量
             String point = exportConfig.getTemplate2swdl().get(station);
-            List<TsPointData> data = remoteService.ShardingService().getHistorySnap(point, startTs, endTs, TIMES_TAMP_DAY);
+            String[] points = point.split(",");
+            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String startTss = dateFormat.format(startTs);
+            String endTss = dateFormat.format(endTs);
+            List<Map> data = analysissubtablebottomService.selectByRecorddateGrop(startTss,endTss,station,points);
+
+
+            //List<TsPointData> data = remoteService.ShardingService().getHistorySnap(point, startTs, endTs, TIMES_TAMP_DAY);
             List<Object> list = new ArrayList<>();
-            list.add(data.stream().map(p -> DateUtils.format(p.getTs(), DateUtils.DATE_PATTERN)).collect(Collectors.toList()));
-            list.add(data.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList()));
+            //list.add(data.stream().map(p -> DateUtils.format(p.getTs(), DateUtils.DATE_PATTERN)).collect(Collectors.toList()));
+            //list.add(data.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList()));
+
+            list.add(data.stream().map(p -> dateFormat.format(p.get("RECORDDATE"))).collect(Collectors.toList()));
+            list.add(data.stream().map(p -> Double.valueOf(p.get("SWDL").toString())).collect(Collectors.toList()));
             map.put("swdl", list);
 
             // 上网功率
@@ -248,10 +264,10 @@ public class GoldenService {
                 List<TsPointData> data = remoteService.ShardingService().getHistorySnap(point, startTs, endTs, interval);
 
                 List<Object> collect = new ArrayList<>();
-                if (data.size() == 0){
+                if (data.size() == 0) {
                     for (int i = 0; i < intervals.size(); i++)
                         collect.add(0);
-                }else{
+                } else {
                     collect = data.stream().map(TsPointData::getDoubleValue).collect(Collectors.toList());
                 }
                 list.add(collect);

src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -473,6 +473,7 @@ public class GenreSetPushService {
                 rycfdl = rfdl * YCFDLXS;
             }
             //预测电量临时算法=(月发电量+日预测发电量*(日历天数-当前日数))*预测发电量系数
+            c = Calendar.getInstance();
             double yycfdl = (yfdl + rycfdl*(daynum-c.get(Calendar.DAY_OF_MONTH)))*YCFDLXS;
             jczbmap.put("rycfdl", MathUtil.twoBit(rycfdl));
             jczbmap.put("yycfdl", MathUtil.twoBit(yycfdl));

src/main/resources/application.yml

@@ -173,12 +173,19 @@ zmconfig:
 exportcode:
   template1: AI022,AI130,GZZT,XDZT
   #日上网电量
+#  template2swdl:
+#    MHS_FDC: MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0136
+#    NSS_FDC: NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0136
+#    QS_FDC: QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0136
+#    SBQ_FDC: SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0136
+#    XS_FDC: XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0136
+  #日上网电量
   template2swdl:
-    MHS_FDC: MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0136
-    NSS_FDC: NSSFCJSFW.NX_GD_NSSF_XX_XX_XXX_XXX_CI0136
-    QS_FDC: QSFCJSFW.NX_GD_QSF_XX_XX_XXX_XXX_CI0136
-    SBQ_FDC: SBQFCJSFW.NX_GD_SBQF_XX_XX_XXX_XXX_CI0136
-    XS_FDC: XSFCJSFW.NX_GD_XSF_XX_XX_XXX_XXX_CI0136
+    MHS_FDC: MHSDJL.NX_GD_MHSF_DD_P1_L1_001_ZXYG057
+    NSS_FDC: NSSDJL.NX_GD_NSSF_DD_P1_L1_001_ZXYG025, NSSDJL.NX_GD_NSSF_DD_P1_L1_001_ZXYG029
+    QS_FDC: QSDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001, SLDJL.NX_GD_QSF_DD_P1_L1_001_ZXYG001
+    SBQ_FDC: SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG009, SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG061, SBQDJL.NX_GD_SBQF_DD_P1_L1_001_ZXYG109
+    XS_FDC: XSDJL.NX_GD_XSF_DD_P1_L1_001_ZXYG017
   #上网功率
   template2swgl:
     MHS_FDC: MHSFCJSFW.NX_GD_MHSF_XX_XX_XXX_XXX_CI0135

src/main/resources/mybatis/auto/AnalysissubtablebottomMapper.xml

@@ -0,0 +1,376 @@
+<?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.AnalysissubtablebottomMapper">
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Analysissubtablebottom">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        <id column="ID" jdbcType="DECIMAL" property="id"/>
+        <result column="TID" jdbcType="DECIMAL" property="tid"/>
+        <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate"/>
+        <result column="WPID" jdbcType="VARCHAR" property="wpid"/>
+        <result column="METERID" jdbcType="VARCHAR" property="meterid"/>
+        <result column="METERNAME" jdbcType="VARCHAR" property="metername"/>
+        <result column="STOPCODE" jdbcType="DECIMAL" property="stopcode"/>
+        <result column="STOPCODEMODIFY" jdbcType="DECIMAL" property="stopcodemodify"/>
+        <result column="DAYVALUE" jdbcType="DECIMAL" property="dayvalue"/>
+        <result column="DAYVALUEMODIFY" jdbcType="DECIMAL" property="dayvaluemodify"/>
+    </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, TID, RECORDDATE, WPID, METERID, METERNAME, STOPCODE, STOPCODEMODIFY, DAYVALUE,
+        DAYVALUEMODIFY
+    </sql>
+    <select id="selectByExample" parameterType="com.gyee.frame.model.auto.AnalysissubtablebottomExample"
+            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 ANALYSISSUBTABLEBOTTOM
+        <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.Short" resultMap="BaseResultMap">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        select
+        <include refid="Base_Column_List"/>
+        from ANALYSISSUBTABLEBOTTOM
+        where ID = #{id,jdbcType=DECIMAL}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        delete from ANALYSISSUBTABLEBOTTOM
+        where ID = #{id,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.AnalysissubtablebottomExample">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        delete from ANALYSISSUBTABLEBOTTOM
+        <if test="_parameter != null">
+            <include refid="Example_Where_Clause"/>
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.gyee.frame.model.auto.Analysissubtablebottom">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        insert into ANALYSISSUBTABLEBOTTOM (ID, TID, RECORDDATE,
+        WPID, METERID, METERNAME,
+        STOPCODE, STOPCODEMODIFY, DAYVALUE,
+        DAYVALUEMODIFY)
+        values (#{id,jdbcType=DECIMAL}, #{tid,jdbcType=DECIMAL}, #{recorddate,jdbcType=TIMESTAMP},
+        #{wpid,jdbcType=VARCHAR}, #{meterid,jdbcType=VARCHAR}, #{metername,jdbcType=VARCHAR},
+        #{stopcode,jdbcType=DECIMAL}, #{stopcodemodify,jdbcType=DECIMAL}, #{dayvalue,jdbcType=DECIMAL},
+        #{dayvaluemodify,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Analysissubtablebottom">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        insert into ANALYSISSUBTABLEBOTTOM
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                ID,
+            </if>
+            <if test="tid != null">
+                TID,
+            </if>
+            <if test="recorddate != null">
+                RECORDDATE,
+            </if>
+            <if test="wpid != null">
+                WPID,
+            </if>
+            <if test="meterid != null">
+                METERID,
+            </if>
+            <if test="metername != null">
+                METERNAME,
+            </if>
+            <if test="stopcode != null">
+                STOPCODE,
+            </if>
+            <if test="stopcodemodify != null">
+                STOPCODEMODIFY,
+            </if>
+            <if test="dayvalue != null">
+                DAYVALUE,
+            </if>
+            <if test="dayvaluemodify != null">
+                DAYVALUEMODIFY,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=DECIMAL},
+            </if>
+            <if test="tid != null">
+                #{tid,jdbcType=DECIMAL},
+            </if>
+            <if test="recorddate != null">
+                #{recorddate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="wpid != null">
+                #{wpid,jdbcType=VARCHAR},
+            </if>
+            <if test="meterid != null">
+                #{meterid,jdbcType=VARCHAR},
+            </if>
+            <if test="metername != null">
+                #{metername,jdbcType=VARCHAR},
+            </if>
+            <if test="stopcode != null">
+                #{stopcode,jdbcType=DECIMAL},
+            </if>
+            <if test="stopcodemodify != null">
+                #{stopcodemodify,jdbcType=DECIMAL},
+            </if>
+            <if test="dayvalue != null">
+                #{dayvalue,jdbcType=DECIMAL},
+            </if>
+            <if test="dayvaluemodify != null">
+                #{dayvaluemodify,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <select id="countByExample" parameterType="com.gyee.frame.model.auto.AnalysissubtablebottomExample"
+            resultType="java.lang.Long">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        select count(*) from ANALYSISSUBTABLEBOTTOM
+        <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 ANALYSISSUBTABLEBOTTOM
+        <set>
+            <if test="record.id != null">
+                ID = #{record.id,jdbcType=DECIMAL},
+            </if>
+            <if test="record.tid != null">
+                TID = #{record.tid,jdbcType=DECIMAL},
+            </if>
+            <if test="record.recorddate != null">
+                RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="record.wpid != null">
+                WPID = #{record.wpid,jdbcType=VARCHAR},
+            </if>
+            <if test="record.meterid != null">
+                METERID = #{record.meterid,jdbcType=VARCHAR},
+            </if>
+            <if test="record.metername != null">
+                METERNAME = #{record.metername,jdbcType=VARCHAR},
+            </if>
+            <if test="record.stopcode != null">
+                STOPCODE = #{record.stopcode,jdbcType=DECIMAL},
+            </if>
+            <if test="record.stopcodemodify != null">
+                STOPCODEMODIFY = #{record.stopcodemodify,jdbcType=DECIMAL},
+            </if>
+            <if test="record.dayvalue != null">
+                DAYVALUE = #{record.dayvalue,jdbcType=DECIMAL},
+            </if>
+            <if test="record.dayvaluemodify != null">
+                DAYVALUEMODIFY = #{record.dayvaluemodify,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 ANALYSISSUBTABLEBOTTOM
+        set ID = #{record.id,jdbcType=DECIMAL},
+        TID = #{record.tid,jdbcType=DECIMAL},
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+        WPID = #{record.wpid,jdbcType=VARCHAR},
+        METERID = #{record.meterid,jdbcType=VARCHAR},
+        METERNAME = #{record.metername,jdbcType=VARCHAR},
+        STOPCODE = #{record.stopcode,jdbcType=DECIMAL},
+        STOPCODEMODIFY = #{record.stopcodemodify,jdbcType=DECIMAL},
+        DAYVALUE = #{record.dayvalue,jdbcType=DECIMAL},
+        DAYVALUEMODIFY = #{record.dayvaluemodify,jdbcType=DECIMAL}
+        <if test="_parameter != null">
+            <include refid="Update_By_Example_Where_Clause"/>
+        </if>
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Analysissubtablebottom">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        update ANALYSISSUBTABLEBOTTOM
+        <set>
+            <if test="tid != null">
+                TID = #{tid,jdbcType=DECIMAL},
+            </if>
+            <if test="recorddate != null">
+                RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="wpid != null">
+                WPID = #{wpid,jdbcType=VARCHAR},
+            </if>
+            <if test="meterid != null">
+                METERID = #{meterid,jdbcType=VARCHAR},
+            </if>
+            <if test="metername != null">
+                METERNAME = #{metername,jdbcType=VARCHAR},
+            </if>
+            <if test="stopcode != null">
+                STOPCODE = #{stopcode,jdbcType=DECIMAL},
+            </if>
+            <if test="stopcodemodify != null">
+                STOPCODEMODIFY = #{stopcodemodify,jdbcType=DECIMAL},
+            </if>
+            <if test="dayvalue != null">
+                DAYVALUE = #{dayvalue,jdbcType=DECIMAL},
+            </if>
+            <if test="dayvaluemodify != null">
+                DAYVALUEMODIFY = #{dayvaluemodify,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where ID = #{id,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Analysissubtablebottom">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        update ANALYSISSUBTABLEBOTTOM
+        set TID = #{tid,jdbcType=DECIMAL},
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+        WPID = #{wpid,jdbcType=VARCHAR},
+        METERID = #{meterid,jdbcType=VARCHAR},
+        METERNAME = #{metername,jdbcType=VARCHAR},
+        STOPCODE = #{stopcode,jdbcType=DECIMAL},
+        STOPCODEMODIFY = #{stopcodemodify,jdbcType=DECIMAL},
+        DAYVALUE = #{dayvalue,jdbcType=DECIMAL},
+        DAYVALUEMODIFY = #{dayvaluemodify,jdbcType=DECIMAL}
+        where ID = #{id,jdbcType=DECIMAL}
+    </update>
+
+    <select id="selectByRecorddateGrop" resultType="java.util.Map">
+
+        select RECORDDATE recorddate, SUM(dayvaluemodify)/1000 swdl from Analysissubtablebottom
+        <where>
+            AND wpid = #{wpid}
+            AND RECORDDATE >= to_date(#{startTs}, 'yyyy-mm-dd')
+            AND RECORDDATE  &lt;=  to_date(#{endTs}, 'yyyy-mm-dd')
+            AND meterid in
+            <foreach collection="point" item="item" index="index" open= "(" separator="," close=")">
+                #{item}
+            </foreach>
+
+        </where>
+         group by RECORDDATE
+         order by RECORDDATE
+
+
+  </select>
+
+</mapper>

src/test/java/test/InitialPointServiceTest.java

@@ -20,11 +20,11 @@ public class InitialPointServiceTest {
 
         InitialPointGoldenService initialPointGoldenService= SpringUtils.getBean("initialPointGoldenService");
 
-//        initialPointGoldenService.initalFj();
+        initialPointGoldenService.initalFj();
 
-//        initialPointGoldenService.initalFc(true);
+        initialPointGoldenService.initalFc(true);
 
-//        initialPointGoldenService.initalDd();
+        initialPointGoldenService.initalDd();
 
         initialPointGoldenService.initalFgl();