消费功能修正

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

@@ -1,8 +1,9 @@
 package com.gyee.consumer.config;
 
 
-import com.gyee.consumer.fallback.*;
-import feign.Request;
+import com.gyee.consumer.fallback.compare.CompareServiceFallbackFactory;
+import com.gyee.consumer.fallback.goodness.WindturbineGoodnessServiceFallbackFactory;
+import com.gyee.consumer.fallback.monitor.*;
 import org.springframework.context.annotation.Bean;
 
 public class FeignConfiguration {
@@ -37,4 +38,16 @@ public class FeignConfiguration {
     public MonitorWtPushServiceFallbackFactory monitorWtPushServiceFallbackFactory() {
         return new MonitorWtPushServiceFallbackFactory();
     }
+
+    @Bean
+    public CompareServiceFallbackFactory compareServiceFallbackFactory() {
+        return new CompareServiceFallbackFactory();
+    }
+
+    @Bean
+    public WindturbineGoodnessServiceFallbackFactory windturbineGoodnessServiceFallbackFactory() {
+        return new WindturbineGoodnessServiceFallbackFactory();
+    }
+
+
 }

web/consumer-hb/src/main/java/com/gyee/consumer/controller/compare/CompareController.java

@@ -0,0 +1,149 @@
+package com.gyee.consumer.controller.compare;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.compare.CompareService;
+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("/compare")
+@Api(value = "单机横向对比功能",tags =  "单机横向对比功能")
+public class CompareController {
+    @Resource
+    private CompareService compareService;
+
+    /**查询日横向对比列表**/
+    @GetMapping("/compareDayList")
+    @ResponseBody
+    @ApiOperation(value = "查询日横向对比列表", notes = "查询日横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareDayList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**创建日风资源图表**/
+    @GetMapping("/fzyDay")
+    @ResponseBody
+    @ApiOperation(value = "创建日风资源图表", notes = "创建日风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyDay(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**查询日横向对比下方图表**/
+    @GetMapping("/compareDayChat")
+    @ResponseBody
+    @ApiOperation(value = "查询日横向对比下方图表", notes = "查询日横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareDayChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /***********************************************************************************************************************/
+
+    /**查询月横向对比列表**/
+    @GetMapping("/compareMonthList")
+    @ResponseBody
+    @ApiOperation(value = "查询月横向对比列表", notes = "查询月横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareMonthList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**创建月风资源图表**/
+    @GetMapping("/fzyMonth")
+    @ResponseBody
+    @ApiOperation(value = "创建月风资源图表", notes = "创建月风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyMonth(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**查询月横向对比下方图表**/
+    @GetMapping("/compareMonthChat")
+    @ResponseBody
+    @ApiOperation(value = "查询月横向对比下方图表", notes = "查询月横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareMonthChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+
+
+    /***********************************************************************************************************************/
+
+    /**查询年横向对比列表**/
+    @GetMapping("/compareYearList")
+    @ResponseBody
+    @ApiOperation(value = "查询年横向对比列表", notes = "查询年横向对比列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareYearList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**创建年风资源图表**/
+    @GetMapping("/fzyYear")
+    @ResponseBody
+    @ApiOperation(value = "创建年风资源图表", notes = "创建年风资源图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult fzyYear(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+    /**查询年横向对比下方图表**/
+    @GetMapping("/compareYearChat")
+    @ResponseBody
+    @ApiOperation(value = "查询年横向对比下方图表", notes = "查询年横向对比下方图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "windturbineid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult compareYearChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) {
+
+        AjaxResult ajax=compareService.compareDayList(windturbineid,recorddate);
+
+        return ajax;
+    }
+
+}

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

@@ -0,0 +1,556 @@
+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 javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * 风机明细信息页面
+ */
+@Controller
+@RequestMapping("/goodness")
+@Api(value = "单机信息总览详细信息",tags =  "单机信息总览详细信息")
+public class WindturbinegoodnessController {
+    
+    @Resource
+    private WindturbineGoodnessService windturbineGoodnessService;
+
+
+   
+/*****************************************************************************************************************/
+
+    /**
+     * 获得单机性能总览列表信息
+     *
+     * @param tablepar
+     * @param wpId
+     * @param recorddate
+     * @return
+     */
+    @GetMapping("/windturbinegoodness")
+    @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 windturbinegoodness(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.windturbinegoodness(tablepar,wpId,recorddate);
+
+        return ajax;
+    }
+
+
+    /**
+     * 获得单机性能总览历史列表信息
+     *
+     * @param tablepar
+     * @param wtId
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
+    @GetMapping("/goodhistorylist")
+    @ResponseBody
+    @ApiOperation(value = "获得单机性能总览历史列表信息", notes = "获得单机性能总览历史列表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", 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 goodhistorylist(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.goodhistorylist(tablepar,wtId,beginDate,endDate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+    /**
+     * 获得功率曲线数据查询
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/findWtRealPowerChar")
+    @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 findWtRealPowerChar(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception  {
+
+        AjaxResult ajax=windturbineGoodnessService.findWtRealPowerChar(wtId,recorddate);
+
+        return ajax;
+    }
+    /**
+     * 获得曲线区间区分功能数据查询
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/getplotBands")
+    @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 getplotBands(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception  {
+
+        AjaxResult ajax=windturbineGoodnessService.getplotBands(wtId,recorddate);
+
+        return ajax;
+    }
+
+    /**
+     * 获取切入风速
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/getInputSmall")
+    @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 getInputSmall(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception  {
+
+        AjaxResult ajax=windturbineGoodnessService.getInputSmall(wtId,recorddate);
+
+        return ajax;
+    }
+
+    /**
+     * 获取24小时功率曲线
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/findRealPowerCharBy24")
+    @ResponseBody
+    @ApiOperation(value = "获取24小时功率曲线", notes = "获取24小时功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult findRealPowerCharBy24(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception  {
+
+        AjaxResult ajax=windturbineGoodnessService.findRealPowerCharBy24(wtId,recorddate);
+
+        return ajax;
+    }
+
+
+    /*
+     * 单台风机当日报警记录
+     */
+    @GetMapping("/bjjllist")
+    @ResponseBody
+    @ApiOperation(value = "单台风机当日报警记录", notes = "单台风机当日报警记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", 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 bjjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.bjjllist(tablepar, wtId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 单台风机当日停机记录
+     */
+    @GetMapping("/gzjllist")
+    @ResponseBody
+    @ApiOperation(value = "单台风机当日停机记录", notes = "单台风机当日停机记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", 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 gzjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.gzjllist(tablepar,wtId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 单台风机当日限电记录
+     */
+    @GetMapping("/xdjllist")
+    @ResponseBody
+    @ApiOperation(value = "单台风机当日限电记录", notes = "单台风机当日限电记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", 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 xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.xdjllist(tablepar,wtId,recorddate);
+
+        return ajax;
+    }
+
+    /**
+     * 获取区域弹出列表信息
+     *
+
+     */
+    @GetMapping("/plotBandAjax")
+    @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")})
+
+    public AjaxResult plotBandAjax(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception  {
+
+        AjaxResult ajax=windturbineGoodnessService.plotBandAjax(wtId,beginDate,endDate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+/*
+ * 风场日最大风速
+ */
+@GetMapping("/wprzdfs")
+@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 wprzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+    AjaxResult ajax=windturbineGoodnessService.wprzdfs(wpId,recorddate);
+
+    return ajax;
+}
+
+    /*
+     * 风场月最大风速
+     */
+    @GetMapping("/wpyzdfs")
+    @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 wpyzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wpyzdfs(wpId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 风场年最大风速
+     */
+    @GetMapping("/wpnzdfs")
+    @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 wpnzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wpnzdfs(wpId,recorddate);
+
+        return ajax;
+    }
+
+
+    /*
+     * 风场日风向频率
+     */
+    @GetMapping("/wprfxpl")
+    @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 wprfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wprfxpl(wpId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 风场月风向频率
+     */
+    @GetMapping("/wpyfxpl")
+    @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 wpyfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wpyfxpl(wpId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 风场年风向频率
+     */
+    @GetMapping("/wpnfxpl")
+    @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 wpnfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wpnfxpl(wpId,recorddate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+
+/*
+ * 风机日最大风速
+ */
+@GetMapping("/wtrzdfs")
+@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 wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+
+    AjaxResult ajax=windturbineGoodnessService.wtrzdfs(wtId,recorddate);
+
+    return ajax;
+}
+
+
+    /*
+     * 风机月最大风速
+     */
+    @GetMapping("/wtyzdfs")
+    @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 wtyzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wtyzdfs(wtId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 风机年最大风速
+     */
+    @GetMapping("/wtnzdfs")
+    @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 wtnzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wtnzdfs(wtId,recorddate);
+
+        return ajax;
+    }
+
+
+    /*
+     * 风机日风向频率
+     */
+    @GetMapping("/wtrfxpl")
+    @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 wtrfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wtrfxpl(wtId,recorddate);
+
+        return ajax;
+    }
+
+
+    /*
+     * 风机月风向频率
+     */
+    @GetMapping("/wtyfxpl")
+    @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 wtyfxpl(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wtyfxpl(wtId,recorddate);
+
+        return ajax;
+    }
+
+
+    /*
+     * 风机年风向频率
+     */
+    @GetMapping("/wtnfxpl")
+    @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 wtnfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  {
+
+        AjaxResult ajax=windturbineGoodnessService.wtnfxpl(wtId,recorddate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+    /**
+     * 获得明细页面显示信息
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     */
+    @GetMapping("/wadAjax")
+    @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 wadAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=windturbineGoodnessService.wadAjax(wtId,recorddate);
+
+        return ajax;
+    }
+    
+   
+    /*
+     * 单台风机当月报警排行
+     */
+    @GetMapping("/bjphlist")
+    @ResponseBody
+    @ApiOperation(value = "单台风机当月报警排行", notes = "单台风机当月报警排行")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", 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 bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=windturbineGoodnessService.bjphlist(tablepar,wtId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 获取明细页面功率曲线
+     */
+    @GetMapping("/glchat")
+    @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 glchat(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=windturbineGoodnessService.glchat(wtId,recorddate);
+
+        return ajax;
+    }
+
+    /*
+     * 获取风机风资源
+     */
+    @GetMapping("/fjfzy")
+    @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 fjfzy(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) {
+
+        AjaxResult ajax=windturbineGoodnessService.fjfzy(wtId,recorddate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+    /**
+     * 饼图图表
+     *
+     * @param wtId
+     * @param recorddate
+     * @return
+     */
+    @GetMapping("/pieChart")
+    @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"),
+            @ApiImplicitParam(name = "type", value = "类型 1:日小风切入，2：月小风切入，3：月小风切入,4:日小风停机，5：月小风停机，6：年小风停机", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult pieChart( String wtId, String recorddate,String type) {
+
+        AjaxResult ajax=windturbineGoodnessService.fjfzy(wtId,recorddate);
+
+        return ajax;
+    }
+/*****************************************************************************************************************/
+}

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

@@ -0,0 +1,458 @@
+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;
+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;
+import java.text.DecimalFormat;
+import java.util.*;
+
+@Controller
+@RequestMapping("/health")
+@Api(value = "健康管理" ,tags =  "健康管理")
+public class HealthController {
+
+
+    @Resource
+    private HealthService healthMainService;
+
+    /***********************************************************************************************************************/
+    @GetMapping("/findAllChart")
+    @ResponseBody
+    @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")})
+    public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception {
+
+        AjaxResult ajax=healthMainService.findAllChart(wpId,num,type);
+
+        return ajax;
+    }
+
+    @GetMapping("/findAllMap")
+    @ResponseBody
+    @ApiOperation(value = "获得全省健康状态基础数据", notes = "获得全省健康状态基础数据")
+    @ApiImplicitParams({
+    })
+    public AjaxResult findAllMap() throws Exception {
+
+        AjaxResult ajax=healthMainService.findAllMap();
+
+        return ajax;
+    }
+
+    @GetMapping("/findWpMap")
+    @ResponseBody
+    @ApiOperation(value = "获得场站健康状态基础数据", notes = "获得场站健康状态基础数据")
+    @ApiImplicitParams({
+    })
+    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=healthMainService.findWpMap(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findHealthMatrixMap")
+    @ResponseBody
+    @ApiOperation(value = "获得健康矩阵", notes = "获得健康矩阵")
+    @ApiImplicitParams({
+    })
+    public AjaxResult findHealthMatrixMap() throws Exception {
+
+        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+
+        return ajax;
+    }
+    /***********************************************************************************************************************/
+    @GetMapping("/findWtHealthInfo")
+    @ResponseBody
+    @ApiOperation(value = "获取健康管理风机信息", notes = "获取健康管理风机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+
+        return ajax;
+    }
+
+    @GetMapping("/findWtHealthInfo1")
+    @ResponseBody
+    @ApiOperation(value = "获取健康管理风机信息", notes = "获取健康管理风机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findWtHealthInfo2")
+    @ResponseBody
+    @ApiOperation(value = "获取健康管理风机信息", notes = "获取健康管理风机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findWtHealthInfo3")
+    @ResponseBody
+    @ApiOperation(value = "获取健康管理风机信息", notes = "获取健康管理风机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+
+        return ajax;
+    }
+
+
+    @GetMapping("/gadaytop5")
+    @ResponseBody
+    @ApiOperation(value = "获得等级评估前5数据", notes = "获得等级评估前5数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.gadaytop5(wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/queryStopTop10")
+    @ResponseBody
+    @ApiOperation(value = "获取最新的十次停机事件", notes = "获取最新的十次停机事件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.queryStopTop10(wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/getWtMttrandMtbfByBj")
+    @ResponseBody
+    @ApiOperation(value = "获取风机部件MTTR和MTBF  数组 0健康状态、1部件名称 2 7天健康状态 3 故障进度 4 mtbf 5 mttr 6损失电量", notes = "获取风机部件MTTR和MTBF 数组 0健康状态、1部件名称 2 7天健康状态 3 故障进度 4 mtbf 5 mttr 6损失电量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.getWtMttrandMtbfByBj(wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/getWeatherRealDay5Info")
+    @ResponseBody
+    @ApiOperation(value = "获取近5天气象数据", notes = "获取近5天气象数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.getWeatherRealDay5Info(wpId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findPowerChar")
+    @ResponseBody
+    @ApiOperation(value = "获得实际功率和理论功率曲线", notes = "获得实际功率和理论功率曲线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findPowerChar(wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/hsFjValueIndex")
+    @ResponseBody
+    @ApiOperation(value = "获取部件图表", notes = "获取部件图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.hsFjValueIndex(wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findWtHisValueForBj")
+    @ResponseBody
+    @ApiOperation(value = "获取风机部件健康曲线图表", notes = "获取风机部件健康曲线图表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.findWtHisValueForBj(wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/hsFjValueIndexByPart")
+    @ResponseBody
+    @ApiOperation(value = "获取风机健康部件曲线图", notes = "获取风机健康部件曲线图")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "部件类型", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception  {
+
+        AjaxResult ajax=healthMainService.hsFjValueIndexByPart(wtId,type);
+
+        return ajax;
+    }
+
+    /***********************************************************************************************************************/
+    @GetMapping("/countWpwarn")
+    @ResponseBody
+    @ApiOperation(value = "近7天报警事件统计 type 1风场2项目", notes = "近7天报警事件统计 ype 1风场2项目")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception  {
+
+        AjaxResult ajax=healthMainService.countWpwarn(type);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/countStop")
+    @ResponseBody
+    @ApiOperation(value = "近7天停机事件统计 type 1风场2项目", notes = "近7天停机事件统计 ype 1风场2项目")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult countStop(@RequestParam("type") String type) throws Exception  {
+
+        AjaxResult ajax=healthMainService.countStop(type);
+
+        return ajax;
+    }
+
+    @GetMapping("/countWpOrProStatus")
+    @ResponseBody
+    @ApiOperation(value = "健康状态占比图表 type 1风场2项目", notes = "健康状态占比图表 type 1风场2项目")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception   {
+
+        AjaxResult ajax=healthMainService.countWpOrProStatus(type);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findWpOrProStatusForHistory")
+    @ResponseBody
+    @ApiOperation(value = "健康状态曲线图表 type 1风场2项目 status 1良好2注意", notes = "健康状态曲线图表 type 1风场2项目 status 1良好2注意")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "类型", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "status", value = "状态", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type,@RequestParam("status")  String status) throws Exception   {
+
+        AjaxResult ajax=healthMainService.findWpOrProStatusForHistory(type,status);
+
+        return ajax;
+    }
+
+
+    /***********************************************************************************************************************/
+    /**性能损失走势列表**/
+    @GetMapping("/losspowerratehealth/losspowerrateList")
+    @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")})
+
+    public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception   {
+
+        AjaxResult ajax=healthMainService.losspowerrateList(wtId,beginDate,endDate);
+
+        return ajax;
+    }
+
+    /**性能损失走势图表**/
+    @GetMapping("/losspowerratehealth/getChartlist")
+    @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")})
+
+    public AjaxResult getChartlist(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception    {
+
+        AjaxResult ajax=healthMainService.getChartlist(wtId,beginDate,endDate);
+
+        return ajax;
+    }
+    /***********************************************************************************************************************/
+    /**批次报警分析**/
+    @GetMapping("/partbjList")
+    @ResponseBody
+    @ApiOperation(value = "批次报警分析主列表", notes = "批次报警分析主列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception   {
+
+        AjaxResult ajax=healthMainService.partbjList(recorddate);
+
+        return ajax;
+    }
+
+    /**批次报警分析**/
+    @GetMapping("/partbjsubList")
+    @ResponseBody
+    @ApiOperation(value = "批次报警分析明细列表", notes = "批次报警分析明细列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lnid", value = "线路编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "part", value = "部件编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult partbjsubList(@RequestParam("lnid") String lnid,@RequestParam("part")  String part,@RequestParam("recorddate")  String recorddate) throws Exception   {
+
+        AjaxResult ajax=healthMainService.partbjsubList(lnid,part,recorddate);
+
+        return ajax;
+    }
+    /***********************************************************************************************************************/
+    @GetMapping("/stopAnalysisList")
+    @ResponseBody
+    @ApiOperation(value = "故障诊断列表", notes = "故障诊断列表")
+    @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")})
+
+    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception   {
+
+        AjaxResult ajax=healthMainService.stopAnalysisList(wpId,modelId,typeId);
+
+        return ajax;
+    }
+
+    @GetMapping("/stopAnalysisTree")
+    @ResponseBody
+    @ApiOperation(value = "故障诊断部件树", notes = "故障诊断部件树")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mainId", value = "主编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "values", value = "诊断值", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult stopAnalysisTree(@RequestParam("mainId")  String mainId,@RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception   {
+
+        AjaxResult ajax=healthMainService.stopAnalysisTree(mainId,wtId,values);
+
+        return ajax;
+    }
+
+    @PostMapping("/saveStopAnalysis")
+    @ResponseBody
+    @ApiOperation(value = "保存故障诊断结果", notes = "保存故障诊断结果")
+    @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")})
+
+    public AjaxResult saveStopAnalysis(@RequestParam("wpId")  String wpId,@RequestParam("modelId")  String modelId,@RequestParam("typeId")  String typeId) throws Exception   {
+
+        AjaxResult ajax=healthMainService.saveStopAnalysis(wpId,modelId,typeId);
+
+        return ajax;
+    }
+
+    /***********************************************************************************************************************/
+    /**单机区间曲线偏差率**/
+    @GetMapping("/windTurbineCurveList")
+    @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 windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) throws Exception   {
+
+        AjaxResult ajax=healthMainService.windTurbineCurveList(tablepar,wpId,recorddate);
+
+        return ajax;
+    }
+
+    /**
+     * @throws
+     * @Title: scatterWtByDayAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @GetMapping("/scatterWtByDayAjax")
+    @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 scatterWtByDayAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) throws Exception   {
+
+        AjaxResult ajax=healthMainService.scatterWtByDayAjax(wtId,recorddate);
+
+        return ajax;
+    }
+
+    /***********************************************************************************************************************/
+    /**风机健康列表**/
+    @GetMapping("/windTurbineHealthList")
+    @ResponseBody
+    @ApiOperation(value = "风机健康列表", notes = "风机健康列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=healthMainService.windTurbineHealthList(wpId);
+
+        return ajax;
+    }
+    /***********************************************************************************************************************/
+    /***********************************************************************************************************************/
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/GenreSetPushController.java

@@ -1,23 +1,16 @@
 package com.gyee.consumer.controller.monitor;
 
 import com.gyee.common.domain.AjaxResult;
-import com.gyee.common.model.StringUtils;
-import com.gyee.common.vo.benchmark.DataVo;
-import com.gyee.consumer.service.GenreSetPushService;
+import com.gyee.consumer.service.monitor.GenreSetPushService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RestController

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/MatrixPushController.java

@@ -0,0 +1,113 @@
+package com.gyee.consumer.controller.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MatrixPushService;
+
+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("/matrix")
+@Api(value = "矩阵" ,tags =  "矩阵")
+public class MatrixPushController {
+
+    @Resource
+    private MatrixPushService matrixPushService;
+
+
+    @GetMapping("/matrixPush")
+    @ResponseBody
+    @ApiOperation(value = "基础矩阵", notes = "基础矩阵")
+    @ApiImplicitParams({})
+    public AjaxResult matrixPush() throws Exception{
+
+        AjaxResult ajax=matrixPushService.matrixPush();
+
+        return ajax;
+    }
+
+    @GetMapping("/matrixDetialPush")
+    @ResponseBody
+    @ApiOperation(value = "明细矩阵", notes = "明细矩阵")
+    @ApiImplicitParams({})
+    public AjaxResult matrixDetialPush() throws Exception{
+
+        AjaxResult ajax=matrixPushService.matrixDetialPush();
+
+        return ajax;
+    }
+
+    @GetMapping("/matrixDetialGfPush")
+    @ResponseBody
+    @ApiOperation(value = "光伏矩阵", notes = "光伏矩阵")
+    @ApiImplicitParams({})
+    public AjaxResult matrixDetialGfPush() throws Exception{
+
+        AjaxResult ajax=matrixPushService.matrixDetialGfPush();
+
+        return ajax;
+    }
+
+    @GetMapping("/matrixQfPush")
+    @ResponseBody
+    @ApiOperation(value = "欠发矩阵", notes = "欠发矩阵")
+    @ApiImplicitParams({})
+    public AjaxResult matrixQfPush() throws Exception{
+
+        AjaxResult ajax=matrixPushService.matrixQfPush();
+
+        return ajax;
+    }
+
+    @GetMapping("/matrixByWpIdPush")
+    @ResponseBody
+    @ApiOperation(value = "风场矩阵", notes = "风场矩阵")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult matrixByWpIdPush(@RequestParam("wpId") String wpId) throws Exception{
+
+        AjaxResult ajax=matrixPushService.matrixByWpIdPush(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findSimpleMatrix")
+    @ResponseBody
+    @ApiOperation(value = "风场简单矩阵", notes = "风场简单矩阵")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findSimpleMatrix(@RequestParam("wpId") String wpId) throws Exception{
+
+        AjaxResult ajax=matrixPushService.findSimpleMatrix(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findSimpleMatrixAll")
+    @ResponseBody
+    @ApiOperation(value = "全风场简单矩阵", notes = "全风场简单矩阵")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findSimpleMatrixAll(@RequestParam("wpId") String wpId) throws Exception{
+
+        AjaxResult ajax=matrixPushService.findSimpleMatrixAll(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findPVSimpleMatrixAll")
+    @ResponseBody
+    @ApiOperation(value = "全光伏场简单矩阵", notes = "全光伏场简单矩阵")
+    public AjaxResult findPVSimpleMatrixAll() throws Exception{
+
+        AjaxResult ajax=matrixPushService.findPVSimpleMatrixAll();
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/MonitorInverterPushController.java

@@ -0,0 +1,61 @@
+package com.gyee.consumer.controller.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorInverterPushService;
+
+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("/monitorinverter")
+@Api(value = "逆变器监视", tags = "逆变器监视")
+public class MonitorInverterPushController {
+
+	@Resource
+	private MonitorInverterPushService monitorInverterPushService;
+
+
+	@GetMapping("/findInverterInfo")
+	@ResponseBody
+	@ApiOperation(value = "逆变器信息", notes = "逆变器AI点、报警点")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
+	public AjaxResult findWtInfo(@RequestParam("wtId") String wtId) throws Exception{
+
+        AjaxResult ajax=monitorInverterPushService.findWtInfo(wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findInverterInfoList")
+    @ResponseBody
+    @ApiOperation(value = "逆变器信息列表", notes = "逆变器信息列表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+
+	public AjaxResult findWtInfoList(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=monitorInverterPushService.findWtInfoList(wpId);
+
+        return ajax;
+    }
+
+	@GetMapping("/findInverterPowerLine")
+	@ResponseBody
+	@ApiOperation(value = "逆变器开网频率", notes = "逆变器当日0点至今功率，间隔30分钟")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "wtId", value = "逆变器ID", required = true, dataType = "string", paramType = "query") })
+	public AjaxResult findInverterPowerLine(@RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax=monitorInverterPushService.findInverterPowerLine(wtId);
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/MonitorPushController.java

@@ -0,0 +1,119 @@
+package com.gyee.consumer.controller.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorPushService;
+
+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("/monitor")
+@Api(value = "状态监视" ,tags =  "状态监视")
+public class MonitorPushController {
+
+    @Resource
+    private MonitorPushService monitorPushService;
+
+    @GetMapping("/findCftInfo")
+    @ResponseBody
+    @ApiOperation(value = "获取测风塔信息", notes = "获取测风塔信息")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult findCftInfo(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=monitorPushService.findCftInfo(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/monitor")
+    @ResponseBody
+    @ApiOperation(value = "状态监视", notes = "状态监视")
+    @ApiImplicitParams({})
+    public AjaxResult monitor() throws Exception {
+
+        AjaxResult ajax=monitorPushService.monitor();
+
+        return ajax;
+    }
+
+    @GetMapping("/findWpInfoBywpId")
+    @ResponseBody
+    @ApiOperation(value = "场站监视", notes = "场站监视")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWpInfoBywpId(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findWpInfoBywpId(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findLossWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视损失电量图表", notes = "场站监视损失电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findLossWpBar(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findLossWpBar(wpId);
+
+        return ajax;
+    }
+    @GetMapping("/findPowerWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视日发电量图表", notes = "场站监视日发电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findPowerWpBar(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findPowerWpBar(wpId);
+
+        return ajax;
+    }
+
+    @GetMapping("/findMonthPowerWpBar")
+    @ResponseBody
+    @ApiOperation(value = "场站监视月发电量图表", notes = "场站监视月发电量图表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findMonthPowerWpBar(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findMonthPowerWpBar(wpId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findPowerFirst")
+    @ResponseBody
+    @ApiOperation(value = "升压站监视", notes = "升压站监视")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findPowerFirst(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findPowerFirst(wpId);
+
+        return ajax;
+    }
+    @GetMapping("/findGeneralAppearance")
+    @ResponseBody
+    @ApiOperation(value = "总貌、地貌监视", notes = "总貌、地貌监视")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findGeneralAppearance(@RequestParam("wpId") String wpId) throws Exception  {
+
+        AjaxResult ajax=monitorPushService.findGeneralAppearance(wpId);
+
+        return ajax;
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/MonitorWtPushController.java

@@ -0,0 +1,69 @@
+package com.gyee.consumer.controller.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorWtPushService;
+
+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("/monitorwt")
+@Api(value = "风机监视" ,tags =  "风机监视")
+public class MonitorWtPushController {
+
+    @Resource
+    private MonitorWtPushService monitorWtPushService;
+
+
+
+    @GetMapping("/findWtInfo")
+    @ResponseBody
+    @ApiOperation(value = "风机信息", notes = "风机信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtInfo(@RequestParam("wtId")String  wtId) throws Exception {
+
+        AjaxResult ajax=monitorWtPushService.findWtInfo(wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findWtWarnInfo")
+    @ResponseBody
+    @ApiOperation(value = "风机报警信息", notes = "风机报警信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtWarnInfo(@RequestParam("wtId")String  wtId) throws Exception {
+
+        AjaxResult ajax=monitorWtPushService.findWtWarnInfo(wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/findWtInfoList")
+    @ResponseBody
+    @ApiOperation(value = "风机信息列表", notes = "风机信息列表")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult findWtInfoList(@RequestParam("wpId")String  wpId) throws Exception {
+
+        AjaxResult ajax=monitorWtPushService.findWtInfoList(wpId);
+
+        return ajax;
+    }
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/controller/monitor/SandtableController.java

@@ -0,0 +1,49 @@
+package com.gyee.consumer.controller.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.SandtableService;
+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("/sandtable")
+@Api(value = "沙盘监视" ,tags =  "沙盘监视")
+public class SandtableController {
+
+    @Resource
+    private SandtableService sandtableService;
+
+
+    @GetMapping("/findWtInfo")
+    @ResponseBody
+    @ApiOperation(value = "风机信息", notes = "风机信息")
+    @ApiImplicitParams({@ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult findWtInfo(@RequestParam("wpId") String wpId) throws Exception {
+
+        AjaxResult ajax=sandtableService.findWtInfo(wpId);
+
+        return ajax;
+    }
+    @GetMapping("/judgeWpHealth")
+    @ResponseBody
+    @ApiOperation(value = "风场健康情况", notes = "风场健康情况")
+
+    public AjaxResult judgeWpHealth() throws Exception {
+
+        AjaxResult ajax=sandtableService.judgeWpHealth();
+
+        return ajax;
+    }
+
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/compare/CompareServiceFallbackFactory.java

@@ -0,0 +1,72 @@
+package com.gyee.consumer.fallback.compare;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.compare.CompareService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class CompareServiceFallbackFactory implements FallbackFactory<CompareService> {
+
+    @Override
+    public CompareService create(Throwable throwable) {
+        return new CompareService() {
+
+
+            /**查询日横向对比列表**/
+            @Override
+            public AjaxResult compareDayList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**创建日风资源图表**/
+            @Override
+            public AjaxResult fzyDay(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**查询日横向对比下方图表**/
+            @Override
+            public AjaxResult compareDayChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /***********************************************************************************************************************/
+
+            /**查询月横向对比列表**/
+            @Override
+            public AjaxResult compareMonthList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /**创建月风资源图表**/
+            @Override
+            public AjaxResult fzyMonth(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**查询月横向对比下方图表**/
+            @Override
+            public AjaxResult compareMonthChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /***********************************************************************************************************************/
+
+            /**查询年横向对比列表**/
+            @Override
+            public AjaxResult compareYearList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**创建年风资源图表**/
+            @Override
+            public AjaxResult fzyYear(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /**查询年横向对比下方图表**/
+            @Override
+            public AjaxResult compareYearChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+
+        };
+    }
+}

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

@@ -0,0 +1,243 @@
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactory<WindturbineGoodnessService> {
+
+    @Override
+    public WindturbineGoodnessService create(Throwable throwable) {
+        return new WindturbineGoodnessService() {
+
+ /*****************************************************************************************************************/
+            /*
+             * 获得单机性能总览列表信息
+             */
+            @Override
+            public AjaxResult windturbinegoodness(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 获得单机性能总览历史列表信息
+             */
+            @Override
+            public AjaxResult goodhistorylist(@RequestParam("tablepar") Tablepar tablepar,@RequestParam("wtId")  String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+ /*****************************************************************************************************************/
+
+            /*
+             * 获得功率曲线数据查询
+             */
+            @Override
+            public AjaxResult findWtRealPowerChar(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /*
+             * 获得曲线区间区分功能数据查询
+             */
+            @Override
+            public AjaxResult getplotBands(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 获取切入风速
+             */
+            @Override
+            public AjaxResult getInputSmall(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 获取24小时功率曲线
+             */
+            @Override
+            public AjaxResult findRealPowerCharBy24(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /*
+             * 单台风机当日报警记录
+             */
+            @Override
+            public AjaxResult bjjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 单台风机当日停机记录
+             */
+            @Override
+            public AjaxResult gzjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 单台风机当日限电记录
+             */
+            @Override
+            public AjaxResult xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /*
+             * 获取区域弹出列表信息
+             */
+            @Override
+             public AjaxResult plotBandAjax(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+/*****************************************************************************************************************/
+
+            /*
+             * 风场日最大风速
+             */
+            @Override
+            public AjaxResult wprzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风场月最大风速
+             */
+            @Override
+            public AjaxResult wpyzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风场年最大风速
+             */
+            @Override
+            public AjaxResult wpnzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风场日风向频率
+             */
+            @Override
+            public AjaxResult wprfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风场月风向频率
+             */
+            @Override
+            public AjaxResult wpyfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风场年风向频率
+             */
+            @Override
+            public AjaxResult wpnfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+            /*****************************************************************************************************************/
+
+            /*
+             * 风机日最大风速
+             */
+            @Override
+            public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /*
+             * 风机月最大风速
+             */
+            @Override
+            public AjaxResult wtyzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 风机年最大风速
+             */
+            @Override
+            public AjaxResult wtnzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /*
+             * 风机日风向频率
+             */
+            @Override
+            public AjaxResult wtrfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /*
+             * 风机月风向频率
+             */
+            @Override
+            public AjaxResult wtyfxpl(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate)  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            /*
+             * 风机年风向频率
+             */
+            @Override
+            public AjaxResult wtnfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)   {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*****************************************************************************************************************/
+            @Override
+            public AjaxResult wadAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 单台风机当月报警排行
+             */
+            @Override
+            public AjaxResult bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 获取明细页面功率曲线
+             */
+            @Override
+            public AjaxResult glchat(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            /*
+             * 获取风机风资源
+             */
+            @Override
+            public AjaxResult fjfzy(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+/*****************************************************************************************************************/
+            @Override
+            public AjaxResult pieChart( String wtId, String recorddate,String type){
+                return  AjaxResult.error(throwable.getMessage());
+            }
+/*****************************************************************************************************************/
+        };
+
+    }
+}

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

@@ -0,0 +1,203 @@
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+public class HealthServiceFallbackFactory implements FallbackFactory<HealthService> {
+
+    @Override
+    public HealthService create(Throwable throwable) {
+        return new HealthService() {
+
+    /***********************************************************************************************************************/
+    @Override
+    public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception{
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findAllMap() throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findHealthMatrixMap() throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+    /***********************************************************************************************************************/
+    @Override
+    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception   {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception   {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception   {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception   {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+ /***********************************************************************************************************************/
+     @Override
+     public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception {
+         return  AjaxResult.error(throwable.getMessage());
+     }
+
+
+     @Override
+    public AjaxResult countStop(@RequestParam("type") String type) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    @Override
+    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type,@RequestParam("status")  String status) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+/***********************************************************************************************************************/
+    /**性能损失走势列表**/
+    @Override
+    public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    /**性能损失走势图表**/
+    @Override
+    public AjaxResult getChartlist(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+ /***********************************************************************************************************************/
+    /**批次报警分析**/
+    @Override
+    public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    /**批次报警分析**/
+    @Override
+    public AjaxResult partbjsubList(@RequestParam("lnid") String lnid,@RequestParam("part")  String part,@RequestParam("recorddate")  String recorddate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+ /***********************************************************************************************************************/
+    @Override
+    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult stopAnalysisTree(@RequestParam("mainId")  String mainId,@RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception  {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+
+    @Override
+    public AjaxResult saveStopAnalysis(@RequestParam("wpId")  String wpId,@RequestParam("modelId")  String modelId,@RequestParam("typeId")  String typeId) throws Exception{
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    /***********************************************************************************************************************/
+    /**单机区间曲线偏差率**/
+    @Override
+    public AjaxResult windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    /**
+     * @throws
+     * @Title: scatterWtByDayAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @Override
+    public AjaxResult scatterWtByDayAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) throws Exception {
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
+    /***********************************************************************************************************************/
+            /**风机健康列表**/
+            @Override
+            public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+      /***********************************************************************************************************************/
+
+
+        };
+    }
+}

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

@@ -1,10 +1,8 @@
-package com.gyee.consumer.fallback;
+package com.gyee.consumer.fallback.monitor;
 
 import com.gyee.common.domain.AjaxResult;
-import com.gyee.consumer.service.GenreSetPushService;
+import com.gyee.consumer.service.monitor.GenreSetPushService;
 import feign.hystrix.FallbackFactory;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 public class GenreSetPushServiceFallbackFactory implements FallbackFactory<GenreSetPushService> {

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/MatrixPushServiceFallbackFactory.java

@@ -0,0 +1,56 @@
+package com.gyee.consumer.fallback.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MatrixPushService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class MatrixPushServiceFallbackFactory implements FallbackFactory<MatrixPushService> {
+
+    @Override
+    public MatrixPushService create(Throwable throwable) {
+        return new MatrixPushService() {
+
+
+            @Override
+            public AjaxResult matrixPush() throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult matrixDetialPush() throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult matrixDetialGfPush() throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult matrixQfPush() throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult matrixByWpIdPush(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findSimpleMatrix(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findSimpleMatrixAll(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findPVSimpleMatrixAll() throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/MonitorInverterPushServiceFallbackFactory.java

@@ -0,0 +1,32 @@
+package com.gyee.consumer.fallback.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorInverterPushService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class MonitorInverterPushServiceFallbackFactory implements FallbackFactory<MonitorInverterPushService> {
+
+    @Override
+    public MonitorInverterPushService create(Throwable throwable) {
+        return new MonitorInverterPushService() {
+
+
+            @Override
+            public AjaxResult findWtInfo(@RequestParam("wtId") String wtId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findWtInfoList(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findInverterPowerLine(@RequestParam("wtId") String wtId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/MonitorPushServiceFallbackFactory.java

@@ -0,0 +1,59 @@
+package com.gyee.consumer.fallback.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorPushService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class MonitorPushServiceFallbackFactory implements FallbackFactory<MonitorPushService> {
+
+    @Override
+    public MonitorPushService create(Throwable throwable) {
+        return new MonitorPushService() {
+
+
+            @Override
+            public AjaxResult findCftInfo(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult monitor() throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findWpInfoBywpId(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findLossWpBar(@RequestParam("wpId") String wpId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findPowerWpBar(@RequestParam("wpId") String wpId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findMonthPowerWpBar(@RequestParam("wpId") String wpId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult findPowerFirst(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findGeneralAppearance(@RequestParam("wpId") String wpId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/MonitorWtPushServiceFallbackFactory.java

@@ -0,0 +1,30 @@
+package com.gyee.consumer.fallback.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.MonitorWtPushService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class MonitorWtPushServiceFallbackFactory implements FallbackFactory<MonitorWtPushService> {
+
+    @Override
+    public MonitorWtPushService create(Throwable throwable) {
+        return new MonitorWtPushService() {
+
+            @Override
+            public AjaxResult findWtInfo(@RequestParam("wtId")String  wtId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findWtWarnInfo(@RequestParam("wtId")String  wtId) throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult findWtInfoList(@RequestParam("wpId")String  wpId) throws Exception  {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+        };
+    }
+}

web/consumer-hb/src/main/java/com/gyee/consumer/fallback/monitor/SandtableServiceFallbackFactory.java

@@ -0,0 +1,27 @@
+package com.gyee.consumer.fallback.monitor;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.monitor.SandtableService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public class SandtableServiceFallbackFactory implements FallbackFactory<SandtableService> {
+
+    @Override
+    public SandtableService create(Throwable throwable) {
+        return new SandtableService() {
+
+            @Override
+            public AjaxResult findWtInfo(@RequestParam("wpId") String wpId) throws Exception{
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult judgeWpHealth() throws Exception {
+                return  AjaxResult.error(throwable.getMessage());
+            }
+
+
+        };
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.gyee.consumer.model;
+
+/**
+ * boostrap table post 参数
+ * @author fc
+ *
+ */
+public class Tablepar {
+	private int pageNum;//页码
+	private int pageSize;//数量
+	private String orderByColumn;//排序字段
+	private String isAsc;//排序字符 asc desc 
+	private String searchText;//列表table里面的搜索
+	public int getPageNum() {
+		return pageNum;
+	}
+	public void setPageNum(int pageNum) {
+		this.pageNum = pageNum;
+	}
+	public int getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
+	public String getOrderByColumn() {
+		return orderByColumn;
+	}
+	public void setOrderByColumn(String orderByColumn) {
+		this.orderByColumn = orderByColumn;
+	}
+	public String getIsAsc() {
+		return isAsc;
+	}
+	public void setIsAsc(String isAsc) {
+		this.isAsc = isAsc;
+	}
+	public String getSearchText() {
+		return searchText;
+	}
+	public void setSearchText(String searchText) {
+		this.searchText = searchText;
+	}
+	
+}

web/consumer-hb/src/main/java/com/gyee/consumer/service/compare/CompareService.java

@@ -0,0 +1,52 @@
+package com.gyee.consumer.service.compare;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.compare.CompareServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "compare",url = "${provider.url}",
+        fallbackFactory = CompareServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface CompareService {
+
+    /**查询日横向对比列表**/
+    @GetMapping("/compare/compareDayList")
+    public AjaxResult compareDayList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) ;
+
+    /**创建日风资源图表**/
+    @GetMapping("/compare/fzyDay")
+      public AjaxResult fzyDay(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+
+    /**查询日横向对比下方图表**/
+    @GetMapping("/compare/compareDayChat")
+      public AjaxResult compareDayChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+    /***********************************************************************************************************************/
+
+    /**查询月横向对比列表**/
+    @GetMapping("/compare/compareMonthList")
+      public AjaxResult compareMonthList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+
+    /**创建月风资源图表**/
+    @GetMapping("/compare/fzyMonth")
+    public AjaxResult fzyMonth(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+    /**查询月横向对比下方图表**/
+    @GetMapping("/compare/compareMonthChat")
+      public AjaxResult compareMonthChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+
+    /***********************************************************************************************************************/
+
+    /**查询年横向对比列表**/
+    @GetMapping("/compare/compareYearList")
+    public AjaxResult compareYearList(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate) ;
+    /**创建年风资源图表**/
+    @GetMapping("/compare/fzyYear")
+      public AjaxResult fzyYear(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+    /**查询年横向对比下方图表**/
+    @GetMapping("/compare/compareYearChat")
+       public AjaxResult compareYearChat(@RequestParam("windturbineid") String windturbineid, @RequestParam("recorddate") String recorddate);
+
+}

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

@@ -0,0 +1,189 @@
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@FeignClient(name = "goodness",url = "${provider.url}",
+        fallbackFactory = WindturbineGoodnessServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface WindturbineGoodnessService {
+
+    /*
+     * 获得单机性能总览列表信息
+     */
+    @GetMapping("/goodness/windturbinegoodness")
+    public AjaxResult windturbinegoodness(@RequestParam("tablepar") 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);
+
+    /*****************************************************************************************************************/
+    /*
+     * 获得功率曲线数据查询
+     */
+    @GetMapping("/goodness/findWtRealPowerChar")
+     public AjaxResult findWtRealPowerChar(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception;
+
+    /*
+     * 获得曲线区间区分功能数据查询
+     */
+    @GetMapping("/goodness/getplotBands")
+    public AjaxResult getplotBands(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception ;
+
+    /*
+     * 获取切入风速
+     */
+    @GetMapping("/goodness/getInputSmall")
+    public AjaxResult getInputSmall(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception ;
+    /*
+     * 获取24小时功率曲线
+     */
+    @GetMapping("/goodness/findRealPowerCharBy24")
+    public AjaxResult findRealPowerCharBy24(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception;
+
+
+    /*
+     * 单台风机当日报警记录
+     */
+    @GetMapping("/goodness/bjjllist")
+    public AjaxResult bjjllist(@RequestParam("tablepar") 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);
+
+    /*
+     * 单台风机当日限电记录
+     */
+    @GetMapping("/goodness/xdjllist")
+    public AjaxResult xdjllist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate);
+
+    /*
+     * 获取区域弹出列表信息
+     */
+    @GetMapping("/goodness/plotBandAjax")
+    public AjaxResult plotBandAjax(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception ;
+    /*****************************************************************************************************************/
+    /*
+     * 风场日最大风速
+     */
+    @GetMapping("/goodness/wprzdfs")
+    public AjaxResult wprzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate)  ;
+
+    /*
+     * 风场月最大风速
+     */
+    @GetMapping("/goodness/wpyzdfs")
+    public AjaxResult wpyzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) ;
+
+    /*
+     * 风场年最大风速
+     */
+    @GetMapping("/goodness/wpnzdfs")
+    public AjaxResult wpnzdfs(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) ;
+
+    /*
+     * 风场日风向频率
+     */
+    @GetMapping("/goodness/wprfxpl")
+    public AjaxResult wprfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) ;
+
+    /*
+     * 风场月风向频率
+     */
+    @GetMapping("/goodness/wpyfxpl")
+    public AjaxResult wpyfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) ;
+
+    /*
+     * 风场年风向频率
+     */
+    @GetMapping("/goodness/wpnfxpl")
+    public AjaxResult wpnfxpl(@RequestParam("wpId") String wpId,@RequestParam("recorddate")  String recorddate) ;
+    /*****************************************************************************************************************/
+
+    /*
+     * 风机日最大风速
+     */
+    @GetMapping("/goodness/wtrzdfs")
+     public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) ;
+
+
+    /*
+     * 风机月最大风速
+     */
+    @GetMapping("/goodness/wtyzdfs")
+     public AjaxResult wtyzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) ;
+
+    /*
+     * 风机年最大风速
+     */
+    @GetMapping("/goodness/wtnzdfs")
+    public AjaxResult wtnzdfs(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) ;
+
+
+    /*
+     * 风机日风向频率
+     */
+    @GetMapping("/goodness/wtrfxpl")
+       public AjaxResult wtrfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) ;
+
+
+    /*
+     * 风机月风向频率
+     */
+    @GetMapping("/goodness/wtyfxpl")
+     public AjaxResult wtyfxpl(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) ;
+
+
+    /*
+     * 风机年风向频率
+     */
+    @GetMapping("/goodness/wtnfxpl")
+      public AjaxResult wtnfxpl(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate)  ;
+
+    /*****************************************************************************************************************/
+    @GetMapping("/goodness/wadAjax")
+    public AjaxResult wadAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate);
+
+    /*
+     * 单台风机当月报警排行
+     */
+    @GetMapping("/goodness/bjphlist")
+    public AjaxResult bjphlist(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wtId")  String wtId, @RequestParam("recorddate")  String recorddate);
+
+    /*
+     * 获取明细页面功率曲线
+     */
+    @GetMapping("/goodness/glchat")
+    public AjaxResult glchat(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate);
+
+    /*
+     * 获取风机风资源
+     */
+    @GetMapping("/goodness/fjfzy")
+    public AjaxResult fjfzy(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate);
+/*****************************************************************************************************************/
+    /*
+     * 饼图图表
+     */
+    @GetMapping("/goodness/pieChart")
+      public AjaxResult pieChart( String wtId, String recorddate,String type);
+/*****************************************************************************************************************/
+}

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

@@ -0,0 +1,140 @@
+package com.gyee.consumer.service.health;
+
+
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@FeignClient(name = "health",url = "${provider.url}",
+        fallbackFactory = CompareServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface HealthService {
+
+/***********************************************************************************************************************/
+    @GetMapping("/healthmain/findAllChart")
+    public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception;
+
+    @GetMapping("/healthmain/findAllMap")
+    public AjaxResult findAllMap() throws Exception ;
+
+    @GetMapping("/healthmain/findWpMap")
+    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception ;
+
+    @GetMapping("/healthmain/findHealthMatrixMap")
+    public AjaxResult findHealthMatrixMap() throws Exception ;
+    /***********************************************************************************************************************/
+    @GetMapping("/healthsub/findWtHealthInfo")
+    public AjaxResult findWtHealthInfo(@RequestParam("wpId") String wtId) throws Exception ;
+
+    @GetMapping("/healthsub/findWtHealthInfo1")
+    public AjaxResult findWtHealthInfo1(@RequestParam("wpId") String wtId) throws Exception ;
+
+
+    @GetMapping("/healthsub/findWtHealthInfo2")
+    public AjaxResult findWtHealthInfo2(@RequestParam("wpId") String wtId) throws Exception ;
+
+    @GetMapping("/healthsub/findWtHealthInfo3")
+    public AjaxResult findWtHealthInfo3(@RequestParam("wpId") String wtId) throws Exception  ;
+
+
+    @GetMapping("/healthsub/gadaytop5")
+    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception  ;
+
+    @GetMapping("/healthsub/queryStopTop10")
+    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception  ;
+
+
+    @GetMapping("/healthsub/getWtMttrandMtbfByBj")
+    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception ;
+
+    @GetMapping("/healthsub/getWeatherRealDay5Info")
+    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception ;
+
+
+    @GetMapping("/healthsub/findPowerChar")
+    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception ;
+
+    @GetMapping("/healthsub/hsFjValueIndex")
+    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception  ;
+
+    @GetMapping("/healthsub/findWtHisValueForBj")
+    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception ;
+
+
+    @GetMapping("/healthsub/hsFjValueIndexByPart")
+    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception  ;
+
+
+
+    /***********************************************************************************************************************/
+    @GetMapping("/healthoperation/countWpwarn")
+   public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception ;
+
+
+    @GetMapping("/healthoperation/countStop")
+    public AjaxResult countStop(@RequestParam("type") String type) throws Exception ;
+
+    @GetMapping("/healthoperation/countWpOrProStatus")
+    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception ;
+
+
+    @GetMapping("/healthoperation/findWpOrProStatusForHistory")
+    public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type,@RequestParam("status")  String status) throws Exception ;
+
+    /***********************************************************************************************************************/
+    /**性能损失走势列表**/
+    @GetMapping("/losspowerratehealth/losspowerrateList")
+    public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception ;
+
+    /**性能损失走势图表**/
+    @GetMapping("/losspowerratehealth/getChartlist")
+    public AjaxResult getChartlist(@RequestParam("wtId") String wtId,@RequestParam("beginDate") String beginDate,@RequestParam("endDate") String endDate) throws Exception;
+    /***********************************************************************************************************************/
+    /**批次报警分析**/
+    @GetMapping("/partbj/partbjList")
+    public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception;
+
+    /**批次报警分析**/
+    @GetMapping("/partbj/partbjsubList")
+    public AjaxResult partbjsubList(@RequestParam("lnid") String lnid,@RequestParam("part")  String part,@RequestParam("recorddate")  String recorddate) throws Exception ;
+    /***********************************************************************************************************************/
+    @GetMapping("/stopanalysis/stopAnalysisList")
+    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception ;
+
+
+    @GetMapping("/stopanalysis/stopAnalysisTree")
+      public AjaxResult stopAnalysisTree(@RequestParam("mainId")  String mainId,@RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception  ;
+
+
+    @PostMapping("/stopanalysis/saveStopAnalysis")
+    public AjaxResult saveStopAnalysis(@RequestParam("wpId")  String wpId,@RequestParam("modelId")  String modelId,@RequestParam("typeId")  String typeId) throws Exception;
+
+    /***********************************************************************************************************************/
+    /**单机区间曲线偏差率**/
+    @GetMapping("/wtcurve/windTurbineCurveList")
+    public AjaxResult windTurbineCurveList(@RequestParam("tablepar") Tablepar tablepar, @RequestParam("wpId")  String wpId, @RequestParam("recorddate")  String recorddate) throws Exception;
+
+    /**
+     * @throws
+     * @Title: scatterWtByDayAjax
+     * @Description: 获得选择风机、年份、月份相关散点图
+     */
+    @GetMapping("/wtcurve/scatterWtByDayAjax")
+    public AjaxResult scatterWtByDayAjax(@RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate) throws Exception;
+
+    /***********************************************************************************************************************/
+    /**风机健康列表**/
+    @GetMapping("/wtHealthList/windTurbineHealthList")
+    public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception;
+    /***********************************************************************************************************************/
+
+}

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

@@ -1,12 +1,11 @@
-package com.gyee.consumer.service;
+package com.gyee.consumer.service.monitor;
 
 
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.config.FeignConfiguration;
-import com.gyee.consumer.fallback.GenreSetPushServiceFallbackFactory;
+import com.gyee.consumer.fallback.monitor.GenreSetPushServiceFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "genreset",url = "${provider.url}",

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

@@ -0,0 +1,39 @@
+package com.gyee.consumer.service.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.monitor.MatrixPushServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "matrix",url = "${provider.url}",
+        fallbackFactory = MatrixPushServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface MatrixPushService {
+
+    @GetMapping("/matrix/matrixPush")
+    public AjaxResult matrixPush() throws Exception;
+
+    @GetMapping("/matrixmatrixDetialPush")
+    public AjaxResult matrixDetialPush() throws Exception;
+
+    @GetMapping("/matrix/matrixDetialGfPush")
+    public AjaxResult matrixDetialGfPush() throws Exception;
+
+    @GetMapping("/matrix/matrixQfPush")
+    public AjaxResult matrixQfPush() throws Exception;
+
+    @GetMapping("/matrix/matrixByWpIdPush")
+    public AjaxResult matrixByWpIdPush(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/matrix/findSimpleMatrix")
+    public AjaxResult findSimpleMatrix(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/matrix/findSimpleMatrixAll")
+    public AjaxResult findSimpleMatrixAll(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/matrix/findPVSimpleMatrixAll")
+      public AjaxResult findPVSimpleMatrixAll() throws Exception;
+}

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

@@ -0,0 +1,24 @@
+package com.gyee.consumer.service.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.monitor.MonitorInverterPushServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "monitorinverter",url = "${provider.url}",
+        fallbackFactory = MonitorInverterPushServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface MonitorInverterPushService {
+
+    @GetMapping("/monitorinverter/findInverterInfo")
+    public AjaxResult findWtInfo(@RequestParam("wtId") String wtId) throws Exception;
+
+    @GetMapping("/monitorinverter/findInverterInfoList")
+    public AjaxResult findWtInfoList(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/monitorinverter/findInverterPowerLine")
+      public AjaxResult findInverterPowerLine(@RequestParam("wtId") String wtId) throws Exception;
+}

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

@@ -0,0 +1,42 @@
+package com.gyee.consumer.service.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.monitor.MonitorInverterPushServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "monitor",url = "${provider.url}",
+        fallbackFactory = MonitorInverterPushServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface MonitorPushService {
+
+
+    @GetMapping("/monitor/findCftInfo")
+     public AjaxResult findCftInfo(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/monitor/monitor")
+    public AjaxResult monitor() throws Exception ;
+
+    @GetMapping("/monitor/findWpInfoBywpId")
+    public AjaxResult findWpInfoBywpId(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/monitor/findLossWpBar")
+    public AjaxResult findLossWpBar(@RequestParam("wpId") String wpId) throws Exception ;
+
+    @GetMapping("/monitor/findPowerWpBar")
+    public AjaxResult findPowerWpBar(@RequestParam("wpId") String wpId) throws Exception ;
+
+    @GetMapping("/monitor/findMonthPowerWpBar")
+    public AjaxResult findMonthPowerWpBar(@RequestParam("wpId") String wpId) throws Exception ;
+
+
+    @GetMapping("/monitor/findPowerFirst")
+    public AjaxResult findPowerFirst(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/monitor/findGeneralAppearance")
+    public AjaxResult findGeneralAppearance(@RequestParam("wpId") String wpId) throws Exception ;
+
+}

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

@@ -0,0 +1,25 @@
+package com.gyee.consumer.service.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.monitor.MonitorWtPushServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "monitorwt",url = "${provider.url}",
+        fallbackFactory = MonitorWtPushServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface MonitorWtPushService {
+
+    @GetMapping("/monitorwt/findWtInfo")
+    public AjaxResult findWtInfo(@RequestParam("wtId")String  wtId) throws Exception;
+
+    @GetMapping("/monitorwt/findWtWarnInfo")
+    public AjaxResult findWtWarnInfo(@RequestParam("wtId")String  wtId) throws Exception;
+
+    @GetMapping("/monitorwt/findWtInfoList")
+    public AjaxResult findWtInfoList(@RequestParam("wpId")String  wpId) throws Exception ;
+
+}

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

@@ -0,0 +1,22 @@
+package com.gyee.consumer.service.monitor;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.monitor.SandtableServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "sandtable",url = "${provider.url}",
+        fallbackFactory = SandtableServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface SandtableService {
+
+    @GetMapping("/sandtable/findWtInfo")
+    public AjaxResult findWtInfo(@RequestParam("wpId") String wpId) throws Exception;
+
+    @GetMapping("/sandtable/judgeWpHealth")
+    public AjaxResult judgeWpHealth() throws Exception ;
+
+}

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

@@ -1,8 +1,8 @@
 # 项目相关配置
 gyee:
   #API访问ip
-  #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
 
@@ -21,8 +21,8 @@ spring:
         password: nacos
   #redis集群
   redis:
-    #host: 10.83.68.94
-    host: 192.168.2.202
+    host: 10.0.118.73
+    #host: 192.168.2.202
     #   host: 10.155.32.4
     password:
     port: 6379
@@ -41,7 +41,7 @@ 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: