移植新版健康管理后台项目

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

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 
 @Controller
 @RequestMapping("/health")
-@Api(value = "健康管理" ,tags =  "健康管理")
+@Api(value = "健康管理", tags = "健康管理")
 public class HealthController {
 
 
@@ -34,7 +34,7 @@ public class HealthController {
             @ApiImplicitParam(name = "type", value = "类型(1、当日2、 7日3、当月)", required = true, dataType = "string", paramType = "query")})
     public AjaxResult findAllChart(@RequestParam("wpId") String wpId, @RequestParam("num") String num, @RequestParam("type") String type) throws Exception {
 
-        AjaxResult ajax=healthMainService.findAllChart(wpId,num,type);
+        AjaxResult ajax = healthMainService.findAllChart(wpId, num, type);
 
         return ajax;
     }
@@ -46,7 +46,7 @@ public class HealthController {
     })
     public AjaxResult findAllMap() throws Exception {
 
-        AjaxResult ajax=healthMainService.findAllMap();
+        AjaxResult ajax = healthMainService.findAllMap();
 
         return ajax;
     }
@@ -58,7 +58,7 @@ public class HealthController {
     })
     public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWpMap(wpId);
+        AjaxResult ajax = healthMainService.findWpMap(wpId);
 
         return ajax;
     }
@@ -70,10 +70,11 @@ public class HealthController {
     })
     public AjaxResult findHealthMatrixMap() throws Exception {
 
-        AjaxResult ajax=healthMainService.findHealthMatrixMap();
+        AjaxResult ajax = healthMainService.findHealthMatrixMap();
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/findWtHealthInfo")
     @ResponseBody
@@ -81,9 +82,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWtHealthInfo(wtId);
+        AjaxResult ajax = healthMainService.findWtHealthInfo(wtId);
 
         return ajax;
     }
@@ -94,9 +95,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWtHealthInfo1(wtId);
+        AjaxResult ajax = healthMainService.findWtHealthInfo1(wtId);
 
         return ajax;
     }
@@ -108,9 +109,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWtHealthInfo2(wtId);
+        AjaxResult ajax = healthMainService.findWtHealthInfo2(wtId);
 
         return ajax;
     }
@@ -122,9 +123,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWtHealthInfo3(wtId);
+        AjaxResult ajax = healthMainService.findWtHealthInfo3(wtId);
 
         return ajax;
     }
@@ -136,9 +137,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.gadaytop5(wtId);
+        AjaxResult ajax = healthMainService.gadaytop5(wtId);
 
         return ajax;
     }
@@ -149,9 +150,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.queryStopTop10(wtId);
+        AjaxResult ajax = healthMainService.queryStopTop10(wtId);
 
         return ajax;
     }
@@ -163,9 +164,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.getWtMttrandMtbfByBj(wtId);
+        AjaxResult ajax = healthMainService.getWtMttrandMtbfByBj(wtId);
 
         return ajax;
     }
@@ -176,9 +177,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception  {
+    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception {
 
-        AjaxResult ajax=healthMainService.getWeatherRealDay5Info(wpId);
+        AjaxResult ajax = healthMainService.getWeatherRealDay5Info(wpId);
 
         return ajax;
     }
@@ -190,9 +191,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findPowerChar(wtId);
+        AjaxResult ajax = healthMainService.findPowerChar(wtId);
 
         return ajax;
     }
@@ -203,9 +204,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.hsFjValueIndex(wtId);
+        AjaxResult ajax = healthMainService.hsFjValueIndex(wtId);
 
         return ajax;
     }
@@ -216,9 +217,9 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception  {
+    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWtHisValueForBj(wtId);
+        AjaxResult ajax = healthMainService.findWtHisValueForBj(wtId);
 
         return ajax;
     }
@@ -231,9 +232,9 @@ public class HealthController {
             @ApiImplicitParam(name = "wtId", value = "风机编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "部件类型1、风机2、齿轮箱3、发电机4、变桨、5控制系统", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId,@RequestParam("type") String type) throws Exception  {
+    public AjaxResult hsFjValueIndexByPart(@RequestParam("wtId") String wtId, @RequestParam("type") String type) throws Exception {
 
-        AjaxResult ajax=healthMainService.hsFjValueIndexByPart(wtId,type);
+        AjaxResult ajax = healthMainService.hsFjValueIndexByPart(wtId, type);
 
         return ajax;
     }
@@ -244,9 +245,9 @@ public class HealthController {
     @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  {
+    public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception {
 
-        AjaxResult ajax=healthMainService.countWpwarn(type);
+        AjaxResult ajax = healthMainService.countWpwarn(type);
 
         return ajax;
     }
@@ -257,9 +258,9 @@ public class HealthController {
     @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  {
+    public AjaxResult countStop(@RequestParam("type") String type) throws Exception {
 
-        AjaxResult ajax=healthMainService.countStop(type);
+        AjaxResult ajax = healthMainService.countStop(type);
 
         return ajax;
     }
@@ -269,9 +270,9 @@ public class HealthController {
     @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   {
+    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception {
 
-        AjaxResult ajax=healthMainService.countWpOrProStatus(type);
+        AjaxResult ajax = healthMainService.countWpOrProStatus(type);
 
         return ajax;
     }
@@ -283,16 +284,18 @@ public class HealthController {
     @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   {
+    public AjaxResult findWpOrProStatusForHistory(@RequestParam("type") String type, @RequestParam("status") String status) throws Exception {
 
-        AjaxResult ajax=healthMainService.findWpOrProStatusForHistory(type,status);
+        AjaxResult ajax = healthMainService.findWpOrProStatusForHistory(type, status);
 
         return ajax;
     }
 
 
     /***********************************************************************************************************************/
-    /**性能损失走势列表**/
+    /**
+     * 性能损失走势列表
+     **/
     @GetMapping("/losspowerrateList")
     @ResponseBody
     @ApiOperation(value = "性能损失走势列表", notes = "性能损失走势列表")
@@ -301,14 +304,16 @@ public class HealthController {
             @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   {
+    public AjaxResult losspowerrateList(@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception {
 
-        AjaxResult ajax=healthMainService.losspowerrateList(wtId,beginDate,endDate);
+        AjaxResult ajax = healthMainService.losspowerrateList(wtId, beginDate, endDate);
 
         return ajax;
     }
 
-    /**性能损失走势图表**/
+    /**
+     * 性能损失走势图表
+     **/
     @GetMapping("/getChartlist")
     @ResponseBody
     @ApiOperation(value = "性能损失走势图表", notes = "性能损失走势图表")
@@ -317,28 +322,32 @@ public class HealthController {
             @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    {
+    public AjaxResult getChartlist(@RequestParam("wtId") String wtId, @RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate) throws Exception {
 
-        AjaxResult ajax=healthMainService.getChartlist(wtId,beginDate,endDate);
+        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   {
+    public AjaxResult partbjList(@RequestParam("recorddate") String recorddate) throws Exception {
 
-        AjaxResult ajax=healthMainService.partbjList(recorddate);
+        AjaxResult ajax = healthMainService.partbjList(recorddate);
 
         return ajax;
     }
 
-    /**批次报警分析**/
+    /**
+     * 批次报警分析
+     **/
     @GetMapping("/partbjsubList")
     @ResponseBody
     @ApiOperation(value = "批次报警分析明细列表", notes = "批次报警分析明细列表")
@@ -347,12 +356,13 @@ public class HealthController {
             @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   {
+    public AjaxResult partbjsubList(@RequestParam("lnid") String lnid, @RequestParam("part") String part, @RequestParam("recorddate") String recorddate) throws Exception {
 
-        AjaxResult ajax=healthMainService.partbjsubList(lnid,part,recorddate);
+        AjaxResult ajax = healthMainService.partbjsubList(lnid, part, recorddate);
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/stopAnalysisList")
     @ResponseBody
@@ -362,9 +372,9 @@ public class HealthController {
             @ApiImplicitParam(name = "modelId", value = "模型编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "typeId", value = "时间类型1、2", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId,@RequestParam("modelId") String modelId,@RequestParam("typeId")  String typeId) throws Exception   {
+    public AjaxResult stopAnalysisList(@RequestParam("wpId") String wpId, @RequestParam("modelId") String modelId, @RequestParam("typeId") String typeId) throws Exception {
 
-        AjaxResult ajax=healthMainService.stopAnalysisList(wpId,modelId,typeId);
+        AjaxResult ajax = healthMainService.stopAnalysisList(wpId, modelId, typeId);
 
         return ajax;
     }
@@ -376,9 +386,9 @@ public class HealthController {
             @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   {
+    public AjaxResult stopAnalysisTree(@RequestParam("mainId") String mainId, @RequestParam("wtId") String wtId, @RequestParam("values") String values) throws Exception {
 
-        AjaxResult ajax=healthMainService.stopAnalysisTree(mainId,wtId,values);
+        AjaxResult ajax = healthMainService.stopAnalysisTree(mainId, wtId, values);
 
         return ajax;
     }
@@ -391,15 +401,17 @@ public class HealthController {
             @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   {
+    public AjaxResult saveStopAnalysis(@RequestParam("wpId") String wpId, @RequestParam("modelId") String modelId, @RequestParam("typeId") String typeId) throws Exception {
 
-        AjaxResult ajax=healthMainService.saveStopAnalysis(wpId,modelId,typeId);
+        AjaxResult ajax = healthMainService.saveStopAnalysis(wpId, modelId, typeId);
 
         return ajax;
     }
 
     /***********************************************************************************************************************/
-    /**单机区间曲线偏差率**/
+    /**
+     * 单机区间曲线偏差率
+     **/
     @PostMapping("/windTurbineCurveList")
     @ResponseBody
     @ApiOperation(value = "单机区间曲线偏差率", notes = "单机区间曲线偏差率")
@@ -408,9 +420,9 @@ public class HealthController {
             @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult windTurbineCurveList(Tablepar tablepar,@RequestParam("wpId")  String wpId,@RequestParam("recorddate")  String recorddate) throws Exception   {
+    public AjaxResult windTurbineCurveList(Tablepar tablepar, @RequestParam("wpId") String wpId, @RequestParam("recorddate") String recorddate) throws Exception {
 
-        AjaxResult ajax=healthMainService.windTurbineCurveList(tablepar,wpId,recorddate);
+        AjaxResult ajax = healthMainService.windTurbineCurveList(tablepar, wpId, recorddate);
 
         return ajax;
     }
@@ -427,63 +439,69 @@ public class HealthController {
             @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   {
+    public AjaxResult scatterWtByDayAjax(@RequestParam("wtId") String wtId, @RequestParam("recorddate") String recorddate) throws Exception {
 
-        AjaxResult ajax=healthMainService.scatterWtByDayAjax(wtId,recorddate);
+        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  {
+    public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception {
 
-        AjaxResult ajax=healthMainService.windTurbineHealthList(wpId);
+        AjaxResult ajax = healthMainService.windTurbineHealthList(wpId);
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/warehouse")
     @ResponseBody
     @ApiOperation(value = "仓库列表", notes = "仓库列表")
     @ApiImplicitParams({})
-    public AjaxResult warehouse() throws Exception  {
+    public AjaxResult warehouse() throws Exception {
 
-        AjaxResult ajax=healthMainService.warehouse();
+        AjaxResult ajax = healthMainService.warehouse();
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/radar/gzfx")
     @ResponseBody
     @ApiOperation(value = "故障分析雷达图", notes = "故障分析雷达图")
-    @ApiImplicitParams({ @ApiImplicitParam(name = "stationid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+    @ApiImplicitParams({@ApiImplicitParam(name = "stationid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "date", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult gzfx(@RequestParam(value = "stationid", required = true) String stationid,
                            @RequestParam(value = "date", required = true) String date) {
-        AjaxResult ajax=healthMainService.gzfx(stationid,date);
+        AjaxResult ajax = healthMainService.gzfx(stationid, date);
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/radar/yjfx")
     @ResponseBody
-    @ApiImplicitParams({ @ApiImplicitParam(name = "stationid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+    @ApiImplicitParams({@ApiImplicitParam(name = "stationid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "date", value = "日期", required = true, dataType = "string", paramType = "query")})
     @ApiOperation(value = "预警分析雷达图", notes = "预警分析雷达图")
     public AjaxResult yjfx(@RequestParam(value = "stationid", required = true) String stationid,
-                           @RequestParam(value = "date", required = true) String date){
+                           @RequestParam(value = "date", required = true) String date) {
 
-        AjaxResult ajax=healthMainService.yjfx(stationid,date);
+        AjaxResult ajax = healthMainService.yjfx(stationid, date);
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
     @GetMapping("/analysis/detail")
     @ResponseBody
@@ -496,17 +514,18 @@ public class HealthController {
             @ApiImplicitParam(name = "interval", value = "间隔", required = true, dataType = "string", paramType = "query")
     })
     @ApiOperation(value = "详细分析", notes = "详细分析")
-    public AjaxResult detail(   @RequestParam(name = "station") String station,
-                                @RequestParam(name = "wtId") String wtId,
-                                @RequestParam(name = "name") String name,
-                                @RequestParam(name = "startTs") long startTs,
-                                @RequestParam(name = "endTs") long endTs,
-                                @RequestParam(name = "interval", required = false) Integer interval){
+    public AjaxResult detail(@RequestParam(name = "station") String station,
+                             @RequestParam(name = "wtId") String wtId,
+                             @RequestParam(name = "name") String name,
+                             @RequestParam(name = "startTs") long startTs,
+                             @RequestParam(name = "endTs") long endTs,
+                             @RequestParam(name = "interval", required = false) Integer interval) {
 
-        AjaxResult ajax=healthMainService.detail(station,wtId,name,startTs,endTs,interval);
+        AjaxResult ajax = healthMainService.detail(station, wtId, name, startTs, endTs, interval);
 
         return ajax;
     }
+
     /***********************************************************************************************************************/
 
     @PostMapping("/healthsystemList")
@@ -536,7 +555,6 @@ public class HealthController {
     }
 
 
-
     @GetMapping("/healthsystemSelect")
     @ResponseBody
     @ApiOperation(value = "通过健康模型主表编号获得对象", notes = "通过健康模型主表编号获得对象")
@@ -579,7 +597,6 @@ public class HealthController {
     }
 
 
-
     @PostMapping("/healthsystemsubList")
     @ResponseBody
     @ApiOperation(value = "获取健康模型子表列表", notes = "获取健康模型子表列表")
@@ -641,7 +658,7 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "record", value = "子表对象", required = true, dataType = "Healthsystemsub", paramType = "query")
     })
-    public AjaxResult healthsystemsubInsert( Healthsystemsub record) throws Exception {
+    public AjaxResult healthsystemsubInsert(Healthsystemsub record) throws Exception {
 
         AjaxResult ajax = healthMainService.healthsystemsubInsert(record);
 
@@ -657,10 +674,10 @@ public class HealthController {
             @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult getEconHealthReportMain(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax =healthMainService.getEconHealthReportMain(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getEconHealthReportMain(recordDate, wtId);
 
         return ajax;
-        
+
 
     }
 
@@ -673,7 +690,7 @@ public class HealthController {
             @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult getconHealthReportTargetMap(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax =healthMainService.getconHealthReportTargetMap(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getconHealthReportTargetMap(recordDate, wtId);
 
         return ajax;
     }
@@ -685,10 +702,10 @@ public class HealthController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "wtId", value = "设备编号", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query")})
-    public AjaxResult getStateJudgment( @RequestParam(name = "recordDate") String recordDate,
-                                        @RequestParam(name = "wtId")String wtId) throws Exception {
+    public AjaxResult getStateJudgment(@RequestParam(name = "recordDate") String recordDate,
+                                       @RequestParam(name = "wtId") String wtId) throws Exception {
 
-        AjaxResult ajax =healthMainService.getStateJudgment(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getStateJudgment(recordDate, wtId);
 
         return ajax;
 
@@ -702,7 +719,7 @@ public class HealthController {
             @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query")})
     public AjaxResult getHealthNumVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
-        AjaxResult ajax =healthMainService.getHealthNumVoList(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getHealthNumVoList(recordDate, wtId);
 
         return ajax;
     }
@@ -717,7 +734,7 @@ public class HealthController {
     public AjaxResult getEquipmentInfoDayTopVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
 
-        AjaxResult ajax =healthMainService.getEquipmentInfoDayTopVoList(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getEquipmentInfoDayTopVoList(recordDate, wtId);
 
         return ajax;
     }
@@ -730,10 +747,10 @@ public class HealthController {
             @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型(clx 齿轮箱，fdj 发电机，bj 变桨，zz 主轴)", required = true, dataType = "string", paramType = "query")
     })
-    public AjaxResult getHealthDataVlueVo(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId,  @RequestParam("type") String type) throws Exception {
+    public AjaxResult getHealthDataVlueVo(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId, @RequestParam("type") String type) throws Exception {
 
 
-        AjaxResult ajax =healthMainService.getHealthDataVlueVo(recordDate, wtId,type);
+        AjaxResult ajax = healthMainService.getHealthDataVlueVo(recordDate, wtId, type);
 
         return ajax;
 
@@ -748,7 +765,7 @@ public class HealthController {
     public AjaxResult getAlarmcountVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
 
-        AjaxResult ajax =healthMainService.getAlarmcountVoList(recordDate, wtId);
+        AjaxResult ajax = healthMainService.getAlarmcountVoList(recordDate, wtId);
 
         return ajax;
 
@@ -763,11 +780,144 @@ public class HealthController {
     public AjaxResult getHealthReportQxpc(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception {
 
 
+        AjaxResult ajax = healthMainService.getHealthReportQxpc(recordDate, wtId);
 
-        AjaxResult ajax =healthMainService.getHealthReportQxpc(recordDate, wtId);
+        return ajax;
+
+    }
+
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * 风场下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/windfarmAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电场数据列表", notes = "查询风电场数据列表")
+    public AjaxResult windfarmAjax() {
+
+        AjaxResult ajax = healthMainService.windfarmAjax();
+
+        return ajax;
+
+    }
+
+
+    /**
+     * 项目下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/projectAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询项目数据列表", notes = "通过风场编号查询项目数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpIds", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult projectAjax(@RequestParam("wpIds") String wpIds) {
+        AjaxResult ajax = healthMainService.projectAjax(wpIds);
 
         return ajax;
 
     }
 
-}
+
+    /**
+     * 所有风电场项目下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/projectAllAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "查询风电项目数据列表", notes = "查询风电项目数据列表")
+    public AjaxResult projectAllAjax() {
+        AjaxResult ajax = healthMainService.projectAllAjax();
+
+        return ajax;
+
+    }
+
+
+    /**
+     * 线路下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/lineAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过项目编号查询线路数据列表", notes = "通过项目编号查询线路数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjIds", value = "项目编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult lineAjax(@RequestParam("pjIds") String pjIds) {
+        AjaxResult ajax = healthMainService.lineAjax(pjIds);
+
+        return ajax;
+
+    }
+
+    /**
+     * 通过风电场ID获取风机下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/windturbineAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过风场编号查询风机数据列表", notes = "通过风场编号查询风机数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wpId", value = "风场编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windturbineAjax( @RequestParam("wpId") String wpId) {
+        AjaxResult ajax = healthMainService.windturbineAjax(wpId);
+
+        return ajax;
+
+    }
+
+
+    /**
+     * 通过项目D获取风机下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/windturbineByPjIdAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过项目编号查询风机数据列表", notes = "通过项目编号查询风机数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pjId", value = "项目编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windturbineByPjIdAjax(@RequestParam("pjId") String pjId) throws Exception {
+        AjaxResult ajax = healthMainService.windturbineByPjIdAjax(pjId);
+
+        return ajax;
+
+    }
+
+    /**
+     * 通过线路ID获取风机下拉接口
+     *
+     * @return
+     */
+    @GetMapping("/windturbineByLnIdAjax")
+    @ResponseBody
+    @CrossOrigin
+    @ApiOperation(value = "通过线路编号查询风机数据列表", notes = "通过线路编号查询风机数据列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "lnId", value = "项目编号", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult windturbineByLnIdAjax(@RequestParam("lnId") String lnId) throws Exception {
+        AjaxResult ajax = healthMainService.windturbineByLnIdAjax(lnId);
+
+        return ajax;
+
+    }
+}

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

@@ -6,6 +6,7 @@ import com.gyee.consumer.model.Healthsystemsub;
 import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.health.HealthService;
 import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 public class HealthServiceFallbackFactory implements FallbackFactory<HealthService> {
@@ -315,6 +316,40 @@ public class HealthServiceFallbackFactory implements FallbackFactory<HealthServi
             public AjaxResult getHealthReportQxpc(String recordDate, String wtId) throws Exception{
                 return AjaxResult.error(throwable.getMessage());
             }
+
+            @Override
+            public AjaxResult windfarmAjax(){
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult projectAjax( String wpIds){
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult projectAllAjax(){
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult lineAjax( String pjIds){
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult windturbineAjax( String wpId){
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult windturbineByPjIdAjax( String pjId){
+                return AjaxResult.error(throwable.getMessage());
+            }
+            @Override
+            public AjaxResult windturbineByLnIdAjax( String lnId) throws Exception {
+                return AjaxResult.error(throwable.getMessage());
+            }
         };
     }
 }

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

@@ -222,29 +222,48 @@ public interface HealthService {
     //////////////////////////////////////////////////////////////////////////////////////////
 
     @GetMapping("/healthreport/getEconHealthReportMain")
-    public AjaxResult getEconHealthReportMain(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getEconHealthReportMain(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthreport/getconHealthReportTargetMap")
-    public AjaxResult getconHealthReportTargetMap(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getconHealthReportTargetMap(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
 
     @GetMapping("/healthreport/getStateJudgment")
-    public AjaxResult getStateJudgment(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getStateJudgment(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthreport/getHealthNumVoList")
-    public AjaxResult getHealthNumVoList(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getHealthNumVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthreport/getEquipmentInfoDayTopVoList")
-    public AjaxResult getEquipmentInfoDayTopVoList(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getEquipmentInfoDayTopVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthreport/getHealthDataVlueVo")
-    public AjaxResult getHealthDataVlueVo(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId, @RequestParam("type") String type) throws Exception;
+    public AjaxResult getHealthDataVlueVo(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId, @RequestParam("type") String type) throws Exception;
 
     @GetMapping("/healthreport/getAlarmcountVoList")
-    public AjaxResult getAlarmcountVoList(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getAlarmcountVoList(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthreport/getHealthReportQxpc")
-    public AjaxResult getHealthReportQxpc(@RequestParam("wtId") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
+    public AjaxResult getHealthReportQxpc(@RequestParam("recordDate") String recordDate, @RequestParam("wtId") String wtId) throws Exception;
 
+    @GetMapping("/healthmain/windfarmAjax")
+    public AjaxResult windfarmAjax();
 
+    @GetMapping("/healthmain/projectAjax")
+    public AjaxResult projectAjax(@RequestParam("wpIds")  String wpIds);
+
+    @GetMapping("/healthmain/projectAllAjax")
+
+    public AjaxResult projectAllAjax();
+
+    @GetMapping("/healthmain/lineAjax")
+    public AjaxResult lineAjax(@RequestParam("pjIds")  String pjIds);
+
+    @GetMapping("/healthmain/windturbineAjax")
+    public AjaxResult windturbineAjax(@RequestParam("wpId") String wpId);
+
+    @GetMapping("/healthmain/windturbineByPjIdAjax")
+    public AjaxResult windturbineByPjIdAjax(@RequestParam("pjId") String pjId);
+    @GetMapping("/healthmain/windturbineByLnIdAjax")
+    public AjaxResult windturbineByLnIdAjax(@RequestParam("lnId") String lnId) throws Exception ;
 }