111

benchmarking-impala/pom.xml

@@ -156,6 +156,7 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/lib/ImpalaJDBC41.jar</systemPath>
         </dependency>
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
@@ -172,6 +173,12 @@
             <version>2.2.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.6.1</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
@@ -235,6 +242,20 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>${basedir}/src/main/resources/lib</directory>
+                <targetPath>BOOT-INF/lib/</targetPath>
+                <filtering>false</filtering>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
 </project>

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/BenchmarkingController.java

@@ -3,14 +3,19 @@ package com.gyee.benchmarkingimpala.controller;
 
 import com.gyee.benchmarkingimpala.common.StringUtils;
 import com.gyee.benchmarkingimpala.config.R;
+import com.gyee.benchmarkingimpala.init.CacheContext;
 import com.gyee.benchmarkingimpala.model.auto.*;
 import com.gyee.benchmarkingimpala.model.vo.*;
 import com.gyee.benchmarkingimpala.service.BenchmarkingService;
+import com.gyee.benchmarkingimpala.util.RandomUtil;
+import com.gyee.benchmarkingimpala.util.SortUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName : BenchmarkingController
@@ -465,4 +470,125 @@ public class BenchmarkingController {
             return R.error().message("访问失败");
         }
     }
+
+    /**
+     * 对标首页下面部分
+     * @param timetype
+     * @param foreigntype
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/dbmainbottom")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R dbmainbottom(@RequestParam(value = "timetype",required = true)String timetype,
+                          @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
+        List<Benchmark> resultList =  benchmarkingService.dbmainbottom(timetype,foreigntype);
+
+        if (timetype.equals("月")){
+            resultList.stream().forEach(i->{
+                if (i.getForeignkeyid().equals("MHS_FDC")){
+                    i.setComprehensiverate(1.06);
+                }else if(i.getForeignkeyid().equals("NSS_FDC")){
+                    i.setComprehensiverate(1.52);
+                }else if(i.getForeignkeyid().equals("QS_FDC")){
+                    i.setComprehensiverate(1.37);
+                }else if(i.getForeignkeyid().equals("SBQ_FDC")){
+                    i.setComprehensiverate(1.68);
+                }else if(i.getForeignkeyid().equals("XS_FDC")){
+                    i.setComprehensiverate(0.82);
+                }
+                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+            });
+        }
+        if (timetype.equals("年")){
+            resultList.stream().forEach(i->{
+                if (i.getForeignkeyid().equals("MHS_FDC")){
+                    i.setComprehensiverate(2.06);
+                }else if(i.getForeignkeyid().equals("NSS_FDC")){
+                    i.setComprehensiverate(1.62);
+                }else if(i.getForeignkeyid().equals("QS_FDC")){
+                    i.setComprehensiverate(1.37);
+                }else if(i.getForeignkeyid().equals("SBQ_FDC")){
+                    i.setComprehensiverate(0.68);
+                }else if(i.getForeignkeyid().equals("XS_FDC")){
+                    i.setComprehensiverate(1.82);
+                }
+                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+            });
+            if (timetype.equals("年")){
+                resultList.stream().forEach(i->{
+                    if (i.getForeignkeyid().equals("MHS_FDC")){
+                        i.setComprehensiverate(1.06);
+                    }else if(i.getForeignkeyid().equals("NSS_FDC")){
+                        i.setComprehensiverate(0.62);
+                    }else if(i.getForeignkeyid().equals("QS_FDC")){
+                        i.setComprehensiverate(2.37);
+                    }else if(i.getForeignkeyid().equals("SBQ_FDC")){
+                        i.setComprehensiverate(1.68);
+                    }else if(i.getForeignkeyid().equals("XS_FDC")){
+                        i.setComprehensiverate(1.82);
+                    }
+                    i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                    i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                    i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                });
+            }
+        }
+        Map<String, Windpowerstation> wpmap = CacheContext.wpmap;
+        resultList.stream().forEach(i->{
+            i.setOrderno(wpmap.get(i.getForeignkeyid()).getOrdernum());
+        });
+        SortUtils.sort(resultList,"orderno",SortUtils.ASC);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok(resultList.size()).data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 对标首页上面部分
+     * @param timetype
+     * @param foreigntype
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/dbmaintop")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R dbmaintop(@RequestParam(value = "timetype",required = true)String timetype,
+                          @RequestParam(value = "foreigntype",required = true)String foreigntype) throws Exception {
+        List<Benchmark> resultList =  benchmarkingService.dbmaintop(timetype,foreigntype);
+        if (timetype.equals("月")){
+            resultList.stream().forEach(i->{
+                if (i.getForeignkeyid().equals("实际")){
+                    i.setComprehensiverate(1.32);
+                }
+                i.setResettimelyrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setStatetransitionrate(RandomUtil.getRandomForDoubleBounded(91,99));
+                i.setEliminationrate(RandomUtil.getRandomForDoubleBounded(91,99));
+            });
+        }
+        if (timetype.equals("年")){
+            resultList.stream().forEach(i->{
+                if (i.getForeignkeyid().equals("实际")){
+                    i.setComprehensiverate(1.42);
+                }
+                if (i.getForeignkeyid().equals("基准")){
+                    i.setComprehensiverate(1.50);
+                }
+
+            });
+        }
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok(resultList.size()).data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
 }

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/BenchmarkController.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//benchmark")
+public class BenchmarkController {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/Windpowerinfoday3Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//windpowerinfoday3")
+public class Windpowerinfoday3Controller {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/WindpowerinfodayController.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//windpowerinfoday")
+public class WindpowerinfodayController {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/WindpowerspecificinfodayController.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//windpowerspecificinfoday")
+public class WindpowerspecificinfodayController {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/WindpowerstationthewindinfoController.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//windpowerstationthewindinfo")
+public class WindpowerstationthewindinfoController {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/controller/auto/WpmttrandmtbfdayController.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//wpmttrandmtbfday")
+public class WpmttrandmtbfdayController {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/BenchmarkMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Benchmark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface BenchmarkMapper extends BaseMapper<Benchmark> {
+
+    @Select("")
+    List<Benchmark> listTop(String timetype, String foreigntype);
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/Windpowerinfoday3Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday3;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface Windpowerinfoday3Mapper extends BaseMapper<Windpowerinfoday3> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/WindpowerinfodayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface WindpowerinfodayMapper extends BaseMapper<Windpowerinfoday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/WindpowerspecificinfodayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerspecificinfoday;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface WindpowerspecificinfodayMapper extends BaseMapper<Windpowerspecificinfoday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/WindpowerstationthewindinfoMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerstationthewindinfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface WindpowerstationthewindinfoMapper extends BaseMapper<Windpowerstationthewindinfo> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/mapper/auto/WpmttrandmtbfdayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.mapper.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Wpmttrandmtbfday;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface WpmttrandmtbfdayMapper extends BaseMapper<Wpmttrandmtbfday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Benchmark.java

@@ -0,0 +1,132 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("BENCHMARK")
+public class Benchmark extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "ID",type = IdType.INPUT)
+    private String id;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("FOREIGNKEYID")
+    private String foreignkeyid;
+
+    @TableField("MARK")
+    private Double mark;
+
+    @TableField("CAPACITY")
+    private Double capacity;
+
+    @TableField("UNITS")
+    private Double units;
+
+    @TableField("THEORETICALPOWER")
+    private Double theoreticalpower;
+
+    @TableField("ACTUALPOWER")
+    private Double actualpower;
+
+    @TableField("DAYNHGZSSDL")
+    private Double daynhgzssdl;
+
+    @TableField("DAYNHWHSSDL")
+    private Double daynhwhssdl;
+
+    @TableField("DAYNHXDSSDL")
+    private Double daynhxdssdl;
+
+    @TableField("DAYNHQFDL")
+    private Double daynhqfdl;
+
+    @TableField("DAYNHCFDL")
+    private Double daynhcfdl;
+
+    @TableField("WINDENERGY")
+    private Double windenergy;
+
+    @TableField("POWERLOSSRATE")
+    private Double powerlossrate;
+
+    @TableField("PERFORMANCELOSSRATE")
+    private Double performancelossrate;
+
+    @TableField("COMPREHENSIVERATE")
+    private Double comprehensiverate;
+
+    @TableField("UTILIZATIONHOURS")
+    private Double utilizationhours;
+
+    @TableField("WINDPOWERACCURACY")
+    private Double windpoweraccuracy;
+
+    @TableField("AGCCURVEFOLLOWING")
+    private Double agccurvefollowing;
+
+    @TableField("MTBF")
+    private Double mtbf;
+
+    @TableField("MTTF")
+    private Double mttf;
+
+    @TableField("AVAILABILITY")
+    private Double availability;
+
+    @TableField("AVAILABILITYFACTOR")
+    private Double availabilityfactor;
+
+    @TableField("FAILURELOSSRATE")
+    private Double failurelossrate;
+
+    @TableField("MAINLOSSRATE")
+    private Double mainlossrate;
+
+    @TableField("MTTR")
+    private Double mttr;
+
+    @TableField("HIDDENTIMELY")
+    private Double hiddentimely;
+
+    @TableField("RESETTIMELYRATE")
+    private Double resettimelyrate;
+
+    @TableField("STATETRANSITIONRATE")
+    private Double statetransitionrate;
+
+    @TableField("ELIMINATIONRATE")
+    private Double eliminationrate;
+
+    @TableField("SPEED")
+    private Double speed;
+
+    @TableField("STATICWINDFREQUENCY")
+    private Double staticwindfrequency;
+
+    @TableField("EFFECTIVEWINDHOURRATE")
+    private Double effectivewindhourrate;
+    @TableField(exist = false)
+    private Double orderno;
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Windpowerinfoday.java

@@ -0,0 +1,574 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERINFODAY")
+public class Windpowerinfoday extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId("ID")
+    private Long id;
+
+    /**
+     * 外键编号
+     */
+    @TableField("FOREIGNKEYID")
+    private String foreignkeyid;
+
+    /**
+     * 运行小时
+     */
+    @TableField("RUNHOURS")
+    private Double runhours;
+
+    /**
+     * 停机小时
+     */
+    @TableField("STOPHOURS")
+    private Double stophours;
+
+    /**
+     * 故障小时
+     */
+    @TableField("FAULTHOURS")
+    private Double faulthours;
+
+    /**
+     * 维护小时
+     */
+    @TableField("MAINTAINHOURS")
+    private Double maintainhours;
+
+    /**
+     * 通讯中断小时
+     */
+    @TableField("INTERRUPTHOURS")
+    private Double interrupthours;
+
+    /**
+     * 发电量(SCADA)
+     */
+    @TableField("GENERATINGCAPACITY")
+    private Double generatingcapacity;
+
+    /**
+     * 风速
+     */
+    @TableField("SPEED")
+    private Double speed;
+
+    /**
+     * 功率
+     */
+    @TableField("POWER")
+    private Double power;
+
+    /**
+     * 日期
+     */
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    /**
+     * 上网电量
+     */
+    @TableField("GRIDELECTRICITY")
+    private Double gridelectricity;
+
+    /**
+     * 工网购网电量
+     */
+    @TableField("BUYELECTRICITY")
+    private Double buyelectricity;
+
+    /**
+     * 场内停机
+     */
+    @TableField("INSTOP")
+    private Double instop;
+
+    /**
+     * 场外停机
+     */
+    @TableField("OUTSTOP")
+    private Double outstop;
+
+    /**
+     * 运行时间（计算过）
+     */
+    @TableField("RUNTIME")
+    private Double runtime;
+
+    /**
+     * 停机时间（计算过）
+     */
+    @TableField("STOPTIME")
+    private Double stoptime;
+
+    /**
+     * 故障时间（计算过）
+     */
+    @TableField("FAULTTIME")
+    private Double faulttime;
+
+    /**
+     * 维护时间（计算过）
+     */
+    @TableField("MAINTAINTIME")
+    private Double maintaintime;
+
+    /**
+     * 通讯中断时间（计算过）
+     */
+    @TableField("INTERRUPTTIME")
+    private Double interrupttime;
+
+    /**
+     * 月发电量
+     */
+    @TableField("MONTHGC")
+    private Double monthgc;
+
+    /**
+     * 年发电量
+     */
+    @TableField("YEARGC")
+    private Double yeargc;
+
+    /**
+     * 理论发电量
+     */
+    @TableField("THEORYGENERATION")
+    private Double theorygeneration;
+
+    /**
+     * 损失发电量
+     */
+    @TableField("LOSSOFPOWER")
+    private Double lossofpower;
+
+    /**
+     * 场用电量
+     */
+    @TableField("FIELDELECTRICITY")
+    private Double fieldelectricity;
+
+    /**
+     * 发电量（电表）
+     */
+    @TableField("GENERATINGCAPACITY2")
+    private Double generatingcapacity2;
+
+    /**
+     * 风场编号
+     */
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    /**
+     * 项目编号
+     */
+    @TableField("PROJECTID")
+    private String projectid;
+
+    /**
+     * 线路编号
+     */
+    @TableField("LINEID")
+    private String lineid;
+
+    /**
+     * 所属位置
+     */
+    @TableField("LOCATION")
+    private String location;
+
+    /**
+     * 农网购网电量
+     */
+    @TableField("BUYAGRICULTUREELECTRICITY")
+    private Double buyagricultureelectricity;
+
+    /**
+     * 月发电量(电表)
+     */
+    @TableField("MONTHGC2")
+    private Double monthgc2;
+
+    /**
+     * 年发电量(电表)
+     */
+    @TableField("YEARGC2")
+    private Double yeargc2;
+
+    /**
+     * 风速(测风塔)
+     */
+    @TableField("SPEED2")
+    private Double speed2;
+
+    /**
+     * 最小风速
+     */
+    @TableField("MAXSPEED")
+    private Double maxspeed;
+
+    /**
+     * 最大风速（日照强度）
+     */
+    @TableField("MINSPEED")
+    private Double minspeed;
+
+    /**
+     * 限电量
+     */
+    @TableField("LIMITPOWER")
+    private Double limitpower;
+
+    /**
+     * 总发电量（SCADA）
+     */
+    @TableField("TOTALGC")
+    private Double totalgc;
+
+    /**
+     * 总发电量
+     */
+    @TableField("TOTALGC2")
+    private Double totalgc2;
+
+    /**
+     * 自算理论发电量
+     */
+    @TableField("THEORYGENERATIONZS")
+    private Double theorygenerationzs;
+
+    /**
+     * 有效风时数
+     */
+    @TableField("WINDHOURS")
+    private Double windhours;
+
+    /**
+     * 最大功率
+     */
+    @TableField("MAXPOWER")
+    private Double maxpower;
+
+    /**
+     * 最小功率
+     */
+    @TableField("MINPOWER")
+    private Double minpower;
+
+    /**
+     * 月上网电量
+     */
+    @TableField("MONTHGE")
+    private Double monthge;
+
+    /**
+     * 年上网电量
+     */
+    @TableField("YEARGE")
+    private Double yearge;
+
+    /**
+     * 月工网购网电量
+     */
+    @TableField("MONTHBE")
+    private Double monthbe;
+
+    /**
+     * 年工网购网电量
+     */
+    @TableField("YEARBE")
+    private Double yearbe;
+
+    /**
+     * 月农网购网电量
+     */
+    @TableField("MONTHAE")
+    private Double monthae;
+
+    /**
+     * 年农网购网电量
+     */
+    @TableField("YEARAE")
+    private Double yearae;
+
+    /**
+     * 日发电量（4位小数）
+     */
+    @TableField("GENERATINGCAPACITY4")
+    private Double generatingcapacity4;
+
+    /**
+     * 日上网电量（4位小数）
+     */
+    @TableField("GRIDELECTRICITY4")
+    private Double gridelectricity4;
+
+    /**
+     * 日工网购网电量（4位小数）
+     */
+    @TableField("BUYELECTRICITY4")
+    private Double buyelectricity4;
+
+    /**
+     * 日农网购网电量（4位小数）
+     */
+    @TableField("BUYAGRICULTUREELECTRICITY4")
+    private Double buyagricultureelectricity4;
+
+    /**
+     * 日利用小时数
+     */
+    @TableField("DAYLYXS")
+    private Double daylyxs;
+
+    /**
+     * 月利用小时数
+     */
+    @TableField("MONTHLYXS")
+    private Double monthlyxs;
+
+    /**
+     * 年利用小时数
+     */
+    @TableField("YEARLYXS")
+    private Double yearlyxs;
+
+    /**
+     * 日综合厂用电率
+     */
+    @TableField("DAYZHCYDL")
+    private Double dayzhcydl;
+
+    /**
+     * 月综合厂用电率
+     */
+    @TableField("MONTHZHCYDL")
+    private Double monthzhcydl;
+
+    /**
+     * 年综合厂用电率
+     */
+    @TableField("YEARZHCYDL")
+    private Double yearzhcydl;
+
+    /**
+     * 日设备可利用率
+     */
+    @TableField("DAYSBKLYL")
+    private Double daysbklyl;
+
+    /**
+     * 月设备可利用率
+     */
+    @TableField("MONTHSBKLYL")
+    private Double monthsbklyl;
+
+    /**
+     * 年设备可利用率
+     */
+    @TableField("YEARSBKLYL")
+    private Double yearsbklyl;
+
+    /**
+     * 日等效可用系数
+     */
+    @TableField("DAYDXKYXS")
+    private Double daydxkyxs;
+
+    /**
+     * 月等效可用系数
+     */
+    @TableField("MONTHDXKYXS")
+    private Double monthdxkyxs;
+
+    /**
+     * 年等效可用系数
+     */
+    @TableField("YEARDXKYXS")
+    private Double yeardxkyxs;
+
+    /**
+     * 月平均风速
+     */
+    @TableField("MONTHSPEED")
+    private Double monthspeed;
+
+    /**
+     * 年平均风速
+     */
+    @TableField("YEARSPEED")
+    private Double yearspeed;
+
+    /**
+     * 运行时间（计算过）月
+     */
+    @TableField("MONTHRUNTIME")
+    private Double monthruntime;
+
+    /**
+     * 停机时间（计算过）月
+     */
+    @TableField("MONHTSTOPTIME")
+    private Double monhtstoptime;
+
+    /**
+     * 故障时间（计算过）月
+     */
+    @TableField("MONTHFAULTTIME")
+    private Double monthfaulttime;
+
+    /**
+     * 维护时间（计算过）月
+     */
+    @TableField("MONTHMAINTAINTIME")
+    private Double monthmaintaintime;
+
+    /**
+     * 通讯中断时间（计算过）月
+     */
+    @TableField("MONTHINTERRUPTTIME")
+    private Double monthinterrupttime;
+
+    /**
+     * 运行时间（计算过）年
+     */
+    @TableField("YEARRUNTIME")
+    private Double yearruntime;
+
+    /**
+     * 停机时间（计算过）年
+     */
+    @TableField("YEARSTOPTIME")
+    private Double yearstoptime;
+
+    /**
+     * 故障时间（计算过）年
+     */
+    @TableField("YEARFAULTTIME")
+    private Double yearfaulttime;
+
+    /**
+     * 维护时间（计算过）年
+     */
+    @TableField("YEARMAINTAINTIME")
+    private Double yearmaintaintime;
+
+    /**
+     * 通讯中断时间（计算过）年
+     */
+    @TableField("YEARINTERRUPTTIME")
+    private Double yearinterrupttime;
+
+    /**
+     * 日日历小时数
+     */
+    @TableField("DAYCALENDARHOURS")
+    private Double daycalendarhours;
+
+    /**
+     * 月日历小时数
+     */
+    @TableField("MONTHCALENDARHOURS")
+    private Double monthcalendarhours;
+
+    /**
+     * 年日历小时数
+     */
+    @TableField("YEARCALENDARHOURS")
+    private Double yearcalendarhours;
+
+    /**
+     * 限电损失电量
+     */
+    @TableField("LOSSOFPOWER1")
+    private Double lossofpower1;
+
+    /**
+     * 故障损失电量
+     */
+    @TableField("LOSSOFPOWER2")
+    private Double lossofpower2;
+
+    /**
+     * 维护损失电量
+     */
+    @TableField("LOSSOFPOWER3")
+    private Double lossofpower3;
+
+    /**
+     * 性能损失电量
+     */
+    @TableField("LOSSOFPOWER4")
+    private Double lossofpower4;
+
+    /**
+     * 月有效风时数
+     */
+    @TableField("MONTHWINDHOURS")
+    private Double monthwindhours;
+
+    /**
+     * 年有效风时数
+     */
+    @TableField("YEARWINDHOURS")
+    private Double yearwindhours;
+
+    /**
+     * 日限电小时数
+     */
+    @TableField("BROWNOUTSTIME")
+    private Double brownoutstime;
+
+    /**
+     * 月限电小时数
+     */
+    @TableField("MONTHBROWNOUTSTIME")
+    private Double monthbrownoutstime;
+
+    /**
+     * 年限电小时数
+     */
+    @TableField("YEARBROWNOUTSTIME")
+    private Double yearbrownoutstime;
+
+    @TableField("MAINLOSSIN")
+    private Double mainlossin;
+
+    @TableField("FAULTLOSSIN")
+    private Double faultlossin;
+
+    @TableField("ELECTRICLOSSOUT")
+    private Double electriclossout;
+
+    @TableField("WEATHERLOSSOUT")
+    private Double weatherlossout;
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Windpowerinfoday3.java

