排行榜功能

common/src/main/java/com/gyee/common/util/DoubleUtils.java

@@ -57,7 +57,7 @@ public class DoubleUtils {
                 res = bigA.multiply(bigB).doubleValue();
                 break;
             case "/":
-                res = bigA.divide(bigB).doubleValue();
+                res = bigA.divide(bigB,2,BigDecimal.ROUND_HALF_UP).doubleValue();
                 break;
             default :
                 System.out.println("运算符不合法~");

common/src/main/java/com/gyee/common/vo/benchmark/RankingVo.java

@@ -0,0 +1,19 @@
+package com.gyee.common.vo.benchmark;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RankingVo {
+
+    private String wpid;
+    private String wtid;
+    private String wpname;
+    private String wtname;
+    private Date beginDate;
+    private Date endDate;
+    private Double speed;
+    private Double power;
+    private Double rankdata;
+}

common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -7,6 +7,7 @@ com\gyee\common\config\GeneratorCodeConfig.class
 com\gyee\common\vo\analysis\AnalysisMainVo.class
 com\gyee\common\vo\benchmark\DjhxdbtopVo.class
 com\gyee\common\vo\benchmark\OpeVo.class
+com\gyee\common\vo\benchmark\RankingVo.class
 com\gyee\common\util\ClassUtil.class
 com\gyee\common\util\JSONUtil.class
 com\gyee\common\vo\analysis\AnalysisSubVo.class

common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,63 +1,64 @@
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\healthmanager\CompareVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisSubVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\CharsetKit.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\SortUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\BigDecimalUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\targetdata\NxzbfxVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CommonUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\PointData.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\GoodCompareVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\CurveVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\StrFormatter.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\CommonMain.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\ClassUtil.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\DynamicBean.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\FjjxbVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\controller\WindturbineController.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\DeskObject.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTopVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DjhxdbtopVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\contant\Contant.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DjhxdbInitVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\BdzVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\FzyVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\RealExport.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\PointDataVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\JSONUtil.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\RandomUtil.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\auto\Windturbine.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\OpeVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DynamicBean.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\mapper\WindturbineMapper.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\StringUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\algorithm\PointVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\threerate\QxjslVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\config\ResultCode.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\algorithm\GDJTLineBuild.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\DateUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\FjjxbmxVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalsisUpdateVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\datacenter\ParameterComparisonVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\CopyUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTargetVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisMainVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\RestTemplateUtil.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\analysis\EnergyDailyVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\WxsslVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\algorithm\LineParameters.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\DNAVal.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificCenterVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\ValueVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\targetdata\KkxzbfxVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\Convert.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\config\GeneratorCodeConfig.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\config\R.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\Operation.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\threerate\FwjslVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\service\impl\WindturbineServiceImpl.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\DoubleUtils.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\model\DNAStatVal.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\service\IWindturbineService.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\vo\benchmark\DataVo.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\domain\AjaxResult.java
-D:\work\ideawork\sis\sis\common\src\main\java\com\gyee\common\util\algorithm\LineBuild.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\CopyUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\controller\WindturbineController.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\datacenter\CurveVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\service\IWindturbineService.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\RandomUtil.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\EnergyDailyVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\OpeVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\DoubleUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\BigDecimalUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalsisUpdateVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\auto\Windturbine.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\threerate\FwjslVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\datacenter\RealExport.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\Convert.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\BdzVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\DNAStatVal.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\DynamicBean.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\algorithm\LineBuild.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificCenterVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\CommonMain.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\RestTemplateUtil.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\DeskObject.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\threerate\QxjslVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\Operation.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\contant\Contant.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\targetdata\NxzbfxVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\config\ResultCode.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\CharsetKit.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\targetdata\KkxzbfxVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\config\R.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\ClassUtil.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\DynamicBean.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\DNAVal.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\service\impl\WindturbineServiceImpl.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\config\GeneratorCodeConfig.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\PointData.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\StrFormatter.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\healthmanager\CompareVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\algorithm\GDJTLineBuild.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\DateUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisMainVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\DataVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTargetVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\datacenter\ParameterComparisonVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\mapper\WindturbineMapper.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\algorithm\PointVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\SortUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\RankingVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\DjhxdbtopVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\DjhxdbInitVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\ValueVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\GoodCompareVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\domain\AjaxResult.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\algorithm\LineParameters.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\JSONUtil.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\FjjxbVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\model\StringUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\analysis\AnalysisSubVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\WxsslVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\specific\SpecificTopVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\FjjxbmxVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\datacenter\PointDataVo.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\util\CommonUtils.java
+E:\IdeaProjects\sis\common\src\main\java\com\gyee\common\vo\benchmark\FzyVo.java

common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-D:\work\ideawork\sis\sis\common\src\test\java\com\gyee\common\CommonMainTest.java
+E:\IdeaProjects\sis\common\src\test\java\com\gyee\common\CommonMainTest.java

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/controller/auto/WindturbineinfodayController.java

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

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/controller/ranking/RankingController.java

@@ -0,0 +1,74 @@
+package com.gyee.benchmarkingweb.controller.ranking;
+
+import com.gyee.benchmarkingweb.config.R;
+import com.gyee.benchmarkingweb.service.ranking.RankingService;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.vo.benchmark.RankingVo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("//ranking")
+public class RankingController {
+    @Resource
+    private RankingService rankingService;
+
+    /**
+     *效率排行
+     * @param beginDate
+     * @param endDate
+     * @param wpid
+     * @param orderby
+     * @param isAsc
+     * @return
+     */
+    @GetMapping("/efficiencyRanking")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R efficiencyRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                  @RequestParam(value = "endDate",required = true) String endDate,
+                  @RequestParam(value = "wpid",required = true) String wpid,
+                               @RequestParam(value = "orderby",required = false) String orderby,
+                               @RequestParam(value = "isAsc",required = false) String isAsc
+    )  {
+        List<RankingVo> resultlist = rankingService.efficiencyRanking(beginDate,endDate,wpid,orderby,isAsc);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+    /**
+     * 发电量排行
+     * @param beginDate
+     * @param endDate
+     * @param wpid
+     * @param orderby
+     * @param isAsc
+     * @return
+     */
+    @GetMapping("/electricRanking")
+    @ResponseBody
+    @CrossOrigin(origins = "*", maxAge = 3600)
+    public R electricRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                               @RequestParam(value = "endDate",required = true) String endDate,
+                               @RequestParam(value = "wpid",required = true) String wpid,
+                               @RequestParam(value = "orderby",required = false) String orderby,
+                               @RequestParam(value = "isAsc",required = false) String isAsc
+    )  {
+        List<RankingVo> resultlist = rankingService.electricRanking(beginDate,endDate,wpid,orderby,isAsc);
+        if (StringUtils.isNotNull(resultlist)) {
+            return R.ok(resultlist.size()).data(resultlist);
+        }else{
+            return R.error().message("访问失败");
+        }
+
+    }
+
+
+
+}

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/mapper/auto/WindturbineinfodayMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingweb.mapper.auto;
+
+import com.gyee.benchmarkingweb.model.auto.Windturbineinfoday;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-24
+ */
+public interface WindturbineinfodayMapper extends BaseMapper<Windturbineinfoday> {
+
+}

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/model/auto/Windturbineinfoday.java

