后台监视系统功能修正

web/consumer-hb/pom.xml

@@ -17,11 +17,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
         <spring-cloud-alibaba.version>2.2.5.RELEASE</spring-cloud-alibaba.version>
+        <feign-version>9.5.0</feign-version>
     </properties>
 
     <dependencies>
-
-        <!--spring boot web依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -142,6 +141,31 @@
             <version>1.6.2</version>
         </dependency>
 
+
+        <!--sentinel数据持久化-->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+        </dependency>
+
+        <!--sentinel-datasource-extension数据源扩展-->
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-extension</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.18.Final</version>
+        </dependency>
+
+
+
     </dependencies>
 
     <dependencyManagement>

web/consumer-hb/src/main/java/com/gyee/consumer/config/FeignConfiguration.java

@@ -3,7 +3,18 @@ package com.gyee.consumer.config;
 
 import com.gyee.consumer.fallback.compare.CompareServiceFallbackFactory;
 import com.gyee.consumer.fallback.goodness.WindturbineGoodnessServiceFallbackFactory;
+import com.gyee.consumer.fallback.leaderboard.LeaderboardServiceFallbackFactory;
 import com.gyee.consumer.fallback.monitor.*;
+import com.gyee.consumer.fallback.outputspeed.InputoroutputspeedtotalServiceFallbackFactory;
+import com.gyee.consumer.fallback.powercompare.PowerCompareServiceFallbackFactory;
+import com.gyee.consumer.fallback.powersaturation.PowersaturationServiceFallbackFactory;
+import com.gyee.consumer.fallback.projectplan.ProjectPlanServiceFallbackFactory;
+import com.gyee.consumer.fallback.recommen.RecommenServiceFallbackFactory;
+import com.gyee.consumer.fallback.scatter.ScatterServiceFallbackFactory;
+import com.gyee.consumer.fallback.singleanalysis.SingleAnalysisServiceFallbackFactory;
+import com.gyee.consumer.fallback.warn.WarningServiceFallbackFactory;
+import com.gyee.consumer.fallback.weather.WeatherServiceFallbackFactory;
+import com.gyee.consumer.fallback.yaw.YawServiceFallbackFactory;
 import org.springframework.context.annotation.Bean;
 
 public class FeignConfiguration {
@@ -49,5 +60,63 @@ public class FeignConfiguration {
         return new WindturbineGoodnessServiceFallbackFactory();
     }
 
+    @Bean
+    public LeaderboardServiceFallbackFactory leaderboardServiceFallbackFactory() {
+        return new LeaderboardServiceFallbackFactory();
+    }
+
+    @Bean
+    public InputoroutputspeedtotalServiceFallbackFactory inputoroutputspeedtotalServiceFallbackFactory() {
+        return new InputoroutputspeedtotalServiceFallbackFactory();
+    }
+
+    @Bean
+    public PowerCompareServiceFallbackFactory powerCompareServiceFallbackFactory() {
+        return new PowerCompareServiceFallbackFactory();
+    }
+
+
+    @Bean
+    public PowersaturationServiceFallbackFactory powersaturationServiceFallbackFactory() {
+        return new PowersaturationServiceFallbackFactory();
+    }
+
+    @Bean
+    public ProjectPlanServiceFallbackFactory projpectPlanServiceFallbackFactory() {
+        return new ProjectPlanServiceFallbackFactory();
+    }
+
+    @Bean
+    public RecommenServiceFallbackFactory recommenServiceFallbackFactory() {
+        return new RecommenServiceFallbackFactory();
+    }
+
+    @Bean
+    public ScatterServiceFallbackFactory scatterServiceFallbackFactory() {
+        return new ScatterServiceFallbackFactory();
+    }
+
+    @Bean
+    public SingleAnalysisServiceFallbackFactory singleAnalysisServiceFallbackFactory() {
+        return new SingleAnalysisServiceFallbackFactory();
+    }
+
+    @Bean
+    public WeatherServiceFallbackFactory weatherServiceFallbackFactory() {
+        return new WeatherServiceFallbackFactory();
+    }
+
+
+    @Bean
+    public WarningServiceFallbackFactory warningServiceFallbackFactory() {
+        return new WarningServiceFallbackFactory();
+    }
+
+    @Bean
+    public YawServiceFallbackFactory yawServiceFallbackFactory() {
+        return new YawServiceFallbackFactory();
+    }
+
+
 
 }

web/consumer-hb/src/main/java/com/gyee/consumer/controller/goodness/WindturbinegoodnessController.java

@@ -1,24 +1,16 @@
 package com.gyee.consumer.controller.goodness;
 
 import com.gyee.common.domain.AjaxResult;
-import com.gyee.common.model.StringUtils;
-import com.gyee.common.vo.benchmark.DataVo;
-import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.goodness.WindturbineGoodnessService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.*;
 
 /**
  * 风机明细信息页面
@@ -43,7 +35,7 @@ public class WindturbinegoodnessController {
      * @param recorddate
      * @return
      */