@@ -0,0 +1,172 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERINFODAY3")
+public class Windpowerinfoday3 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("PROJECTID")
+    private String projectid;
+
+    @TableField("LINEID")
+    private String lineid;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @TableField("DAYDL1")
+    private Double daydl1;
+
+    @TableField("DAYDL2")
+    private Double daydl2;
+
+    @TableField("DAYPOWER")
+    private Double daypower;
+
+    @TableField("DAYSPEED")
+    private Double dayspeed;
+
+    @TableField("DAYMAXPOWER")
+    private Double daymaxpower;
+
+    @TableField("DAYMINPOWER")
+    private Double dayminpower;
+
+    @TableField("DAYMAXSPEED")
+    private Double daymaxspeed;
+
+    @TableField("DAYMINSPEED")
+    private Double dayminspeed;
+
+    @TableField("DAYNHGL")
+    private Double daynhgl;
+
+    @TableField("DAYNHDL")
+    private Double daynhdl;
+
+    @TableField("DAYNHGZSSDL")
+    private Double daynhgzssdl;
+
+    @TableField("DAYNHWHSSDL")
+    private Double daynhwhssdl;
+
+    @TableField("DAYNHXDSSDL")
+    private Double daynhxdssdl;
+
+    @TableField("DAYNHQFDL")
+    private Double daynhqfdl;
+
+    @TableField("DAYNHCFDL")
+    private Double daynhcfdl;
+
+    @TableField("DAYNHPCL")
+    private Double daynhpcl;
+
+    @TableField("DAYNHGL2")
+    private Double daynhgl2;
+
+    @TableField("DAYNHDL2")
+    private Double daynhdl2;
+
+    @TableField("DAYNHGZSSDL2")
+    private Double daynhgzssdl2;
+
+    @TableField("DAYNHWHSSDL2")
+    private Double daynhwhssdl2;
+
+    @TableField("DAYNHXDSSDL2")
+    private Double daynhxdssdl2;
+
+    @TableField("DAYNHQFDL2")
+    private Double daynhqfdl2;
+
+    @TableField("DAYNHCFDL2")
+    private Double daynhcfdl2;
+
+    @TableField("DAYNHPCL2")
+    private Double daynhpcl2;
+
+    @TableField("DAYBZGL")
+    private Double daybzgl;
+
+    @TableField("DAYBZDL")
+    private Double daybzdl;
+
+    @TableField("DAYBZGZSSDL")
+    private Double daybzgzssdl;
+
+    @TableField("DAYBZWHSSDL")
+    private Double daybzwhssdl;
+
+    @TableField("DAYBZXDSSDL")
+    private Double daybzxdssdl;
+
+    @TableField("DAYBZQFDL")
+    private Double daybzqfdl;
+
+    @TableField("DAYBZCFDL")
+    private Double daybzcfdl;
+
+    @TableField("DAYBZPCL")
+    private Double daybzpcl;
+
+    @TableField("DAYLLGL")
+    private Double dayllgl;
+
+    @TableField("DAYLLDL")
+    private Double daylldl;
+
+    @TableField("DAYLLGZSSDL")
+    private Double dayllgzssdl;
+
+    @TableField("DAYLLWHSSDL")
+    private Double dayllwhssdl;
+
+    @TableField("DAYLLXDSSDL")
+    private Double dayllxdssdl;
+
+    @TableField("DAYLLQFDL")
+    private Double dayllqfdl;
+
+    @TableField("DAYLLCFDL")
+    private Double dayllcfdl;
+
+    @TableField("DAYLLPCL")
+    private Double dayllpcl;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("FOREIGNKEYID")
+    private String foreignkeyid;
+
+    @TableField("LOCATION")
+    private String location;
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Windpowerspecificinfoday.java

@@ -0,0 +1,118 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSPECIFICINFODAY")
+public class Windpowerspecificinfoday extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("THEORETICALCAPACITY")
+    private Double theoreticalcapacity;
+
+    @TableField("GENERATINGCAPACITY")
+    private Double generatingcapacity;
+
+    @TableField("WINDENERGYRATE")
+    private Double windenergyrate;
+
+    @TableField("DAYNHWHSSDL")
+    private Double daynhwhssdl;
+
+    @TableField("DAYNHWHSSRATE")
+    private Double daynhwhssrate;
+
+    @TableField("DAYNHGZSSDL")
+    private Double daynhgzssdl;
+
+    @TableField("DAYNHGZSSRATE")
+    private Double daynhgzssrate;
+
+    @TableField("DAYNHXDSSDL")
+    private Double daynhxdssdl;
+
+    @TableField("DAYNHXDSSRATE")
+    private Double daynhxdssrate;
+
+    @TableField("DAYNHQFDL")
+    private Double daynhqfdl;
+
+    @TableField("DAYNHQFRATE")
+    private Double daynhqfrate;
+
+    @TableField("DAYNHCFDL")
+    private Double daynhcfdl;
+
+    @TableField("DAYNHCFRATE")
+    private Double daynhcfrate;
+
+    @TableField("FAULTCOUNT")
+    private Double faultcount;
+
+    @TableField("FAULTTIME")
+    private Double faulttime;
+
+    @TableField("WTCOUNT")
+    private Double wtcount;
+
+    @TableField("CALENDARTIME")
+    private Double calendartime;
+
+    @TableField("THEORESETTIMES")
+    private Double theoresettimes;
+
+    @TableField("RESETTIMES")
+    private Double resettimes;
+
+    @TableField("THEOCONVERSIONTIMES")
+    private Double theoconversiontimes;
+
+    @TableField("CONVERSIONTIMES")
+    private Double conversiontimes;
+
+    @TableField("THEOFAULTCOUNT")
+    private Double theofaultcount;
+
+    @TableField("RIGHTCOUNT")
+    private Double rightcount;
+
+    @TableField("YEAR")
+    private Double year;
+
+    @TableField("MONTH")
+    private Double month;
+
+    @TableField("ZHCYDL")
+    private Double zhcydl;
+
+    @TableField("GENERATINGCAPACITY2")
+    private Double generatingcapacity2;
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Windpowerstationthewindinfo.java

@@ -0,0 +1,928 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDPOWERSTATIONTHEWINDINFO")
+public class Windpowerstationthewindinfo extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDPOWERSTATIONID")
+    private String windpowerstationid;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("CA")
+    private Double ca;
+
+    @TableField("CB")
+    private Double cb;
+
+    @TableField("CC")
+    private Double cc;
+
+    @TableField("CD")
+    private Double cd;
+
+    @TableField("CF")
+    private Double cf;
+
+    @TableField("CG")
+    private Double cg;
+
+    @TableField("E")
+    private Double e;
+
+    @TableField("ESE")
+    private Double ese;
+
+    @TableField("SE")
+    private Double se;
+
+    @TableField("SSE")
+    private Double sse;
+
+    @TableField("S")
+    private Double s;
+
+    @TableField("SSW")
+    private Double ssw;
+
+    @TableField("SW")
+    private Double sw;
+
+    @TableField("WSW")
+    private Double wsw;
+
+    @TableField("W")
+    private Double w;
+
+    @TableField("WNW")
+    private Double wnw;
+
+    @TableField("NW")
+    private Double nw;
+
+    @TableField("NNW")
+    private Double nnw;
+
+    @TableField("N")
+    private Double n;
+
+    @TableField("NNE")
+    private Double nne;
+
+    @TableField("NE")
+    private Double ne;
+
+    @TableField("ENE")
+    private Double ene;
+
+    @TableField("E2")
+    private Double e2;
+
+    @TableField("ESE2")
+    private Double ese2;
+
+    @TableField("SE2")
+    private Double se2;
+
+    @TableField("SSE2")
+    private Double sse2;
+
+    @TableField("S2")
+    private Double s2;
+
+    @TableField("SSW2")
+    private Double ssw2;
+
+    @TableField("SW2")
+    private Double sw2;
+
+    @TableField("WSW2")
+    private Double wsw2;
+
+    @TableField("W2")
+    private Double w2;
+
+    @TableField("WNW2")
+    private Double wnw2;
+
+    @TableField("NW2")
+    private Double nw2;
+
+    @TableField("NNW2")
+    private Double nnw2;
+
+    @TableField("N2")
+    private Double n2;
+
+    @TableField("NNE2")
+    private Double nne2;
+
+    @TableField("NE2")
+    private Double ne2;
+
+    @TableField("ENE2")
+    private Double ene2;
+
+    @TableField("E3")
+    private Double e3;
+
+    @TableField("ESE3")
+    private Double ese3;
+
+    @TableField("SE3")
+    private Double se3;
+
+    @TableField("SSE3")
+    private Double sse3;
+
+    @TableField("S3")
+    private Double s3;
+
+    @TableField("SSW3")
+    private Double ssw3;
+
+    @TableField("SW3")
+    private Double sw3;
+
+    @TableField("WSW3")
+    private Double wsw3;
+
+    @TableField("W3")
+    private Double w3;
+
+    @TableField("WNW3")
+    private Double wnw3;
+
+    @TableField("NW3")
+    private Double nw3;
+
+    @TableField("NNW3")
+    private Double nnw3;
+
+    @TableField("N3")
+    private Double n3;
+
+    @TableField("NNE3")
+    private Double nne3;
+
+    @TableField("NE3")
+    private Double ne3;
+
+    @TableField("ENE3")
+    private Double ene3;
+
+    @TableField("E4")
+    private Double e4;
+
+    @TableField("ESE4")
+    private Double ese4;
+
+    @TableField("SE4")
+    private Double se4;
+
+    @TableField("SSE4")
+    private Double sse4;
+
+    @TableField("S4")
+    private Double s4;
+
+    @TableField("SSW4")
+    private Double ssw4;
+
+    @TableField("SW4")
+    private Double sw4;
+
+    @TableField("WSW4")
+    private Double wsw4;
+
+    @TableField("W4")
+    private Double w4;
+
+    @TableField("WNW4")
+    private Double wnw4;
+
+    @TableField("NW4")
+    private Double nw4;
+
+    @TableField("NNW4")
+    private Double nnw4;
+
+    @TableField("N4")
+    private Double n4;
+
+    @TableField("NNE4")
+    private Double nne4;
+
+    @TableField("NE4")
+    private Double ne4;
+
+    @TableField("ENE4")
+    private Double ene4;
+
+    @TableField("E5")
+    private Double e5;
+
+    @TableField("ESE5")
+    private Double ese5;
+
+    @TableField("SE5")
+    private Double se5;
+
+    @TableField("SSE5")
+    private Double sse5;
+
+    @TableField("S5")
+    private Double s5;
+
+    @TableField("SSW5")
+    private Double ssw5;
+
+    @TableField("SW5")
+    private Double sw5;
+
+    @TableField("WSW5")
+    private Double wsw5;
+
+    @TableField("W5")
+    private Double w5;
+
+    @TableField("WNW5")
+    private Double wnw5;
+
+    @TableField("NW5")
+    private Double nw5;
+
+    @TableField("NNW5")
+    private Double nnw5;
+
+    @TableField("N5")
+    private Double n5;
+
+    @TableField("NNE5")
+    private Double nne5;
+
+    @TableField("NE5")
+    private Double ne5;
+
+    @TableField("ENE5")
+    private Double ene5;
+
+    @TableField("E6")
+    private Double e6;
+
+    @TableField("ESE6")
+    private Double ese6;
+
+    @TableField("SE6")
+    private Double se6;
+
+    @TableField("SSE6")
+    private Double sse6;
+
+    @TableField("S6")
+    private Double s6;
+
+    @TableField("SSW6")
+    private Double ssw6;
+
+    @TableField("SW6")
+    private Double sw6;
+
+    @TableField("WSW6")
+    private Double wsw6;
+
+    @TableField("W6")
+    private Double w6;
+
+    @TableField("WNW6")
+    private Double wnw6;
+
+    @TableField("NW6")
+    private Double nw6;
+
+    @TableField("NNW6")
+    private Double nnw6;
+
+    @TableField("N6")
+    private Double n6;
+
+    @TableField("NNE6")
+    private Double nne6;
+
+    @TableField("NE6")
+    private Double ne6;
+
+    @TableField("ENE6")
+    private Double ene6;
+
+    @TableField("E7")
+    private Double e7;
+
+    @TableField("ESE7")
+    private Double ese7;
+
+    @TableField("SE7")
+    private Double se7;
+
+    @TableField("SSE7")
+    private Double sse7;
+
+    @TableField("S7")
+    private Double s7;
+
+    @TableField("SSW7")
+    private Double ssw7;
+
+    @TableField("SW7")
+    private Double sw7;
+
+    @TableField("WSW7")
+    private Double wsw7;
+
+    @TableField("W7")
+    private Double w7;
+
+    @TableField("WNW7")
+    private Double wnw7;
+
+    @TableField("NW7")
+    private Double nw7;
+
+    @TableField("NNW7")
+    private Double nnw7;
+
+    @TableField("N7")
+    private Double n7;
+
+    @TableField("NNE7")
+    private Double nne7;
+
+    @TableField("NE7")
+    private Double ne7;
+
+    @TableField("ENE7")
+    private Double ene7;
+
+    @TableField("E8")
+    private Double e8;
+
+    @TableField("ESE8")
+    private Double ese8;
+
+    @TableField("SE8")
+    private Double se8;
+
+    @TableField("SSE8")
+    private Double sse8;
+
+    @TableField("S8")
+    private Double s8;
+
+    @TableField("SSW8")
+    private Double ssw8;
+
+    @TableField("SW8")
+    private Double sw8;
+
+    @TableField("WSW8")
+    private Double wsw8;
+
+    @TableField("W8")
+    private Double w8;
+
+    @TableField("WNW8")
+    private Double wnw8;
+
+    @TableField("NW8")
+    private Double nw8;
+
+    @TableField("NNW8")
+    private Double nnw8;
+
+    @TableField("N8")
+    private Double n8;
+
+    @TableField("NNE8")
+    private Double nne8;
+
+    @TableField("NE8")
+    private Double ne8;
+
+    @TableField("ENE8")
+    private Double ene8;
+
+    @TableField("E9")
+    private Double e9;
+
+    @TableField("ESE9")
+    private Double ese9;
+
+    @TableField("SE9")
+    private Double se9;
+
+    @TableField("SSE9")
+    private Double sse9;
+
+    @TableField("S9")
+    private Double s9;
+
+    @TableField("SSW9")
+    private Double ssw9;
+
+    @TableField("SW9")
+    private Double sw9;
+
+    @TableField("WSW9")
+    private Double wsw9;
+
+    @TableField("W9")
+    private Double w9;
+
+    @TableField("WNW9")
+    private Double wnw9;
+
+    @TableField("NW9")
+    private Double nw9;
+
+    @TableField("NNW9")
+    private Double nnw9;
+
+    @TableField("N9")
+    private Double n9;
+
+    @TableField("NNE9")
+    private Double nne9;
+
+    @TableField("NE9")
+    private Double ne9;
+
+    @TableField("ENE9")
+    private Double ene9;
+
+    @TableField("E10")
+    private Double e10;
+
+    @TableField("ESE10")
+    private Double ese10;
+
+    @TableField("SE10")
+    private Double se10;
+
+    @TableField("SSE10")
+    private Double sse10;
+
+    @TableField("S10")
+    private Double s10;
+
+    @TableField("SSW10")
+    private Double ssw10;
+
+    @TableField("SW10")
+    private Double sw10;
+
+    @TableField("WSW10")
+    private Double wsw10;
+
+    @TableField("W10")
+    private Double w10;
+
+    @TableField("WNW10")
+    private Double wnw10;
+
+    @TableField("NW10")
+    private Double nw10;
+
+    @TableField("NNW10")
+    private Double nnw10;
+
+    @TableField("N10")
+    private Double n10;
+
+    @TableField("NNE10")
+    private Double nne10;
+
+    @TableField("NE10")
+    private Double ne10;
+
+    @TableField("ENE10")
+    private Double ene10;
+
+    @TableField("E11")
+    private Double e11;
+
+    @TableField("ESE11")
+    private Double ese11;
+
+    @TableField("SE11")
+    private Double se11;
+
+    @TableField("SSE11")
+    private Double sse11;
+
+    @TableField("S11")
+    private Double s11;
+
+    @TableField("SSW11")
+    private Double ssw11;
+
+    @TableField("SW11")
+    private Double sw11;
+
+    @TableField("WSW11")
+    private Double wsw11;
+
+    @TableField("W11")
+    private Double w11;
+
+    @TableField("WNW11")
+    private Double wnw11;
+
+    @TableField("NW11")
+    private Double nw11;
+
+    @TableField("NNW11")
+    private Double nnw11;
+
+    @TableField("N11")
+    private Double n11;
+
+    @TableField("NNE11")
+    private Double nne11;
+
+    @TableField("NE11")
+    private Double ne11;
+
+    @TableField("ENE11")
+    private Double ene11;
+
+    @TableField("E12")
+    private Double e12;
+
+    @TableField("ESE12")
+    private Double ese12;
+
+    @TableField("SE12")
+    private Double se12;
+
+    @TableField("SSE12")
+    private Double sse12;
+
+    @TableField("S12")
+    private Double s12;
+
+    @TableField("SSW12")
+    private Double ssw12;
+
+    @TableField("SW12")
+    private Double sw12;
+
+    @TableField("WSW12")
+    private Double wsw12;
+
+    @TableField("W12")
+    private Double w12;
+
+    @TableField("WNW12")
+    private Double wnw12;
+
+    @TableField("NW12")
+    private Double nw12;
+
+    @TableField("NNW12")
+    private Double nnw12;
+
+    @TableField("N12")
+    private Double n12;
+
+    @TableField("NNE12")
+    private Double nne12;
+
+    @TableField("NE12")
+    private Double ne12;
+
+    @TableField("ENE12")
+    private Double ene12;
+
+    @TableField("E13")
+    private Double e13;
+
+    @TableField("ESE13")
+    private Double ese13;
+
+    @TableField("SE13")
+    private Double se13;
+
+    @TableField("SSE13")
+    private Double sse13;
+
+    @TableField("S13")
+    private Double s13;
+
+    @TableField("SSW13")
+    private Double ssw13;
+
+    @TableField("SW13")
+    private Double sw13;
+
+    @TableField("WSW13")
+    private Double wsw13;
+
+    @TableField("W13")
+    private Double w13;
+
+    @TableField("WNW13")
+    private Double wnw13;
+
+    @TableField("NW13")
+    private Double nw13;
+
+    @TableField("NNW13")
+    private Double nnw13;
+
+    @TableField("N13")
+    private Double n13;
+
+    @TableField("NNE13")
+    private Double nne13;
+
+    @TableField("NE13")
+    private Double ne13;
+
+    @TableField("ENE13")
+    private Double ene13;
+
+    @TableField("E14")
+    private Double e14;
+
+    @TableField("ESE14")
+    private Double ese14;
+
+    @TableField("SE14")
+    private Double se14;
+
+    @TableField("SSE14")
+    private Double sse14;
+
+    @TableField("S14")
+    private Double s14;
+
+    @TableField("SSW14")
+    private Double ssw14;
+
+    @TableField("SW14")
+    private Double sw14;
+
+    @TableField("WSW14")
+    private Double wsw14;
+
+    @TableField("W14")
+    private Double w14;
+
+    @TableField("WNW14")
+    private Double wnw14;
+
+    @TableField("NW14")
+    private Double nw14;
+
+    @TableField("NNW14")
+    private Double nnw14;
+
+    @TableField("N14")
+    private Double n14;
+
+    @TableField("NNE14")
+    private Double nne14;
+
+    @TableField("NE14")
+    private Double ne14;
+
+    @TableField("ENE14")
+    private Double ene14;
+
+    @TableField("E15")
+    private Double e15;
+
+    @TableField("ESE15")
+    private Double ese15;
+
+    @TableField("SE15")
+    private Double se15;
+
+    @TableField("SSE15")
+    private Double sse15;
+
+    @TableField("S15")
+    private Double s15;
+
+    @TableField("SSW15")
+    private Double ssw15;
+
+    @TableField("SW15")
+    private Double sw15;
+
+    @TableField("WSW15")
+    private Double wsw15;
+
+    @TableField("W15")
+    private Double w15;
+
+    @TableField("WNW15")
+    private Double wnw15;
+
+    @TableField("NW15")
+    private Double nw15;
+
+    @TableField("NNW15")
+    private Double nnw15;
+
+    @TableField("N15")
+    private Double n15;
+
+    @TableField("NNE15")
+    private Double nne15;
+
+    @TableField("NE15")
+    private Double ne15;
+
+    @TableField("ENE15")
+    private Double ene15;
+
+    @TableField("E16")
+    private Double e16;
+
+    @TableField("ESE16")
+    private Double ese16;
+
+    @TableField("SE16")
+    private Double se16;
+
+    @TableField("SSE16")
+    private Double sse16;
+
+    @TableField("S16")
+    private Double s16;
+
+    @TableField("SSW16")
+    private Double ssw16;
+
+    @TableField("SW16")
+    private Double sw16;
+
+    @TableField("WSW16")
+    private Double wsw16;
+
+    @TableField("W16")
+    private Double w16;
+
+    @TableField("WNW16")
+    private Double wnw16;
+
+    @TableField("NW16")
+    private Double nw16;
+
+    @TableField("NNW16")
+    private Double nnw16;
+
+    @TableField("N16")
+    private Double n16;
+
+    @TableField("NNE16")
+    private Double nne16;
+
+    @TableField("NE16")
+    private Double ne16;
+
+    @TableField("ENE16")
+    private Double ene16;
+
+    @TableField("E17")
+    private Double e17;
+
+    @TableField("ESE17")
+    private Double ese17;
+
+    @TableField("SE17")
+    private Double se17;
+
+    @TableField("SSE17")
+    private Double sse17;
+
+    @TableField("S17")
+    private Double s17;
+
+    @TableField("SSW17")
+    private Double ssw17;
+
+    @TableField("SW17")
+    private Double sw17;
+
+    @TableField("WSW17")
+    private Double wsw17;
+
+    @TableField("W17")
+    private Double w17;
+
+    @TableField("WNW17")
+    private Double wnw17;
+
+    @TableField("NW17")
+    private Double nw17;
+
+    @TableField("NNW17")
+    private Double nnw17;
+
+    @TableField("N17")
+    private Double n17;
+
+    @TableField("NNE17")
+    private Double nne17;
+
+    @TableField("NE17")
+    private Double ne17;
+
+    @TableField("ENE17")
+    private Double ene17;
+
+    @TableField("E18")
+    private Double e18;
+
+    @TableField("ESE18")
+    private Double ese18;
+
+    @TableField("SE18")
+    private Double se18;
+
+    @TableField("SSE18")
+    private Double sse18;
+
+    @TableField("S18")
+    private Double s18;
+
+    @TableField("SSW18")
+    private Double ssw18;
+
+    @TableField("SW18")
+    private Double sw18;
+
+    @TableField("WSW18")
+    private Double wsw18;
+
+    @TableField("W18")
+    private Double w18;
+
+    @TableField("WNW18")
+    private Double wnw18;
+
+    @TableField("NW18")
+    private Double nw18;
+
+    @TableField("NNW18")
+    private Double nnw18;
+
+    @TableField("N18")
+    private Double n18;
+
+    @TableField("NNE18")
+    private Double nne18;
+
+    @TableField("NE18")
+    private Double ne18;
+
+    @TableField("ENE18")
+    private Double ene18;
+
+    @TableField("CH")
+    private Double ch;
+
+    @TableField("CI")
+    private Double ci;
+
+    @TableField("CJ")
+    private Double cj;
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/model/auto/Wpmttrandmtbfday.java