@@ -0,0 +1,259 @@
+package com.gyee.benchmarkingweb.model.auto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("WINDTURBINEINFODAY")
+public class Windturbineinfoday extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Long id;
+
+    @TableField("WINDTURBINEID")
+    private String windturbineid;
+
+    @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;
+
+    @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("MAXSPEED")
+    private Double maxspeed;
+
+    @TableField("MINSPEED")
+    private Double minspeed;
+
+    @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("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("MONTHSPEED")
+    private Double monthspeed;
+
+    @TableField("YEARSPEED")
+    private Double yearspeed;
+
+    @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("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("MONTHWINDHOURS")
+    private Double monthwindhours;
+
+    @TableField("YEARWINDHOURS")
+    private Double yearwindhours;
+
+    @TableField("DAYLYXS")
+    private Double daylyxs;
+
+    @TableField("MONTHLYXS")
+    private Double monthlyxs;
+
+    @TableField("YEARLYXS")
+    private Double yearlyxs;
+
+    @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;
+
+
+}

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/auto/IWindturbineinfodayService.java

@@ -0,0 +1,16 @@
+package com.gyee.benchmarkingweb.service.auto;
+
+import com.gyee.benchmarkingweb.model.auto.Windturbineinfoday;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-24
+ */
+public interface IWindturbineinfodayService extends IService<Windturbineinfoday> {
+
+}

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/auto/impl/WindturbineinfodayServiceImpl.java

@@ -0,0 +1,20 @@
+package com.gyee.benchmarkingweb.service.auto.impl;
+
+import com.gyee.benchmarkingweb.model.auto.Windturbineinfoday;
+import com.gyee.benchmarkingweb.mapper.auto.WindturbineinfodayMapper;
+import com.gyee.benchmarkingweb.service.auto.IWindturbineinfodayService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 谢生杰
+ * @since 2022-02-24
+ */
+@Service
+public class WindturbineinfodayServiceImpl extends ServiceImpl<WindturbineinfodayMapper, Windturbineinfoday> implements IWindturbineinfodayService {
+
+}

web/benchmarking-web-hb/src/main/java/com/gyee/benchmarkingweb/service/ranking/RankingService.java

@@ -0,0 +1,129 @@
+package com.gyee.benchmarkingweb.service.ranking;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.benchmarkingweb.init.CacheContext;
+import com.gyee.benchmarkingweb.model.auto.Equipmentmodel;
+import com.gyee.benchmarkingweb.model.auto.Windpowerstation;
+import com.gyee.benchmarkingweb.model.auto.Windturbine;
+import com.gyee.benchmarkingweb.model.auto.Windturbineinfoday;
+import com.gyee.benchmarkingweb.service.auto.IWindturbineinfodayService;
+import com.gyee.common.model.StringUtils;
+import com.gyee.common.util.DateUtils;
+import com.gyee.common.util.DoubleUtils;
+import com.gyee.common.util.SortUtils;
+import com.gyee.common.vo.benchmark.RankingVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class RankingService {
+    @Resource
+    private IWindturbineinfodayService windturbineinfodayService;
+
+    public List<RankingVo> efficiencyRanking(String beginDate, String endDate, String wpid, String orderby,String isAsc) {
+        List<RankingVo> resultList = new ArrayList<>();
+
+        QueryWrapper<Windturbineinfoday> qw = new QueryWrapper<>();
+        Date begin = DateUtils.parseDate(beginDate);
+        Date end = DateUtils.parseDate(endDate);
+        qw.eq("windpowerstationid",wpid);
+        qw.ge("recorddate", begin);
+        qw.le("recorddate", end);
+        List<Windturbineinfoday> dataList = windturbineinfodayService.list(qw);
+        Map<String, Equipmentmodel> equipmentmodelMap = CacheContext.equipmentmodelMap;
+        List<Windturbine> wtls = CacheContext.wtls;//缓存中获取风机列表
+        Map<String, Windpowerstation> wpmap = CacheContext.wpmap;//缓存中获取风场列表
+
+        wtls.stream().forEach(wt->{
+            RankingVo vo = new RankingVo();
+            List<Windturbineinfoday> windturbineinfodayList = dataList.stream().filter(d -> d.getWindturbineid().equals(wt.getId())).collect(Collectors.toList());
+            OptionalDouble speedAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getSpeed).average();
+            OptionalDouble powerAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getPower).average();
+            Double speed = 0.0;
+            Double power = 0.0;
+            if (speedAverage.isPresent()){
+                speed = speedAverage.getAsDouble();
+            }
+            if (powerAverage.isPresent()){
+                power = powerAverage.getAsDouble();
+            }
+            Double generatingcapacity = windturbineinfodayList.stream().filter(i -> i.getSpeed() != null).mapToDouble(Windturbineinfoday::getGeneratingcapacity).sum();
+            Double powerproduction = equipmentmodelMap.get(wt.getModelid()).getPowerproduction();
+            Double rankdata = DoubleUtils.GetResult(generatingcapacity, powerproduction, "/");
+            String windpowerstationid = wt.getWindpowerstationid();
+            vo.setWpid(windpowerstationid);
+            vo.setWpname(wpmap.get(windpowerstationid).getName());
+            vo.setWtid(wt.getId());
+            vo.setWtname(wt.getName());
+            vo.setBeginDate(begin);
+            vo.setEndDate(end);
+            vo.setSpeed(speed);
+            vo.setPower(power);
+            vo.setRankdata(rankdata);
+            resultList.add(vo);
+        });
+
+        if (StringUtils.isNotEmpty(orderby) && StringUtils.isNotEmpty(isAsc)){
+            if (isAsc.equals("1"))
+                SortUtils.sort(resultList,orderby,SortUtils.ASC);
+                SortUtils.sort(resultList,orderby,SortUtils.DESC);
+        }
+
+        return resultList;
+    }
+
+    public List<RankingVo> electricRanking(String beginDate, String endDate, String wpid, String orderby, String isAsc) {
+        List<RankingVo> resultList = new ArrayList<>();
+
+        QueryWrapper<Windturbineinfoday> qw = new QueryWrapper<>();
+        Date begin = DateUtils.parseDate(beginDate);
+        Date end = DateUtils.parseDate(endDate);
+        qw.eq("windpowerstationid", wpid);
+        qw.ge("recorddate", begin);
+        qw.le("recorddate", end);
+        List<Windturbineinfoday> dataList = windturbineinfodayService.list(qw);
+        Map<String, Equipmentmodel> equipmentmodelMap = CacheContext.equipmentmodelMap;
+        List<Windturbine> wtls = CacheContext.wtls;//缓存中获取风机列表
+        Map<String, Windpowerstation> wpmap = CacheContext.wpmap;//缓存中获取风场列表
+
+        wtls.stream().forEach(wt -> {
+            RankingVo vo = new RankingVo();
+            List<Windturbineinfoday> windturbineinfodayList = dataList.stream().filter(d -> d.getWindturbineid().equals(wt.getId())).collect(Collectors.toList());
+            OptionalDouble speedAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getSpeed).average();
+            OptionalDouble powerAverage = windturbineinfodayList.stream().mapToDouble(Windturbineinfoday::getPower).average();
+            Double speed = 0.0;
+            Double power = 0.0;
+            if (speedAverage.isPresent()) {
+                speed = speedAverage.getAsDouble();
+            }
+            if (powerAverage.isPresent()) {
+                power = powerAverage.getAsDouble();
+            }
+            Double rankdata = windturbineinfodayList.stream().filter(i -> i.getSpeed() != null).mapToDouble(Windturbineinfoday::getGeneratingcapacity).sum();
+            //Double powerproduction = equipmentmodelMap.get(wt.getModelid()).getPowerproduction();
+            //Double rankdata = DoubleUtils.GetResult(generatingcapacity, powerproduction, "/");
+            String windpowerstationid = wt.getWindpowerstationid();
+            vo.setWpid(windpowerstationid);
+            vo.setWpname(wpmap.get(windpowerstationid).getName());
+            vo.setWtid(wt.getId());
+            vo.setWtname(wt.getName());
+            vo.setBeginDate(begin);
+            vo.setEndDate(end);
+            vo.setSpeed(speed);
+            vo.setPower(power);
+            vo.setRankdata(rankdata);
+            resultList.add(vo);
+        });
+
+        if (StringUtils.isNotEmpty(orderby) && StringUtils.isNotEmpty(isAsc)) {
+            if (isAsc.equals("1"))
+                SortUtils.sort(resultList, orderby, SortUtils.ASC);
+            SortUtils.sort(resultList, orderby, SortUtils.DESC);
+        }
+
+        return resultList;
+    }
+}

