手机问题功能修改

src/main/java/com/gyee/frame/common/conf/V2Config.java

@@ -38,6 +38,16 @@ public class V2Config
     private static Boolean rollVerification;
     /** 实时数据库 **/
     private  static String realtimedataBase;
+    /**app升级路径**/
+    private   static String appUpdateUrl;
+
+    public static String getAppUpdateUrl() {
+        return appUpdateUrl;
+    }
+
+    public static void setAppUpdateUrl(String appUpdateUrl) {
+        V2Config.appUpdateUrl = appUpdateUrl;
+    }
 
     public static String getRealtimedataBase() {
         return realtimedataBase;

src/main/java/com/gyee/frame/common/spring/InitialRunner.java

@@ -48,6 +48,7 @@ public class InitialRunner implements CommandLineRunner {
 
 //    public static List<Line> lnls = new ArrayList<Line>(); // 线路LIST集合
 
+    public static Map<String, Windturbine>  wtmap = new HashMap<String, Windturbine>();
     public static Map<String, List<Windturbine>> wp_wtmap = new HashMap<String, List<Windturbine>>();
     public static Map<String, List<Windturbine>> pj_wtmap = new HashMap<String, List<Windturbine>>();
    // public static Map<String, List<Windturbine>> ln_wtmap = new HashMap<String, List<Windturbine>>();
@@ -96,6 +97,13 @@ public class InitialRunner implements CommandLineRunner {
         windturbineExample.createCriteria().andWindpowerstationidNotLike("%GDC");
         wtls= windturbineService.selectByExample(windturbineExample);
 
+        if(!wtls.isEmpty())
+        {
+            for(Windturbine wt:wtls)
+            {
+                wtmap.put(wt.getId(),wt);
+            }
+        }
 
 //        WindturbinepowercurvefittingExample windturbinepowercurvefittingExample=new WindturbinepowercurvefittingExample();
 //        windturbinepowercurvefittingExample.setOrderByClause("ordernum ASC");

src/main/java/com/gyee/frame/common/support/Convert.java

@@ -301,6 +301,13 @@ public class Convert
     {
         return toIntArray(",", str);
     }
+
+
+    public static List<Integer> toIntArrayList(String str){
+        Integer[] stringArray= toIntArray(str);
+        List<Integer> stringB = Arrays.asList(stringArray);
+        return stringB;
+    }
     
     /**
      * 转换为List<String>数组<br>

src/main/java/com/gyee/frame/controller/AnonController.java

@@ -1,6 +1,7 @@
 package com.gyee.frame.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.dataSources.DataSource;
 import com.gyee.frame.common.dataSources.DataSourceType;
 import com.gyee.frame.common.domain.AjaxResult;
@@ -45,7 +46,7 @@ public class AnonController {
     @GetMapping("/downloadFile")
     public ResponseEntity<Resource> downloadFile( HttpServletRequest request) {
         // Load file as Resource
-        Resource resource = fileService.loadFileAsResource("D://sisphone.apk");
+        Resource resource = fileService.loadFileAsResource(V2Config.getAppUpdateUrl()+"sisphone.apk");
 
         // Try to determine file's content type
         String contentType = null;

src/main/java/com/gyee/frame/controller/gen/WindturbineinfodaytopController.java

@@ -0,0 +1,114 @@
+package com.gyee.frame.controller.gen;
+
+
+import com.gyee.frame.common.conf.redis.CacheContext;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.DatasVo;
+import com.gyee.frame.model.custom.ValueVo;
+import com.gyee.frame.service.*;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * windturbineinfodaytopController
+ * @ClassName: windturbineinfodaytopController
+ * @author gyee
+ */
+
+@Controller
+@RequestMapping("/windturbineinfodaytopController")
+public class WindturbineinfodaytopController {
+
+
+    @Resource
+    private Windturbineinfodaytop2Service windturbineinfodaytop2Service;
+
+
+    @GetMapping("/gadaylist")
+    @ResponseBody
+    public AjaxResult gadaylist(String windfarm){
+
+        if(StringUtils.isNotEmpty(windfarm) )
+        {
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DAY_OF_MONTH,-1);
+            c.set(Calendar.HOUR_OF_DAY, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            c.set(Calendar.MILLISECOND, 0);
+            Date recorddate=c.getTime();
+            AjaxResult result=windturbineinfodaytop2Service.gadaylist(windfarm, recorddate);
+            return result;
+        }
+        return  new AjaxResult();
+    }
+
+
+    @GetMapping("/gamonthlist")
+    @ResponseBody
+    public AjaxResult gamonthlist(String windfarm){
+
+        if(StringUtils.isNotEmpty(windfarm) )
+        {
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DAY_OF_MONTH,-1);
+            int year=c.get(Calendar.YEAR);
+            int month=c.get(Calendar.MONTH)+1;
+
+            AjaxResult result=windturbineinfodaytop2Service.gamonthlist(windfarm, String.valueOf(year),String.valueOf(month));
+            return result;
+        }
+        return  new AjaxResult();
+    }
+
+    @GetMapping("/gayearlist")
+    @ResponseBody
+    public AjaxResult gayearlist(String windfarm){
+
+        if(StringUtils.isNotEmpty(windfarm))
+        {
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DAY_OF_MONTH,-1);
+            int year=c.get(Calendar.YEAR);
+
+            AjaxResult result=windturbineinfodaytop2Service.gayearlist(windfarm, String.valueOf(year));
+            return result;
+        }
+        return  new AjaxResult();
+    }
+
+    @GetMapping("/wtchart")
+    @ResponseBody
+    public List<ValueVo>  wtchart(String gaid) {
+
+        if(StringUtils.isNotEmpty(gaid))
+        {
+            List<ValueVo> result=windturbineinfodaytop2Service.wtchart(gaid);
+            return result;
+        }
+        return  new ArrayList<ValueVo>();
+    }
+
+
+    @GetMapping("/wtchartCompare")
+    @ResponseBody
+    public AjaxResult wtdaychartCompare(String gaid1, String gaid2) {
+
+        if(StringUtils.isNotEmpty(gaid1) && StringUtils.isNotEmpty(gaid1))
+        {
+            AjaxResult result=windturbineinfodaytop2Service.wtchartCompare(gaid1, gaid2);
+            return result;
+        }
+        return  new AjaxResult();
+    }
+
+}

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

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

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

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

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

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

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

@@ -0,0 +1,444 @@
+package com.gyee.frame.model.auto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class Daylygradeassessmentmain2 implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.ID
+     *
+     * @mbg.generated
+     */
+    private String id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.WTID
+     *
+     * @mbg.generated
+     */
+    private String wtid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.WPID
+     *
+     * @mbg.generated
+     */
+    private String wpid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.PROJECTID
+     *
+     * @mbg.generated
+     */
+    private String projectid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.LINEID
+     *
+     * @mbg.generated
+     */
+    private String lineid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    private Date recorddate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.SCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal score;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.PLEVEL
+     *
+     * @mbg.generated
+     */
+    private String plevel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.STATE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal state;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.MODSCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal modscore;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.MODLEVEL
+     *
+     * @mbg.generated
+     */
+    private String modlevel;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.TOTALSCORE
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalscore;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column DAYLYGRADEASSESSMENTMAIN2.TID
+     *
+     * @mbg.generated
+     */
+    private String tid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table DAYLYGRADEASSESSMENTMAIN2
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.ID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.ID
+     *
+     * @mbg.generated
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.ID
+     *
+     * @param id the value for DAYLYGRADEASSESSMENTMAIN2.ID
+     *
+     * @mbg.generated
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.WTID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.WTID
+     *
+     * @mbg.generated
+     */
+    public String getWtid() {
+        return wtid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.WTID
+     *
+     * @param wtid the value for DAYLYGRADEASSESSMENTMAIN2.WTID
+     *
+     * @mbg.generated
+     */
+    public void setWtid(String wtid) {
+        this.wtid = wtid == null ? null : wtid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.WPID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.WPID
+     *
+     * @mbg.generated
+     */
+    public String getWpid() {
+        return wpid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.WPID
+     *
+     * @param wpid the value for DAYLYGRADEASSESSMENTMAIN2.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 DAYLYGRADEASSESSMENTMAIN2.PROJECTID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.PROJECTID
+     *
+     * @mbg.generated
+     */
+    public String getProjectid() {
+        return projectid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.PROJECTID
+     *
+     * @param projectid the value for DAYLYGRADEASSESSMENTMAIN2.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 DAYLYGRADEASSESSMENTMAIN2.LINEID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.LINEID
+     *
+     * @mbg.generated
+     */
+    public String getLineid() {
+        return lineid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.LINEID
+     *
+     * @param lineid the value for DAYLYGRADEASSESSMENTMAIN2.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 DAYLYGRADEASSESSMENTMAIN2.RECORDDATE
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.RECORDDATE
+     *
+     * @mbg.generated
+     */
+    public Date getRecorddate() {
+        return recorddate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.RECORDDATE
+     *
+     * @param recorddate the value for DAYLYGRADEASSESSMENTMAIN2.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 DAYLYGRADEASSESSMENTMAIN2.SCORE
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.SCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.SCORE
+     *
+     * @param score the value for DAYLYGRADEASSESSMENTMAIN2.SCORE
+     *
+     * @mbg.generated
+     */
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.PLEVEL
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.PLEVEL
+     *
+     * @mbg.generated
+     */
+    public String getPlevel() {
+        return plevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.PLEVEL
+     *
+     * @param plevel the value for DAYLYGRADEASSESSMENTMAIN2.PLEVEL
+     *
+     * @mbg.generated
+     */
+    public void setPlevel(String plevel) {
+        this.plevel = plevel == null ? null : plevel.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.STATE
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.STATE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.STATE
+     *
+     * @param state the value for DAYLYGRADEASSESSMENTMAIN2.STATE
+     *
+     * @mbg.generated
+     */
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.MODSCORE
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.MODSCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getModscore() {
+        return modscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.MODSCORE
+     *
+     * @param modscore the value for DAYLYGRADEASSESSMENTMAIN2.MODSCORE
+     *
+     * @mbg.generated
+     */
+    public void setModscore(BigDecimal modscore) {
+        this.modscore = modscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.MODLEVEL
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.MODLEVEL
+     *
+     * @mbg.generated
+     */
+    public String getModlevel() {
+        return modlevel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.MODLEVEL
+     *
+     * @param modlevel the value for DAYLYGRADEASSESSMENTMAIN2.MODLEVEL
+     *
+     * @mbg.generated
+     */
+    public void setModlevel(String modlevel) {
+        this.modlevel = modlevel == null ? null : modlevel.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.TOTALSCORE
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.TOTALSCORE
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTotalscore() {
+        return totalscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.TOTALSCORE
+     *
+     * @param totalscore the value for DAYLYGRADEASSESSMENTMAIN2.TOTALSCORE
+     *
+     * @mbg.generated
+     */
+    public void setTotalscore(BigDecimal totalscore) {
+        this.totalscore = totalscore;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column DAYLYGRADEASSESSMENTMAIN2.TID
+     *
+     * @return the value of DAYLYGRADEASSESSMENTMAIN2.TID
+     *
+     * @mbg.generated
+     */
+    public String getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column DAYLYGRADEASSESSMENTMAIN2.TID
+     *
+     * @param tid the value for DAYLYGRADEASSESSMENTMAIN2.TID
+     *
+     * @mbg.generated
+     */
+    public void setTid(String tid) {
+        this.tid = tid == null ? null : tid.trim();
+    }
+}

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

@@ -0,0 +1,70 @@
+package com.gyee.frame.model.custom;
+
+public class ValueVo {
+	private String name;
+	private String value;
+	private Double data1;
+
+	private String warningId;
+	private String shutdowneventId;
+	private String wpId;
+	private String wtId;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Double getData1() {
+		return data1;
+	}
+
+	public void setData1(Double data1) {
+		this.data1 = data1;
+	}
+
+	public String getWarningId() {
+		return warningId;
+	}
+
+	public void setWarningId(String warningId) {
+		this.warningId = warningId;
+	}
+
+	public String getShutdowneventId() {
+		return shutdowneventId;
+	}
+
+	public void setShutdowneventId(String shutdowneventId) {
+		this.shutdowneventId = shutdowneventId;
+	}
+
+	public String getWpId() {
+		return wpId;
+	}
+
+	public void setWpId(String wpId) {
+		this.wpId = wpId;
+	}
+
+	public String getWtId() {
+		return wtId;
+	}
+
+	public void setWtId(String wtId) {
+		this.wtId = wtId;
+	}
+
+	
+}

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

@@ -0,0 +1,124 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Daylygradeassessmentmain2Mapper;
+import com.gyee.frame.model.auto.Daylygradeassessmentmain2;
+import com.gyee.frame.model.auto.Daylygradeassessmentmain2Example;
+import com.gyee.frame.model.custom.Tablepar;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *  Daylygradeassessmentmain2Service
+ * @Title: Daylygradeassessmentmain2Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-17 14:18:03  
+ **/
+@Service
+public class Daylygradeassessmentmain2Service implements BaseService<Daylygradeassessmentmain2, Daylygradeassessmentmain2Example>{
+	@Resource
+	private Daylygradeassessmentmain2Mapper daylygradeassessmentmain2Mapper;
+
+      	   	      	      	      	      	
+	/**
+	 * 分页查询
+	 * @return
+	 */
+	 public PageInfo<Daylygradeassessmentmain2> list(Tablepar tablepar,String name){
+	        Daylygradeassessmentmain2Example testExample=new Daylygradeassessmentmain2Example();
+	        testExample.setOrderByClause("id ASC");
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Daylygradeassessmentmain2> list= daylygradeassessmentmain2Mapper.selectByExample(testExample);
+	        PageInfo<Daylygradeassessmentmain2> pageInfo = new PageInfo<Daylygradeassessmentmain2>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<String> lista=Convert.toListStrArray(ids);
+			Daylygradeassessmentmain2Example example=new Daylygradeassessmentmain2Example();
+			example.createCriteria().andIdIn(lista);
+			return daylygradeassessmentmain2Mapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Daylygradeassessmentmain2 selectByPrimaryKey(String id) {
+				
+			return daylygradeassessmentmain2Mapper.selectByPrimaryKey(id);
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Daylygradeassessmentmain2 record) {
+		return daylygradeassessmentmain2Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Daylygradeassessmentmain2 record) {
+				
+
+		return daylygradeassessmentmain2Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Daylygradeassessmentmain2 record, Daylygradeassessmentmain2Example example) {
+		
+		return daylygradeassessmentmain2Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Daylygradeassessmentmain2 record, Daylygradeassessmentmain2Example example) {
+		
+		return daylygradeassessmentmain2Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Daylygradeassessmentmain2> selectByExample(Daylygradeassessmentmain2Example example) {
+		
+		return daylygradeassessmentmain2Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Daylygradeassessmentmain2Example example) {
+		
+		return daylygradeassessmentmain2Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Daylygradeassessmentmain2Example example) {
+		
+		return daylygradeassessmentmain2Mapper.deleteByExample(example);
+	}
+
+
+
+//	public List<Daylygradeassessmentmain2> queryDaylygradeassessmentmain2ByUserId(String userid){
+//
+//		return daylygradeassessmentmain2Mapper.queryDaylygradeassessmentmain2ByUserId(userid);
+//	}
+
+
+
+
+}

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

@@ -6,6 +6,8 @@ import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.mapper.auto.WindpowerinfodayMapper;
 import com.gyee.frame.model.auto.Windpowerinfoday;
 import com.gyee.frame.model.auto.WindpowerinfodayExample;
+import com.gyee.frame.model.auto.Windturbineinfodaytop;
+import com.gyee.frame.model.auto.WindturbineinfodaytopExample;
 import com.gyee.frame.model.custom.Tablepar;
 import com.gyee.frame.netty.websocket.util.SocketToolService;
 import com.gyee.frame.util.DateUtils;

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

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.gyee.frame.common.base.BaseService;
 import com.gyee.frame.mapper.auto.WindturbineinfodayMapper;
+import com.gyee.frame.model.auto.Windpowerinfoday;
+import com.gyee.frame.model.auto.WindpowerinfodayExample;
 import com.gyee.frame.model.auto.Windturbineinfoday;
 import com.gyee.frame.model.auto.WindturbineinfodayExample;
 import com.gyee.frame.model.custom.Tablepar;
@@ -177,6 +179,38 @@ public class WindturbineinfodayService extends SocketToolService implements Base
 	}
 
 
+	public List<Windturbineinfoday> querywindturbineinfodayByWp(String windfarm, Date recorddate){
 
+		WindturbineinfodayExample example=new WindturbineinfodayExample();
+		example.createCriteria().andWindpowerstationidEqualTo(windfarm).andRecorddateEqualTo(recorddate);
+		List<Windturbineinfoday> ls=windturbineinfodayMapper.selectByExample(example);
+
+		return  ls;
+	}
+
+	public List<Windturbineinfoday> querywindturbineinfodayByWt(String wtId, Date recorddate){
+
+		WindturbineinfodayExample example=new WindturbineinfodayExample();
+		example.createCriteria().andWindturbineidEqualTo(wtId).andRecorddateEqualTo(recorddate);
+		List<Windturbineinfoday> ls=windturbineinfodayMapper.selectByExample(example);
+
+		return  ls;
+	}
 
+	public List<Windturbineinfoday> querywindturbineinfodayByWt(String wtId, Date beginDate,Date endDate){
+
+		WindturbineinfodayExample example=new WindturbineinfodayExample();
+		example.createCriteria().andWindturbineidEqualTo(wtId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		List<Windturbineinfoday> ls=windturbineinfodayMapper.selectByExample(example);
+
+		return  ls;
+	}
+	public List<Windturbineinfoday> querywindturbineinfodayByWp(String wpId, Date beginDate,Date endDate){
+
+		WindturbineinfodayExample example=new WindturbineinfodayExample();
+		example.createCriteria().andWindpowerstationidEqualTo(wpId).andRecorddateGreaterThanOrEqualTo(beginDate).andRecorddateLessThanOrEqualTo(endDate);
+		List<Windturbineinfoday> ls=windturbineinfodayMapper.selectByExample(example);
+
+		return  ls;
+	}
 }

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

@@ -0,0 +1,667 @@
+package com.gyee.frame.service;
+
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.common.spring.InitialRunner;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.Windturbineinfodaytop2Mapper;
+import com.gyee.frame.model.auto.*;
+import com.gyee.frame.model.custom.ValueVo;
+import com.gyee.frame.util.DateUtils;
+import com.gyee.frame.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ *  Windturbineinfodaytop2Service
+ * @Title: Windturbineinfodaytop2Service.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-17 14:18:03  
+ **/
+@Service
+public class Windturbineinfodaytop2Service implements BaseService<Windturbineinfodaytop2, Windturbineinfodaytop2Example>{
+	@Resource
+	private Windturbineinfodaytop2Mapper windturbineinfodaytop2Mapper;
+	@Resource
+	private Daylygradeassessmentmain2Service daylygradeassessmentmain2Service;
+	@Resource
+	private WindturbineinfodayService windturbineinfodayService;
+      	   	      	      	      	      	
+
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+
+			return 0;
+			
+				
+	}
+
+
+	@Override
+	public Windturbineinfodaytop2 selectByPrimaryKey(String id) {
+				
+			return windturbineinfodaytop2Mapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Windturbineinfodaytop2 record) {
+		return windturbineinfodaytop2Mapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windturbineinfodaytop2 record) {
+				
+
+		return windturbineinfodaytop2Mapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Windturbineinfodaytop2 record, Windturbineinfodaytop2Example example) {
+		
+		return windturbineinfodaytop2Mapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Windturbineinfodaytop2 record, Windturbineinfodaytop2Example example) {
+		
+		return windturbineinfodaytop2Mapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windturbineinfodaytop2> selectByExample(Windturbineinfodaytop2Example example) {
+		
+		return windturbineinfodaytop2Mapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(Windturbineinfodaytop2Example example) {
+		
+		return windturbineinfodaytop2Mapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(Windturbineinfodaytop2Example example) {
+		
+		return windturbineinfodaytop2Mapper.deleteByExample(example);
+	}
+
+
+
+	public AjaxResult gadaylist(String windfarm, Date recorddate){
+
+		Windturbineinfodaytop2Example example=new Windturbineinfodaytop2Example();
+		example.createCriteria().andWindpowerstationidEqualTo(windfarm).andTypeEqualTo(1).andRecorddateEqualTo(recorddate);
+		example.setOrderByClause("rank ASC");
+		List<Windturbineinfodaytop2> ls=windturbineinfodaytop2Mapper.selectByExample(example);
+
+		List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWp( windfarm, recorddate);
+		Map<String, Windturbineinfoday> map = new HashMap<String, Windturbineinfoday>();
+		if (null != wtdls && !wtdls.isEmpty()) {
+			for (Windturbineinfoday wd : wtdls) {
+				map.put(wd.getWindturbineid(), wd);
+			}
+		}
+		Map<String, Windturbine> wtmap = InitialRunner.wtmap;
+
+		if (!ls.isEmpty()) {
+			for (Windturbineinfodaytop2 wtop : ls) {
+				if (wtmap.containsKey(wtop.getWindturbineid())) {
+					Windturbine wt = wtmap.get(wtop.getWindturbineid());
+					wtop.setWindturbinename(wt.getName());
+				}
+
+				if (map.containsKey(wtop.getWindturbineid())) {
+					Windturbineinfoday wt = map.get(wtop.getWindturbineid());
+					double fdl = null != wt.getGeneratingcapacity2() ? wt.getGeneratingcapacity2() : 0.0;
+					double gz = null != wt.getLossofpower2() ? wt.getLossofpower2() : 0.0;
+					double jx = null != wt.getLossofpower3() ? wt.getLossofpower3() : 0.0;
+					double qf = null != wt.getLossofpower4() ? wt.getLossofpower4() : 0.0;
+					double xd = null != wt.getLossofpower1() ? wt.getLossofpower1() : 0.0;
+					double sl1 = null != wt.getMainlossin() ? wt.getMainlossin() : 0.0;
+					double sl2 = null != wt.getFaultlossin() ? wt.getFaultlossin() : 0.0;
+					double sl3 = null != wt.getElectriclossout() ? wt.getElectriclossout() : 0.0;
+					double sl4 = null != wt.getWeatherlossout() ? wt.getWeatherlossout() : 0.0;
+
+					wtop.setDayllfdl(StringUtils.round(fdl + gz + jx + qf + xd + sl1 + sl2 + sl3 + sl4, 2));
+				}
+			}
+			return 	AjaxResult.successData(200, ls);
+		}
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+	public AjaxResult gamonthlist(String windfarm, String year,String month){
+
+
+
+		if(StringUtils.isNotEmpty(windfarm) && StringUtils.isNotEmpty(year) && StringUtils.isNotEmpty(month))
+		{
+			Windturbineinfodaytop2Example example=new Windturbineinfodaytop2Example();
+			example.createCriteria().andWindpowerstationidEqualTo(windfarm).andTypeEqualTo(2).andYearEqualTo(Integer.valueOf(year)).andMonthEqualTo(Integer.valueOf(month));
+			example.setOrderByClause("rank ASC");
+			List<Windturbineinfodaytop2> ls=windturbineinfodaytop2Mapper.selectByExample(example);
+
+
+			Calendar c = Calendar.getInstance();
+
+			c.set(Calendar.YEAR, Integer.valueOf(year));
+			c.set(Calendar.MONTH, Integer.valueOf(month) - 1);
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY, 0);
+			c.set(Calendar.MINUTE, 0);
+			c.set(Calendar.SECOND, 0);
+			c.set(Calendar.MILLISECOND, 0);
+
+			Date beginDate=c.getTime();
+			c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+			Date endDate=c.getTime();
+			List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWp( windfarm, beginDate,endDate);
+
+
+			if (!wtdls.isEmpty()) {
+
+
+				Map<String, Double> map = new HashMap<String, Double>();
+				if (null != wtdls && !wtdls.isEmpty()) {
+					for (Windturbineinfoday wt : wtdls) {
+						if (map.containsKey(wt.getWindturbineid())) {
+							double result = map.get(wt.getWindturbineid());
+							result = result + getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						} else {
+							double result = getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						}
+
+					}
+				}
+				for (Windturbineinfodaytop2 w : ls) {
+					if (map.containsKey(w.getWindturbineid())) {
+						double llfdl = map.get(w.getWindturbineid());
+						w.setDayllfdl(StringUtils.round(llfdl, 2));
+					}
+				}
+				return 	AjaxResult.successData(200, ls);
+
+			}
+
+		}
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+
+	public AjaxResult gayearlist(String windfarm, String year){
+
+
+
+		if(StringUtils.isNotEmpty(windfarm) && StringUtils.isNotEmpty(year) )
+		{
+			Windturbineinfodaytop2Example example=new Windturbineinfodaytop2Example();
+			example.createCriteria().andWindpowerstationidEqualTo(windfarm).andTypeEqualTo(3).andYearEqualTo(Integer.valueOf(year));
+			example.setOrderByClause("rank ASC");
+			List<Windturbineinfodaytop2> ls=windturbineinfodaytop2Mapper.selectByExample(example);
+
+
+			Calendar c = Calendar.getInstance();
+
+			c.set(Calendar.YEAR, Integer.valueOf(year));
+
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY, 0);
+			c.set(Calendar.MINUTE, 0);
+			c.set(Calendar.SECOND, 0);
+			c.set(Calendar.MILLISECOND, 0);
+
+			Date beginDate=c.getTime();
+			c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_YEAR));
+			Date endDate=c.getTime();
+			List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWp( windfarm, beginDate,endDate);
+
+
+			if (!wtdls.isEmpty()) {
+
+
+				Map<String, Double> map = new HashMap<String, Double>();
+				if (null != wtdls && !wtdls.isEmpty()) {
+					for (Windturbineinfoday wt : wtdls) {
+						if (map.containsKey(wt.getWindturbineid())) {
+							double result = map.get(wt.getWindturbineid());
+							result = result + getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						} else {
+							double result = getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						}
+
+					}
+				}
+				for (Windturbineinfodaytop2 w : ls) {
+					if (map.containsKey(w.getWindturbineid())) {
+						double llfdl = map.get(w.getWindturbineid());
+						w.setDayllfdl(StringUtils.round(llfdl, 2));
+					}
+				}
+
+				return 	AjaxResult.successData(200, ls);
+
+			}
+
+		}
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+	private double getllfdlValue(Windturbineinfoday wt) {
+		double fdl = null != wt.getGeneratingcapacity2() ? wt.getGeneratingcapacity2() : 0.0;
+		double gz = null != wt.getLossofpower2() ? wt.getLossofpower2() : 0.0;
+		double jx = null != wt.getLossofpower3() ? wt.getLossofpower3() : 0.0;
+		double qf = null != wt.getLossofpower4() ? wt.getLossofpower4() : 0.0;
+		double xd = null != wt.getLossofpower1() ? wt.getLossofpower1() : 0.0;
+		double sl1 = null != wt.getMainlossin() ? wt.getMainlossin() : 0.0;
+		double sl2 = null != wt.getFaultlossin() ? wt.getFaultlossin() : 0.0;
+		double sl3 = null != wt.getElectriclossout() ? wt.getElectriclossout() : 0.0;
+		double sl4 = null != wt.getWeatherlossout() ? wt.getWeatherlossout() : 0.0;
+		return StringUtils.round(fdl + gz + jx + qf + xd + sl1 + sl2 + sl3 + sl4, 2);
+	}
+
+
+
+	public AjaxResult wtdayinfo(String gaid){
+
+		if (StringUtils.isNotEmpty(gaid)) {
+
+			Map<String, String> resultmap = new HashMap<String, String>();
+
+			Windturbineinfodaytop2 wtd =windturbineinfodaytop2Mapper.selectByPrimaryKey(Integer.valueOf(gaid));
+
+			getWtTop2Map(resultmap, wtd);
+
+			List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWp( wtd.getWindturbineid(), wtd.getRecorddate());
+
+			if (null != wtdls && !wtdls.isEmpty()) {
+				Windturbineinfoday wt = wtdls.get(0);
+
+				double fdl = null != wt.getGeneratingcapacity2() ? wt.getGeneratingcapacity2() : 0.0;
+				double gz = null != wt.getLossofpower2() ? wt.getLossofpower2() : 0.0;
+				double jx = null != wt.getLossofpower3() ? wt.getLossofpower3() : 0.0;
+				double qf = null != wt.getLossofpower4() ? wt.getLossofpower4() : 0.0;
+				double xd = null != wt.getLossofpower1() ? wt.getLossofpower1() : 0.0;
+				double sl1 = null != wt.getMainlossin() ? wt.getMainlossin() : 0.0;
+				double sl2 = null != wt.getFaultlossin() ? wt.getFaultlossin() : 0.0;
+				double sl3 = null != wt.getElectriclossout() ? wt.getElectriclossout() : 0.0;
+				double sl4 = null != wt.getWeatherlossout() ? wt.getWeatherlossout() : 0.0;
+
+				resultmap.put("dayllfdl", String.valueOf(StringUtils.round(fdl + gz + jx + qf + xd + sl1 + sl2 + sl3 + sl4, 2)));
+
+			}
+
+			return 	AjaxResult.successData(200, resultmap);
+		}
+
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+	public AjaxResult wtmonthinfo(String gaid){
+
+		if (StringUtils.isNotEmpty(gaid)) {
+
+			Map<String, String> resultmap = new HashMap<String, String>();
+
+			Windturbineinfodaytop2 wtd =windturbineinfodaytop2Mapper.selectByPrimaryKey(Integer.valueOf(gaid));
+
+			getWtTop2Map(resultmap, wtd);
+
+			Calendar c = Calendar.getInstance();
+
+			c.set(Calendar.YEAR, wtd.getYear());
+			c.set(Calendar.MONTH, wtd.getMonth() - 1);
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY, 0);
+			c.set(Calendar.MINUTE, 0);
+			c.set(Calendar.SECOND, 0);
+			c.set(Calendar.MILLISECOND, 0);
+
+			Date beginDate=c.getTime();
+			c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+			Date endDate=c.getTime();
+			List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWt( wtd.getWindturbineid(), beginDate,endDate);
+
+			if (null != wtdls && !wtdls.isEmpty()) {
+				Map<String, Double> map = new HashMap<String, Double>();
+				if (null != wtdls && !wtdls.isEmpty()) {
+					for (Windturbineinfoday wt : wtdls) {
+						if (map.containsKey(wt.getWindturbineid())) {
+							double result = map.get(wt.getWindturbineid());
+							result = result + getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						} else {
+							double result = getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						}
+					}
+				}
+
+				double llfdl = map.get(wtd.getWindturbineid());
+
+				resultmap.put("dayllfdl", String.valueOf(StringUtils.round(llfdl, 2)));
+
+			}
+
+			return 	AjaxResult.successData(200, resultmap);
+		}
+
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+	public AjaxResult wtyearinfo(String gaid){
+
+		if (StringUtils.isNotEmpty(gaid)) {
+
+			Map<String, String> resultmap = new HashMap<String, String>();
+
+			Windturbineinfodaytop2 wtd =windturbineinfodaytop2Mapper.selectByPrimaryKey(Integer.valueOf(gaid));
+
+			getWtTop2Map(resultmap, wtd);
+
+			Calendar c = Calendar.getInstance();
+
+			c.set(Calendar.YEAR, wtd.getYear());
+
+			c.set(Calendar.DAY_OF_MONTH, 1);
+			c.set(Calendar.HOUR_OF_DAY, 0);
+			c.set(Calendar.MINUTE, 0);
+			c.set(Calendar.SECOND, 0);
+			c.set(Calendar.MILLISECOND, 0);
+
+			Date beginDate=c.getTime();
+			c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_YEAR));
+			Date endDate=c.getTime();
+			List<Windturbineinfoday> wtdls=windturbineinfodayService.querywindturbineinfodayByWt( wtd.getWindturbineid(), beginDate,endDate);
+
+			if (null != wtdls && !wtdls.isEmpty()) {
+				Map<String, Double> map = new HashMap<String, Double>();
+				if (null != wtdls && !wtdls.isEmpty()) {
+					for (Windturbineinfoday wt : wtdls) {
+						if (map.containsKey(wt.getWindturbineid())) {
+							double result = map.get(wt.getWindturbineid());
+							result = result + getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						} else {
+							double result = getllfdlValue(wt);
+							map.put(wt.getWindturbineid(), result);
+						}
+					}
+				}
+
+				double llfdl = map.get(wtd.getWindturbineid());
+
+				resultmap.put("dayllfdl", String.valueOf(StringUtils.round(llfdl, 2)));
+
+			}
+
+			return 	AjaxResult.successData(200, resultmap);
+		}
+
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+	public List<ValueVo>  wtchart(String gaid) {
+
+
+		if (StringUtils.isNotEmpty(gaid)) {
+			List<ValueVo> vos = new ArrayList<ValueVo>();
+
+
+			Windturbineinfodaytop2 wtd =windturbineinfodaytop2Mapper.selectByPrimaryKey(Integer.valueOf(gaid));
+
+			if (null !=wtd) {
+
+
+				for (int i = 0; i < 10; i++) {
+					ValueVo vo = new ValueVo();
+
+					switch (i) {
+						case 0:
+							vo.setName("平均切入风速");
+							vo.setData1(wtd.getYearxfqr());
+							break;
+						case 1:
+							vo.setName("性能损失电量");
+							vo.setData1(wtd.getYearxnssdl());
+							break;
+						case 2:
+							vo.setName("拟合优度");
+							vo.setData1(wtd.getYearnhyd());
+							break;
+						case 3:
+							vo.setName("功率一致性系数");
+							vo.setData1(wtd.getYearglyzxxs());
+							break;
+						case 4:
+							vo.setName("利用小时");
+							vo.setData1(wtd.getYearlyxs());
+							break;
+						case 5:
+							vo.setName("设备可利用率");
+							vo.setData1(wtd.getYearsbklyl());
+							break;
+						case 6:
+							vo.setName("等效可利用系数");
+							vo.setData1(wtd.getYeardxkyxs());
+							break;
+						case 7:
+							vo.setName("有效风时数");
+							vo.setData1(wtd.getYearyxfss());
+							break;
+						case 8:
+							vo.setName("平均风速");
+							vo.setData1(wtd.getYeardxkyxs());
+							break;
+						case 9:
+							vo.setName("静风频率");
+							vo.setData1(wtd.getYeardxkyxs());
+							break;
+						default:
+							break;
+					}
+
+
+
+					vos.add(vo);
+
+				}
+			}
+
+			Map<String, Object> map = new HashMap<String, Object>();
+
+			map.put("data", vos);
+
+			return 	vos;
+
+		}
+
+		return null;
+	}
+
+
+	public AjaxResult wtchartCompare(String gaid1,String gaid2) {
+
+
+		if (StringUtils.isNotEmpty(gaid1) && StringUtils.isNotEmpty(gaid2)) {
+			List<ValueVo> vos1 = wtchart(gaid1);
+			List<ValueVo> vos2 = wtchart(gaid2);
+
+			Map<String, Object> map = new HashMap<String, Object>();
+
+			map.put("gaid1", vos1);
+			map.put("gaid2", vos2);
+			return 	AjaxResult.successData(200, map);
+
+		}
+
+		return AjaxResult.error(500, "无法获取评估信息");
+	}
+
+
+	private void getWtTop2Map(Map<String, String> resultmap, Windturbineinfodaytop2 wtd) {
+
+		Map<String, Windturbine> wtmap = InitialRunner.wtmap;
+
+		if (wtmap.containsKey(wtd.getWindturbineid())) {
+			Windturbine wt = wtmap.get(wtd.getWindturbineid());
+			resultmap.put("wtname", wt.getName());
+		}
+		resultmap.put("id", String.valueOf(wtd.getId()));
+		resultmap.put("windpowerstationid", wtd.getWindpowerstationid());
+		resultmap.put("projectid", wtd.getProjectid());
+		resultmap.put("lineid", wtd.getLineid());
+		resultmap.put("windturbineid", wtd.getWindturbineid());
+		resultmap.put("recorddate", DateUtils.toDate(wtd.getRecorddate()));
+		resultmap.put("dayfdl", String.valueOf(null != wtd.getDayfdl() ? wtd.getDayfdl() : ""));
+		resultmap.put("monthfdl", String.valueOf(null != wtd.getMonthfdl() ? wtd.getMonthfdl() : ""));
+		// resultmap.put("yearfdl",
+		// String.valueOf(null!=wtd.getYearfdl()?wtd.getYearfdl():""));
+
+		resultmap.put("yearfdl", String.valueOf(""));
+		resultmap.put("dayllfdl", String.valueOf(null != wtd.getDayllfdl() ? wtd.getDayllfdl() : ""));
+		resultmap.put("monthllfdl", String.valueOf(null != wtd.getMonthllfdl() ? wtd.getMonthllfdl() : ""));
+
+		resultmap.put("yearllfdl", String.valueOf(StringUtils.round(null != wtd.getYearllfdl() ? wtd.getYearllfdl() : 0, 0)));
+		resultmap.put("dayfs", String.valueOf(null != wtd.getDayfs() ? wtd.getDayfs() : ""));
+		resultmap.put("monthfs", String.valueOf(null != wtd.getMonthfs() ? wtd.getMonthfs() : ""));
+		// resultmap.put("yearfs",
+		// String.valueOf(null!=wtd.getYearfs()?wtd.getYearfs():""));
+		resultmap.put("yearfs", String.valueOf(StringUtils.round(null != wtd.getYearfs() ? wtd.getYearfs() : 0, 0)));
+
+		resultmap.put("daygl", String.valueOf(null != wtd.getDaygl() ? wtd.getDaygl() : ""));
+		resultmap.put("monthgl", String.valueOf(null != wtd.getMonthgl() ? wtd.getMonthgl() : ""));
+		// resultmap.put("yeargl",
+		// String.valueOf(null!=wtd.getYeargl()?wtd.getYeargl():""));
+		resultmap.put("yeargl", String.valueOf(StringUtils.round(null != wtd.getYeargl() ? wtd.getYeargl() : 0, 0)));
+
+		resultmap.put("daygzssdl", String.valueOf(null != wtd.getDaygzssdl() ? wtd.getDaygzssdl() : ""));
+		resultmap.put("monthgzssdl", String.valueOf(null != wtd.getMonthgzssdl() ? wtd.getMonthgzssdl() : ""));
+		// resultmap.put("yeargzssdl",
+		// String.valueOf(null!=wtd.getYeargzssdl()?wtd.getYeargzssdl():""));
+		resultmap.put("yeargzssdl", String.valueOf(StringUtils.round(null != wtd.getYeargzssdl() ? wtd.getYeargzssdl() : 0, 0)));
+
+		resultmap.put("dayxdssdl", String.valueOf(null != wtd.getDayxdssdl() ? wtd.getDayxdssdl() : ""));
+		resultmap.put("monthxdssdl", String.valueOf(null != wtd.getMonthxdssdl() ? wtd.getMonthxdssdl() : ""));
+		// resultmap.put("yearxdssdl",
+		// String.valueOf(null!=wtd.getYearxdssdl()?wtd.getYearxdssdl():""));
+		resultmap.put("yearxdssdl", String.valueOf(StringUtils.round(null != wtd.getYearxdssdl() ? wtd.getYearxdssdl() : 0, 0)));
+
+		resultmap.put("daywhssdl", String.valueOf(null != wtd.getDaywhssdl() ? wtd.getDaywhssdl() : ""));
+		resultmap.put("monthwhssdl", String.valueOf(null != wtd.getMonthwhssdl() ? wtd.getMonthwhssdl() : ""));
+		// resultmap.put("yearwhssdl",
+		// String.valueOf(null!=wtd.getYearwhssdl()?wtd.getYearwhssdl():""));
+		resultmap.put("yearwhssdl", String.valueOf(StringUtils.round(null != wtd.getYearwhssdl() ? wtd.getYearwhssdl() : 0, 0)));
+
+		resultmap.put("dayxnssdl", String.valueOf(null != wtd.getDayxnssdl() ? wtd.getDayxnssdl() : ""));
+		resultmap.put("monthxnssdl", String.valueOf(null != wtd.getMonthxnssdl() ? wtd.getMonthxnssdl() : ""));
+		// resultmap.put("yearxnssdl",
+		// String.valueOf(null!=wtd.getYearxnssdl()?wtd.getYearxnssdl():""));
+		resultmap.put("yearxnssdl", String.valueOf(StringUtils.round(null != wtd.getYearxnssdl() ? wtd.getYearxnssdl() : 0, 0)));
+
+		resultmap.put("daygzsj", String.valueOf(null != wtd.getDaygzsj() ? wtd.getDaygzsj() : ""));
+		resultmap.put("monthgzsj", String.valueOf(null != wtd.getMonthgzsj() ? wtd.getMonthgzsj() : ""));
+		// resultmap.put("yeargzsj",
+		// String.valueOf(null!=wtd.getYeargzsj()?wtd.getYeargzsj():""));
+		resultmap.put("yeargzsj", String.valueOf(StringUtils.round(null != wtd.getYeargzsj() ? wtd.getYeargzsj() : 0, 0)));
+
+		resultmap.put("daywhsj", String.valueOf(null != wtd.getDaywhsj() ? wtd.getDaywhsj() : ""));
+		resultmap.put("monthwhsj", String.valueOf(null != wtd.getMonthwhsj() ? wtd.getMonthwhsj() : ""));
+		// resultmap.put("yearwhsj",
+		// String.valueOf(null!=wtd.getYearwhsj()?wtd.getYearwhsj():""));
+		resultmap.put("yearwhsj", String.valueOf(StringUtils.round(null != wtd.getYearwhsj() ? wtd.getYearwhsj() : 0, 0)));
+
+		resultmap.put("dayyxsj", String.valueOf(null != wtd.getDayyxsj() ? wtd.getDayyxsj() : ""));
+		resultmap.put("monthyxsj", String.valueOf(null != wtd.getMonthyxsj() ? wtd.getMonthyxsj() : ""));
+		// resultmap.put("yearyxsj",
+		// String.valueOf(null!=wtd.getYearyxsj()?wtd.getYearyxsj():""));
+		resultmap.put("yearyxsj", String.valueOf(StringUtils.round(null != wtd.getYearyxsj() ? wtd.getYearyxsj() : 0, 0)));
+
+		resultmap.put("daytjsj", String.valueOf(null != wtd.getDaytjsj() ? wtd.getDaytjsj() : ""));
+		resultmap.put("monthtjsj", String.valueOf(null != wtd.getMonthtjsj() ? wtd.getMonthtjsj() : ""));
+		// resultmap.put("yeartjsj",
+		// String.valueOf(null!=wtd.getYeartjsj()?wtd.getYeartjsj():""));
+		resultmap.put("yeartjsj", String.valueOf(StringUtils.round(null != wtd.getYeartjsj() ? wtd.getYeartjsj() : 0, 0)));
+
+		resultmap.put("daylyxs", String.valueOf(null != wtd.getDaylyxs() ? wtd.getDaylyxs() : ""));
+		resultmap.put("monthlyxs", String.valueOf(null != wtd.getMonthlyxs() ? wtd.getMonthlyxs() : ""));
+		// resultmap.put("yearlyxs",
+		// String.valueOf(null!=wtd.getYearlyxs()?wtd.getYearlyxs():""));
+		resultmap.put("yearlyxs", String.valueOf(StringUtils.round(null != wtd.getYearlyxs() ? wtd.getYearlyxs() : 0, 0)));
+
+		resultmap.put("daynhyd", String.valueOf(null != wtd.getDaynhyd() ? wtd.getDaynhyd() : ""));
+		resultmap.put("monthnhyd", String.valueOf(null != wtd.getMonthnhyd() ? wtd.getMonthnhyd() : ""));
+		// resultmap.put("yearnhyd",
+		// String.valueOf(null!=wtd.getYearnhyd()?wtd.getYearnhyd():""));
+		resultmap.put("yearnhyd", String.valueOf(StringUtils.round(null != wtd.getYearnhyd() ? wtd.getYearnhyd() : 0, 0)));
+
+		resultmap.put("daysbklyl", String.valueOf(null != wtd.getDaysbklyl() ? wtd.getDaysbklyl() : ""));
+		resultmap.put("monthsbklyl", String.valueOf(null != wtd.getMonthsbklyl() ? wtd.getMonthsbklyl() : ""));
+		// resultmap.put("yearsbklyl",
+		// String.valueOf(null!=wtd.getYearsbklyl()?wtd.getYearsbklyl():""));
+		resultmap.put("yearsbklyl", String.valueOf(StringUtils.round(null != wtd.getYearsbklyl() ? wtd.getYearsbklyl() : 0, 0)));
+
+		resultmap.put("daydxkyxs", String.valueOf(null != wtd.getDaydxkyxs() ? wtd.getDaydxkyxs() : ""));
+		resultmap.put("monthdxkyxs", String.valueOf(null != wtd.getMonthdxkyxs() ? wtd.getMonthdxkyxs() : ""));
+		// resultmap.put("yeardxkyxs",
+		// String.valueOf(null!=wtd.getYeardxkyxs()?wtd.getYeardxkyxs():""));
+		resultmap.put("yeardxkyxs", String.valueOf(StringUtils.round(null != wtd.getYeardxkyxs() ? wtd.getYeardxkyxs() : 0, 0)));
+
+		resultmap.put("dayyxfss", String.valueOf(null != wtd.getDayyxfss() ? wtd.getDayyxfss() : ""));
+		resultmap.put("monthyxfss", String.valueOf(null != wtd.getMonthyxfss() ? wtd.getMonthyxfss() : ""));
+		// resultmap.put("yearyxfss",
+		// String.valueOf(null!=wtd.getYearyxfss()?wtd.getYearyxfss():""));
+		resultmap.put("yearyxfss", String.valueOf(StringUtils.round(null != wtd.getYearyxfss() ? wtd.getYearyxfss() : 0, 0)));
+
+		resultmap.put("dayxfqr", String.valueOf(null != wtd.getDayxfqr() ? wtd.getDayxfqr() : ""));
+		resultmap.put("monthxfqr", String.valueOf(null != wtd.getMonthxfqr() ? wtd.getMonthxfqr() : ""));
+		// resultmap.put("yearxfqr",
+		// String.valueOf(null!=wtd.getYearxfqr()?wtd.getYearxfqr():""));
+		resultmap.put("yearxfqr", String.valueOf(StringUtils.round(null != wtd.getYearxfqr() ? wtd.getYearxfqr() : 0, 0)));
+
+		resultmap.put("dayjfpl", String.valueOf(null != wtd.getDayjfpl() ? wtd.getDayjfpl() : ""));
+		resultmap.put("monthjfpl", String.valueOf(null != wtd.getMonthjfpl() ? wtd.getMonthjfpl() : ""));
+		// resultmap.put("yearjfpl",
+		// String.valueOf(null!=wtd.getYearjfpl()?wtd.getYearjfpl():""));
+		resultmap.put("yearjfpl", String.valueOf(StringUtils.round(null != wtd.getYearjfpl() ? wtd.getYearjfpl() : 0, 0)));
+
+		resultmap.put("dayglyzxxs", String.valueOf(null != wtd.getDayglyzxxs() ? wtd.getDayglyzxxs() : ""));
+		resultmap.put("monthglyzxxs", String.valueOf(null != wtd.getMonthglyzxxs() ? wtd.getMonthglyzxxs() : ""));
+		// resultmap.put("yearglyzxxs",
+		// String.valueOf(null!=wtd.getYearglyzxxs()?wtd.getYearglyzxxs():""));
+		resultmap.put("yearglyzxxs", String.valueOf(StringUtils.round(null != wtd.getYearglyzxxs() ? wtd.getYearglyzxxs() : 0, 0)));
+
+		resultmap.put("type", String.valueOf(wtd.getType()));
+		resultmap.put("rank", String.valueOf(wtd.getRank()));
+		resultmap.put("level", String.valueOf(wtd.getLevel()));
+		resultmap.put("year", String.valueOf(wtd.getYear()));
+		resultmap.put("month", String.valueOf(wtd.getMonth()));
+
+	}
+
+}

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

@@ -0,0 +1,119 @@
+package com.gyee.frame.service;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.gyee.frame.common.base.BaseService;
+import com.gyee.frame.common.support.Convert;
+import com.gyee.frame.mapper.auto.WindturbineinfodaytopMapper;
+import com.gyee.frame.model.auto.Windturbineinfodaytop;
+import com.gyee.frame.model.auto.WindturbineinfodaytopExample;
+import com.gyee.frame.model.custom.Tablepar;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *  WindturbineinfodaytopService
+ * @Title: WindturbineinfodaytopService.java 
+ * @Package com.gyee.frame.service 
+ * @author gyee_自动生成
+ * @email 1@qq.com
+ * @date 2020-04-17 14:18:03  
+ **/
+@Service
+public class WindturbineinfodaytopService implements BaseService<Windturbineinfodaytop, WindturbineinfodaytopExample>{
+	@Resource
+	private WindturbineinfodaytopMapper windturbineinfodaytopMapper;
+
+      	   	      	      	      	      	
+	/**
+	 * 分页查询
+	 * @return
+	 */
+	 public PageInfo<Windturbineinfodaytop> list(Tablepar tablepar,String name){
+	        WindturbineinfodaytopExample testExample=new WindturbineinfodaytopExample();
+	        testExample.setOrderByClause("id ASC");
+
+	        PageHelper.startPage(tablepar.getPageNum(), tablepar.getPageSize());
+	        List<Windturbineinfodaytop> list= windturbineinfodaytopMapper.selectByExample(testExample);
+	        PageInfo<Windturbineinfodaytop> pageInfo = new PageInfo<Windturbineinfodaytop>(list);
+	        return  pageInfo;
+	 }
+
+	@Override
+	public int deleteByPrimaryKey(String ids) {
+				
+			List<Integer> lista=Convert.toIntArrayList(ids);
+			WindturbineinfodaytopExample example=new WindturbineinfodaytopExample();
+			example.createCriteria().andIdIn(lista);
+			return windturbineinfodaytopMapper.deleteByExample(example);
+			
+				
+	}
+	
+	
+	@Override
+	public Windturbineinfodaytop selectByPrimaryKey(String id) {
+				
+			return windturbineinfodaytopMapper.selectByPrimaryKey(Integer.valueOf(id));
+				
+	}
+
+	
+	@Override
+	public int updateByPrimaryKeySelective(Windturbineinfodaytop record) {
+		return windturbineinfodaytopMapper.updateByPrimaryKeySelective(record);
+	}
+	
+	
+	/**
+	 * 添加
+	 */
+	@Override
+	public int insertSelective(Windturbineinfodaytop record) {
+				
+
+		return windturbineinfodaytopMapper.insertSelective(record);
+	}
+	
+	
+	@Override
+	public int updateByExampleSelective(Windturbineinfodaytop record, WindturbineinfodaytopExample example) {
+		
+		return windturbineinfodaytopMapper.updateByExampleSelective(record, example);
+	}
+
+	
+	@Override
+	public int updateByExample(Windturbineinfodaytop record, WindturbineinfodaytopExample example) {
+		
+		return windturbineinfodaytopMapper.updateByExample(record, example);
+	}
+
+	@Override
+	public List<Windturbineinfodaytop> selectByExample(WindturbineinfodaytopExample example) {
+		
+		return windturbineinfodaytopMapper.selectByExample(example);
+	}
+
+	
+	@Override
+	public long countByExample(WindturbineinfodaytopExample example) {
+		
+		return windturbineinfodaytopMapper.countByExample(example);
+	}
+
+	
+	@Override
+	public int deleteByExample(WindturbineinfodaytopExample example) {
+		
+		return windturbineinfodaytopMapper.deleteByExample(example);
+	}
+
+
+
+
+
+
+}

src/main/java/com/gyee/frame/service/ticket/FileService.java

@@ -1,5 +1,6 @@
 package com.gyee.frame.service.ticket;
 
+import com.gyee.frame.common.conf.V2Config;
 import com.gyee.frame.common.exception.TicketException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
@@ -22,12 +23,12 @@ public class FileService {
 
     @Autowired
     public FileService() {
-        this.fileStorageLocation = Paths.get("D://").toAbsolutePath().normalize();
-        try {
-            Files.createDirectories(this.fileStorageLocation);
-        } catch (Exception ex) {
-
-        }
+        this.fileStorageLocation = Paths.get(V2Config.getAppUpdateUrl()).toAbsolutePath().normalize();
+//        try {
+//            Files.createDirectories(this.fileStorageLocation);
+//        } catch (Exception ex) {
+//
+//        }
     }
 
     /**

src/main/java/com/gyee/frame/util/DateUtils.java

@@ -238,5 +238,9 @@ public class DateUtils  extends org.apache.commons.lang3.time.DateUtils{
                 cal1.get(Calendar.MONTH) - cal2.get(Calendar.MONTH));
     }
 
+    public static String toDate(Date date) {
 
+        SimpleDateFormat df =new SimpleDateFormat("yyyy-MM-dd");
+        return df.format(date);
+    }
 }

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,74 @@
+Manifest-Version: 1.0
+Main-Class: com.gyee.SpringbootStart
+Class-Path: libs/validation-api-2.0.1.Final.jar libs/reflections-0.9.11.
+ jar libs/shiro-event-1.4.0.jar libs/snakeyaml-1.19.jar libs/spring-boot
+ -starter-web-2.0.0.RELEASE.jar libs/shiro-config-ogdl-1.4.0.jar libs/my
+ batis-plus-boot-starter-3.3.2.jar libs/spring-boot-starter-tomcat-2.0.0
+ .RELEASE.jar libs/mapstruct-1.1.0.Final.jar libs/jsqlparser-3.1.jar lib
+ s/spring-boot-starter-logging-2.0.0.RELEASE.jar libs/quartz-2.2.1.jar l
+ ibs/spring-boot-starter-2.0.0.RELEASE.jar libs/spring-webmvc-5.0.4.RELE
+ ASE.jar libs/spring-boot-configuration-processor-2.0.0.RELEASE.jar libs
+ /spring-aop-5.0.4.RELEASE.jar libs/logback-classic-1.2.3.jar libs/jacks
+ on-module-parameter-names-2.9.4.jar libs/lombok-1.18.12.jar libs/activa
+ tion-1.1.jar libs/thymeleaf-spring5-3.0.9.RELEASE.jar libs/lettuce-core
+ -5.0.2.RELEASE.jar libs/druid-spring-boot-starter-1.1.10.jar libs/log4j
+ -to-slf4j-2.10.0.jar libs/mybatis-plus-extension-3.3.2.jar libs/shiro-w
+ eb-1.4.0.jar libs/spring-jdbc-5.0.4.RELEASE.jar libs/qiniu-java-sdk-7.2
+ .29.jar libs/spring-core-5.0.4.RELEASE.jar libs/spring-plugin-core-1.2.
+ 0.RELEASE.jar libs/netty-handler-4.1.22.Final.jar libs/ojdbc6-11.2.0.3.
+ jar libs/jul-to-slf4j-1.7.25.jar libs/jboss-logging-3.3.2.Final.jar lib
+ s/shiro-cache-1.4.0.jar libs/reactive-streams-1.0.2.jar libs/shiro-core
+ -1.4.0.jar libs/spring-boot-starter-json-2.0.0.RELEASE.jar libs/commons
+ -pool2-2.5.0.jar libs/druid-1.1.10.jar libs/javax.servlet-api-3.1.0.jar
+  libs/okhttp-3.14.4.jar libs/spring-web-5.0.4.RELEASE.jar libs/javax.an
+ notation-api-1.3.2.jar libs/logback-core-1.2.3.jar libs/jackson-annotat
+ ions-2.9.0.jar libs/springfox-swagger2-2.7.0.jar libs/shiro-crypto-core
+ -1.4.0.jar libs/mail-1.4.7.jar libs/netty-common-4.1.22.Final.jar libs/
+ commons-io-2.5.jar libs/spring-tx-5.0.4.RELEASE.jar libs/kaptcha-2.3.2.
+ jar libs/netty-transport-4.1.22.Final.jar libs/sqljdbc42.jar libs/commo
+ ns-collections-3.2.1.jar libs/spring-data-redis-2.0.5.RELEASE.jar libs/
+ shiro-spring-1.4.0.jar libs/commons-codec-1.9.jar libs/shiro-config-cor
+ e-1.4.0.jar libs/thymeleaf-extras-shiro-2.0.0.jar libs/guava-18.0.jar l
+ ibs/mybatis-3.5.4.jar libs/spring-boot-devtools-2.0.0.RELEASE.jar libs/
+ springfox-core-2.7.0.jar libs/reactor-core-3.1.5.RELEASE.jar libs/mybat
+ is-plus-generator-3.3.2.jar libs/commons-fileupload-1.3.3.jar libs/java
+ ssist-3.21.0-GA.jar libs/jackson-datatype-jdk8-2.9.4.jar libs/springfox
+ -swagger-common-2.7.0.jar libs/unbescape-1.1.5.RELEASE.jar libs/spring-
+ messaging-5.0.4.RELEASE.jar libs/tomcat-embed-core-9.0.35.jar libs/c3p0
+ -0.9.1.1.jar libs/gson-2.8.2.jar libs/spring-oxm-5.0.4.RELEASE.jar libs
+ /mybatis-plus-core-3.3.2.jar libs/slf4j-api-1.7.25.jar libs/jedis-2.9.0
+ .jar libs/classmate-1.3.4.jar libs/spring-data-keyvalue-2.0.5.RELEASE.j
+ ar libs/mysql-connector-java-5.1.40.jar libs/netty-all-4.1.36.Final.jar
+  libs/jacob-1.18.jar libs/mybatis-spring-boot-autoconfigure-1.3.2.jar l
+ ibs/hibernate-validator-6.0.7.Final.jar libs/spring-context-5.0.4.RELEA
+ SE.jar libs/filters-2.0.235-1.jar libs/springfox-spi-2.7.0.jar libs/net
+ ty-resolver-4.1.22.Final.jar libs/mybatis-plus-3.3.2.jar libs/spring-be
+ ans-5.0.4.RELEASE.jar libs/spring-boot-starter-aop-2.0.0.RELEASE.jar li
+ bs/commons-lang-2.4.jar libs/commons-lang3-3.7.jar libs/jackson-datatyp
+ e-jsr310-2.9.4.jar libs/okio-1.17.2.jar libs/spring-websocket-5.0.4.REL
+ EASE.jar libs/spring-boot-2.0.0.RELEASE.jar libs/mongo-java-driver-3.10
+ .2.jar libs/thymeleaf-3.0.9.RELEASE.jar libs/thymeleaf-extras-java8time
+ -3.0.1.RELEASE.jar libs/tomcat-embed-el-9.0.35.jar libs/swagger-models-
+ 1.5.13.jar libs/mybatis-spring-boot-starter-1.3.2.jar libs/shiro-lang-1
+ .4.0.jar libs/fastjson-1.2.17.jar libs/velocity-1.7.jar libs/tomcat-emb
+ ed-websocket-9.0.35.jar libs/log4j-api-2.10.0.jar libs/mybatis-plus-ann
+ otation-3.3.2.jar libs/spring-expression-5.0.4.RELEASE.jar libs/HikariC
+ P-2.7.8.jar libs/pagehelper-spring-boot-starter-1.2.5.jar libs/pagehelp
+ er-5.1.4.jar libs/jackson-core-2.9.4.jar libs/shiro-crypto-hash-1.4.0.j
+ ar libs/springfox-schema-2.7.0.jar libs/attoparser-2.0.4.RELEASE.jar li
+ bs/spring-boot-autoconfigure-2.0.0.RELEASE.jar libs/commons-logging-1.1
+ .1.jar libs/netty-buffer-4.1.22.Final.jar libs/thumbnailator-0.4.2-all.
+ jar libs/spring-jcl-5.0.4.RELEASE.jar libs/tomcat-annotations-api-9.0.3
+ 5.jar libs/netty-codec-4.1.22.Final.jar libs/spring-plugin-metadata-1.2
+ .0.RELEASE.jar libs/pagehelper-spring-boot-autoconfigure-1.2.5.jar libs
+ /mybatis-spring-2.0.4.jar libs/spring-boot-starter-thymeleaf-2.0.0.RELE
+ ASE.jar libs/shiro-crypto-cipher-1.4.0.jar libs/hutool-all-4.1.12.jar l
+ ibs/aspectjweaver-1.8.13.jar libs/ueditor-1.1.2.jar libs/tomcat-juli-9.
+ 0.35.jar libs/spring-data-commons-2.0.5.RELEASE.jar libs/commons-config
+ uration-1.10.jar libs/springfox-spring-web-2.7.0.jar libs/spring-contex
+ t-support-5.0.4.RELEASE.jar libs/jackson-databind-2.9.4.jar libs/spring
+ -boot-starter-websocket-2.0.0.RELEASE.jar libs/spring-boot-starter-data
+ -redis-2.0.0.RELEASE.jar libs/byte-buddy-1.7.10.jar libs/springfox-swag
+ ger-ui-2.7.0.jar libs/spring-boot-starter-jdbc-2.0.0.RELEASE.jar libs/s
+ wagger-annotations-1.5.13.jar libs/commons-beanutils-1.9.3.jar
+

src/main/resources/application.yml

@@ -27,6 +27,9 @@ gyee:
   rollVerification: true
   #实时数据库
   realtimedataBase: golden
+  #app升级路径
+  appUpdateUrl: /root/Public/apk_ipa_download/webapps/ROOT/
+
 #tomcat websocket
 server :
   port : 9988

src/main/resources/mybatis-generator.xml

@@ -38,6 +38,11 @@
             <property name="javaFormatter" value="org.mybatis.generator.api.dom.DefaultJavaFormatter"/>
             <!-- 格式化XML代码 -->
             <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
+            <!-- 自动识别数据库关键字，默认false -->
+            <property name="autoDelimitKeywords" value="true" />
+            <!--可以使用``包括字段名，避免字段名与sql保留字冲突报错 -->
+            <property name="beginningDelimiter" value="`" />
+            <property name="endingDelimiter" value="`" />
         </commentGenerator>
         <!-- 数据库链接地址账号密码 -->
         <jdbcConnection
@@ -90,7 +95,9 @@
             <generatedKey column="id" sqlStatement="Mysql" identity="true"/>
         </table>-->
         
-        <table tableName='windturbinepowercurvefitting' domainObjectName='Windturbinepowercurvefitting'/>
+        <table tableName='windturbineinfodaytop2' domainObjectName='Windturbineinfodaytop2'/>
+        <table tableName='daylygradeassessmentmain2' domainObjectName='Daylygradeassessmentmain2'/>
+
 
     </context>
 </generatorConfiguration>

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

@@ -0,0 +1,398 @@
+<?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.Daylygradeassessmentmain2Mapper">
+  <resultMap id="BaseResultMap" type="com.gyee.frame.model.auto.Daylygradeassessmentmain2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="WTID" jdbcType="VARCHAR" property="wtid" />
+    <result column="WPID" jdbcType="VARCHAR" property="wpid" />
+    <result column="PROJECTID" jdbcType="VARCHAR" property="projectid" />
+    <result column="LINEID" jdbcType="VARCHAR" property="lineid" />
+    <result column="RECORDDATE" jdbcType="TIMESTAMP" property="recorddate" />
+    <result column="SCORE" jdbcType="DECIMAL" property="score" />
+    <result column="PLEVEL" jdbcType="VARCHAR" property="plevel" />
+    <result column="STATE" jdbcType="DECIMAL" property="state" />
+    <result column="MODSCORE" jdbcType="DECIMAL" property="modscore" />
+    <result column="MODLEVEL" jdbcType="VARCHAR" property="modlevel" />
+    <result column="TOTALSCORE" jdbcType="DECIMAL" property="totalscore" />
+    <result column="TID" jdbcType="VARCHAR" property="tid" />
+  </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, WTID, WPID, PROJECTID, LINEID, RECORDDATE, SCORE, PLEVEL, STATE, MODSCORE, MODLEVEL, 
+    TOTALSCORE, TID
+  </sql>
+  <select id="selectByExample" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2Example" 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 DAYLYGRADEASSESSMENTMAIN2
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from DAYLYGRADEASSESSMENTMAIN2
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from DAYLYGRADEASSESSMENTMAIN2
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from DAYLYGRADEASSESSMENTMAIN2
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into DAYLYGRADEASSESSMENTMAIN2 (ID, WTID, WPID, 
+      PROJECTID, LINEID, RECORDDATE, 
+      SCORE, PLEVEL, STATE, 
+      MODSCORE, MODLEVEL, TOTALSCORE, 
+      TID)
+    values (#{id,jdbcType=VARCHAR}, #{wtid,jdbcType=VARCHAR}, #{wpid,jdbcType=VARCHAR}, 
+      #{projectid,jdbcType=VARCHAR}, #{lineid,jdbcType=VARCHAR}, #{recorddate,jdbcType=TIMESTAMP}, 
+      #{score,jdbcType=DECIMAL}, #{plevel,jdbcType=VARCHAR}, #{state,jdbcType=DECIMAL}, 
+      #{modscore,jdbcType=DECIMAL}, #{modlevel,jdbcType=VARCHAR}, #{totalscore,jdbcType=DECIMAL}, 
+      #{tid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into DAYLYGRADEASSESSMENTMAIN2
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="wtid != null">
+        WTID,
+      </if>
+      <if test="wpid != null">
+        WPID,
+      </if>
+      <if test="projectid != null">
+        PROJECTID,
+      </if>
+      <if test="lineid != null">
+        LINEID,
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE,
+      </if>
+      <if test="score != null">
+        SCORE,
+      </if>
+      <if test="plevel != null">
+        PLEVEL,
+      </if>
+      <if test="state != null">
+        STATE,
+      </if>
+      <if test="modscore != null">
+        MODSCORE,
+      </if>
+      <if test="modlevel != null">
+        MODLEVEL,
+      </if>
+      <if test="totalscore != null">
+        TOTALSCORE,
+      </if>
+      <if test="tid != null">
+        TID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="wtid != null">
+        #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wpid != null">
+        #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="plevel != null">
+        #{plevel,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=DECIMAL},
+      </if>
+      <if test="modscore != null">
+        #{modscore,jdbcType=DECIMAL},
+      </if>
+      <if test="modlevel != null">
+        #{modlevel,jdbcType=VARCHAR},
+      </if>
+      <if test="totalscore != null">
+        #{totalscore,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from DAYLYGRADEASSESSMENTMAIN2
+    <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 DAYLYGRADEASSESSMENTMAIN2
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtid != null">
+        WTID = #{record.wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wpid != null">
+        WPID = #{record.wpid,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.recorddate != null">
+        RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.score != null">
+        SCORE = #{record.score,jdbcType=DECIMAL},
+      </if>
+      <if test="record.plevel != null">
+        PLEVEL = #{record.plevel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        STATE = #{record.state,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modscore != null">
+        MODSCORE = #{record.modscore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.modlevel != null">
+        MODLEVEL = #{record.modlevel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.totalscore != null">
+        TOTALSCORE = #{record.totalscore,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tid != null">
+        TID = #{record.tid,jdbcType=VARCHAR},
+      </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 DAYLYGRADEASSESSMENTMAIN2
+    set ID = #{record.id,jdbcType=VARCHAR},
+      WTID = #{record.wtid,jdbcType=VARCHAR},
+      WPID = #{record.wpid,jdbcType=VARCHAR},
+      PROJECTID = #{record.projectid,jdbcType=VARCHAR},
+      LINEID = #{record.lineid,jdbcType=VARCHAR},
+      RECORDDATE = #{record.recorddate,jdbcType=TIMESTAMP},
+      SCORE = #{record.score,jdbcType=DECIMAL},
+      PLEVEL = #{record.plevel,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=DECIMAL},
+      MODSCORE = #{record.modscore,jdbcType=DECIMAL},
+      MODLEVEL = #{record.modlevel,jdbcType=VARCHAR},
+      TOTALSCORE = #{record.totalscore,jdbcType=DECIMAL},
+      TID = #{record.tid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update DAYLYGRADEASSESSMENTMAIN2
+    <set>
+      <if test="wtid != null">
+        WTID = #{wtid,jdbcType=VARCHAR},
+      </if>
+      <if test="wpid != null">
+        WPID = #{wpid,jdbcType=VARCHAR},
+      </if>
+      <if test="projectid != null">
+        PROJECTID = #{projectid,jdbcType=VARCHAR},
+      </if>
+      <if test="lineid != null">
+        LINEID = #{lineid,jdbcType=VARCHAR},
+      </if>
+      <if test="recorddate != null">
+        RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="score != null">
+        SCORE = #{score,jdbcType=DECIMAL},
+      </if>
+      <if test="plevel != null">
+        PLEVEL = #{plevel,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        STATE = #{state,jdbcType=DECIMAL},
+      </if>
+      <if test="modscore != null">
+        MODSCORE = #{modscore,jdbcType=DECIMAL},
+      </if>
+      <if test="modlevel != null">
+        MODLEVEL = #{modlevel,jdbcType=VARCHAR},
+      </if>
+      <if test="totalscore != null">
+        TOTALSCORE = #{totalscore,jdbcType=DECIMAL},
+      </if>
+      <if test="tid != null">
+        TID = #{tid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gyee.frame.model.auto.Daylygradeassessmentmain2">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update DAYLYGRADEASSESSMENTMAIN2
+    set WTID = #{wtid,jdbcType=VARCHAR},
+      WPID = #{wpid,jdbcType=VARCHAR},
+      PROJECTID = #{projectid,jdbcType=VARCHAR},
+      LINEID = #{lineid,jdbcType=VARCHAR},
+      RECORDDATE = #{recorddate,jdbcType=TIMESTAMP},
+      SCORE = #{score,jdbcType=DECIMAL},
+      PLEVEL = #{plevel,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=DECIMAL},
+      MODSCORE = #{modscore,jdbcType=DECIMAL},
+      MODLEVEL = #{modlevel,jdbcType=VARCHAR},
+      TOTALSCORE = #{totalscore,jdbcType=DECIMAL},
+      TID = #{tid,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

src/test/java/test/RelationalDataBaseTest.java

@@ -1,11 +1,9 @@
 package test;
 
 import com.gyee.SpringbootStart;
+import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
-import com.gyee.frame.model.auto.Windpowerinfoday;
-import com.gyee.frame.model.auto.Windturbineinfoday;
-import com.gyee.frame.service.WindpowerinfodayService;
-import com.gyee.frame.service.WindturbineinfodayService;
+import com.gyee.frame.service.Windturbineinfodaytop2Service;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
@@ -18,22 +16,43 @@ public class RelationalDataBaseTest {
 
         SpringApplication.run(SpringbootStart.class, args);
 
-        WindturbineinfodayService windturbineinfodayService = SpringUtils.getBean("windturbineinfodayService");
-        WindpowerinfodayService windpowerinfodayService = SpringUtils.getBean("windpowerinfodayService");
+        Windturbineinfodaytop2Service windturbineinfodaytop2Service = SpringUtils.getBean("windturbineinfodaytop2Service");
+
 
-//        LineExample lineExample=new LineExample();
-//
-//        List<Line> ls=lineService.selectByExample(lineExample);
 
         Calendar c = Calendar.getInstance();
 
         c.set(Calendar.HOUR_OF_DAY, 0);
         c.set(Calendar.MINUTE, 0);
         c.set(Calendar.SECOND, 0);
-
-        Windturbineinfoday wt=windturbineinfodayService.findListByDate("MG01_01",c.getTime());
-        Windpowerinfoday wp=windpowerinfodayService.findListByDate("MHS_FDC",c.getTime());
-
+        c.set(Calendar.MILLISECOND, 0);
+        c.add(Calendar.DAY_OF_MONTH,-2);
+
+        AjaxResult result1=windturbineinfodaytop2Service.gamonthlist("MHS_FDC","2020","10");
+
+            if (null!=result1)
+            {
+                System.out.println(result1.get("data"));
+            }
+
+
+        AjaxResult result2=windturbineinfodaytop2Service.gayearlist("MHS_FDC","2020");
+
+        if (null!=result2)
+        {
+            System.out.println(result2.get("data"));
+        }
+
+        AjaxResult result3=windturbineinfodaytop2Service.wtmonthinfo("1263975");
+        if (null!=result3)
+        {
+            System.out.println(result3.get("data"));
+        }
+        AjaxResult result4=windturbineinfodaytop2Service.wtyearinfo("1151990");
+        if (null!=result4)
+        {
+            System.out.println(result4.get("data"));
+        }
         //System.out.println(wt.getRecorddate()+ "___" +wt.getGeneratingcapacity2());
         //System.out.println(wp.getRecorddate()+ "___" +wp.getDaylyxs());