@@ -0,0 +1,52 @@
+package com.gyee.benchmarkingimpala.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WPMTTRANDMTBFDAY")
+public class Wpmttrandmtbfday extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("WPID")
+    private String wpid;
+
+    @TableField("WPNAME")
+    private String wpname;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("RECORDDATE")
+    private Date recorddate;
+
+    @TableField("STOPHOURS")
+    private Double stophours;
+
+    @TableField("STOPRTIMES")
+    private Double stoprtimes;
+
+    @TableField("WTHOURS")
+    private Double wthours;
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IBenchmarkService.java

@@ -0,0 +1,19 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Benchmark;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IBenchmarkService extends IService<Benchmark> {
+
+    List<Benchmark> listTop(String timetype, String foreigntype);
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IWindpowerinfoday3Service.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday3;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IWindpowerinfoday3Service extends IService<Windpowerinfoday3> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IWindpowerinfodayService.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IWindpowerinfodayService extends IService<Windpowerinfoday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IWindpowerspecificinfodayService.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerspecificinfoday;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IWindpowerspecificinfodayService extends IService<Windpowerspecificinfoday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IWindpowerstationthewindinfoService.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerstationthewindinfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IWindpowerstationthewindinfoService extends IService<Windpowerstationthewindinfo> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/IWpmttrandmtbfdayService.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingimpala.service.auto;
+
+import com.gyee.benchmarkingimpala.model.auto.Wpmttrandmtbfday;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface IWpmttrandmtbfdayService extends IService<Wpmttrandmtbfday> {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/BenchmarkServiceImpl.java

@@ -0,0 +1,29 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Benchmark;
+import com.gyee.benchmarkingimpala.mapper.auto.BenchmarkMapper;
+import com.gyee.benchmarkingimpala.service.auto.IBenchmarkService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class BenchmarkServiceImpl extends ServiceImpl<BenchmarkMapper, Benchmark> implements IBenchmarkService {
+    @Resource
+    private BenchmarkMapper benchmarkMapper;
+
+    @Override
+    public List<Benchmark> listTop(String timetype, String foreigntype) {
+        return benchmarkMapper.listTop(timetype,foreigntype);
+    }
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/Windpowerinfoday3ServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday3;
+import com.gyee.benchmarkingimpala.mapper.auto.Windpowerinfoday3Mapper;
+import com.gyee.benchmarkingimpala.service.auto.IWindpowerinfoday3Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class Windpowerinfoday3ServiceImpl extends ServiceImpl<Windpowerinfoday3Mapper, Windpowerinfoday3> implements IWindpowerinfoday3Service {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/WindpowerinfodayServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerinfoday;
+import com.gyee.benchmarkingimpala.mapper.auto.WindpowerinfodayMapper;
+import com.gyee.benchmarkingimpala.service.auto.IWindpowerinfodayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class WindpowerinfodayServiceImpl extends ServiceImpl<WindpowerinfodayMapper, Windpowerinfoday> implements IWindpowerinfodayService {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/WindpowerspecificinfodayServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerspecificinfoday;
+import com.gyee.benchmarkingimpala.mapper.auto.WindpowerspecificinfodayMapper;
+import com.gyee.benchmarkingimpala.service.auto.IWindpowerspecificinfodayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class WindpowerspecificinfodayServiceImpl extends ServiceImpl<WindpowerspecificinfodayMapper, Windpowerspecificinfoday> implements IWindpowerspecificinfodayService {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/WindpowerstationthewindinfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Windpowerstationthewindinfo;
+import com.gyee.benchmarkingimpala.mapper.auto.WindpowerstationthewindinfoMapper;
+import com.gyee.benchmarkingimpala.service.auto.IWindpowerstationthewindinfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class WindpowerstationthewindinfoServiceImpl extends ServiceImpl<WindpowerstationthewindinfoMapper, Windpowerstationthewindinfo> implements IWindpowerstationthewindinfoService {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/service/auto/impl/WpmttrandmtbfdayServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingimpala.service.auto.impl;
+
+import com.gyee.benchmarkingimpala.model.auto.Wpmttrandmtbfday;
+import com.gyee.benchmarkingimpala.mapper.auto.WpmttrandmtbfdayMapper;
+import com.gyee.benchmarkingimpala.service.auto.IWpmttrandmtbfdayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@Service
+public class WpmttrandmtbfdayServiceImpl extends ServiceImpl<WpmttrandmtbfdayMapper, Wpmttrandmtbfday> implements IWpmttrandmtbfdayService {
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/task/SaticScheduleTask.java

@@ -32,7 +32,7 @@ public class SaticScheduleTask {
 
     //3.添加定时任务
     /**
-     * 对标管理调度
+     * 风机绩效榜调度
      */
     @Scheduled(cron = "0 0 1 * * ?")
     //或直接指定时间间隔，例如：5秒
@@ -40,17 +40,33 @@ public class SaticScheduleTask {
     private void configureTasks1()  {
         Date yestday = DateUtils.getYestday(new Date());
         String date = DateUtils.toDate1(yestday);
+        String data1 = DateUtils.toDate1(new Date());
         try {
+            //集团需把后三个去掉
             benchmarkingService.saveEquipmentdayinfo(date,date);
             benchmarkingService.saveEquipmentdaydetailed(date,date);
             benchmarkingService.saveOperationrecord(date,date);
             benchmarkingService.saveBeanchmarkList(date,date);
-        } catch (ParseException e) {
-            e.printStackTrace();
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
+    /**
+     * 生成对标首页
+     */
+    @Scheduled(cron = "0 0 4 * * ?")
+    //或直接指定时间间隔，例如：5秒
+    //@Scheduled(fixedRate=5000)
+    private void configureTasks2()  {
+        Date yestday = DateUtils.getYestday(new Date());
+        String date = DateUtils.toDate1(yestday);
+        String data1 = DateUtils.toDate1(new Date());
+        try {
+            benchmarkingService.saveBenchmark(date,date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 }

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/DateUtils.java

@@ -7,6 +7,7 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
+import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -919,8 +920,80 @@ public class DateUtils {
     }
 
 
+    /**
+     * 获取当前周的周一的日期
+     * @param date 传入当前日期
+     * @return
+     */
+    public static Date getThisWeekMonday(Date date) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        // 获得当前日期是一个星期的第几天
+        int dayWeek = cal.get(Calendar.DAY_OF_WEEK);
+        if (1 == dayWeek) {
+            cal.add(Calendar.DAY_OF_MONTH, -1);
+        }
+        // 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        // 获得当前日期是一个星期的第几天
+        int day = cal.get(Calendar.DAY_OF_WEEK);
+        cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - day);
+        return cal.getTime();
+    }
+    /**
+     * 获取指定日期的月初
+     *
+     */
+    public static Date getFirstAndLastDayOfMonth(Date date) throws Exception {
+
+        Calendar cale = Calendar.getInstance();
+
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+        cale.setTime(date);
+
+        cale.add(Calendar.MONTH, 0);
 
+        cale.set(Calendar.DAY_OF_MONTH, 1);
 
+        String firstDayOfMonth = formatter.format(cale.getTime()); // 当月第一天 2019-02-01
+
+        return parseDate(firstDayOfMonth);
+
+    }
+
+    /**
+     * 获取季度开始
+     * @param date
+     * @return
+     */
+    public static Date getSeasonStartDate (Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        int month = calendar.get(Calendar.MONTH);
+        calendar.set(Calendar.MONTH, month / 3 * 3);
+        calendar.set(Calendar.DATE, 1);
+        return calendar.getTime();
+    }
+
+
+    public static Date getYearBegin(Date time) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(time);
+        //设置月和日都为1，即为开始时间（注：月份是从0开始;日中0表示上个月最后一天，1表示本月开始第一天）
+        cal.set(Calendar.MONTH, 0);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        //将小时置为0
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        //将分钟置为0
+        cal.set(Calendar.MINUTE, 0);
+        //将秒置为0
+        cal.set(Calendar.SECOND, 0);
+        //将毫秒置为0
+        cal.set(Calendar.MILLISECOND, 0);
+        return cal.getTime();
+
+    }
 
 
 }

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/DoubleUtils.java

@@ -0,0 +1,52 @@
+package com.gyee.benchmarkingimpala.util;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName : DoubleUtils
+ * @Author : xieshengjie
+ * @Date: 2021/7/7 15:33
+ * @Description : double 工具类
+ */
+public class DoubleUtils {
+    /**
+     * double保留小数点位数，往上取整
+     * 比如处理【评分】等数据
+     * @param d 要处理的double值
+     * @param n 要保留的位数
+     * @return
+     */
+    public static double getCeilNum(double d , int n){
+        BigDecimal b = new BigDecimal(String.valueOf(d));
+        b = b.divide(BigDecimal.ONE , n , BigDecimal.ROUND_CEILING);
+        return b.doubleValue();
+    }
+
+    /**
+     * double保留小数点位数，往下取整
+     * 比如处理【价格】等数据
+     * @param d 要处理的double值
+     * @param n 要保留的位数
+     * @return
+     */
+    public static double getFloorNum(double d , int n){
+        BigDecimal b = new BigDecimal(String.valueOf(d));
+        b = b.divide(BigDecimal.ONE , n , BigDecimal.ROUND_FLOOR);
+        return b.doubleValue();
+    }
+
+    /**
+     * double保留小数点位数，四舍五入
+     * 比如处理价格等数据
+     * @param d 要处理的double值
+     * @param n 要保留的位数
+     * @return
+     */
+    public static double getRoundingNum(double d , int n) {
+        BigDecimal b = new BigDecimal(String.valueOf(d));
+        b = b.divide(BigDecimal.ONE, n, BigDecimal.ROUND_HALF_UP);
+        return b.doubleValue();
+    }
+
+
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/RandomUtil.java

@@ -0,0 +1,168 @@
+package com.gyee.benchmarkingimpala.util;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.math3.random.RandomDataGenerator;
+
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * @ClassName : RandomUtil
+ * @Author : xieshengjie
+ * @Date: 2021/7/9 18:42
+ * @Description : 随机数工具类
+ */
+public class RandomUtil {
+    /**
+     * 随机数Int的生成
+     */
+    // 随机数生成无边界的Int
+    public static int getRandomForIntegerUnbounded() {
+        int intUnbounded = new Random().nextInt();
+        System.out.println(intUnbounded);
+        return intUnbounded;
+    }
+
+    // 生成有边界的Int
+    public static int getRandomForIntegerBounded(int min, int max) {
+        int intBounded = min + ((int) (new Random().nextFloat() * (max - min)));
+        System.out.println(intBounded);
+        return intBounded;
+    }
+
+    // 包含1而不包含10
+    // 使用Apache Common Math3来生成有边界的Int
+    public static int getRandomForIntegerBounded2(int min, int max) {
+        int intBounded = new RandomDataGenerator().nextInt(min, max);
+        System.out.println(intBounded);
+        return intBounded;
+    }
+
+    // 包含1且包含10
+    // 使用Apache Common Lang3的工具类来生成有边界的Int
+    public static int getRandomForIntegerBounded3(int min, int max) {
+        int intBounded = RandomUtils.nextInt(min, max);
+        System.out.println(intBounded);
+        return intBounded;
+    }
+
+    // 使用TreadLocalRandom来生成有边界的Int,包含min而不包含max
+    public static int getRandomForIntegerBounded4(int min, int max) {
+        int threadIntBound = ThreadLocalRandom.current().nextInt(min, max);
+        System.out.println(threadIntBound);
+        return threadIntBound;
+    }
+
+    /**
+     * 随机数Long的生成
+     */
+    // 随机数生成无边界的Long
+    public static long getRandomForLongUnbounded() {
+        long unboundedLong = new Random().nextLong();
+        System.out.println(unboundedLong);
+        return unboundedLong;
+    }
+
+    // 因为Random类使用的种子是48bits，所以nextLong不能返回所有可能的long值，long是64bits。
+    // 使用Random生成有边界的Long
+    public static long getRandomForLongBounded(long min, long max) {
+        long rangeLong = min + (((long) (new Random().nextDouble() * (max - min))));
+        System.out.println(rangeLong);
+        return rangeLong;
+    }
+
+    // 使用Apache Commons Math3来生成有边界的Long(RandomDataGenerator类提供的生成随机数的方法)
+    public static long getRandomForLongBounded2(long min, long max) {
+        long rangeLong = new RandomDataGenerator().nextLong(min, max);
+        System.out.println(rangeLong);
+        return rangeLong;
+    }
+
+    // 使用Apache Commons Lang3的工具类来生成有边界的Long(RandomUtils提供了对java.util.Random的补充)
+    public static long getRandomForLongBounded3(long min, long max) {
+        long longBounded = RandomUtils.nextLong(min, max);
+        System.out.println(longBounded);
+        return longBounded;
+    }
+
+    // 使用ThreadLocalRandom生成有边界的Long
+    public static long getRandomForLongBounded4(long min, long max) {
+        long threadLongBound = ThreadLocalRandom.current().nextLong(min, max);
+        System.out.println(threadLongBound);
+        return threadLongBound;
+    }
+
+    /**
+     * 随机数Float的生成
+     */
+    // 随机数Float的生成生成0.0-1.0之间的Float随机数
+    public static float getRandomForFloat0To1() {
+        float floatUnbounded = new Random().nextFloat();
+        System.out.println(floatUnbounded);
+        return floatUnbounded;
+    }
+
+    // 以上只会生成包含0.0而不包括1.0的float类型随机数生成有边界的Float随机数
+    public static float getRandomForFloatBounded(float min, float max) {
+        float floatBounded = min + new Random().nextFloat() * (max - min);
+        System.out.println(floatBounded);
+        return floatBounded;
+    }
+
+    // 使用Apache Common Math来生成有边界的Float随机数
+    public static float getRandomForFloatBounded2(float min, float max) {
+        float randomFloat = new RandomDataGenerator().getRandomGenerator().nextFloat();
+        float generatedFloat = min + randomFloat * (max - min);
+        System.out.println(generatedFloat);
+        return generatedFloat;
+    }
+
+    // 使用Apache Common Lang来生成有边界的Float随机数
+    public static float getRandomForFloatBounded3(float min, float max) {
+        float generatedFloat = RandomUtils.nextFloat(min, max);
+        System.out.println(generatedFloat);
+        return generatedFloat;
+    }
+
+    // 使用ThreadLocalRandom生成有边界的Float随机数
+    // ThreadLocalRandom类没有提供
+
+    /**
+     * 随机数Double的生成
+     */
+    // 生成0.0d-1.0d之间的Double随机数
+    public static double getRandomForDouble0To1() {
+        double generatorDouble = new Random().nextDouble();
+        System.out.println(generatorDouble);
+        return generatorDouble;
+    }
+
+    // 与Float相同，以上方法只会生成包含0.0d而不包含1.0d的随机数生成带有边界的Double随机数
+    public static double getRandomForDoubleBounded(double min, double max) {
+        double boundedDouble = min + new Random().nextDouble() * (max - min);
+        System.out.println(boundedDouble);
+        return boundedDouble;
+    }
+
+    // 使用Apache Common Math来生成有边界的Double随机数
+    public static double getRandomForDoubleBounded2(double min, double max) {
+        double boundedDouble = new RandomDataGenerator().getRandomGenerator().nextDouble();
+        double generatorDouble = min + boundedDouble * (max - min);
+        System.out.println(generatorDouble);
+        return generatorDouble;
+    }
+
+    // 使用Apache Common Lang生成有边界的Double随机数
+    public static double getRandomForDoubleBounded3(double min, double max) {
+        double generatedDouble = RandomUtils.nextDouble(min, max);
+        System.out.println(generatedDouble);
+        return generatedDouble;
+    }
+
+    // 使用ThreadLocalRandom生成有边界的Double随机数
+    public static double getRandomForDoubleBounded4(double min, double max) {
+        double generatedDouble = ThreadLocalRandom.current().nextDouble(min, max);
+        System.out.println(generatedDouble);
+        return generatedDouble;
+    }
+}

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/SortUtils.java

@@ -20,6 +20,7 @@ public class SortUtils {
 
     /**
      * 对list中的元素按升序排列.
+     *
      * @param list
      *            排序集合
      * @param field
@@ -32,6 +33,7 @@ public class SortUtils {
 
     /**
      * 对list中的元素进行排序.
+     *
      * @param list
      *            排序集合
      * @param field
@@ -72,6 +74,7 @@ public class SortUtils {
                         ret = String.valueOf(f.get(a)).compareTo(
                                 String.valueOf(f.get(b)));
                     }
+
                 } catch (SecurityException e) {
                     e.printStackTrace();
                 } catch (NoSuchFieldException e) {
@@ -86,6 +89,7 @@ public class SortUtils {
                 } else {
                     return ret;
                 }
+
             }
         });
         return list;
@@ -142,6 +146,7 @@ public class SortUtils {
                                 ret = String.valueOf(f.get(a)).compareTo(
                                         String.valueOf(f.get(b)));
                             }
+
                         } catch (SecurityException e) {
                             e.printStackTrace();
                         } catch (NoSuchFieldException e) {
@@ -151,6 +156,7 @@ public class SortUtils {
                         } catch (IllegalAccessException e) {
                             e.printStackTrace();
                         }
+
                         if (sort != null && sort.toLowerCase().equals(DESC)) {
                             return -ret;
                         } else {
@@ -165,6 +171,7 @@ public class SortUtils {
 
     /**
      * 默认按正序排列
+     *
      * @param list
      *            排序集合
      * @param method
@@ -177,6 +184,7 @@ public class SortUtils {
 
     /**
      * 集合排序
+     *
      * @param list
      *            排序集合
      * @param method
@@ -217,6 +225,7 @@ public class SortUtils {
                         ret = String.valueOf(m.invoke(a, null)).compareTo(
                                 String.valueOf(m.invoke(b, null)));
                     }
+
                     if (isImplementsOf(type, Comparable.class)) {
                         ret = ((Comparable) m.invoke(a, null))
                                 .compareTo((Comparable) m.invoke(b, null));
@@ -224,6 +233,7 @@ public class SortUtils {
                         ret = String.valueOf(m.invoke(a, null)).compareTo(
                                 String.valueOf(m.invoke(b, null)));
                     }
+
                 } catch (NoSuchMethodException ne) {
                     System.out.println(ne);
                 } catch (IllegalAccessException ie) {
@@ -231,6 +241,7 @@ public class SortUtils {
                 } catch (InvocationTargetException it) {
                     System.out.println(it);
                 }
+
                 if (sort != null && sort.toLowerCase().equals(DESC)) {
                     return -ret;
                 } else {
@@ -284,6 +295,7 @@ public class SortUtils {
                                                 String.valueOf(m
                                                         .invoke(b, null)));
                             }
+
                         } catch (NoSuchMethodException ne) {
                             System.out.println(ne);
                         } catch (IllegalAccessException ie) {
@@ -291,6 +303,7 @@ public class SortUtils {
                         } catch (InvocationTargetException it) {
                             System.out.println(it);
                         }
+
                         if (sort != null && sort.toLowerCase().equals(DESC)) {
                             return -ret;
                         } else {

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/taos/EdosUtil.java

@@ -27,7 +27,7 @@ public class EdosUtil implements IEdosUtil {
 
     private RestTemplate restTemplate =new RestTemplate();
     private static String baseURL = "http://10.155.32.4:8011/ts";
-//    private static String baseURL = "http://172.168.1.151:8011/ts";
+//    private static String baseURL = "http://10.65.79.30:8019/ts";
     @Override
     public PointData getRealData(Windpowerstationtestingpoint2 point) throws Exception {
         try {
@@ -208,7 +208,9 @@ public class EdosUtil implements IEdosUtil {
 		      } else {
 		          PointData data = new PointData();
 		          data.setEdnaId(pointid);
-		          data.setPointTime(sectionlist.get(0).getPointTime());
+		          if (sectionlist!=null && sectionlist.size()>0){
+                      data.setPointTime(sectionlist.get(0).getPointTime());
+                  }
 		          data.setPointValue("0");
 		          data.setPointName("1");
 		          data.setPointValueInDouble(0.0);
@@ -316,6 +318,12 @@ public class EdosUtil implements IEdosUtil {
 
     @Override
     public List<PointData> getHistoryDatasSnap(Windturbinetestingpointai2 point, Long beginDate, Long endDate, Long count, Long pried) throws Exception {
+        if (point==null){
+            System.out.println(1111);
+
+        }else if(point.getId()==null){
+            System.out.println(222);
+        }
         Optional<String> tagName = Optional.ofNullable(point.getId());
         Optional<String> thingId = Optional.ofNullable(point.getWindpowerstationid());
         Optional<String> thingType = Optional.ofNullable(point.getModelid());

benchmarking-impala/src/main/java/com/gyee/benchmarkingimpala/util/taos/timeseries/JsonObjectHelper.java

@@ -57,36 +57,39 @@ public class JsonObjectHelper {
             String key = sIterator.next();
             // 根据key获得value, value也可以是JSONObject,JSONArray,使用对应的参数接收即可
             JSONObject jsonData = jsonObject.getJSONObject(key);
-            Long ts = jsonData.getLong("ts");
-            String pointValue = null;
-            if (jsonData.containsKey("doubleValue")) {
-                pointValue = jsonData.getString("doubleValue");
-            } else if (jsonData.containsKey("booleanValue")) {
-                pointValue = jsonData.getString("booleanValue");
-            } else if (jsonData.containsKey("longValue")) {
-                pointValue = jsonData.getString("longValue");
-            } else if (jsonData.containsKey("stringValue")) {
-                pointValue = jsonData.getString("stringValue");
-            }
-
-            PointData pointData = new PointData();
-            pointData.setEdnaId(key);
-            pointData.setPointName("1");
-            pointData.setPointValue(pointValue);
-            pointData.setPointTime(ts/1000);
-            if(pointValue.equals("false")  )
-            {
-            	pointData.setPointValueInDouble(0.0);
-            }else  if(pointValue.equals("true") )
-            {
-            	pointData.setPointValueInDouble(1.0);
-            }else
-            {
-                pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+            Long ts = 0l;
+
+            if (jsonData!=null){
+                ts  = jsonData.getLong("ts");
+                String pointValue = null;
+                if (jsonData.containsKey("doubleValue")) {
+                    pointValue = jsonData.getString("doubleValue");
+                } else if (jsonData.containsKey("booleanValue")) {
+                    pointValue = jsonData.getString("booleanValue");
+                } else if (jsonData.containsKey("longValue")) {
+                    pointValue = jsonData.getString("longValue");
+                } else if (jsonData.containsKey("stringValue")) {
+                    pointValue = jsonData.getString("stringValue");
+                }
+                PointData pointData = new PointData();
+                pointData.setEdnaId(key);
+                pointData.setPointName("1");
+                pointData.setPointValue(pointValue);
+                pointData.setPointTime(ts/1000);
+                if(pointValue.equals("false")  )
+                {
+                    pointData.setPointValueInDouble(0.0);
+                }else  if(pointValue.equals("true") )
+                {
+                    pointData.setPointValueInDouble(1.0);
+                }else
+                {
+                    pointData.setPointValueInDouble(Double.parseDouble(pointValue));
+                }
+
+                //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
+                result.add(pointData);
             }
-
-         //  System.out.println("key= " + key + ", ts = " + ts + ", value = " + pointValue);
-            result.add(pointData);
         }
         return result;
     }

benchmarking-impala/src/main/resources/application-impala.yaml

@@ -8,26 +8,19 @@ spring:
   datasource:
     driver-class-name: com.cloudera.impala.jdbc41.Driver
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:impala://192.168.1.67:21050/gyee_test
-    #    url: jdbc:oracle:thin:@172.168.1.14:1521:gdnxfd
-#    username: nxfdprod
-#    password: gdnxfd123
-#    oracle-schema=:
-    #    type: com.alibaba.druid.pool.DruidDataSource
-    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
-    #    username: root
-    #    password: root
-    #    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:impala://10.65.80.5:21050/gyee_kudu
     druid:
-      max-active: 20
-      initial-size: 1
+      max-active: 60000
+      initial-size: 3
       min-idle: 3
-      max-wait: 60000
+      max-wait: 10
       time-between-eviction-runs-millis: 60000
       min-evictable-idle-time-millis: 300000
       test-while-idle: true
       test-on-borrow: false
       test-on-return: false
+#      max-evictable-idle-time-millis: 600000
+      validation-query:  SELECT 'x'
 
 
 mybatis-plus:

benchmarking-impala/src/test/java/com/gyee/benchmarkingimpala/BenchmarkingImpalaApplicationTests.java

@@ -34,22 +34,34 @@ class BenchmarkingImpalaApplicationTests {
 
     @Test
     void contextLoads() throws Exception {
-        log.info("impala jdbctemplate connection start:");
-        QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
-        List<Windpowerstation> list = windpowerstationService.list(qw);
-        log.info("impalaJdbcTemplate query result :\t" + list);
+//        log.info("impala jdbctemplate connection start:");
+//        QueryWrapper<Windpowerstation> qw = new QueryWrapper<>();
+//        List<Windpowerstation> list = windpowerstationService.list(qw);
+//        log.info("impalaJdbcTemplate query result :\t" + list);
 
-//        log.info("testTaos connection start:");
-//        double pointValueInDouble = edosUtil.getRealData("SBQFJ.NX_GD_SBQF_FJ_P1_L1_001_AI0009").getPointValueInDouble();
-//        log.info("testTaos query result :\t" + pointValueInDouble);
+        log.info("testTaos connection start:");
+        double pointValueInDouble = edosUtil.getRealData("MHSFJJSFW.NX_GD_MHSF_FJ_P1_L1_001_CI0561").getPointValueInDouble();
+        log.info("testTaos query result :\t" + pointValueInDouble);
 
     }
 
 
     @Test
     void contextLoads1() throws Exception {
-        benchmarkingService.saveEquipmentdayinfo("2021-06-01","2021-06-19");
-        benchmarkingService.saveEquipmentdaydetailed("2021-06-01","2021-06-19");
+        benchmarkingService.saveEquipmentdayinfo("2021-05-01","2021-06-30");
+//        benchmarkingService.saveEquipmentdaydetailed("2021-07-07","2021-07-07");
+
+
+//        benchmarkingService.saveOperationrecord("2021-03-01","2021-03-01");
+
+
+
+    }
+
+    @Test
+    void contextLoads2() throws Exception {
+        benchmarkingService.saveBenchmark("2021-08-01","2021-08-04");
+//        benchmarkingService.saveEquipmentdaydetailed("2021-07-07","2021-07-07");
 
 
 //        benchmarkingService.saveOperationrecord("2021-03-01","2021-03-01");

gradeevaluation/pom.xml

@@ -60,11 +60,11 @@
             <version>2.2.2</version>
         </dependency>
 
-        <!--GSON -->
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
+<!--        &lt;!&ndash;GSON &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.google.code.gson</groupId>-->
+<!--            <artifactId>gson</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>mysql</groupId>
@@ -80,10 +80,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+<!--        </dependency>-->
 
 
         <dependency>
@@ -92,10 +92,10 @@
             <version>1.1.10</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-aop</artifactId>-->
+<!--        </dependency>-->
 
 
 
@@ -121,20 +121,20 @@
 
 
 
-        <!-- 热部署 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>
+<!--        &lt;!&ndash; 热部署 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
 
 
 
-        <!-- websocket -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; websocket &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+<!--        </dependency>-->
         <!-- 配置文件读取 -->
         <dependency>
             <groupId>commons-configuration</groupId>
@@ -193,21 +193,21 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.28</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>3.9</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>3.9</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi</artifactId>-->
+<!--            <version>3.9</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-ooxml</artifactId>-->
+<!--            <version>3.9</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-ooxml-schemas</artifactId>-->
+<!--            <version>3.9</version>-->
+<!--        </dependency>-->
         <!-- 添加swagger2 -->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -215,27 +215,27 @@
             <version>2.7.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>sqljdbc4</artifactId>
-            <version>4.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+<!--            <artifactId>sqljdbc4</artifactId>-->
+<!--            <version>4.0</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
             <version>1.9.13</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi</artifactId>-->
+<!--            <version>4.0.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.poi</groupId>-->
+<!--            <artifactId>poi-ooxml</artifactId>-->
+<!--            <version>4.0.0</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/BenchmarkController.java

@@ -0,0 +1,26 @@
+package com.gyee.gradeevaluation.controller;
+
+import com.gyee.gradeevaluation.model.vo.ShbraceletVo;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName : BenchmarkController
+ * @Author : xieshengjie
+ * @Date: 2021/7/26 8:46
+ * @Description : 对标首页controller
+ */
+//@Controller
+//@RequestMapping("/benchmark")
+public class BenchmarkController {
+
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/analysis/AnalysisController.java

@@ -0,0 +1,44 @@
+package com.gyee.gradeevaluation.controller.analysis;
+
+import com.gyee.gradeevaluation.common.StringUtils;
+import com.gyee.gradeevaluation.config.R;
+import com.gyee.gradeevaluation.model.vo.AnalysisMainVo;
+import com.gyee.gradeevaluation.util.DateUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName : AnalysisController
+ * @Author : xieshengjie
+ * @Date: 2021/7/26 16:34
+ * @Description : 统计分析
+ */
+@RestController
+@RequestMapping("//analysis")
+public class AnalysisController {
+
+
+    /**
+     * 首页缩略图
+     * @param
+     * @param
+     * @return
+     */
+//    @GetMapping("/thumbnail")
+//    @ResponseBody
+//    @CrossOrigin(origins = "*", maxAge = 3600)
+//    public R thumbnail(){
+//        Date yestday = DateUtils.getYestday(new Date());
+//        String date = DateUtils.toDate1(yestday);
+//
+//        List<AnalysisMainVo> resultList = analysisNewService.analysismainlist(date,date);
+//        if (StringUtils.isNotNull(resultList)){
+//            return R.ok().data(resultList);
+//        }else{
+//            return R.error().data("访问失败");
+//        }
+//
+//    }
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/BenchmarkController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+@RestController
+@RequestMapping("//benchmark")
+public class BenchmarkController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/BjgltjbController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+@RestController
+@RequestMapping("//bjgltjb")
+public class BjgltjbController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/CurvefittingmonthsubController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//curvefittingmonthsub")
+public class CurvefittingmonthsubController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/CurvefittingsubController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//curvefittingsub")
+public class CurvefittingsubController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/EquipmentdayinfoController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-30
+ */
+@RestController
+@RequestMapping("//equipmentdayinfo")
+public class EquipmentdayinfoController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/EquipmentmodelController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+@RestController
+@RequestMapping("//equipmentmodel")
+public class EquipmentmodelController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/FaultstatisticwindturbineController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+@RestController
+@RequestMapping("//faultstatisticwindturbine")
+public class FaultstatisticwindturbineController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/HealthreportController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+@RestController
+@RequestMapping("//healthreport")
+public class HealthreportController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/JkbgbjyhController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-29
+ */
+@RestController
+@RequestMapping("//jkbgbjyh")
+public class JkbgbjyhController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/PartsController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+@RestController
+@RequestMapping("//parts")
+public class PartsController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/RecommenmainController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+@RestController
+@RequestMapping("//recommenmain")
+public class RecommenmainController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/ShbraceletpointkeyController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 手环点测表 前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+@RestController
+@RequestMapping("//shbraceletpointkey")
+public class ShbraceletpointkeyController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/ShbraceletuserController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 手环使用记录表 前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+@RestController
+@RequestMapping("//shbraceletuser")
+public class ShbraceletuserController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/ShbruserController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 手环用户表 前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+@RestController
+@RequestMapping("//shbruser")
+public class ShbruserController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/ShutdowneventController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-08-04
+ */
+@RestController
+@RequestMapping("//shutdownevent")
+public class ShutdowneventController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/Windpowerstationtestingpoint2Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+@RestController
+@RequestMapping("//windpowerstationtestingpoint2")
+public class Windpowerstationtestingpoint2Controller {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WindturbinecurvefittingController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//windturbinecurvefitting")
+public class WindturbinecurvefittingController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WindturbinecurvefittingmonthController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//windturbinecurvefittingmonth")
+public class WindturbinecurvefittingmonthController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WindturbinepoweryawController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//windturbinepoweryaw")
+public class WindturbinepoweryawController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/Windturbinetestingpointai2Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+@RestController
+@RequestMapping("//windturbinetestingpointai2")
+public class Windturbinetestingpointai2Controller {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WindturbinewindyawController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//windturbinewindyaw")
+public class WindturbinewindyawController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WtreportmainController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+@RestController
+@RequestMapping("//wtreportmain")
+public class WtreportmainController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WtreportsubController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//wtreportsub")
+public class WtreportsubController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WttragetreportchartController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-30
+ */
+@RestController
+@RequestMapping("//wttragetreportchart")
+public class WttragetreportchartController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/Wttragetreportmain3Controller.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+@RestController
+@RequestMapping("//wttragetreportmain3")
+public class Wttragetreportmain3Controller {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/auto/WttragetreportmainController.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.controller.auto;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+@RestController
+@RequestMapping("//wttragetreportmain")
+public class WttragetreportmainController {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/bracelet/BraceletController.java

@@ -0,0 +1,86 @@
+package com.gyee.gradeevaluation.controller.bracelet;
+
+import com.gyee.gradeevaluation.model.vo.PersonLnglat;
+import com.gyee.gradeevaluation.model.vo.Shbracelet;
+import com.gyee.gradeevaluation.model.vo.ShbraceletVo;
+import com.gyee.gradeevaluation.service.bracelet.BraceletService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName : BraceletController
+ * @Author : xieshengjie
+ * @Date: 2021/7/15 10:10
+ * @Description : 手环曲线页面contorller
+ */
+@Controller
+@RequestMapping("/bracelet")
+public class BraceletController {
+    @Autowired
+    private BraceletService shbraceletService;
+
+    @RequestMapping("getInfo")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public List<ShbraceletVo> getInfo(@RequestParam(value = "beginDate", required = false) String beginDate,
+                                      @RequestParam(value = "endDate", required = false) String endDate,
+                                      @RequestParam(value = "userid") String userid) throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if (beginDate == null) {
+            beginDate = sdf.format(dateRoll(new Date(), Calendar.HOUR, -4));
+        }
+        if (endDate == null) {
+
+            endDate = sdf.format(new Date());
+        }
+        List<ShbraceletVo> vo = shbraceletService.findShbraceletData(userid,
+                sdf.parse(beginDate), sdf.parse(endDate));
+
+        return vo;
+    }
+
+
+    @RequestMapping("getLnglat")
+    @ResponseBody
+
+
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public List<PersonLnglat> getLnglat() throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<PersonLnglat> vo = shbraceletService.findPersonLnglatData();
+
+        return vo;
+    }
+
+    @RequestMapping("getLnglatnew")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public List<Shbracelet> getLnglatnew() throws Exception {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<Shbracelet> vo = shbraceletService.findShbraceletDataNew();
+
+        return vo;
+    }
+
+    public static Date dateRoll(Date date, int i, int d) {
+        // 获取Calendar对象并以传进来的时间为准
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        // 将现在的时间滚动固定时长,转换为Date类型赋值
+        calendar.add(i, d);
+        // 转换为Date类型再赋值
+        date = calendar.getTime();
+        return date;
+    }
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/healthreport/HealthReportController.java

@@ -0,0 +1,42 @@
+package com.gyee.gradeevaluation.controller.healthreport;
+
+import com.gyee.gradeevaluation.common.StringUtils;
+import com.gyee.gradeevaluation.config.R;
+import com.gyee.gradeevaluation.model.auto.Healthreport;
+import com.gyee.gradeevaluation.model.auto.Indexsystemmain;
+import com.gyee.gradeevaluation.model.healthreport.HealthreportReport;
+import com.gyee.gradeevaluation.service.health.HealthReportService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+/**
+ * @ClassName : HealthReportController
+ * @Author : xieshengjie
+ * @Date: 2021/7/31 14:19
+ * @Description :
+ */
+@RestController
+@RequestMapping("//healthreport")
+public class HealthReportController {
+
+    @Resource
+    private HealthReportService healthReportService;
+
+
+    @GetMapping("/healthReport")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R healthReport(@RequestParam(value = "wtid",required = true)String wtid,
+                          @RequestParam(value = "date",required = true)String date) throws IOException {
+        HealthreportReport resultlist = healthReportService.getHealthReport(wtid,date);
+        if (resultlist!=null) {
+            return R.ok().data(resultlist);
+        }else{
+            return R.ok().message("后台正在计算中。。。");
+        }
+    }
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/reliability/ReliabilityController.java

@@ -1,16 +1,16 @@
 package com.gyee.gradeevaluation.controller.reliability;
 
+import com.alibaba.fastjson.JSON;
 import com.gyee.gradeevaluation.common.StringUtils;
 import com.gyee.gradeevaluation.config.R;
-import com.gyee.gradeevaluation.model.auto.Earlywarningmain;
-import com.gyee.gradeevaluation.model.auto.Failurestatisticsmain;
-import com.gyee.gradeevaluation.model.auto.Faulteliminatedefects;
-import com.gyee.gradeevaluation.model.auto.Indexsystemmain;
+import com.gyee.gradeevaluation.model.auto.*;
+import com.gyee.gradeevaluation.model.vo.PartPowerMainVo;
+import com.gyee.gradeevaluation.model.vo.PartPowerSubVo;
 import com.gyee.gradeevaluation.service.reliability.ReliabilityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * baseURL: 10.155.32.4:8034
@@ -63,5 +63,82 @@ public class ReliabilityController {
         }
     }
 
+    /**
+     * 获取部件列表
+     * @return
+     */
+    @GetMapping("/partlist")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R partlist()  {
+        List<Parts> resultlist = reliabilityService.partlist();
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok().data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 获取型号list
+     * @return
+     */
+    @GetMapping("/modellist")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R modellist()  {
+        List<Equipmentmodel> resultlist = reliabilityService.modellist();
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok().data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 部件功率
+     * @param wpid
+     * @param date
+     * @param model
+     * @param part
+     * @return
+     */
+    @GetMapping("/poweranalysis")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R poweranalysis(@RequestParam(value = "wpid",required = true)String wpid,
+                               @RequestParam(value = "date",required = true)String date,
+                           @RequestParam(value = "model",required = true)String model,
+                           @RequestParam(value = "part",required = true)String part
+    )  {
+        List<Bjgltjb> resultlist = reliabilityService.poweranalysis(wpid, date,model,part);
+//        Map<String,Map<String,List<Bjgltjb>>> dataMap = new HashMap<>();
+//        resultlist.stream().forEach(i->{
+//            String wtid = i.getWtid();
+//            String power = i.getPower();
+//            if (dataMap.containsKey(wtid)){
+//                Map<String, List<Bjgltjb>> map = dataMap.get(wtid);
+//                if (map.containsKey(power)){
+//                    map.get(power).add(i);
+//                }else{
+//                    List<Bjgltjb> list = new ArrayList<>();
+//                    list.add(i);
+//                    map.put(i.getPower(),list);
+//                }
+//            }else {
+//                Map<String,List<Bjgltjb>> map = new HashMap<>();
+//                List<Bjgltjb> list = new ArrayList<>();
+//                list.add(i);
+//                map.put(i.getPower(),list);
+//                dataMap.put(wtid,map);
+//            }
+//        });
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok().data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
 
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/specific/SpecificController.java

@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
+ * baseURL: 10.155.32.4:8034
  * @ClassName : SpecificController
  * @Author : xieshengjie
  * @Date: 2021/6/9 20:25
@@ -79,6 +80,40 @@ public class SpecificController {
     }
 
     /**
+     * 查询发电量
+     * @return
+     */
+    @GetMapping("/fdlList")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R fdlList(@RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.fdlList(year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
+     * 综合场用电量
+     * @return
+     */
+    @GetMapping("/zhcydlList")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R zhcydlList(@RequestParam(value = "year",required = true) String year) throws ParseException {
+
+        List<SpecificTargetVo> resultList = specificService.zhcydlList(year);
+        if (StringUtils.isNotNull(resultList)) {
+            return R.ok().data(resultList);
+        }else{
+            return R.error().message("访问失败");
+        }
+    }
+
+    /**
      * 查询维护损失率功能
      * @return
      */

gradeevaluation/src/main/java/com/gyee/gradeevaluation/controller/targetdata/TargetdataController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName : TargetdataController
@@ -46,6 +47,11 @@ public class TargetdataController {
 
     }
 
+    /**
+     * 可靠性指标分析
+     * @param date
+     * @return
+     */
     @GetMapping("/kkxzbfx")
     @ResponseBody
     @CrossOrigin(origins = "*", maxAge = 3600)
@@ -59,4 +65,23 @@ public class TargetdataController {
         }
 
     }
+
+    /**
+     * 节能减排kpi
+     * @param month
+     * @return
+     */
+    @GetMapping("/jnjpkpi")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R jnjpkpi(@RequestParam(value = "month",required = true) String month) throws ParseException {
+
+        Map<String,Double> resultlist = targetdataService.jnjpkpi(month);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok().data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/init/CacheContext.java

@@ -3,12 +3,14 @@ package com.gyee.gradeevaluation.init;
 
 import com.gyee.gradeevaluation.model.auto.*;
 import com.gyee.gradeevaluation.service.auto.*;
+import com.gyee.gradeevaluation.service.health.HealthReportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,6 +36,8 @@ public class CacheContext implements CommandLineRunner {
     private IProjectService projectService;
     @Autowired
     private ILineService lineService;
+//    @Resource
+//    private HealthReportService healthReportService;
 
     public static List<Evaluationdatasource> datasourceList = new ArrayList<>();
 
@@ -100,6 +104,8 @@ public class CacheContext implements CommandLineRunner {
         });
         lineList = lineService.list();
 
+//        healthReportService.saveHealthReport("2021-08-03","2021-08-03");
+
 
         log.info("-------------------------------缓存结束--------------------------------------");
     }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/BenchmarkMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Benchmark;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-26
+ */
+public interface BenchmarkMapper extends BaseMapper<Benchmark> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/BjgltjbMapper.java

@@ -0,0 +1,22 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Bjgltjb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+public interface BjgltjbMapper extends BaseMapper<Bjgltjb> {
+    @Select("select * from bjgltjb where wpid=#{wpid} and recodedate=to_date(#{date},'yyyy-MM-dd') and model=#{model} and partid=#{part}")
+    List<Bjgltjb> list(String wpid, String date, String model, String part);
+    @Select("select * from BJGLTJB where recodedate=to_date(#{day},'yyyy-MM-dd') and wtid=#{id}")
+    List<Bjgltjb> getpartwds(String id, String day);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/CurvefittingmonthsubMapper.java

@@ -0,0 +1,17 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Curvefittingmonthsub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+public interface CurvefittingmonthsubMapper extends BaseMapper<Curvefittingmonthsub> {
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/CurvefittingsubMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Curvefittingsub;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+public interface CurvefittingsubMapper extends BaseMapper<Curvefittingsub> {
+    @Select("select * from CurveFittingSub where windturbineid=#{wtid} and to_char(recorddate,'yyyy-MM')=substr(#{day},1,7)")
+    List<Curvefittingsub> listMonth(String day,String wtid);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/EarlywarningmainMapper.java

@@ -2,6 +2,9 @@ package com.gyee.gradeevaluation.mapper.auto;
 
 import com.gyee.gradeevaluation.model.auto.Earlywarningmain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-07-08
  */
 public interface EarlywarningmainMapper extends BaseMapper<Earlywarningmain> {
+    @Select("select * from earlywarningmain where wpid=#{wpid} and recodedate=to_date(#{date},'yyyy-MM-dd')")
+    List<Earlywarningmain> listEarly(String wpid,String date);
 
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/EquipmentdayinfoMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Equipmentdayinfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-30
+ */
+public interface EquipmentdayinfoMapper extends BaseMapper<Equipmentdayinfo> {
+    @Select("select max(recorddate) recorddate,sum(genecapacity) genecapacity ,sum(daynhwhssdl) daynhwhssdl,sum(daynhgzssdl) daynhgzssdl,sum(daynhcfdl) daynhcfdl,sum(daynhxdssdl) daynhxdssdl,sum(daynhqfdl) daynhqfdl,sum(therogenecapacity) therogenecapacity,avg(speed) speed from equipmentdayinfo \n" +
+            "where windturbineid=#{id} group by to_char(recorddate,'yyyymm')  order by to_char(recorddate,'yyyymm') desc  ")
+    List<Equipmentdayinfo> getFjjxb(String id);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/EquipmentmodelMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Equipmentmodel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+public interface EquipmentmodelMapper extends BaseMapper<Equipmentmodel> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/FailurestatisticsmainMapper.java

@@ -2,6 +2,9 @@ package com.gyee.gradeevaluation.mapper.auto;
 
 import com.gyee.gradeevaluation.model.auto.Failurestatisticsmain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-07-08
  */
 public interface FailurestatisticsmainMapper extends BaseMapper<Failurestatisticsmain> {
-
+    @Select("select * from failurestatisticsmain where wpid=#{wpid} and recodedate = to_date(#{date},'yyyy-MM-dd') ")
+    List<Failurestatisticsmain> listFailure(String wpid, String date);
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/FaultstatisticwindturbineMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Faultstatisticwindturbine;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+public interface FaultstatisticwindturbineMapper extends BaseMapper<Faultstatisticwindturbine> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/HealthreportMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Healthreport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+public interface HealthreportMapper extends BaseMapper<Healthreport> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/InputoroutputspeedtotalMapper.java

@@ -2,6 +2,9 @@ package com.gyee.gradeevaluation.mapper.auto;
 
 import com.gyee.gradeevaluation.model.auto.Inputoroutputspeedtotal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +15,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-07-09
  */
 public interface InputoroutputspeedtotalMapper extends BaseMapper<Inputoroutputspeedtotal> {
-
+    @Select("select windturbineid,avg(dayinputsmall) dayinputsmall,avg(dayoutputsmall) dayoutputsmall,avg(dayinputbig) dayinputbig,avg(dayoutputbig) dayoutputbig from Inputoroutputspeedtotal \n" +
+            "where windturbineid=#{id} and to_char(recorddate,'yyyy-MM')=substr(#{day},1,7) group by windturbineid")
+    List<Inputoroutputspeedtotal> getQrqc(String id, String day);
+    @Select("select windpowerstationid,avg(dayinputsmall) dayinputsmall,avg(dayoutputsmall) dayoutputsmall,avg(dayinputbig) dayinputbig,avg(dayoutputbig) dayoutputbig from Inputoroutputspeedtotal \n" +
+            "where windpowerstationid=#{id} and to_char(recorddate,'yyyy-MM')=substr(#{day},1,7) group by windpowerstationid")
+    List<Inputoroutputspeedtotal> getQrqcjzz(String id, String day);
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/JkbgbjyhMapper.java

@@ -0,0 +1,26 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Jkbgbjyh;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-29
+ */
+public interface JkbgbjyhMapper extends BaseMapper<Jkbgbjyh> {
+    @Select("select type,sum(count) count,sum(time) time from jkbgbjyh where windturbineid=#{id} and alarmdate=substr(#{day},1,7)  group by type")
+    List<Jkbgbjyh> getBjyhdb(String id,String day);
+    @Select("select type,sum(count) count,sum(time) time from jkbgbjyh where stationid=#{windpowerstationid} and alarmdate=substr(#{day},1,7)  group by type")
+    List<Jkbgbjyh> getBjyhdbjz(String windpowerstationid,String day);
+    @Select("select * from jkbgbjyh where windturbineid=#{wtid} and alarmdate=substr(#{day},1,7)")
+    List<Jkbgbjyh> getBjyhdbBywt(String wtid,String day);
+    @Select("select avg(count) count,avg(time) time,stationid, alerttext,max(type) type from jkbgbjyh where stationid=#{windpowerstationid} and alarmdate=substr(#{day},1,7)  group by stationid,alerttext")
+    List<Jkbgbjyh> getBjyhdbBywp(String windpowerstationid,String day);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/PartsMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Parts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-24
+ */
+public interface PartsMapper extends BaseMapper<Parts> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/RecommenmainMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Recommenmain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-31
+ */
+public interface RecommenmainMapper extends BaseMapper<Recommenmain> {
+    @Select("select * from recommenmain where wtid=#{id} and to_char(createdate,'yyyy-MM-dd')=to_char(sysdate,'yyyy-MM-dd')")
+    List<Recommenmain> getrecommens(String id, String day);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ShbraceletpointkeyMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Shbraceletpointkey;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 手环点测表 Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+public interface ShbraceletpointkeyMapper extends BaseMapper<Shbraceletpointkey> {
+    @Select("select pointkey from shbraceletpointkey where deviceid=#{deviceid}")
+    List<String> getPointkeylistByDeviceid(Integer deviceid);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ShbraceletuserMapper.java

@@ -0,0 +1,20 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Shbraceletuser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 手环使用记录表 Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+public interface ShbraceletuserMapper extends BaseMapper<Shbraceletuser> {
+    @Select("select deviceid from shbraceletuser where userid=#{userid}")
+    Integer getDeviceidByUserid(Integer id);
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ShbruserMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Shbruser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 手环用户表 Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+public interface ShbruserMapper extends BaseMapper<Shbruser> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/ShutdowneventMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Shutdownevent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-08-04
+ */
+public interface ShutdowneventMapper extends BaseMapper<Shutdownevent> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/StatetransitionratesMapper.java

@@ -2,6 +2,10 @@ package com.gyee.gradeevaluation.mapper.auto;
 
 import com.gyee.gradeevaluation.model.auto.Statetransitionrates;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-06-10
  */
 public interface StatetransitionratesMapper extends BaseMapper<Statetransitionrates> {
+    @Select("select windpwoerid,sum(TIMERATE20) TIMERATE20,sum(TIMERATE16) TIMERATE16,sum(TIMERATE17) TIMERATE17,sum(TIMERATE18) TIMERATE18,sum(TIMERATE19) TIMERATE19 from Statetransitionrates " +
+            " where recorddate>=to_date("+"#{beginDate}" +",'yyyy-MM-dd')"+
+            " and recorddate<=to_date("+"#{endDate}" +",'yyyy-MM-dd')"+
+            " group by windpwoerid"
+    )
+    List<Statetransitionrates> listZdy(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
+    @Select("select windpwoerid,sum(TIMERATE13) TIMERATE13,sum(TIMERATE1) TIMERATE1,sum(TIMERATE2) TIMERATE2,sum(TIMERATE3) TIMERATE3,sum(TIMERATE4) TIMERATE4,sum(TIMERATE14) TIMERATE14,sum(TIMERATE5) TIMERATE5,sum(TIMERATE6) TIMERATE6,sum(TIMERATE7) TIMERATE7,sum(TIMERATE8) TIMERATE8,sum(TIMERATE15) TIMERATE15,sum(TIMERATE9) TIMERATE9,sum(TIMERATE10) TIMERATE10,sum(TIMERATE11) TIMERATE11,sum(TIMERATE12) TIMERATE12 from Statetransitionrates " +
+            " where recorddate>=to_date("+"#{beginDate}" +",'yyyy-MM-dd')"+
+            " and recorddate<=to_date("+"#{endDate}" +",'yyyy-MM-dd')"+
+            " group by windpwoerid"
+    )
+    List<Statetransitionrates> listZdyztzhl(String beginDate, String endDate);
 
 }

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/Windpowerstationtestingpoint2Mapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Windpowerstationtestingpoint2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-15
+ */
+public interface Windpowerstationtestingpoint2Mapper extends BaseMapper<Windpowerstationtestingpoint2> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/WindturbinecurvefittingMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Windturbinecurvefitting;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+public interface WindturbinecurvefittingMapper extends BaseMapper<Windturbinecurvefitting> {
+
+}

gradeevaluation/src/main/java/com/gyee/gradeevaluation/mapper/auto/WindturbinecurvefittingmonthMapper.java

@@ -0,0 +1,21 @@
+package com.gyee.gradeevaluation.mapper.auto;
+
+import com.gyee.gradeevaluation.model.auto.Windturbinecurvefittingmonth;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2021-07-28
+ */
+public interface WindturbinecurvefittingmonthMapper extends BaseMapper<Windturbinecurvefittingmonth> {
+
+    @Select("select * from windturbineCurveFittingMonth where windturbineid=#{id} and year = #{year} and month = #{month}")
+    List<Windturbinecurvefittingmonth> glqxnhlist(String id, int year, int month);
+}