web/consumer/src/main/java/com/gyee/consumer/api/ranking/RankingApi.java

@@ -0,0 +1,25 @@
+package com.gyee.consumer.api.ranking;
+
+import com.gyee.common.config.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient("benchmarking-provider")
+@RequestMapping("//ranking")
+public interface RankingApi {
+    @GetMapping("/efficiencyRanking")
+    public R efficiencyRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                               @RequestParam(value = "endDate",required = true) String endDate,
+                               @RequestParam(value = "wpid",required = true) String wpid,
+                               @RequestParam(value = "orderby",required = false) String orderby,
+                               @RequestParam(value = "isAsc",required = false) String isAsc
+    );
+    @GetMapping("/electricRanking")
+    public R electricRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                             @RequestParam(value = "endDate",required = true) String endDate,
+                             @RequestParam(value = "wpid",required = true) String wpid,
+                             @RequestParam(value = "orderby",required = false) String orderby,
+                             @RequestParam(value = "isAsc",required = false) String isAsc
+    );
+
+}

web/consumer/src/main/java/com/gyee/consumer/controller/knowleage/KnowleageController.java

@@ -1,13 +1,10 @@
 package com.gyee.consumer.controller.knowleage;
 
 import com.gyee.common.config.R;
-import com.gyee.common.model.StringUtils;
 import com.gyee.consumer.api.knowleage.KnowledgeApi;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @ClassName : KnowleageController
@@ -31,8 +28,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/faultKnowledge")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R faultKnowledge(@RequestParam(value = "gzjb",required = true) String gzjb,
                             @RequestParam(value = "tjlx",required = true) String tjlx,
                             @RequestParam(value = "cxnr",required = true) String cxnr,
@@ -53,8 +48,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/earlyKnowledge")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R earlyKnowledge(@RequestParam(value = "gzjb",required = true) String gzjb,
                             @RequestParam(value = "bjlx",required = true) String bjlx,
                             @RequestParam(value = "cxnr",required = true) String cxnr,
@@ -73,8 +66,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/checkRepairProgramme")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R checkRepairProgramme(@RequestParam(value = "model",required = true) String model,
                                   @RequestParam(value = "pageNum",required = true) String pageNum,
                                   @RequestParam(value = "pageSize",required = true) String pageSize
@@ -90,8 +81,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/modelList")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R modelList()  {
 
 
@@ -108,8 +97,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/featureParameter")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R featureParameter(@RequestParam(value = "name",required = true) String name,
                               @RequestParam(value = "pageNum",required = true) String pageNum,
                               @RequestParam(value = "pageSize",required = true) String pageSize
@@ -127,8 +114,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/safeMeasureKnowledge")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R safeMeasureKnowledge(@RequestParam(value = "safecontent",required = true) String name,
                                   @RequestParam(value = "pageNum",required = true) String pageNum,
                                   @RequestParam(value = "pageSize",required = true) String pageSize
@@ -149,8 +134,6 @@ public class KnowleageController {
      */
 
     @GetMapping("/consumer/knowledge/workGuideKnowledge")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R workGuideKnowledge(@RequestParam(value = "content",required = true) String name,
                                 @RequestParam(value = "pageNum",required = true) String pageNum,
                                 @RequestParam(value = "pageSize",required = true) String pageSize
@@ -166,8 +149,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/workGuideKnowledge/safetyMeasure")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R safetyMeasure(@RequestParam(value = "rsnum",required = false) String rsnum,
                            @RequestParam(value = "content",required = false) String content,
                            @RequestParam(value = "pageNum",required = true) String pageNum,
@@ -186,8 +167,6 @@ public class KnowleageController {
      * @return
      */
     @GetMapping("/consumer/knowledge/workGuideKnowledge/dangerContent")
-    @ResponseBody
-    @CrossOrigin(origins = "*", maxAge = 3600)
     public R dangerContent(@RequestParam(value = "rsnum",required = false) String rsnum,
                            @RequestParam(value = "content",required = false) String content,
                            @RequestParam(value = "pageNum",required = true) String pageNum,

web/consumer/src/main/java/com/gyee/consumer/controller/ranking/RankingController.java

@@ -0,0 +1,37 @@
+package com.gyee.consumer.controller.ranking;
+
+import com.gyee.common.config.R;
+import com.gyee.consumer.api.ranking.RankingApi;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+public class RankingController {
+    @Resource
+    private RankingApi rankingApi;
+    @GetMapping("/consumer/efficiencyRanking")
+    public R efficiencyRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                               @RequestParam(value = "endDate",required = true) String endDate,
+                               @RequestParam(value = "wpid",required = true) String wpid,
+                               @RequestParam(value = "orderby",required = false) String orderby,
+                               @RequestParam(value = "isAsc",required = false) String isAsc
+    )  {
+        return rankingApi.efficiencyRanking(beginDate,endDate,wpid,orderby,isAsc);
+
+    }
+    @GetMapping("/consumer/electricRanking")
+    public R electricRanking(@RequestParam(value = "beginDate",required = true) String beginDate,
+                             @RequestParam(value = "endDate",required = true) String endDate,
+                             @RequestParam(value = "wpid",required = true) String wpid,
+                             @RequestParam(value = "orderby",required = false) String orderby,
+                             @RequestParam(value = "isAsc",required = false) String isAsc
+    )  {
+        return rankingApi.electricRanking(beginDate,endDate,wpid,orderby,isAsc);
+
+
+    }
+
+}