-    @GetMapping("/windturbinegoodness")
+    @PostMapping(value = "/windturbinegoodness" )
     @ResponseBody
     @ApiOperation(value = "获得单机性能总览列表信息", notes = "获得单机性能总览列表信息")
     @ApiImplicitParams({
@@ -51,9 +43,9 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult windturbinegoodness(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate)  {
+    public AjaxResult windturbinegoodness(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate)  {
 
-        AjaxResult ajax=windturbineGoodnessService.windturbinegoodness(tablepar,wpId,recorddate);
+        AjaxResult ajax=windturbineGoodnessService.windturbinegoodness( tablepar,wpId,recorddate);
 
         return ajax;
     }
@@ -68,7 +60,7 @@ public class WindturbinegoodnessController {
      * @param endDate
      * @return
      */
-    @GetMapping("/goodhistorylist")
+    @PostMapping("/goodhistorylist")
     @ResponseBody
     @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
     @ApiImplicitParams({
@@ -77,7 +69,7 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult goodhistorylist(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)  {
+    public AjaxResult goodhistorylist(Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)  {
 
         AjaxResult ajax=windturbineGoodnessService.goodhistorylist(tablepar,wtId,beginDate,endDate);
 
@@ -175,15 +167,15 @@ public class WindturbinegoodnessController {
     /*
      * 单台风机当日报警记录
      */
-    @GetMapping("/bjjllist")
+    @PostMapping("/bjjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日报警记录", notes = "单台风机当日报警记录")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "tablepar", paramType = "query"),
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult bjjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+    public AjaxResult bjjllist(Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
 
         AjaxResult ajax=windturbineGoodnessService.bjjllist(tablepar, wtId,recorddate);
 
@@ -193,7 +185,7 @@ public class WindturbinegoodnessController {
     /*
      * 单台风机当日停机记录
      */
-    @GetMapping("/gzjllist")
+    @PostMapping("/gzjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日停机记录", notes = "单台风机当日停机记录")
     @ApiImplicitParams({
@@ -201,7 +193,7 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult gzjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+    public AjaxResult gzjllist(Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
 
         AjaxResult ajax=windturbineGoodnessService.gzjllist(tablepar,wtId,recorddate);
 
@@ -211,7 +203,7 @@ public class WindturbinegoodnessController {
     /*
      * 单台风机当日限电记录
      */
-    @GetMapping("/xdjllist")
+    @PostMapping("/xdjllist")
     @ResponseBody
     @ApiOperation(value = "单台风机当日限电记录", notes = "单台风机当日限电记录")
     @ApiImplicitParams({
@@ -219,7 +211,7 @@ public class WindturbinegoodnessController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+    public AjaxResult xdjllist(Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
 
         AjaxResult ajax=windturbineGoodnessService.xdjllist(tablepar,wtId,recorddate);
 
@@ -482,7 +474,7 @@ public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recor
     /*
      * 单台风机当月报警排行
      */
-    @GetMapping("/bjphlist")
+    @PostMapping("/bjphlist")
     @ResponseBody
     @ApiOperation(value = "单台风机当月报警排行", notes = "单台风机当月报警排行")
     @ApiImplicitParams({
@@ -490,7 +482,7 @@ public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recor
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate) {
+    public AjaxResult bjphlist(Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate) {
 
         AjaxResult ajax=windturbineGoodnessService.bjphlist(tablepar,wtId,recorddate);
 
@@ -546,7 +538,7 @@ public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recor
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型 1:日小风切入，2：月小风切入，3：月小风切入,4:日小风停机，5：月小风停机，6：年小风停机", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult pieChart(@RequestParam("wtId") String wtId,@RequestParam("wtId")  String recorddate,@RequestParam("wtId") String type) {
+    public AjaxResult pieChart(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate,@RequestParam("type") String type) {
 
         AjaxResult ajax=windturbineGoodnessService.pieChart(wtId,recorddate,type);
 

web/consumer-hb/src/main/java/com/gyee/consumer/controller/health/HealthController.java

@@ -2,11 +2,6 @@ package com.gyee.consumer.controller.health;
 
 
 import com.gyee.common.domain.AjaxResult;
-import com.gyee.common.model.PointData;
-import com.gyee.common.model.StringUtils;
-import com.gyee.common.model.auto.Windturbine;
-import com.gyee.common.util.DateUtils;
-import com.gyee.common.vo.benchmark.ValueVo;
 import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.health.HealthService;
 import io.swagger.annotations.Api;
@@ -17,8 +12,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.DecimalFormat;
-import java.util.*;
 
 @Controller
 @RequestMapping("/health")
@@ -35,8 +28,8 @@ public class HealthController {
     @ApiOperation(value = "获得健康状态情况图表", notes = "获得健康状态情况图表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "num", value = "结果数量", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query")})
+            @ApiImplicitParam(name = "num", value = "结果数量(多少个点)", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型(1、当日2、 7日3、当月)", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception {
 
         AjaxResult ajax=healthMainService.findAllChart(wpId,num,type);
@@ -86,7 +79,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception  {
 
         AjaxResult ajax=healthMainService.findHealthMatrixMap();
 
@@ -99,7 +92,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception  {
 
         AjaxResult ajax=healthMainService.findHealthMatrixMap();
 
@@ -113,7 +106,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception  {
 
         AjaxResult ajax=healthMainService.findHealthMatrixMap();
 
@@ -127,7 +120,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception  {
 
         AjaxResult ajax=healthMainService.findHealthMatrixMap();
 
@@ -234,7 +227,7 @@ public class HealthController {
     @ApiOperation(value = "获取风机健康部件曲线图", notes = "获取风机健康部件曲线图")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "type", value = "部件类型", required = true, dataType = "string", paramType = "query")
+            @ApiImplicitParam(name = "type", value = "部件类型1、风机2、齿轮箱3、发电机4、变桨、5控制系统", required = true, dataType = "string", paramType = "query")
     })
     public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception  {
 
@@ -298,7 +291,7 @@ public class HealthController {
 
     /***********************************************************************************************************************/
     /**性能损失走势列表**/
-    @GetMapping("/losspowerratehealth/losspowerrateList")
+    @GetMapping("/losspowerrateList")
     @ResponseBody
     @ApiOperation(value = "性能损失走势列表", notes = "性能损失走势列表")
     @ApiImplicitParams({
@@ -314,7 +307,7 @@ public class HealthController {
     }
 
     /**性能损失走势图表**/
-    @GetMapping("/losspowerratehealth/getChartlist")
+    @GetMapping("/getChartlist")
     @ResponseBody
     @ApiOperation(value = "性能损失走势图表", notes = "性能损失走势图表")
     @ApiImplicitParams({
@@ -365,7 +358,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "modelId", value = "模型编号", required = true, dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "typeId", value = "时间类型", required = true, dataType = "string", paramType = "query")})
+            @ApiImplicitParam(name = "typeId", value = "时间类型1、2", required = true, dataType = "string", paramType = "query")})
 
     public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception   {
 
@@ -405,7 +398,7 @@ public class HealthController {
 
     /***********************************************************************************************************************/
     /**单机区间曲线偏差率**/
-    @GetMapping("/windTurbineCurveList")
+    @PostMapping("/windTurbineCurveList")
     @ResponseBody
     @ApiOperation(value = "单机区间曲线偏差率", notes = "单机区间曲线偏差率")
     @ApiImplicitParams({
@@ -413,7 +406,7 @@ public class HealthController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) throws Exception   {
+    public AjaxResult windTurbineCurveList(Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) throws Exception   {
 
         AjaxResult ajax=healthMainService.windTurbineCurveList(tablepar,wpId,recorddate);
 

web/consumer-hb/src/main/java/com/gyee/consumer/controller/leaderboard/LeaderboardController.java

@@ -0,0 +1,322 @@
+package com.gyee.consumer.controller.leaderboard;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.leaderboard.LeaderboardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/leaderboard")
+@Api(value = "排行榜功能",tags =  "排行榜功能")
+public class LeaderboardController {
+    @Resource
+    private LeaderboardService leaderboardService;
+
+    /**查询拟合优度列表**/
+    @PostMapping("/fittingtoplist")
+    @ResponseBody
+    @ApiOperation(value = "查询拟合优度列表", notes = "查询拟合优度列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult fittingtoplist(Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+
+
+        AjaxResult ajax=leaderboardService.fittingtoplist(tablepar,wpIps,beginDate,endDate);
+
+        return ajax;
+    }
+
+
+    /**查询拟合优度图表**/
+    @GetMapping("/fittingtopchart")
+    @ResponseBody
+    @ApiOperation(value = "查询拟合优度图表", notes = "查询拟合优度图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtIds", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult fittingtopchart(@RequestParam("wtIds") String wtIds, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception
+        {
+
+
+            AjaxResult ajax=leaderboardService.fittingtopchart(wtIds,beginDate,endDate);
+
+            return ajax;
+        }
+
+
+        /**查询总发电量排行列表**/
+    @PostMapping("/totalPowerCapacityTopList")
+    @ResponseBody
+    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpIps", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult totalPowerCapacityTopList(Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)
+    {
+
+
+        AjaxResult ajax=leaderboardService.totalPowerCapacityTopList(tablepar,wpIps,beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**查询利用率排行榜列表**/
+    @PostMapping("/utilizationList")
+    @ResponseBody
+    @ApiOperation(value = "查询总发电量排行列表", notes = "查询总发电量排行列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult utilizationList(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type)  {
+
+
+        AjaxResult ajax=leaderboardService.utilizationList(tablepar,wpId,beginDate,endDate,type);
+
+        return ajax;
+    }
+
+
+    /**查询损失率排行榜列表**/
+    @PostMapping("/lossList")
+    @ResponseBody
+    @ApiOperation(value = "查询损失率排行榜列表", notes = "查询损失率排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult lossList(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type) {
+
+        AjaxResult ajax=leaderboardService.lossList(tablepar,wpId,beginDate,endDate,type);
+
+        return ajax;
+    }
+
+    /**查询负荷率排行榜列表**/
+    @PostMapping("/loadfactortoplist")
+    @ResponseBody
+    @ApiOperation(value = "查询负荷率排行榜列表", notes = "查询负荷率排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 0:风场,1:项目,2:线路,3:风机,", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult loadfactortoplist(Tablepar tablepar,@RequestParam("type") String type, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+
+
+        AjaxResult ajax=leaderboardService.loadfactortoplist(tablepar,type,wpId,beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**查询报警排行榜列表**/
+    @PostMapping("/querywarningStatistical")
+    @ResponseBody
+    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult querywarningStatistical(Tablepar tablepar,@RequestParam("type")  String type, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+
+        AjaxResult ajax=leaderboardService.querywarningStatistical(tablepar,type,beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**查询报警排行榜图表**/
+    @GetMapping("/querywarningStatisticalPie")
+    @ResponseBody
+    @ApiOperation(value = "查询报警排行榜列表", notes = "查询报警排行榜列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "type", value = "类型 1报警:,2:报警类型,3:厂家", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult querywarningStatisticalPie(@RequestParam("type") String type,  @RequestParam("beginDate") String beginDate,@RequestParam("endDate")  String endDate) {
+
+        AjaxResult ajax=leaderboardService.querywarningStatisticalPie(type,beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**查询日曲线偏差率列表**/
+    @PostMapping("/curvefittingmainList")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线偏差率列表", notes = "查询日曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvefittingmainList(Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) {
+        AjaxResult ajax=leaderboardService.curvefittingmainList(tablepar,wpId,recorddate);
+
+        return ajax;
+    }
+
+    /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/getCurvechatAjax")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线", notes = "查询日曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getCurvechatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("recorddate")  String recorddate) {
+        AjaxResult ajax=leaderboardService.getCurvechatAjax(type,wtId,recorddate);
+
+        return ajax;
+    }
+
+    /**查询日曲线同比图表**/
+    @GetMapping("/curvechatAjaxtb")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线同比图表", notes = "查询日曲线同比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvechatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate) {
+
+        AjaxResult ajax=leaderboardService.curvechatAjaxtb(type,wtId,recorddate);
+
+        return ajax;
+    }
+    /**查询日曲线环比图表**/
+    @GetMapping("/curvechatAjaxhb")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线环比图表", notes = "查询日曲线环比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvechatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,  @RequestParam("recorddate") String recorddate) {
+        AjaxResult ajax=leaderboardService.curvechatAjaxhb(type,wtId,recorddate);
+
+        return ajax;
+    }
+    /**查询日曲线标杆图表**/
+    @GetMapping("/curvechatAjaxbg")
+    @ResponseBody
+    @ApiOperation(value = "查询日曲线标杆图表", notes = "查询日曲线标杆图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvechatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate) {
+        AjaxResult ajax=leaderboardService.curvechatAjaxbg(type,wtId,recorddate);
+
+        return ajax;
+    }
+
+    /**查询月曲线偏差率列表**/
+    @PostMapping("/curvefittingmonthmainList")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线偏差率列表", notes = "查询月曲线偏差率列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curvefittingmonthmainList(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("year") String year,@RequestParam("month") String month) {
+        AjaxResult ajax=leaderboardService.curvefittingmonthmainList(tablepar,wpId,year,month);
+
+        return ajax;
+    }
+
+    /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/curveMonthchatAjax")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线偏差率", notes = "查询月曲线偏差率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 sjbz:实际/保证,sjzy:实际/最优,zybz:最优/保证", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curveMonthchatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month) {
+        AjaxResult ajax=leaderboardService.curveMonthchatAjax(type,wtId,year,month);
+
+        return ajax;
+    }
+
+    /**查询月曲线同比图表**/
+    @GetMapping("/curveMonthchatAjaxtb")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线同比图表", notes = "查询月曲线同比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curveMonthchatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month") String month) {
+        AjaxResult ajax=leaderboardService.curveMonthchatAjaxtb(type,wtId,year,month);
+
+        return ajax;
+    }
+    /**查询月曲线环比图表**/
+    @GetMapping("/curveMonthchatAjaxhb")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线环比图表", notes = "查询月曲线环比图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curveMonthchatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month) {
+        AjaxResult ajax=leaderboardService.curveMonthchatAjaxhb(type,wtId,year,month);
+
+        return ajax;
+    }
+    /**查询月曲线标杆图表**/
+    @GetMapping("/curveMonthchatAjaxbg")
+    @ResponseBody
+    @ApiOperation(value = "查询月曲线标杆图表", notes = "查询月曲线标杆图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型 tb:同比,hb:环比,bg:标杆", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult curveMonthchatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year") String year,@RequestParam("month") String month) {
+        AjaxResult ajax=leaderboardService.curveMonthchatAjaxbg(type,wtId,year,month);
+
+        return ajax;
+    }
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/outputspeed/OutputSpeedController.java

@@ -0,0 +1,59 @@
+package com.gyee.consumer.controller.outputspeed;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.outputspeed.InputoroutputspeedtotalService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/outputspeed")
+@Api(value = "切入切出管理",tags =  "切入切出管理")
+public class OutputSpeedController {
+
+    @Resource
+    private InputoroutputspeedtotalService inputoroutputspeedtotalService;
+
+    /**切入切出列表**/
+    @PostMapping("/outputSpeedlist")
+    @ResponseBody
+    @ApiOperation(value = "切入切出列表", notes = "切入切出列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult outputSpeedlist(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=inputoroutputspeedtotalService.outputSpeedlist(tablepar,wpId,recorddate);
+
+        return ajax;
+    }
+
+    /**切入切出历史列表**/
+    @PostMapping("/outputspeedhistorylist")
+    @ResponseBody
+    @ApiOperation(value = "切入切出历史列表", notes = "切入切出历史列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult outputspeedhistorylist(Tablepar tablepar, @RequestParam("wpId") String wpId,@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) {
+
+        AjaxResult ajax=inputoroutputspeedtotalService.outputspeedhistorylist(tablepar,wpId,wtId,beginDate,endDate);
+
+        return ajax;
+    }
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/powercompare/PowerCompareController.java

@@ -0,0 +1,319 @@
+package com.gyee.consumer.controller.powercompare;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.powercompare.PowerCompareService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/powercompare")
+@Api(value = "风机绩效榜功能",tags =  "风机绩效榜功能")
+public class PowerCompareController {
+
+    @Resource
+    private PowerCompareService powerCompareService;
+
+
+    /**
+     * 报警类型列表
+     * @return
+     */
+    @GetMapping("/warningClassAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询报警类型列表", notes = "查询报警类型列表")
+    public AjaxResult warningClassAjax() {
+
+        AjaxResult ajax=powerCompareService.warningClassAjax();
+
+        return ajax;
+    }
+
+    /**
+     * 风场下拉接口
+     * @return
+     */
+    @GetMapping("/windfarmAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电场数据列表", notes = "查询风电场数据列表")
+    public AjaxResult windfarmAjax() {
+
+        AjaxResult ajax=powerCompareService.windfarmAjax();
+
+        return ajax;
+    }
+
+    /**
+     * 风电场下拉接口
+     * @return
+     */
+    @GetMapping("/windfarmAllAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电场(光伏)数据列表", notes = "查询风电场(光伏)数据列表")
+      public AjaxResult windfarmAllAjax() {
+
+        AjaxResult ajax=powerCompareService.windfarmAllAjax();
+
+        return ajax;
+    }
+
+    /**
+     * 项目下拉接口
+     * @return
+     */
+    @GetMapping("/projectAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询项目数据列表", notes = "通过风场编号查询项目数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult projectAjax(@RequestParam("wpIds") String wpIds) {
+
+            AjaxResult ajax=powerCompareService.projectAjax(wpIds);
+
+            return ajax;
+        }
+
+
+    /**
+     * 所有风电场项目下拉接口
+     * @return
+     */
+    @GetMapping("/projectAllAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电项目数据列表", notes = "查询风电项目数据列表")
+    public AjaxResult projectAllAjax() {
+
+        AjaxResult ajax=powerCompareService.projectAllAjax();
+
+        return ajax;
+    }
+
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/lineAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过项目编号查询线路数据列表", notes = "通过项目编号查询线路数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult lineAjax(@RequestParam("pjIds") String pjIds) {
+
+        AjaxResult ajax=powerCompareService.lineAjax(pjIds);
+
+        return ajax;
+    }
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/lineWpIdAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询线路数据列表", notes = "通过项目编号查询线路数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult lineWpIdAjax(@RequestParam("wpId") String wpId) {
+
+        AjaxResult ajax=powerCompareService.lineWpIdAjax(wpId);
+
+        return ajax;
+    }
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/lineAllAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电线路数据列表", notes = "查询风电线路数据列表")
+
+    public AjaxResult lineAllAjax() {
+
+        AjaxResult ajax=powerCompareService.lineAllAjax();
+
+        return ajax;
+    }
+    /**
+     * 通过风电场ID获取风机下拉接口
+     * @return
+     */
+    @GetMapping("/windturbineAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询风机数据列表", notes = "通过风场编号查询风机数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windturbineAjax(@RequestParam("wpId") String wpId) {
+
+        AjaxResult ajax=powerCompareService.windturbineAjax(wpId);
+
+        return ajax;
+    }
+
+    /**
+     * 获得所有风电场风机下拉接口
+     * @return
+     */
+    @GetMapping("/windturbineAllAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风机数据列表", notes = "查询风机数据列表")
+
+    public AjaxResult windturbineAllAjax() {
+
+        AjaxResult ajax=powerCompareService.windturbineAllAjax();
+
+        return ajax;
+    }
+    /**查询风机图表数据结果**/
+    @GetMapping("/queryPower")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风机图表数据结果", notes = "查询风机图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lineIds", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult queryPower(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds,@RequestParam("lineIds") String lineIds,@RequestParam("beginDate") String beginDate,
+                                 @RequestParam("endDate")String endDate)  {
+
+        AjaxResult ajax=powerCompareService.queryPower(wpIds, pjIds, lineIds, beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**查询风场、项目、线路图表数据结果**/
+    @GetMapping("/queryPowerAll")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风场、项目、线路图表数据结果", notes = "查询风场、项目、线路图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult queryPowerAll(@RequestParam("wpIds")String wpIds, @RequestParam("beginDate") String beginDate,
+                                    @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType)  {
+
+        AjaxResult ajax=powerCompareService.queryPowerAll(wpIds, beginDate,endDate, queryType);
+
+        return ajax;
+    }
+    /**查询风机列表数据结果**/
+    @GetMapping("/powerAjax")
+    @ResponseBody
+    @CrossOrigin
+
+    @ApiOperation(value = "查询风机图表数据结果", notes = "查询风机图表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lineIds", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortName", value = "排序字段", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortOrder", value = "排序顺序 asc,desc", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult powerAjax(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds, @RequestParam("lineIds")String lineIds, @RequestParam("beginDate")String beginDate,
+                                @RequestParam("endDate")String endDate, @RequestParam("sortName")String sortName, @RequestParam("sortOrder")String sortOrder)  {
+
+        AjaxResult ajax=powerCompareService.powerAjax(wpIds,pjIds,lineIds,beginDate,endDate,sortName, sortOrder);
+
+        return ajax;
+    }
+
+    /**查询风场、项目、线路列表数据结果**/
+    @GetMapping("/powerAjaxAll")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风场、项目、线路列表数据结果", notes = "查询风场、项目、线路列表数据结果")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortName", value = "排序字段", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "sortOrder", value = "排序顺序 asc,desc", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powerAjaxAll(@RequestParam("wpIds")String wpIds,  @RequestParam("beginDate")String beginDate,
+                                   @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType, @RequestParam("sortName")String sortName,@RequestParam("sortOrder") String sortOrder)  {
+
+        AjaxResult ajax=powerCompareService.powerAjaxAll(wpIds,  beginDate,
+                endDate, queryType, sortName, sortOrder);
+
+        return ajax;
+    }
+
+  /******************************************************************************************************************/
+
+
+    /**查询风机列表数据结果**/
+    @GetMapping("/powerAjaxDetail")
+    @ResponseBody
+    @ApiOperation(value = "查询风机绩效榜明细信息", notes = "查询风机绩效榜明细信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "xlId", value = "线路编号", required = false, dataType = "string", paramType = "query")})
+
+    public AjaxResult powerAjaxDetail(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                      @RequestParam(value = "endDate",required = true) String endDate,
+                                      @RequestParam(value = "wpId",required = false) String  wpId,
+                                      @RequestParam(value = "pjId",required = false) String  pjId,
+                                      @RequestParam(value = "xlId",required = false) String  xlId )  {
+
+        AjaxResult ajax=powerCompareService.powerAjaxDetail(beginDate,
+                endDate, wpId, pjId, xlId);
+
+        return ajax;
+    }
+
+    /**查询风场、项目、线路列表数据结果**/
+    @GetMapping("/powerAjaxDetailAll")
+    @ResponseBody
+    @ApiOperation(value = "查询风场、项目、线路列表数据结果", notes = "查询风场、项目、线路列表数据结果")
+    @ApiImplicitParams({
+
+
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "queryType", value = "查询类型 fc:风场,pj:项目,xl:线路", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powerAjaxDetailAll(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                         @RequestParam(value = "endDate",required = true) String endDate,
+                                         @RequestParam(value = "queryType",required = true) String  queryType)  {
+
+
+        AjaxResult ajax=powerCompareService.powerAjaxDetailAll(beginDate,
+                endDate, queryType);
+
+        return ajax;
+    }
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/powersaturation/PowerSaturationController.java

@@ -0,0 +1,117 @@
+package com.gyee.consumer.controller.powersaturation;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.powersaturation.PowersaturationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/powersaturation")
+@Api(value = "总单机饱和度统计",tags =  "总单机饱和度统计")
+public class PowerSaturationController {
+    @Resource
+    private PowersaturationService powersaturationService;
+
+    /**总功率饱和列表**/
+    @PostMapping("/powersaturationamonutlist")
+    @ResponseBody
+    @ApiOperation(value = "查询总功率饱和列表", notes = "查询总功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationamonutlist( Tablepar tablepar, @RequestParam("wtId")  String wtId) {
+
+        AjaxResult ajax=powersaturationService.powersaturationamonutlist(tablepar, wtId);
+
+        return ajax;
+    }
+    /**总功率饱和图表**/
+    @GetMapping("/powersaturationamonutchart")
+    @ResponseBody
+    @ApiOperation(value = "查询总功率饱和图表", notes = "查询总功率饱和图表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationamonutchart(@RequestParam("wtId") String wtId) {
+
+        AjaxResult ajax=powersaturationService.powersaturationamonutchart(wtId);
+
+        return ajax;
+    }
+    /***********************************************************************************************/
+    /**日功率饱和列表**/
+    @PostMapping("/powersaturationlist")
+    @ResponseBody
+    @ApiOperation(value = "日功率饱和列表", notes = "日功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationlist(  Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=powersaturationService.powersaturationlist(tablepar, wtId, recorddate);
+
+        return ajax;
+    }
+    /**日功率饱和图表**/
+    @GetMapping("/powersaturationchart")
+    @ResponseBody
+    @ApiOperation(value = "日功率饱和图表", notes = "日功率饱和图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationchart(@RequestParam("wtId") String wtId,@RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=powersaturationService.powersaturationchart(wtId,recorddate);
+
+        return ajax;
+    }
+    /***********************************************************************************************/
+
+    /**月功率饱和列表**/
+    @PostMapping("/powersaturationmonthlist")
+    @ResponseBody
+    @ApiOperation(value = "月功率饱和列表", notes = "月功率饱和列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationmonthlist(  Tablepar tablepar,@RequestParam("wtId")  String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) {
+
+        AjaxResult ajax=powersaturationService.powersaturationmonthlist(tablepar, wtId, year, month);
+
+        return ajax;
+    }
+    /**月功率饱和图表**/
+    @GetMapping("/powersaturationmonthchart")
+    @ResponseBody
+    @ApiOperation(value = "月功率饱和图表", notes = "月功率饱和图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powersaturationmonthchart(@RequestParam("wtId") String wtId, @RequestParam("year") String year,@RequestParam("month")  String month) {
+
+        AjaxResult ajax=powersaturationService.powersaturationmonthchart(wtId, year, month);
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/projectplan/ProjectPlanController.java

@@ -0,0 +1,72 @@
+package  com.gyee.consumer.controller.projectplan;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.ProjectPlanVo;
+import com.gyee.consumer.service.projectplan.ProjectPlanService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/projectplan")
+@Api(value = "计划发电量",tags =  "计划发电量")
+public class ProjectPlanController {
+
+    @Resource
+    private ProjectPlanService projectPlanService;
+
+    /**计划发电量列表**/
+    @GetMapping("/getProjectPlanVo")
+    @ResponseBody
+    @ApiOperation(value = "计划发电量列表", notes = "计划发电量列表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getProjectPlanVo(@RequestParam("wpId") String wpId, @RequestParam("pjId") String pjId,@RequestParam("year")  String year)  {
+
+        AjaxResult ajax=projectPlanService.getProjectPlanVo(wpId, pjId, year);
+
+        return ajax;
+    }
+
+    /**返回计划发电量修改对象**/
+    @GetMapping("/getSingleProjectPlan")
+    @ResponseBody
+    @ApiOperation(value = "查询计划发电量修改对象", notes = "查询计划发电量修改对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getSingleProjectPlan(@RequestParam("pjId") String pjId,@RequestParam("year")  String year) {
+
+        AjaxResult ajax=projectPlanService.getSingleProjectPlan(pjId, year);
+
+        return ajax;
+    }
+
+    /**计划发电量添加和修改**/
+    @PostMapping("/saveData")
+    @ResponseBody
+    @ApiOperation(value = "查询计划发电量修改对象", notes = "查询计划发电量修改对象")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "vo", value = "项目VO对象", required = true, dataType = "ProjectPlanVo", paramType = "query")})
+
+    public AjaxResult saveData(@RequestParam("vo") ProjectPlanVo vo) {
+
+        AjaxResult ajax=projectPlanService.saveData(vo);
+
+        return ajax;
+    }
+
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/recommen/RecommenController.java

@@ -0,0 +1,321 @@
+package com.gyee.consumer.controller.recommen;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.recommen.RecommenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/recommen")
+@Api(value = "健康风机推荐",tags =  "健康风机推荐")
+public class RecommenController {
+
+    @Resource
+    private RecommenService recommenService;
+
+    /**
+     * 获得当日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/getRecommenmainDay1")
+    @ResponseBody
+    @ApiOperation(value = "获得当日健康推荐检修风机", notes = "获得当日健康推荐检修风机")
+     public AjaxResult getRecommenmainDay1() {
+
+        AjaxResult ajax=recommenService.getRecommenmainDay1();
+
+        return ajax;
+    }
+
+    /**
+     * 获得3日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/getRecommenmainDay3")
+    @ResponseBody
+    @ApiOperation(value = "获得3日健康推荐检修风机", notes = "获得3日健康推荐检修风机")
+    public AjaxResult getRecommenmainDay3() {
+
+        AjaxResult ajax=recommenService.getRecommenmainDay3();
+
+        return ajax;
+    }
+
+    /**
+     * 获得7日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/getRecommenmainDay7")
+    @ResponseBody
+    @ApiOperation(value = "获得7日健康推荐检修风机", notes = "获得7日健康推荐检修风机")
+    public AjaxResult getRecommenmainDay7() {
+
+        AjaxResult ajax=recommenService.getRecommenmainDay7();
+
+        return ajax;
+    }
+
+    /**
+     * 确认推荐检修风机，并添加记录到生产系统
+     * @param rid
+     */
+    @PostMapping("/confirpush")
+    @ResponseBody
+    @ApiOperation(value = "确认推荐检修风机，并添加记录到生产系统", notes = "确认推荐检修风机，并添加记录到生产系统")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "rid", value = "推荐记录编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult confirpush(@RequestParam("rid") String rid)
+    {
+
+        AjaxResult ajax=recommenService.confirpush(rid);
+
+        return ajax;
+    }
+
+    /**
+     * 全部确认不同时间段的推荐检修风机
+     * @param typeid 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐
+     */
+    @PostMapping("/confirpushAll")
+    @ResponseBody
+    @ApiOperation(value = "全部确认不同时间段的推荐检修风机", notes = "全部确认不同时间段的推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "typeid", value = "类型编号 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult confirpushAll(@RequestParam("typeid") String typeid)
+    {
+
+        AjaxResult ajax=recommenService.confirpushAll(typeid);
+
+        return ajax;
+    }
+    /**
+     * 取消推荐检修风机
+     * @param rid
+     */
+    @PostMapping("/ignorepush")
+    @ResponseBody
+    @ApiOperation(value = "取消推荐检修风机", notes = "取消推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "rid", value = "推荐记录编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult ignorepush(@RequestParam("rid") String rid)
+    {
+
+        AjaxResult ajax=recommenService.ignorepush(rid);
+
+        return ajax;
+    }
+
+    /**
+     * 全部取消不同时间段的推荐检修风机
+     * @param typeid 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐
+     */
+    @PostMapping("/ignorepushAll")
+    @ResponseBody
+    @ApiOperation(value = "全部取消不同时间段的推荐检修风机", notes = "全部取消不同时间段的推荐检修风机")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "typeid", value = "类型编号 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult ignorepushAll(@RequestParam("typeid") String typeid)
+    {
+
+        AjaxResult ajax=recommenService.ignorepushAll(typeid);
+
+        return ajax;
+    }
+
+    /**
+     * 获得已经确认检修风机
+     * @return
+     */
+    @GetMapping("/recommenConfirmedList")
+    @ResponseBody
+    @ApiOperation(value = "获得已经确认检修风机", notes = "获得已经确认检修风机")
+
+    public AjaxResult recommenConfirmedList() {
+
+        AjaxResult ajax=recommenService.recommenConfirmedList();
+
+        return ajax;
+    }
+
+    /**
+     * 获得健康状态预测
+     * @param wpId
+     * @param type 1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势，
+     * @return map.put(" yslchart ", yslchart); //优数量
+     *             map.put("lslchart", lslchart);//良数量
+     *             map.put("cslchart", cslchart);//差数量
+     *             map.put("lvchart", lvchart);//健康率
+     *             map.put("datechart", datechart);//日期
+     * @throws Exception
+     */
+    @GetMapping("/findAllChartjz")
+    @ResponseBody
+    @ApiOperation(value = "获得健康状态预测", notes = "获得健康状态预测")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型编号 1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult findAllChartjz(@RequestParam("wpId") String wpId, @RequestParam("type")  String type) throws Exception {
+
+        AjaxResult ajax=recommenService.findAllChartjz(wpId,type);
+
+        return ajax;
+    }
+
+
+    /**
+     * 通过消缺单获得详细信息
+     * @param rid
+     * @return
+     */
+    @GetMapping("/findMainTrack")
+    @ResponseBody
+    @ApiOperation(value = "通过消缺单获得详细信息", notes = "通过消缺单获得详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "rid", value = "推荐检修编号", required = true, dataType = "string", paramType = "query")
+        })
+
+    public AjaxResult findMainTrack(@RequestParam("rid") String rid) {
+
+        AjaxResult ajax=recommenService.findMainTrack(rid);
+
+        return ajax;
+    }
+
+    /**
+     * 获得未完成消缺单列表
+     * @return
+     */
+    @GetMapping("/unfinishedList")
+    @ResponseBody
+    @ApiOperation(value = "获得未完成消缺单列表", notes = "获得未完成消缺单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult unfinishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate) {
+
+        AjaxResult ajax=recommenService.unfinishedList(wpId,wtId,beginDate,endDate);
+
+        return ajax;
+    }
+    /**
+     * 获得完成消缺单列表
+     * @return
+     */
+    @GetMapping("/finishedList")
+    @ResponseBody
+    @ApiOperation(value = "获得完成消缺单列表", notes = "获得完成消缺单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult finishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate) {
+
+        AjaxResult ajax=recommenService.finishedList(wpId, wtId, beginDate, endDate);
+
+        return ajax;
+    }
+
+
+    /**
+     * 通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据
+     * @param name
+     * @param beginDate
+     * @param endDate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/findShbraceletList")
+    @ResponseBody
+    @ApiOperation(value = "通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据", notes = "通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "名称", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findShbraceletList(@RequestParam("name") String name,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
+
+        AjaxResult ajax=recommenService.findShbraceletList( name,beginDate,endDate);
+
+        return ajax;
+    }
+
+
+    /**
+     * 获取部件结构树
+     * @return
+     */
+    @GetMapping("/findLocationTreeByWtId")
+    @ResponseBody
+    @ApiOperation(value = "获取部件结构树", notes = "获取部件结构树")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findLocationTreeByWtId(@RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax=recommenService.findLocationTreeByWtId(wtId);
+
+        return ajax;
+    }
+
+    /**
+     * 通过位置编号获得缺陷单信息
+     * @return
+     */
+    @PostMapping("/findWobugeqByLocation")
+    @ResponseBody
+    @ApiOperation(value = "通过位置编号获得缺陷单信息", notes = "通过位置编号获得缺陷单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = false, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "location", value = "位置", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWobugeqByLocation( Tablepar tablepar, @RequestParam("location") String location) throws Exception {
+
+        AjaxResult ajax=recommenService.findWobugeqByLocation(tablepar,location);
+
+        return ajax;
+    }
+
+
+    /**
+     * 获得对应风机的1个月健康推荐检修记录
+     * @return
+     */
+    @GetMapping("/getRecommenmainMonth")
+    @ResponseBody
+    @ApiOperation(value = "获得对应风机的1个月健康推荐检修记录", notes = "获得对应风机的1个月健康推荐检修记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult getRecommenmainMonth(@RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax=recommenService.getRecommenmainMonth(wtId);
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/scatter/ScatterController.java

@@ -0,0 +1,84 @@
+package com.gyee.consumer.controller.scatter;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.scatter.ScatterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/scatter")
+@Api(value = "风场、项目、线路功率风速散点图", tags = "风场、项目、线路功率风速散点图")
+public class ScatterController {
+
+    @Resource
+    private ScatterService scatterService;
+
+    /**
+     * @throws
+     * @Title: scatterAjax
+     * @Description: 获得选择场站、项目、线路、年份、月份相关散点图
+     */
+    @GetMapping("/scatterAjax")
+    @ResponseBody
+    @ApiOperation(value = "获得选择场站、项目、线路、年份、月份相关散点图", notes = "获得选择场站、项目、线路、年份、月份相关散点图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "lnId", value = "线路编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult scatterAjax(@RequestParam("wpId") String wpId,@RequestParam("pjId")  String pjId,@RequestParam("lnId")  String lnId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception  {
+
+        AjaxResult ajax=scatterService.scatterAjax(wpId, pjId, lnId, year, month);
+
+        return ajax;
+    }
+
+    /**
+     * @throws
+     * @Title: scatterAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @GetMapping("/scatterWtAjax")
+    @ResponseBody
+    @ApiOperation(value = "获得选择风机、年份、月份相关散点图", notes = "获得选择风机、年份、月份相关散点图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult scatterWtAjax(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception  {
+
+        AjaxResult ajax=scatterService.scatterWtAjax(wtId, year, month);
+
+        return ajax;
+    }
+
+    @GetMapping("/getWinddirection")
+    @ResponseBody
+    @ApiOperation(value = "风向图表", notes = "风向图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getWinddirection(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) throws Exception {
+
+        AjaxResult ajax=scatterService.getWinddirection(wpId, recorddate);
+
+        return ajax;
+    }
+
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/singleanalysis/SingleAnalysisController.java

@@ -0,0 +1,98 @@
+package com.gyee.consumer.controller.singleanalysis;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.singleanalysis.SingleAnalysisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/singleanalysis")
+@Api(value = "单机性能分析" ,tags="单机性能分析")
+public class SingleAnalysisController {
+
+    @Resource
+    private SingleAnalysisService singleAnalysisService;
+
+    /**
+     * 单机信息总览首页
+     * @param tablepar
+     * @param wpId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/singleanalysisMain")
+    @ResponseBody
+    @ApiOperation(value = "查询单机性能分析首页", notes = "查询单机性能分析首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页对象1", required = true, dataType = "Tablepar", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult singleanalysisMain( Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("year")  String year, @RequestParam("month")  String month) throws Exception {
+
+        AjaxResult ajax=singleAnalysisService.singleanalysisMain(tablepar, wpId, year, month);
+
+        return ajax;
+    }
+
+    /**
+     * 单机信息总览子页面
+     * @param wtId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/singleanalysisSub")
+    @ResponseBody
+    @ApiOperation(value = "查询单机性能分析子页面", notes = "查询单机性能分析子页面")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult singleanalysisSub(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception {
+
+        AjaxResult ajax=singleAnalysisService.singleanalysisSub(wtId, year, month);
+
+        return ajax;
+    }
+
+
+    /**
+     * 单机信息总览图表接口(3个)
+     * @param wtId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/singleanalysisChart")
+    @ResponseBody
+    @ApiOperation(value = "单机信息总览图表接口(3个) 发电量和风速、五项损失、静风频率和待机时间", notes = "单机信息总览图表接口(3个) 发电量和风速、五项损失、静风频率和待机时间")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "year", value = "年份", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "month", value = "月份", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult singleanalysisChart(@RequestParam("wtId") String wtId, @RequestParam("year") String year, @RequestParam("month") String month) throws Exception {
+
+        AjaxResult ajax=singleAnalysisService.singleanalysisChart(wtId, year, month);
+
+        return ajax;
+    }
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/warn/WarningController.java

@@ -0,0 +1,122 @@
+package com.gyee.consumer.controller.warn;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.warn.WarningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/fault")
+@Api(value = "停机故障回溯", tags = "停机故障回溯")
+public class WarningController {
+
+    private static final String format = "yyyy-MM-dd HH:mm";
+    @Resource
+    private WarningService warningService;
+
+
+    @GetMapping("/queryPointVos")
+    @ResponseBody
+    @ApiOperation(value = "停机故障回溯查询", notes = "停机故障回溯查询")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "bjtype", value = "部件类型0风机、1齿轮箱、2发电机、3变桨、主控", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "cdtype", value = "测点类型0所有、1AI、2DI", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult queryPointVos(@RequestParam("wtId") String wtId,@RequestParam("bjtype")  String bjtype,@RequestParam("cdtype")  String cdtype) throws Exception {
+
+        AjaxResult ajax=warningService.queryPointVos(wtId, bjtype, cdtype);
+
+        return ajax;
+    }
+    @GetMapping("/getFaultPlayback")
+    @ResponseBody
+    @ApiOperation(value = "停机故障回溯查询", notes = "停机故障回溯查询")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "pointids", value = "测点集合", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "stopTime", value = "测点对应时间（yyyy-mm-dd mm:ss）", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getFaultPlayback(@RequestParam("wtId") String wtId,@RequestParam("pointids")  String pointids,@RequestParam("stopTime")  String stopTime) throws Exception {
+
+        AjaxResult ajax=warningService.getFaultPlayback(wtId, pointids, stopTime);
+
+        return ajax;
+    }
+
+
+    /*************************************************************************************************************/
+    @GetMapping("/getTemperatureList")
+    @ResponseBody
+    @ApiOperation(value = "预警事件查询 type yyz 液压站,clx 齿轮箱,fdj 发电机,bj 变桨,qt 其他,zz 主轴,zd 震动", notes = "预警事件查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getTemperatureList(@RequestParam("wpId") String wpId,@RequestParam("type")  String type) throws Exception {
+
+        AjaxResult ajax=warningService.getTemperatureList(wpId, type);
+
+        return ajax;
+    }
+    /*****************************************************************************************************************/
+
+    @PostMapping("/getBrownoutsList")
+    @ResponseBody
+    @ApiOperation(value = "限电事件查询", notes = "限电事件查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页控件", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getBrownoutsList( Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("beginDate")  String beginDate, @RequestParam("endDate")  String endDate) throws Exception {
+
+        AjaxResult ajax=warningService.getBrownoutsList(tablepar, wpId, beginDate, endDate);
+
+        return ajax;
+    }
+
+        @GetMapping("/getBrownouts")
+        @ResponseBody
+        @ApiOperation(value = "限电详细事件查询", notes = "限电详细事件查询")
+        @ApiImplicitParams({
+                @ApiImplicitParam(name = "mainId", value = "主表编号", required = true, dataType = "string", paramType = "query")})
+
+        public AjaxResult getBrownouts(@RequestParam("mainId") String mainId) throws Exception {
+
+            AjaxResult ajax=warningService.getBrownouts(mainId);
+
+            return ajax;
+        }
+
+    /*****************************************************************************************************************/
+    @PostMapping("/getShutdownevent")
+    @ResponseBody
+    @ApiOperation(value = "停机事件查询", notes = "停机事件查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页控件", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = false, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型4 维护 2故障", required = false, dataType = "string", paramType = "query")})
+
+    public AjaxResult getShutdownevent(  Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate,@RequestParam("type")  String type) throws Exception {
+
+        AjaxResult ajax=warningService.getShutdownevent(tablepar, wpId, wtId, beginDate, endDate, type);
+
+        return ajax;
+    }
+
+    /*****************************************************************************************************************/
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/weather/WeatherAnalysisController.java

@@ -0,0 +1,82 @@
+package com.gyee.consumer.controller.weather;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.weather.WeatherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/weather")
+@Api(value = "天气预测", tags = "天气预测")
+public class WeatherAnalysisController {
+
+    @Resource
+    private WeatherService weatherService;
+
+
+
+    @GetMapping("/weatherInfo")
+    @ResponseBody
+    @ApiOperation(value = "天气分析信息", notes = "天气分析信息")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult weatherInfo(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=weatherService.weatherInfo(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/weatherChart")
+    @ResponseBody
+    @ApiOperation(value = "天气图表", notes = "天气图表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult weatherChart(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=weatherService.weatherChart(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/powerChart")
+    @ResponseBody
+    @ApiOperation(value = "风速、电量、功率图表", notes = "风速、电量、功率图表")
+    @ApiImplicitParams({
+
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult powerChart(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=weatherService.powerChart(wpId);
+
+        return ajax;
+    }
+
+
+    @PostMapping("/history/list")
+    @ResponseBody
+    @ApiOperation(value = "气象历史数据查询", notes = "气象历史数据查询")
+    public AjaxResult getWeatherHistory(Tablepar tablepar,
+                                        @RequestParam("wpId") String wpId,
+                                        @RequestParam("startTs") String startTs,
+                                        @RequestParam("endTs") String endTs){
+        AjaxResult ajax=weatherService.getWeatherHistory(tablepar,wpId,startTs,endTs);
+
+        return ajax;
+    }
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/yaw/YawController.java

@@ -0,0 +1,102 @@
+package com.gyee.consumer.controller.yaw;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.yaw.YawService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+
+@Controller
+@RequestMapping("/yaw")
+@Api(value = "偏航对风分析", tags = "偏航对风分析")
+public class YawController {
+
+
+    @Resource
+    private YawService yawService;
+
+
+
+    @GetMapping("/getPassRate")
+    @ResponseBody
+    @ApiOperation(value = "功率或风速合格率", notes = "功率或风速合格率")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1 功率 2风速", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getPassRate(@RequestParam("wtId")String wtId,
+                                  @RequestParam("beginDate") String beginDate,
+                                  @RequestParam("endDate") String endDate,
+                                  @RequestParam("type") String type) throws Exception {
+
+        AjaxResult ajax=yawService.getPassRate(wtId, beginDate, endDate, type);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/getRanges")
+    @ResponseBody
+    @ApiOperation(value = "偏航对风合格区域分析", notes = "偏航对风合格区域分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "value", value = "功率、风速对应数值", required = true, dataType = "int", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1 功率 2风速", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getRanges(@RequestParam("wtId")String wtId,
+                                @RequestParam("beginDate")String beginDate,
+                                @RequestParam("endDate")String endDate,
+                                @RequestParam("value")Integer value,
+                                @RequestParam("type")String type) throws Exception {
+
+        AjaxResult ajax=yawService.getRanges(wtId, beginDate, endDate,value,type);
+
+        return ajax;
+    }
+
+
+
+    @GetMapping("/getTotalRanges")
+    @ResponseBody
+    @ApiOperation(value = "所有风速偏航对风合格区域分析", notes = "所有风速偏航对风合格区域分析")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "beginDate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endDate", value = "结束日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "类型 1 功率 2风速", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult getTotalRanges(@RequestParam("wtId")String wtId,
+                                     @RequestParam("beginDate")String beginDate,
+                                     @RequestParam("endDate")String endDate,
+                                     @RequestParam("type")String type) throws Exception {
+
+        AjaxResult ajax=yawService.getTotalRanges(wtId, beginDate, endDate,type);
+
+        return ajax;
+    }
+
+    @GetMapping("/getWppointnum")
+    @ResponseBody
+    @ApiOperation(value = "获得数据查询测点数量统计", notes = "获得数据查询测点数量统计")
+    @ApiImplicitParams({})
+
+    public AjaxResult getWppointnum() throws Exception {
+
+        AjaxResult ajax=yawService.getWppointnum();
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/goodness/WindturbineGoodnessServiceFallbackFactory.java

@@ -2,15 +2,10 @@ package com.gyee.consumer.fallback.goodness;
 
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.model.Tablepar;
-import com.gyee.consumer.service.compare.CompareService;
 import com.gyee.consumer.service.goodness.WindturbineGoodnessService;
 import feign.hystrix.FallbackFactory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactory<WindturbineGoodnessService> {
 
@@ -23,7 +18,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 获得单机性能总览列表信息
              */
             @Override
-            public AjaxResult windturbinegoodness(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate){
+            public AjaxResult windturbinegoodness(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate){
                 return  AjaxResult.error(throwable.getMessage());
             }
 
@@ -31,7 +26,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 获得单机性能总览历史列表信息
              */
             @Override
-            public AjaxResult goodhistorylist(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate){
+            public AjaxResult goodhistorylist(@RequestBody  Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate){
                 return  AjaxResult.error(throwable.getMessage());
             }
  /*****************************************************************************************************************/
@@ -72,7 +67,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 单台风机当日报警记录
              */
             @Override
-            public AjaxResult bjjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
+            public AjaxResult bjjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
                 return  AjaxResult.error(throwable.getMessage());
             }
 
@@ -80,7 +75,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 单台风机当日停机记录
              */
             @Override
-            public AjaxResult gzjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) {
+            public AjaxResult gzjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) {
                 return  AjaxResult.error(throwable.getMessage());
             }
 
@@ -88,7 +83,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 单台风机当日限电记录
              */
             @Override
-            public AjaxResult xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate){
+            public AjaxResult xdjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate){
                 return  AjaxResult.error(throwable.getMessage());
             }
             /*
@@ -212,7 +207,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
              * 单台风机当月报警排行
              */
             @Override
-            public AjaxResult bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate){
+            public AjaxResult bjphlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate){
                 return  AjaxResult.error(throwable.getMessage());
             }
 

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/health/HealthServiceFallbackFactory.java

@@ -2,16 +2,10 @@ package com.gyee.consumer.fallback.health;
 
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.model.Tablepar;
-import com.gyee.consumer.service.compare.CompareService;
 import com.gyee.consumer.service.health.HealthService;
 import feign.hystrix.FallbackFactory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 public class HealthServiceFallbackFactory implements FallbackFactory<HealthService> {
 
@@ -174,7 +168,7 @@ public class HealthServiceFallbackFactory implements FallbackFactory<HealthServi
     /***********************************************************************************************************************/
     /**单机区间曲线偏差率**/
     @Override
-    public AjaxResult windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception {
+    public AjaxResult windTurbineCurveList(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception {
         return  AjaxResult.error(throwable.getMessage());
     }
 

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/leaderboard/LeaderboardServiceFallbackFactory.java

@@ -0,0 +1,132 @@
+package com.gyee.consumer.fallback.leaderboard;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.leaderboard.LeaderboardService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class LeaderboardServiceFallbackFactory implements FallbackFactory<LeaderboardService> {
+
+    @Override
+    public LeaderboardService create(Throwable throwable) {
+        return new LeaderboardService() {
+
+
+            /**查询拟合优度列表**/
+            @Override
+            public AjaxResult fittingtoplist(Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**查询拟合优度图表**/
+            @Override
+            public AjaxResult fittingtopchart(@RequestParam("wtIds") String wtIds, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**查询总发电量排行列表**/
+            @Override
+            public AjaxResult totalPowerCapacityTopList(@RequestBody  Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询利用率排行榜列表**/
+            @Override
+            public AjaxResult utilizationList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**查询损失率排行榜列表**/
+            @Override
+            public AjaxResult lossList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询负荷率排行榜列表**/
+            @Override
+            public AjaxResult loadfactortoplist(@RequestBody  Tablepar tablepar,@RequestParam("type") String type, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询报警排行榜列表**/
+            @Override
+            public AjaxResult querywarningStatistical(@RequestBody  Tablepar tablepar,@RequestParam("type")  String type, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询报警排行榜图表**/
+            @Override
+            public AjaxResult querywarningStatisticalPie(@RequestParam("type") String type,  @RequestParam("beginDate") String beginDate,@RequestParam("endDate")  String endDate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询日曲线偏差率列表**/
+            @Override
+            public AjaxResult curvefittingmainList(@RequestBody  Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
+            @Override
+            public AjaxResult getCurvechatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("recorddate")  String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询日曲线同比图表**/
+            @Override
+            public AjaxResult curvechatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**查询日曲线环比图表**/
+            @Override
+            public AjaxResult curvechatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,  @RequestParam("recorddate") String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询日曲线标杆图表**/
+            @Override
+            public AjaxResult curvechatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate)  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**查询月曲线偏差率列表**/
+            @Override
+            public AjaxResult curvefittingmonthmainList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("year") String year, @RequestParam("month") String month) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
+            @Override
+            public AjaxResult curveMonthchatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询月曲线同比图表**/
+            @Override
+            public AjaxResult curveMonthchatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month") String month) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询月曲线环比图表**/
+            @Override
+            public AjaxResult curveMonthchatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询月曲线标杆图表**/
+            @Override
+            public AjaxResult curveMonthchatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year") String year,@RequestParam("month") String month) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/outputspeed/InputoroutputspeedtotalServiceFallbackFactory.java

@@ -0,0 +1,32 @@
+package com.gyee.consumer.fallback.outputspeed;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.outputspeed.InputoroutputspeedtotalService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class InputoroutputspeedtotalServiceFallbackFactory implements FallbackFactory<InputoroutputspeedtotalService> {
+
+    @Override
+    public InputoroutputspeedtotalService create(Throwable throwable) {
+        return new InputoroutputspeedtotalService() {
+
+
+            /**切入切出列表**/
+            @Override
+            public AjaxResult outputSpeedlist(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate")  String recorddate)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**切入切出历史列表**/
+            @Override
+            public AjaxResult outputspeedhistorylist(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/powercompare/PowerCompareServiceFallbackFactory.java

@@ -0,0 +1,154 @@
+package com.gyee.consumer.fallback.powercompare;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.powercompare.PowerCompareService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class PowerCompareServiceFallbackFactory implements FallbackFactory<PowerCompareService> {
+
+    @Override
+    public PowerCompareService create(Throwable throwable) {
+        return new PowerCompareService() {
+
+
+
+
+            /**
+             * 报警类型列表
+             * @return
+             */
+            @Override
+            public AjaxResult warningClassAjax()         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 风场下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult windfarmAjax()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 风电场下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult windfarmAllAjax()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 项目下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult projectAjax(@RequestParam("wpIds") String wpIds)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**
+             * 所有风电场项目下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult projectAllAjax()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 线路下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult lineAjax(@RequestParam("pjIds") String pjIds)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 线路下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult lineWpIdAjax(@RequestParam("wpId") String wpId)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 线路下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult lineAllAjax()         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 通过风电场ID获取风机下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult windturbineAjax(@RequestParam("wpId") String wpId)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得所有风电场风机下拉接口
+             * @return
+             */
+            @Override
+            public AjaxResult windturbineAllAjax()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**查询风机图表数据结果**/
+            @Override
+            public AjaxResult queryPower(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds,@RequestParam("lineIds") String lineIds,@RequestParam("beginDate") String beginDate,
+                                         @RequestParam("endDate")String endDate)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询风场、项目、线路图表数据结果**/
+            @Override
+            public AjaxResult queryPowerAll(@RequestParam("wpIds")String wpIds, @RequestParam("beginDate") String beginDate,
+                                            @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**查询风机列表数据结果**/
+            @Override
+            public AjaxResult powerAjax(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds, @RequestParam("lineIds")String lineIds, @RequestParam("beginDate")String beginDate,
+                                        @RequestParam("endDate")String endDate, @RequestParam("sortName")String sortName, @RequestParam("sortOrder")String sortOrder)          {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询风场、项目、线路列表数据结果**/
+            @Override
+            public AjaxResult powerAjaxAll(@RequestParam("wpIds")String wpIds,  @RequestParam("beginDate")String beginDate,
+                                           @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType, @RequestParam("sortName")String sortName,@RequestParam("sortOrder") String sortOrder)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /******************************************************************************************************************/
+
+
+            /**查询风机列表数据结果**/
+            @Override
+            public AjaxResult powerAjaxDetail(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                              @RequestParam(value = "endDate",required = true) String endDate,
+                                              @RequestParam(value = "wpId",required = false) String  wpId,
+                                              @RequestParam(value = "pjId",required = false) String  pjId,
+                                              @RequestParam(value = "xlId",required = false) String  xlId )        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询风场、项目、线路列表数据结果**/
+            @Override
+            public AjaxResult powerAjaxDetailAll(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                                 @RequestParam(value = "endDate",required = true) String endDate,
+                                                 @RequestParam(value = "queryType",required = true) String  queryType)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/powersaturation/PowersaturationServiceFallbackFactory.java

@@ -0,0 +1,63 @@
+package com.gyee.consumer.fallback.powersaturation;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.powersaturation.PowersaturationService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class PowersaturationServiceFallbackFactory implements FallbackFactory<PowersaturationService> {
+
+    @Override
+    public PowersaturationService create(Throwable throwable) {
+        return new PowersaturationService() {
+
+
+
+
+
+            /**总功率饱和列表**/
+            @Override
+            public AjaxResult powersaturationamonutlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId")  String wtId)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**总功率饱和图表**/
+            @Override
+            public AjaxResult powersaturationamonutchart(@RequestParam("wtId") String wtId)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /***********************************************************************************************/
+            /**日功率饱和列表**/
+            @Override
+            public AjaxResult powersaturationlist(Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate")  String recorddate)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**日功率饱和图表**/
+            @Override
+            public AjaxResult powersaturationchart(@RequestParam("wtId") String wtId,@RequestParam("recorddate") String recorddate)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /***********************************************************************************************/
+
+            /**月功率饱和列表**/
+            @Override
+            public AjaxResult powersaturationmonthlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("year")  String year, @RequestParam("month")  String month)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**月功率饱和图表**/
+            @Override
+            public AjaxResult powersaturationmonthchart(@RequestParam("wtId") String wtId, @RequestParam("year") String year,@RequestParam("month")  String month)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/projectplan/ProjectPlanServiceFallbackFactory.java

@@ -0,0 +1,39 @@
+package com.gyee.consumer.fallback.projectplan;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.ProjectPlanVo;
+import com.gyee.consumer.service.projectplan.ProjectPlanService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class ProjectPlanServiceFallbackFactory implements FallbackFactory<ProjectPlanService> {
+
+    @Override
+    public ProjectPlanService create(Throwable throwable) {
+        return new ProjectPlanService() {
+
+
+            /**计划发电量列表**/
+            @Override
+            public AjaxResult getProjectPlanVo(@RequestParam("wpId") String wpId, @RequestParam("pjId") String pjId,@RequestParam("year")  String year)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**返回计划发电量修改对象**/
+            @Override
+            public AjaxResult getSingleProjectPlan(@RequestParam("pjId") String pjId,@RequestParam("year")  String year)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**计划发电量添加和修改**/
+            @Override
+            public AjaxResult saveData(@RequestParam("vo") ProjectPlanVo vo)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/recommen/RecommenServiceFallbackFactory.java

@@ -0,0 +1,179 @@
+package com.gyee.consumer.fallback.recommen;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.recommen.RecommenService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class RecommenServiceFallbackFactory implements FallbackFactory<RecommenService> {
+
+    @Override
+    public RecommenService create(Throwable throwable) {
+        return new RecommenService() {
+
+
+
+
+            /**
+             * 获得当日健康推荐检修风机
+             * @return
+             */
+            @Override
+            public AjaxResult getRecommenmainDay1()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得3日健康推荐检修风机
+             * @return
+             */
+            @Override
+            public AjaxResult getRecommenmainDay3()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得7日健康推荐检修风机
+             * @return
+             */
+            @Override
+            public AjaxResult getRecommenmainDay7()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 确认推荐检修风机，并添加记录到生产系统
+             * @param rid
+             */
+            @Override
+            public AjaxResult confirpush(@RequestParam("rid") String rid)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 全部确认不同时间段的推荐检修风机
+             * @param typeid 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐
+             */
+            @Override
+            public AjaxResult confirpushAll(@RequestParam("typeid") String typeid)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 取消推荐检修风机
+             * @param rid
+             */
+            @Override
+            public AjaxResult ignorepush(@RequestParam("rid") String rid)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 全部取消不同时间段的推荐检修风机
+             * @param typeid 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐
+             */
+            @Override
+            public AjaxResult ignorepushAll(@RequestParam("typeid") String typeid)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得已经确认检修风机
+             * @return
+             */
+            @Override
+            public AjaxResult recommenConfirmedList()        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得健康状态预测
+             * @param wpId
+             * @param type 1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势，
+             * @return map.put(" yslchart ", yslchart); //优数量
+             *             map.put("lslchart", lslchart);//良数量
+             *             map.put("cslchart", cslchart);//差数量
+             *             map.put("lvchart", lvchart);//健康率
+             *             map.put("datechart", datechart);//日期
+             * @throws Exception
+             */
+            @Override
+            public AjaxResult findAllChartjz(@RequestParam("wpId") String wpId, @RequestParam("type")  String type) throws Exception         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**
+             * 通过消缺单获得详细信息
+             * @param rid
+             * @return
+             */
+            @Override
+            public AjaxResult findMainTrack(@RequestParam("rid") String rid)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 获得未完成消缺单列表
+             * @return
+             */
+            @Override
+            public AjaxResult unfinishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate)         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**
+             * 获得完成消缺单列表
+             * @return
+             */
+            @Override
+            public AjaxResult finishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+            /**
+             * 通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据
+             * @param name
+             * @param beginDate
+             * @param endDate
+             * @return
+             * @throws Exception
+             */
+            @Override
+            public AjaxResult findShbraceletList(@RequestParam("name") String name,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**
+             * 获取部件结构树
+             * @return
+             */
+            @Override
+            public AjaxResult findLocationTreeByWtId(@RequestParam("wtId") String wtId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 通过位置编号获得缺陷单信息
+             * @return
+             */
+            @Override
+            public AjaxResult findWobugeqByLocation(Tablepar tablepar, @RequestParam("location") String location) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /**
+             * 获得对应风机的1个月健康推荐检修记录
+             * @return
+             */
+            @Override
+            public AjaxResult getRecommenmainMonth(@RequestParam("wtId") String wtId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/scatter/ScatterServiceFallbackFactory.java

@@ -0,0 +1,44 @@
+package com.gyee.consumer.fallback.scatter;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.scatter.ScatterService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class ScatterServiceFallbackFactory implements FallbackFactory<ScatterService> {
+
+    @Override
+    public ScatterService create(Throwable throwable) {
+        return new ScatterService() {
+
+            /**
+             * @throws
+             * @Title: scatterAjax
+             * @Description: 获得选择场站、项目、线路、年份、月份相关散点图
+             */
+            @Override
+            public AjaxResult scatterAjax(@RequestParam("wpId") String wpId,@RequestParam("pjId")  String pjId,@RequestParam("lnId")  String lnId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * @throws
+             * @Title: scatterAjax
+             * @Description: 获得选择风机、年份、月份相关散点图
+             */
+            @Override
+            public AjaxResult scatterWtAjax(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /***********************************************************************************************************************/
+
+            @Override
+            public AjaxResult getWinddirection(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/singleanalysis/SingleAnalysisServiceFallbackFactory.java

@@ -0,0 +1,61 @@
+package com.gyee.consumer.fallback.singleanalysis;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.singleanalysis.SingleAnalysisService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class SingleAnalysisServiceFallbackFactory implements FallbackFactory<SingleAnalysisService> {
+
+    @Override
+    public SingleAnalysisService create(Throwable throwable) {
+        return new SingleAnalysisService() {
+
+
+            /**
+             * 单机信息总览首页
+             * @param tablepar
+             * @param wpId
+             * @param year
+             * @param month
+             * @return
+             * @throws Exception
+             */
+            @Override
+            public AjaxResult singleanalysisMain(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("year")  String year, @RequestParam("month")  String month) throws Exception         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 单机信息总览子页面
+             * @param wtId
+             * @param year
+             * @param month
+             * @return
+             * @throws Exception
+             */
+            @Override
+            public AjaxResult singleanalysisSub(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**
+             * 单机信息总览图表接口(3个)
+             * @param wtId
+             * @param year
+             * @param month
+             * @return
+             * @throws Exception
+             */
+            @Override
+            public AjaxResult singleanalysisChart(@RequestParam("wtId") String wtId, @RequestParam("year") String year, @RequestParam("month") String month) throws Exception         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/warn/WarningServiceFallbackFactory.java

@@ -0,0 +1,57 @@
+package com.gyee.consumer.fallback.warn;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.warn.WarningService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class WarningServiceFallbackFactory implements FallbackFactory<WarningService> {
+
+    @Override
+    public WarningService create(Throwable throwable) {
+        return new WarningService() {
+
+
+
+            @Override
+            public AjaxResult queryPointVos(@RequestParam("wtId") String wtId,@RequestParam("bjtype")  String bjtype,@RequestParam("cdtype")  String cdtype) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getFaultPlayback(@RequestParam("wtId") String wtId,@RequestParam("pointids")  String pointids,@RequestParam("stopTime")  String stopTime) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult getTemperatureList(@RequestParam("wpId") String wpId,@RequestParam("type")  String type) throws Exception         {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /***********************************************************************************************************************/
+
+            @Override
+            public AjaxResult getBrownoutsList(@RequestBody  Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("beginDate")  String beginDate, @RequestParam("endDate")  String endDate) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult getBrownouts(@RequestParam("mainId") String mainId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /***********************************************************************************************************************/
+            @Override
+            public AjaxResult getShutdownevent(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("wtId")  String wtId, @RequestParam("beginDate")  String beginDate, @RequestParam("endDate")  String endDate, @RequestParam("type")  String type) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/weather/WeatherServiceFallbackFactory.java

@@ -0,0 +1,43 @@
+package com.gyee.consumer.fallback.weather;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
+import com.gyee.consumer.service.weather.WeatherService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class WeatherServiceFallbackFactory implements FallbackFactory<WeatherService> {
+
+    @Override
+    public WeatherService create(Throwable throwable) {
+        return new WeatherService() {
+
+            @Override
+            public AjaxResult weatherInfo(@RequestParam("wpId") String wpId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult weatherChart(@RequestParam("wpId") String wpId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult powerChart(@RequestParam("wpId") String wpId) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult getWeatherHistory(Tablepar tablepar,
+                                                @RequestParam("wpId") String wpId,
+                                                @RequestParam("startTs") String startTs,
+                                                @RequestParam("endTs") String endTs)        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/yaw/YawServiceFallbackFactory.java

@@ -0,0 +1,53 @@
+package com.gyee.consumer.fallback.yaw;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.yaw.YawService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class YawServiceFallbackFactory implements FallbackFactory<YawService> {
+
+    @Override
+    public YawService create(Throwable throwable) {
+        return new YawService() {
+
+
+
+            @Override
+            public AjaxResult getPassRate(@RequestParam("wtId")String wtId,
+                                          @RequestParam("beginDate") String beginDate,
+                                          @RequestParam("endDate") String endDate,
+                                          @RequestParam("type") String type) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult getRanges(@RequestParam("wtId")String wtId,
+                                        @RequestParam("beginDate")String beginDate,
+                                        @RequestParam("endDate")String endDate,
+                                        @RequestParam("value")Integer value,
+                                        @RequestParam("type")String type) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+            @Override
+            public AjaxResult getTotalRanges(@RequestParam("wtId")String wtId,
+                                             @RequestParam("beginDate")String beginDate,
+                                             @RequestParam("endDate")String endDate,
+                                             @RequestParam("type")String type) throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getWppointnum() throws Exception        {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/model/ProjectPlanVo.java

@@ -0,0 +1,151 @@
+package com.gyee.consumer.model;
+
+public class ProjectPlanVo {
+	private String id;
+	private String projectid;
+	private String generatingcapacity;
+	private Double outagehours;
+	private String year;
+	private String month;
+	private String windpower;
+	private String windpowerName;
+	private String projectName;
+	private String gc01="0";
+	private String gc02="0";
+	private String gc03="0";
+	private String gc04="0";
+	private String gc05="0";
+	private String gc06="0";
+	private String gc07="0";
+	private String gc08="0";
+	private String gc09="0";
+	private String gc10="0";
+	private String gc11="0";
+	private String gc12="0";
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getProjectid() {
+		return projectid;
+	}
+	public void setProjectid(String projectid) {
+		this.projectid = projectid;
+	}
+	public String getGeneratingcapacity() {
+		return generatingcapacity;
+	}
+	public void setGeneratingcapacity(String generatingcapacity) {
+		this.generatingcapacity = generatingcapacity;
+	}
+	public Double getOutagehours() {
+		return outagehours;
+	}
+	public void setOutagehours(Double outagehours) {
+		this.outagehours = outagehours;
+	}
+	public String getYear() {
+		return year;
+	}
+	public void setYear(String year) {
+		this.year = year;
+	}
+	public String getMonth() {
+		return month;
+	}
+	public String getGc01() {
+		return gc01;
+	}
+	public void setGc01(String gc01) {
+		this.gc01 = gc01;
+	}
+	public String getGc02() {
+		return gc02;
+	}
+	public void setGc02(String gc02) {
+		this.gc02 = gc02;
+	}
+	public String getGc03() {
+		return gc03;
+	}
+	public void setGc03(String gc03) {
+		this.gc03 = gc03;
+	}
+	public String getGc04() {
+		return gc04;
+	}
+	public void setGc04(String gc04) {
+		this.gc04 = gc04;
+	}
+	public String getGc05() {
+		return gc05;
+	}
+	public void setGc05(String gc05) {
+		this.gc05 = gc05;
+	}
+	public String getGc06() {
+		return gc06;
+	}
+	public void setGc06(String gc06) {
+		this.gc06 = gc06;
+	}
+	public String getGc07() {
+		return gc07;
+	}
+	public void setGc07(String gc07) {
+		this.gc07 = gc07;
+	}
+	public String getGc08() {
+		return gc08;
+	}
+	public void setGc08(String gc08) {
+		this.gc08 = gc08;
+	}
+	public String getGc09() {
+		return gc09;
+	}
+	public void setGc09(String gc09) {
+		this.gc09 = gc09;
+	}
+	public String getGc10() {
+		return gc10;
+	}
+	public void setGc10(String gc10) {
+		this.gc10 = gc10;
+	}
+	public String getGc11() {
+		return gc11;
+	}
+	public void setGc11(String gc11) {
+		this.gc11 = gc11;
+	}
+	public String getGc12() {
+		return gc12;
+	}
+	public void setGc12(String gc12) {
+		this.gc12 = gc12;
+	}
+	public void setMonth(String month) {
+		this.month = month;
+	}
+	public String getWindpower() {
+		return windpower;
+	}
+	public void setWindpower(String windpower) {
+		this.windpower = windpower;
+	}
+	public String getWindpowerName() {
+		return windpowerName;
+	}
+	public void setWindpowerName(String windpowerName) {
+		this.windpowerName = windpowerName;
+	}
+	public String getProjectName() {
+		return projectName;
+	}
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/goodness/WindturbineGoodnessService.java

@@ -4,15 +4,12 @@ package com.gyee.consumer.service.goodness;
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.config.FeignConfiguration;
 import com.gyee.consumer.fallback.goodness.WindturbineGoodnessServiceFallbackFactory;
-import com.gyee.consumer.fallback.monitor.GenreSetPushServiceFallbackFactory;
 import com.gyee.consumer.model.Tablepar;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @FeignClient(name = "goodness",url = "${provider.url}",
         fallbackFactory = WindturbineGoodnessServiceFallbackFactory.class,
@@ -22,15 +19,15 @@ public interface WindturbineGoodnessService {
     /*
      * 获得单机性能总览列表信息
      */
-    @GetMapping("/goodness/windturbinegoodness")
-    public AjaxResult windturbinegoodness(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate);
+    @PostMapping(value = "/goodness/windturbinegoodness")
+    public AjaxResult windturbinegoodness(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate);
 
 
     /*
      * 获得单机性能总览历史列表信息
      */
-    @GetMapping("/goodness/goodhistorylist")
-    public AjaxResult goodhistorylist(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate);
+    @PostMapping("/goodness/goodhistorylist")
+    public AjaxResult goodhistorylist(@RequestBody  Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate);
 
     /*****************************************************************************************************************/
     /*
@@ -60,20 +57,20 @@ public interface WindturbineGoodnessService {
     /*
      * 单台风机当日报警记录
      */
-    @GetMapping("/goodness/bjjllist")
-    public AjaxResult bjjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate);
+    @PostMapping("/goodness/bjjllist")
+    public AjaxResult bjjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate);
 
     /*
      * 单台风机当日停机记录
      */
-    @GetMapping("/goodness/gzjllist")
-    public AjaxResult gzjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate);
+    @PostMapping("/goodness/gzjllist")
+    public AjaxResult gzjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate);
 
     /*
      * 单台风机当日限电记录
      */
-    @GetMapping("/goodness/xdjllist")
-    public AjaxResult xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate);
+    @PostMapping("/goodness/xdjllist")
+    public AjaxResult xdjllist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate);
 
     /*
      * 获取区域弹出列表信息
@@ -165,8 +162,8 @@ public interface WindturbineGoodnessService {
     /*
      * 单台风机当月报警排行
      */
-    @GetMapping("/goodness/bjphlist")
-    public AjaxResult bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate);
+    @PostMapping("/goodness/bjphlist")
+    public AjaxResult bjphlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate);
 
     /*
      * 获取明细页面功率曲线

web/consumer-hb/src/main/java/com/gyee/consumer/service/health/HealthService.java

@@ -5,14 +5,11 @@ import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.config.FeignConfiguration;
 import com.gyee.consumer.fallback.compare.CompareServiceFallbackFactory;
 import com.gyee.consumer.model.Tablepar;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 @FeignClient(name = "health",url = "${provider.url}",
         fallbackFactory = CompareServiceFallbackFactory.class,
@@ -33,17 +30,17 @@ public interface HealthService {
     public AjaxResult findHealthMatrixMap() throws Exception ;
     /***********************************************************************************************************************/
     @GetMapping("/healthsub/findWtHealthInfo")
-    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception ;
 
     @GetMapping("/healthsub/findWtHealthInfo1")
-    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception ;
 
 
     @GetMapping("/healthsub/findWtHealthInfo2")
-    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception ;
 
     @GetMapping("/healthsub/findWtHealthInfo3")
-    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception  ;
+    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception  ;
 
 
     @GetMapping("/healthsub/gadaytop5")
@@ -120,8 +117,8 @@ public interface HealthService {
 
     /***********************************************************************************************************************/
     /**单机区间曲线偏差率**/
-    @GetMapping("/wtcurve/windTurbineCurveList")
-    public AjaxResult windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception;
+    @PostMapping("/wtcurve/windTurbineCurveList")
+    public AjaxResult windTurbineCurveList(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception;
 
     /**
      * @throws

web/consumer-hb/src/main/java/com/gyee/consumer/service/leaderboard/LeaderboardService.java

@@ -0,0 +1,94 @@
+package com.gyee.consumer.service.leaderboard;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.leaderboard.LeaderboardServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "leaderboard",url = "${provider.url}",
+        fallbackFactory = LeaderboardServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface LeaderboardService {
+
+    /**查询拟合优度列表**/
+    @PostMapping("/leaderboard/fittingtoplist")
+    public AjaxResult fittingtoplist(Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate);
+
+
+    /**查询拟合优度图表**/
+    @GetMapping("/leaderboard/fittingtopchart")
+    public AjaxResult fittingtopchart(@RequestParam("wtIds") String wtIds, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception;
+
+
+    /**查询总发电量排行列表**/
+    @PostMapping("/leaderboard/totalPowerCapacityTopList")
+    public AjaxResult totalPowerCapacityTopList(@RequestBody  Tablepar tablepar, @RequestParam("wpIps") String wpIps, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate);
+
+    /**查询利用率排行榜列表**/
+    @PostMapping("/leaderboard/utilizationList")
+    public AjaxResult utilizationList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type);
+
+
+    /**查询损失率排行榜列表**/
+    @PostMapping("/leaderboard/lossList")
+    public AjaxResult lossList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate,@RequestParam("type") String type);
+
+    /**查询负荷率排行榜列表**/
+    @PostMapping("/leaderboard/loadfactortoplist")
+    public AjaxResult loadfactortoplist(@RequestBody  Tablepar tablepar,@RequestParam("type") String type, @RequestParam("wpId") String wpId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) ;
+
+    /**查询报警排行榜列表**/
+    @PostMapping("/leaderboard/querywarningStatistical")
+    public AjaxResult querywarningStatistical(@RequestBody  Tablepar tablepar,@RequestParam("type")  String type, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate);
+
+    /**查询报警排行榜图表**/
+    @GetMapping("/leaderboard/querywarningStatisticalPie")
+    public AjaxResult querywarningStatisticalPie(@RequestParam("type") String type,  @RequestParam("beginDate") String beginDate,@RequestParam("endDate")  String endDate);
+
+    /**查询日曲线偏差率列表**/
+    @PostMapping("/leaderboard/curvefittingmainList")
+    public AjaxResult curvefittingmainList(@RequestBody  Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate);
+
+    /**查询日曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/leaderboard/getCurvechatAjax")
+    public AjaxResult getCurvechatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("recorddate")  String recorddate);
+
+    /**查询日曲线同比图表**/
+    @GetMapping("/leaderboard/curvechatAjaxtb")
+    public AjaxResult curvechatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate);
+    /**查询日曲线环比图表**/
+    @GetMapping("/leaderboard/curvechatAjaxhb")
+    public AjaxResult curvechatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,  @RequestParam("recorddate") String recorddate);
+
+    /**查询日曲线标杆图表**/
+    @GetMapping("/leaderboard/curvechatAjaxbg")
+    public AjaxResult curvechatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("recorddate")   String recorddate) ;
+
+
+    /**查询月曲线偏差率列表**/
+    @PostMapping("/leaderboard/curvefittingmonthmainList")
+    public AjaxResult curvefittingmonthmainList(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("year") String year,@RequestParam("month") String month);
+
+    /**查询月曲线（实际/保证 实际/最优 最优/保证）图表**/
+    @GetMapping("/leaderboard/curveMonthchatAjax")
+    public AjaxResult curveMonthchatAjax(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month);
+
+    /**查询月曲线同比图表**/
+    @GetMapping("/leaderboard/curveMonthchatAjaxtb")
+    public AjaxResult curveMonthchatAjaxtb(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month") String month);
+
+    /**查询月曲线环比图表**/
+    @GetMapping("/leaderboard/curveMonthchatAjaxhb")
+    public AjaxResult curveMonthchatAjaxhb(@RequestParam("type") String type,@RequestParam("wtId") String wtId, @RequestParam("year")  String year,@RequestParam("month") String month);
+
+    /**查询月曲线标杆图表**/
+    @GetMapping("/leaderboard/curveMonthchatAjaxbg")
+    public AjaxResult curveMonthchatAjaxbg(@RequestParam("type") String type,@RequestParam("wtId") String wtId,@RequestParam("year") String year,@RequestParam("month") String month);
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/monitor/MatrixPushService.java

@@ -16,7 +16,7 @@ public interface MatrixPushService {
     @GetMapping("/matrix/matrixPush")
     public AjaxResult matrixPush() throws Exception;
 
-    @GetMapping("/matrixmatrixDetialPush")
+    @GetMapping("/matrix/matrixDetialPush")
     public AjaxResult matrixDetialPush() throws Exception;
 
     @GetMapping("/matrix/matrixDetialGfPush")

web/consumer-hb/src/main/java/com/gyee/consumer/service/outputspeed/InputoroutputspeedtotalService.java

@@ -0,0 +1,26 @@
+package com.gyee.consumer.service.outputspeed;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.outputspeed.InputoroutputspeedtotalServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "outputspeed",url = "${provider.url}",
+        fallbackFactory = InputoroutputspeedtotalServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface InputoroutputspeedtotalService {
+
+    /**切入切出列表**/
+    @PostMapping("/outputspeed/outputSpeedlist")
+    public AjaxResult outputSpeedlist(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate")  String recorddate);
+
+    /**切入切出历史列表**/
+    @PostMapping("/outputspeed/outputspeedhistorylist")
+    public AjaxResult outputspeedhistorylist(@RequestBody  Tablepar tablepar, @RequestParam("wpId") String wpId,@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate);
+
+    }

web/consumer-hb/src/main/java/com/gyee/consumer/service/powercompare/PowerCompareService.java

@@ -0,0 +1,117 @@
+package com.gyee.consumer.service.powercompare;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.powercompare.PowerCompareServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "powercompare",url = "${provider.url}",
+        fallbackFactory = PowerCompareServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface PowerCompareService {
+
+    /**
+     * 报警类型列表
+     * @return
+     */
+    @GetMapping("/powercompare/warningClassAjax")
+    public AjaxResult warningClassAjax() ;
+
+    /**
+     * 风场下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/windfarmAjax")
+    public AjaxResult windfarmAjax();
+    /**
+     * 风电场下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/windfarmAllAjax")
+    public AjaxResult windfarmAllAjax();
+
+    /**
+     * 项目下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/projectAjax")
+    public AjaxResult projectAjax(@RequestParam("wpIds") String wpIds) ;
+
+
+    /**
+     * 所有风电场项目下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/projectAllAjax")
+    public AjaxResult projectAllAjax() ;
+
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/lineAjax")
+    public AjaxResult lineAjax(@RequestParam("pjIds") String pjIds) ;
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/lineWpIdAjax")
+    public AjaxResult lineWpIdAjax(@RequestParam("wpId") String wpId) ;
+    /**
+     * 线路下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/lineAllAjax")
+    public AjaxResult lineAllAjax() ;
+    /**
+     * 通过风电场ID获取风机下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/windturbineAjax")
+    public AjaxResult windturbineAjax(@RequestParam("wpId") String wpId) ;
+
+    /**
+     * 获得所有风电场风机下拉接口
+     * @return
+     */
+    @GetMapping("/powercompare/windturbineAllAjax")
+    public AjaxResult windturbineAllAjax();
+    /**查询风机图表数据结果**/
+    @GetMapping("/powercompare/queryPower")
+    public AjaxResult queryPower(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds,@RequestParam("lineIds") String lineIds,@RequestParam("beginDate") String beginDate,
+                                 @RequestParam("endDate")String endDate)  ;
+
+    /**查询风场、项目、线路图表数据结果**/
+    @GetMapping("/powercompare/queryPowerAll")
+    public AjaxResult queryPowerAll(@RequestParam("wpIds")String wpIds, @RequestParam("beginDate") String beginDate,
+                                    @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType)  ;
+    /**查询风机列表数据结果**/
+    @GetMapping("/powercompare/powerAjax")
+    public AjaxResult powerAjax(@RequestParam("wpIds")String wpIds,@RequestParam("pjIds") String pjIds, @RequestParam("lineIds")String lineIds, @RequestParam("beginDate")String beginDate,
+                                @RequestParam("endDate")String endDate, @RequestParam("sortName")String sortName, @RequestParam("sortOrder")String sortOrder)  ;
+
+    /**查询风场、项目、线路列表数据结果**/
+    @GetMapping("/powercompare/powerAjaxAll")
+    public AjaxResult powerAjaxAll(@RequestParam("wpIds")String wpIds,  @RequestParam("beginDate")String beginDate,
+                                   @RequestParam("endDate")String endDate,@RequestParam("queryType")String  queryType, @RequestParam("sortName")String sortName,@RequestParam("sortOrder") String sortOrder) ;
+
+    /******************************************************************************************************************/
+
+
+    /**查询风机列表数据结果**/
+    @GetMapping("/powercompare/powerAjaxDetail")
+    public AjaxResult powerAjaxDetail(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                      @RequestParam(value = "endDate",required = true) String endDate,
+                                      @RequestParam(value = "wpId",required = false) String  wpId,
+                                      @RequestParam(value = "pjId",required = false) String  pjId,
+                                      @RequestParam(value = "xlId",required = false) String  xlId );
+
+    /**查询风场、项目、线路列表数据结果**/
+    @GetMapping("/powercompare/powerAjaxDetailAll")
+    public AjaxResult powerAjaxDetailAll(@RequestParam(value = "beginDate",required = true) String beginDate,
+                                         @RequestParam(value = "endDate",required = true) String endDate,
+                                         @RequestParam(value = "queryType",required = true) String  queryType);
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/powersaturation/PowersaturationService.java

@@ -0,0 +1,45 @@
+package com.gyee.consumer.service.powersaturation;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.powersaturation.PowersaturationServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "powersaturation",url = "${provider.url}",
+        fallbackFactory = PowersaturationServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface PowersaturationService {
+
+    /**总功率饱和列表**/
+    @PostMapping("/powersaturation/powersaturationamonutlist")
+    public AjaxResult powersaturationamonutlist(Tablepar tablepar, @RequestParam("wtId")  String wtId) ;
+
+    /**总功率饱和图表**/
+    @GetMapping("/powersaturation/powersaturationamonutchart")
+    public AjaxResult powersaturationamonutchart(@RequestParam("wtId") String wtId);
+    /***********************************************************************************************/
+    /**日功率饱和列表**/
+    @PostMapping("/powersaturation/powersaturationlist")
+    public AjaxResult powersaturationlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) ;
+
+    /**日功率饱和图表**/
+    @GetMapping("/powersaturation/powersaturationchart")
+    public AjaxResult powersaturationchart(@RequestParam("wtId") String wtId,@RequestParam("recorddate") String recorddate) ;
+
+    /***********************************************************************************************/
+
+    /**月功率饱和列表**/
+    @PostMapping("/powersaturation/powersaturationmonthlist")
+    public AjaxResult powersaturationmonthlist(@RequestBody  Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("year")  String year, @RequestParam("month")  String month) ;
+
+    /**月功率饱和图表**/
+    @GetMapping("/powersaturation/powersaturationmonthchart")
+    public AjaxResult powersaturationmonthchart(@RequestParam("wtId") String wtId, @RequestParam("year") String year,@RequestParam("month")  String month) ;
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/projectplan/ProjectPlanService.java

@@ -0,0 +1,31 @@
+package com.gyee.consumer.service.projectplan;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.projectplan.ProjectPlanServiceFallbackFactory;
+import com.gyee.consumer.model.ProjectPlanVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "projectplan",url = "${provider.url}",
+        fallbackFactory = ProjectPlanServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface ProjectPlanService {
+
+    /**计划发电量列表**/
+    @GetMapping("/projectplan/getProjectPlanVo")
+    public AjaxResult getProjectPlanVo(@RequestParam("wpId") String wpId, @RequestParam("pjId") String pjId,@RequestParam("year")  String year) ;
+
+    /**返回计划发电量修改对象**/
+    @GetMapping("/projectplan/getSingleProjectPlan")
+    public AjaxResult getSingleProjectPlan(@RequestParam("pjId") String pjId,@RequestParam("year")  String year) ;
+
+
+    /**计划发电量添加和修改**/
+    @PostMapping("/saveData")
+    public AjaxResult saveData(@RequestParam("vo") ProjectPlanVo vo) ;
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/recommen/RecommenService.java

@@ -0,0 +1,144 @@
+package com.gyee.consumer.service.recommen;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.recommen.RecommenServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "recommen",url = "${provider.url}",
+        fallbackFactory = RecommenServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface RecommenService {
+
+    /**
+     * 获得当日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/recommen/getRecommenmainDay1")
+    public AjaxResult getRecommenmainDay1();
+
+    /**
+     * 获得3日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/recommen/getRecommenmainDay3")
+    public AjaxResult getRecommenmainDay3();
+
+    /**
+     * 获得7日健康推荐检修风机
+     * @return
+     */
+    @GetMapping("/recommen/getRecommenmainDay7")
+    public AjaxResult getRecommenmainDay7();
+    /**
+     * 确认推荐检修风机，并添加记录到生产系统
+     * @param rid
+     */
+    @PostMapping("/recommen/confirpush")
+    public AjaxResult confirpush(@RequestParam("rid") String rid);
+
+    /**
+     * 全部确认不同时间段的推荐检修风机
+     * @param typeid 1代表全部确认当日推荐  2 代表全部确认三天推荐 3 代表全部确认未来七天推荐
+     */
+    @PostMapping("/recommen/confirpushAll")
+    public AjaxResult confirpushAll(@RequestParam("typeid") String typeid);
+    /**
+     * 取消推荐检修风机
+     * @param rid
+     */
+    @PostMapping("/recommen/ignorepush")
+    public AjaxResult ignorepush(@RequestParam("rid") String rid);
+
+    /**
+     * 全部取消不同时间段的推荐检修风机
+     * @param typeid 1代表全部取消当日推荐  2 代表全部取消三天推荐 3 代表全部取消未来七天推荐
+     */
+    @PostMapping("/recommen/ignorepushAll")
+    public AjaxResult ignorepushAll(@RequestParam("typeid") String typeid);
+
+    /**
+     * 获得已经确认检修风机
+     * @return
+     */
+    @GetMapping("/recommen/recommenConfirmedList")
+    public AjaxResult recommenConfirmedList();
+
+    /**
+     * 获得健康状态预测
+     * @param wpId
+     * @param type 1 表示24小时健康趋势，2 表示七天健康趋势 3 表示30天健康趋势，
+     * @return map.put(" yslchart ", yslchart); //优数量
+     *             map.put("lslchart", lslchart);//良数量
+     *             map.put("cslchart", cslchart);//差数量
+     *             map.put("lvchart", lvchart);//健康率
+     *             map.put("datechart", datechart);//日期
+     * @throws Exception
+     */
+    @GetMapping("/recommen/findAllChartjz")
+    public AjaxResult findAllChartjz(@RequestParam("wpId") String wpId, @RequestParam("type")  String type) throws Exception ;
+
+
+    /**
+     * 通过消缺单获得详细信息
+     * @param rid
+     * @return
+     */
+    @GetMapping("/recommen/findMainTrack")
+    public AjaxResult findMainTrack(@RequestParam("rid") String rid) ;
+
+    /**
+     * 获得未完成消缺单列表
+     * @return
+     */
+    @GetMapping("/recommen/unfinishedList")
+    public AjaxResult unfinishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate) ;
+    /**
+     * 获得完成消缺单列表
+     * @return
+     */
+    @GetMapping("/recommen/finishedList")
+    public AjaxResult finishedList(@RequestParam("wpId") String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate);
+
+
+
+    /**
+     * 通过用户姓名和开始检修时间和结束检修时间获取手环实时和历史数据
+     * @param name
+     * @param beginDate
+     * @param endDate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/recommen/findShbraceletList")
+    public AjaxResult findShbraceletList(@RequestParam("name") String name,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception;
+
+
+    /**
+     * 获取部件结构树
+     * @return
+     */
+    @GetMapping("/recommen/findLocationTreeByWtId")
+    public AjaxResult findLocationTreeByWtId(@RequestParam("wtId") String wtId) throws Exception;
+
+    /**
+     * 通过位置编号获得缺陷单信息
+     * @return
+     */
+    @PostMapping("/recommen/findWobugeqByLocation")
+    public AjaxResult findWobugeqByLocation(Tablepar tablepar, @RequestParam("location") String location) throws Exception;
+
+
+    /**
+     * 获得对应风机的1个月健康推荐检修记录
+     * @return
+     */
+    @GetMapping("/recommen/getRecommenmainMonth")
+    public AjaxResult getRecommenmainMonth(@RequestParam("wtId") String wtId) throws Exception;
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/scatter/ScatterService.java

@@ -0,0 +1,35 @@
+package com.gyee.consumer.service.scatter;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.scatter.ScatterServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "scatter",url = "${provider.url}",
+        fallbackFactory = ScatterServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface ScatterService {
+
+    /**
+     * @throws
+     * @Title: scatterAjax
+     * @Description: 获得选择场站、项目、线路、年份、月份相关散点图
+     */
+    @GetMapping("/scatter/scatterAjax")
+    public AjaxResult scatterAjax(@RequestParam("wpId") String wpId,@RequestParam("pjId")  String pjId,@RequestParam("lnId")  String lnId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception  ;
+
+    /**
+     * @throws
+     * @Title: scatterAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @GetMapping("/scatter/scatterWtAjax")
+    public AjaxResult scatterWtAjax(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception;
+    /***********************************************************************************************************************/
+
+    @GetMapping("/winddirection/getWinddirection")
+    public AjaxResult getWinddirection(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) throws Exception;
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/singleanalysis/SingleAnalysisService.java

@@ -0,0 +1,54 @@
+package com.gyee.consumer.service.singleanalysis;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.singleanalysis.SingleAnalysisServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "singleanalysis",url = "${provider.url}",
+        fallbackFactory = SingleAnalysisServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface SingleAnalysisService {
+
+    /**
+     * 单机信息总览首页
+     * @param tablepar
+     * @param wpId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/singleanalysis/singleanalysisMain")
+    public AjaxResult singleanalysisMain(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("year")  String year, @RequestParam("month")  String month) throws Exception ;
+
+    /**
+     * 单机信息总览子页面
+     * @param wtId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/singleanalysis/singleanalysisSub")
+    public AjaxResult singleanalysisSub(@RequestParam("wtId") String wtId,@RequestParam("year")  String year,@RequestParam("month")  String month) throws Exception ;
+
+    /**
+     * 单机信息总览图表接口(3个)
+     * @param wtId
+     * @param year
+     * @param month
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/singleanalysis/singleanalysisChart")
+    public AjaxResult singleanalysisChart(@RequestParam("wtId") String wtId, @RequestParam("year") String year, @RequestParam("month") String month) throws Exception ;
+
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/warn/WarningService.java

@@ -0,0 +1,42 @@
+package com.gyee.consumer.service.warn;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.warn.WarningServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "warning",url = "${provider.url}",
+        fallbackFactory = WarningServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface WarningService {
+
+    @GetMapping("/fault/queryPointVos")
+    public AjaxResult queryPointVos(@RequestParam("wtId") String wtId,@RequestParam("bjtype")  String bjtype,@RequestParam("cdtype")  String cdtype) throws Exception;
+    @GetMapping("/fault/getFaultPlayback")
+    public AjaxResult getFaultPlayback(@RequestParam("wtId") String wtId,@RequestParam("pointids")  String pointids,@RequestParam("stopTime")  String stopTime) throws Exception;
+    /***********************************************************************************************************************/
+    @GetMapping("/temperature/getTemperatureList")
+    public AjaxResult getTemperatureList(@RequestParam("wpId") String wpId,@RequestParam("type")  String type) throws Exception ;
+
+
+    /***********************************************************************************************************************/
+
+    @PostMapping("/brownouts/getBrownoutsList")
+    public AjaxResult getBrownoutsList(Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("beginDate")  String beginDate, @RequestParam("endDate")  String endDate) throws Exception ;
+
+
+    @GetMapping("/brownouts/getBrownouts")
+    public AjaxResult getBrownouts(@RequestParam("mainId") String mainId) throws Exception;
+
+
+    /***********************************************************************************************************************/
+    @PostMapping("/event/getShutdownevent")
+    public AjaxResult getShutdownevent(@RequestBody  Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("wtId")  String wtId,@RequestParam("beginDate")  String beginDate,@RequestParam("endDate")  String endDate,@RequestParam("type")  String type) throws Exception ;
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/weather/WeatherService.java

@@ -0,0 +1,34 @@
+package com.gyee.consumer.service.weather;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.weather.WeatherServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "weather",url = "${provider.url}",
+        fallbackFactory = WeatherServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface WeatherService {
+
+    @GetMapping("/weather/weatherInfo")
+    public AjaxResult weatherInfo(@RequestParam("wpId") String wpId) throws Exception ;
+
+    @GetMapping("/weather/weatherChart")
+    public AjaxResult weatherChart(@RequestParam("wpId") String wpId) throws Exception ;
+
+    @GetMapping("/weather/powerChart")
+    public AjaxResult powerChart(@RequestParam("wpId") String wpId) throws Exception;
+
+
+    @PostMapping("/weather/history/list")
+    public AjaxResult getWeatherHistory(Tablepar tablepar,
+                                        @RequestParam("wpId") String wpId,
+                                        @RequestParam("startTs") String startTs,
+                                        @RequestParam("endTs") String endTs);
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/yaw/YawService.java

@@ -0,0 +1,40 @@
+package com.gyee.consumer.service.yaw;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.yaw.YawServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "yaw",url = "${provider.url}",
+        fallbackFactory = YawServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface YawService {
+
+    @GetMapping("/yaw/getPassRate")
+    public AjaxResult getPassRate(@RequestParam("wtId")String wtId,
+                                  @RequestParam("beginDate") String beginDate,
+                                  @RequestParam("endDate") String endDate,
+                                  @RequestParam("type") String type) throws Exception;
+
+
+    @GetMapping("/yaw/getRanges")
+    public AjaxResult getRanges(@RequestParam("wtId")String wtId,
+                                @RequestParam("beginDate")String beginDate,
+                                @RequestParam("endDate")String endDate,
+                                @RequestParam("value")Integer value,
+                                @RequestParam("type")String type) throws Exception ;
+
+
+
+    @GetMapping("/yaw/getTotalRanges")
+    public AjaxResult getTotalRanges(@RequestParam("wtId")String wtId,
+                                     @RequestParam("beginDate")String beginDate,
+                                     @RequestParam("endDate")String endDate,
+                                     @RequestParam("type")String type) throws Exception;
+
+    @GetMapping("/yaw/getWppointnum")
+    public AjaxResult getWppointnum() throws Exception;
+}

web/consumer-hb/src/main/resources/application.yml

@@ -2,30 +2,45 @@
 gyee:
   #API访问ip
   #swaggerip: 10.83.68.97:8170
-  #swaggerip: 192.168.56.1:8170
-  swaggerip: 192.168.2.216:8170
+  swaggerip: 192.168.56.1:8170
+  #swaggerip: 192.168.2.216:8170
 server:
   port: 8170
 
 spring:
   application:
     name: monitor-web-hb-consumer
-    cloud:
-      nacos:
-        discovery:
-          #server-addr: 192.168.56.1:8848
-          server-addr: 10.83.68.97:8848
-          #server-addr: 192.168.2.216:8848
-          #指定yaml格式的配置
-          file-extension: yaml
-          cluster-name: master
-        username: nacos
-        password: nacos
+  cloud:
+    sentinel:
+      transport:
+        dashboard: 192.168.56.1:8080
+        port: 8719
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 192.168.56.1:8848
+            data-id: ${spring.application.name}.json
+            group-id: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow
+      filter:
+        enabled: true
+      eager: true
+    nacos:
+      discovery:
+        server-addr: 192.168.56.1:8848
+        #server-addr: 10.83.68.97:8848
+        #server-addr: 192.168.2.216:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
   #redis集群
   redis:
-    #host: 10.0.118.73
+    host: 10.0.118.73
     #host: 192.168.2.202
-    host: 10.83.68.94
+    #host: 10.83.68.94
     password:
     port: 6379
     timeout: 100000
@@ -43,16 +58,16 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 19
+    database: 1
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
     #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:
@@ -101,6 +116,10 @@ url:
   analysis: http://192.168.2.216:8082
 
 feign:
+  sentinel:
+    enabled: true
+  httpclient:
+    enabled: true
   client:
     config:
       default: