Browse Source

修正健康管理状态数量统计

shilin 1 year ago
parent
commit
dea2133ecc

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

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 @Controller
 @RequestMapping("/health")
@@ -641,12 +642,132 @@ 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);
 
         return ajax;
     }
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////
+    @GetMapping("/getconHealthReportTargetMap")
+    @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 getEconHealthReportMain(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax =healthMainService.getEconHealthReportMain(recordDate, wtId);
+
+        return ajax;
+        
+
+    }
+
+    @GetMapping("/getconHealthReportTargetMap")
+    @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 getconHealthReportTargetMap(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax =healthMainService.getconHealthReportTargetMap(recordDate, wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/getStateJudgment")
+    @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 getStateJudgment(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax =healthMainService.getStateJudgment(recordDate, wtId);
+
+        return ajax;
+
+    }
+
+    @GetMapping("/getHealthNumVoList")
+    @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 getHealthNumVoList(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+        AjaxResult ajax =healthMainService.getHealthNumVoList(recordDate, wtId);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/getEquipmentInfoDayTopVoList")
+    @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 getEquipmentInfoDayTopVoList(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+
+        AjaxResult ajax =healthMainService.getEquipmentInfoDayTopVoList(recordDate, wtId);
+
+        return ajax;
+    }
+
+    @GetMapping("/getHealthDataVlueVo")
+    @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 = "类型(clx 齿轮箱,fdj 发电机,bj 变桨,zz 主轴)", required = true, dataType = "string", paramType = "query")
+    })
+    public AjaxResult getHealthDataVlueVo(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId,  @RequestParam("type") String type) throws Exception {
+
+
+        AjaxResult ajax =healthMainService.getHealthDataVlueVo(recordDate, wtId,type);
+
+        return ajax;
+
+    }
+
+    @GetMapping("/getAlarmcountVoList")
+    @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 getAlarmcountVoList(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+
+        AjaxResult ajax =healthMainService.getAlarmcountVoList(recordDate, wtId);
+
+        return ajax;
+
+    }
+
+    @GetMapping("/getHealthReportQxpc")
+    @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 getHealthReportQxpc(@RequestParam("recordDate") Date recordDate, @RequestParam("wtId") String wtId) throws Exception {
+
+
+
+        AjaxResult ajax =healthMainService.getHealthReportQxpc(recordDate, wtId);
+
+        return ajax;
+
+    }
 
 }

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

@@ -6,8 +6,11 @@ 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;
 
+import java.util.Date;
+
 public class HealthServiceFallbackFactory implements FallbackFactory<HealthService> {
 
     @Override
@@ -274,6 +277,47 @@ public class HealthServiceFallbackFactory implements FallbackFactory<HealthServi
             public AjaxResult healthsystemsubInsert( Healthsystemsub record) throws Exception{
                 return AjaxResult.error(throwable.getMessage());
             }
+            ////////////////////////////////////////////////////////////////////////////////
+            @Override
+            public AjaxResult getEconHealthReportMain(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getconHealthReportTargetMap(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+
+            @Override
+            public AjaxResult getStateJudgment(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getHealthNumVoList(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getEquipmentInfoDayTopVoList(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getHealthDataVlueVo(Date recordDate, String wtId, String type) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getAlarmcountVoList(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
+
+            @Override
+            public AjaxResult getHealthReportQxpc(Date recordDate, String wtId) throws Exception{
+                return AjaxResult.error(throwable.getMessage());
+            }
         };
     }
 }

+ 1 - 1
web/consumer-hb/src/main/java/com/gyee/consumer/model/Healthsystem.java

@@ -226,7 +226,7 @@ public class Healthsystem implements Serializable {
      *
      * @mbg.generated
      */
-    public String getModelid() {
+    public String getModelId() {
         return modelid;
     }
 

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

@@ -12,114 +12,127 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "health",url = "${provider.healthurl}",
+import java.util.Date;
+
+@FeignClient(name = "health", url = "${provider.healthurl}",
         fallbackFactory = HealthServiceFallbackFactory.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 ;
+    public AjaxResult findAllMap() throws Exception;
 
     @GetMapping("/healthmain/findWpMap")
-    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception ;
+    public AjaxResult findWpMap(@RequestParam("wpId") String wpId) throws Exception;
 
     @GetMapping("/healthmain/findHealthMatrixMap")
-    public AjaxResult findHealthMatrixMap() throws Exception ;
+    public AjaxResult findHealthMatrixMap() throws Exception;
+
     /***********************************************************************************************************************/
     @GetMapping("/healthsub/findWtHealthInfo")
-    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/findWtHealthInfo1")
-    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo1(@RequestParam("wtId") String wtId) throws Exception;
 
 
     @GetMapping("/healthsub/findWtHealthInfo2")
-    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception ;
+    public AjaxResult findWtHealthInfo2(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/findWtHealthInfo3")
-    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception  ;
+    public AjaxResult findWtHealthInfo3(@RequestParam("wtId") String wtId) throws Exception;
 
 
     @GetMapping("/healthsub/gadaytop5")
-    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception  ;
+    public AjaxResult gadaytop5(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/queryStopTop10")
-    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception  ;
+    public AjaxResult queryStopTop10(@RequestParam("wtId") String wtId) throws Exception;
 
 
     @GetMapping("/healthsub/getWtMttrandMtbfByBj")
-    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception ;
+    public AjaxResult getWtMttrandMtbfByBj(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/getWeatherRealDay5Info")
-    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception ;
+    public AjaxResult getWeatherRealDay5Info(@RequestParam("wpId") String wpId) throws Exception;
 
 
     @GetMapping("/healthsub/findPowerChar")
-    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception ;
+    public AjaxResult findPowerChar(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/hsFjValueIndex")
-    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception  ;
+    public AjaxResult hsFjValueIndex(@RequestParam("wtId") String wtId) throws Exception;
 
     @GetMapping("/healthsub/findWtHisValueForBj")
-    public AjaxResult findWtHisValueForBj(@RequestParam("wtId") String wtId) throws Exception ;
+    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  ;
-
+    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 ;
+    public AjaxResult countWpwarn(@RequestParam("type") String type) throws Exception;
 
 
     @GetMapping("/healthoperation/countStop")
-    public AjaxResult countStop(@RequestParam("type") String type) throws Exception ;
+    public AjaxResult countStop(@RequestParam("type") String type) throws Exception;
 
     @GetMapping("/healthoperation/countWpOrProStatus")
-    public AjaxResult countWpOrProStatus(@RequestParam("type") String type) throws Exception ;
+    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 ;
+    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 ;
+    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;
+    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 ;
+    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 ;
+    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  ;
+    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;
+    public AjaxResult saveStopAnalysis(@RequestParam("wpId") String wpId, @RequestParam("modelId") String modelId, @RequestParam("typeId") String typeId) throws Exception;
 
     /***********************************************************************************************************************/
-    /**单机区间曲线偏差率**/
+    /**
+     * 单机区间曲线偏差率
+     **/
     @PostMapping("/wtcurve/windTurbineCurveList")
-    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;
 
     /**
      * @throws
@@ -127,34 +140,44 @@ public interface HealthService {
      * @Description: 获得选择风机、年份、月份相关散点图
      */
     @GetMapping("/wtcurve/scatterWtByDayAjax")
-    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;
 
     /***********************************************************************************************************************/
-    /**风机健康列表**/
+    /**
+     * 风机健康列表
+     **/
     @GetMapping("/wtHealthList/windTurbineHealthList")
     public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception;
     /***********************************************************************************************************************/
-    /**仓库列表**/
+    /**
+     * 仓库列表
+     **/
     @GetMapping("/ticket/warehouse")
-    public AjaxResult warehouse() throws Exception ;
+    public AjaxResult warehouse() throws Exception;
     /***********************************************************************************************************************/
-    /**故障分析雷达图**/
+    /**
+     * 故障分析雷达图
+     **/
     @GetMapping("/radar/gzfx")
     public AjaxResult gzfx(@RequestParam(value = "stationid", required = true) String stationid,
                            @RequestParam(value = "date", required = true) String date);
     /***********************************************************************************************************************/
-    /**预警分析雷达图**/
+    /**
+     * 预警分析雷达图
+     **/
     @GetMapping("/radar/yjfx")
     public AjaxResult yjfx(@RequestParam(value = "stationid", required = true) String stationid,
                            @RequestParam(value = "date", required = true) String date);
+
     /***********************************************************************************************************************/
     @GetMapping("/analysis/detail")
-    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);
+
     /***********************************************************************************************************************/
 
     @PostMapping("/healthsub/healthsystemList")
@@ -165,7 +188,7 @@ public interface HealthService {
 
 
     @GetMapping("/healthsub/healthsystemSelect")
-       public AjaxResult healthsystemSelect(@RequestParam("id") String id) throws Exception;
+    public AjaxResult healthsystemSelect(@RequestParam("id") String id) throws Exception;
 
 
     @PostMapping("/healthsub/healthsystemUpdate")
@@ -174,8 +197,7 @@ public interface HealthService {
 
 
     @PostMapping("/healthsub/healthsystemInsert")
-        public AjaxResult healthsystemInsert(Healthsystem record) throws Exception;
-
+    public AjaxResult healthsystemInsert(Healthsystem record) throws Exception;
 
 
     @PostMapping("/healthsub/healthsystemsubList")
@@ -184,7 +206,7 @@ public interface HealthService {
 
     @PostMapping("/healthsub/healthsystemsubDelete")
 
-    public AjaxResult healthsystemsubDelete(@RequestParam("ids") String ids) throws Exception ;
+    public AjaxResult healthsystemsubDelete(@RequestParam("ids") String ids) throws Exception;
 
     @GetMapping("/healthsub/healthsystemsubSelect")
 
@@ -197,4 +219,34 @@ public interface HealthService {
     @PostMapping("/healthsub/healthsystemsubInsert")
 
     public AjaxResult healthsystemsubInsert(Healthsystemsub record) throws Exception;
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////
+
+    @GetMapping("/healthreport/getconHealthReportTargetMap")
+    public AjaxResult getEconHealthReportMain(Date recordDate, String wtId) throws Exception;
+
+    @GetMapping("/healthreport/getconHealthReportTargetMap")
+    public AjaxResult getconHealthReportTargetMap(Date recordDate, String wtId) throws Exception;
+
+
+    @GetMapping("/healthreport/getStateJudgment")
+    public AjaxResult getStateJudgment(Date recordDate, String wtId) throws Exception;
+
+    @GetMapping("/healthreport/getHealthNumVoList")
+    public AjaxResult getHealthNumVoList(Date recordDate, String wtId) throws Exception;
+
+    @GetMapping("/healthreport/getEquipmentInfoDayTopVoList")
+    public AjaxResult getEquipmentInfoDayTopVoList(Date recordDate, String wtId) throws Exception;
+
+    @GetMapping("/healthreport/getHealthDataVlueVo")
+    public AjaxResult getHealthDataVlueVo(Date recordDate, String wtId, String type) throws Exception;
+
+    @GetMapping("/healthreport/getAlarmcountVoList")
+    public AjaxResult getAlarmcountVoList(Date recordDate, String wtId) throws Exception;
+
+    @GetMapping("/healthreport/getHealthReportQxpc")
+    public AjaxResult getHealthReportQxpc(Date recordDate, String wtId) throws Exception;
+
+
 }

+ 1 - 1
web/consumer-hb/src/main/resources/application-jn.properties

@@ -3,7 +3,7 @@ server.port=8170
 
 #\u670D\u52A1\u540D\u79F0
 spring.application.name=consumer-hb
-spring.cloud.nacos.discovery.server-addr=192.168.1.104:8870
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8870
 #spring.cloud.nacos.discovery.server-addr=10.81.3.155:8848
 
 

+ 7 - 7
web/consumer-hb/src/main/resources/application-jn.yml

@@ -10,7 +10,7 @@ spring:
 #    name: monitor-web-hb-consumer
 #    nacos:
 #      discovery:
-#        server-addr: 192.168.1.104:8870
+#        server-addr: 127.0.0.1:8870
 #        #指定yaml格式的配置
 #        file-extension: yaml
 ##        cluster-name: master
@@ -109,12 +109,12 @@ provider:
 #  alarmurl: http://10.81.3.155:8176/
 #  peranalyurl: http://10.81.3.155:8171/
 
-  monitorurl: http://192.168.1.104:8171/
-  healthurl: http://192.168.1.104:8172/
-  analysisurl: http://192.168.1.104:8171/
-  adminurl: http://192.168.1.104:8171/
-  alarmurl: http://192.168.1.104:8176/
-  peranalyurl: http://192.168.1.104:8171/
+  monitorurl: http://127.0.0.1:8171/
+  healthurl: http://127.0.0.1:8172/
+  analysisurl: http://127.0.0.1:8171/
+  adminurl: http://127.0.0.1:8171/
+  alarmurl: http://127.0.0.1:8176/
+  peranalyurl: http://127.0.0.1:8171/
 management:
   endpoints:
     jmx: