后台消费者功能修正

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

@@ -546,9 +546,9 @@ public AjaxResult wtrzdfs(@RequestParam("wtId") String wtId,@RequestParam("recor
             @ApiImplicitParam(name = "recorddate", value = "日期", required = true, dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "type", value = "类型 1:日小风切入，2：月小风切入，3：月小风切入,4:日小风停机，5：月小风停机，6：年小风停机", required = true, dataType = "string", paramType = "query")})
 
-    public AjaxResult pieChart( String wtId, String recorddate,String type) {
+    public AjaxResult pieChart(@RequestParam("wtId") String wtId,@RequestParam("wtId")  String recorddate,@RequestParam("wtId") String type) {
 
-        AjaxResult ajax=windturbineGoodnessService.fjfzy(wtId,recorddate);
+        AjaxResult ajax=windturbineGoodnessService.pieChart(wtId,recorddate,type);
 
         return ajax;
     }

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

@@ -233,7 +233,7 @@ public class WindturbineGoodnessServiceFallbackFactory implements FallbackFactor
             }
 /*****************************************************************************************************************/
             @Override
-            public AjaxResult pieChart( String wtId, String recorddate,String type){
+            public AjaxResult pieChart( @RequestParam("wtId") String wtId,@RequestParam("recorddate")  String recorddate,@RequestParam("type") String type){
                 return  AjaxResult.error(throwable.getMessage());
             }
 /*****************************************************************************************************************/

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

@@ -184,6 +184,6 @@ public interface WindturbineGoodnessService {
      * 饼图图表
      */
     @GetMapping("/goodness/pieChart")
-      public AjaxResult pieChart( String wtId, String recorddate,String type);
+      public AjaxResult pieChart(@RequestParam("wtId") String wtId,@RequestParam("recorddate") String recorddate,@RequestParam("type") String type);
 /*****************************************************************************************************************/
 }

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

@@ -1,8 +1,9 @@
 # 项目相关配置
 gyee:
   #API访问ip
-  swaggerip: 192.168.56.1:8170
-  #swaggerip: 192.168.2.216:8170
+  #swaggerip: 10.83.68.97:8170
+  #swaggerip: 192.168.56.1:8170
+  swaggerip: 192.168.2.216:8170
 server:
   port: 8170
 
@@ -12,7 +13,8 @@ spring:
     cloud:
       nacos:
         discovery:
-          server-addr: 192.168.56.1:8848
+          #server-addr: 192.168.56.1:8848
+          server-addr: 10.83.68.97:8848
           #server-addr: 192.168.2.216:8848
           #指定yaml格式的配置
           file-extension: yaml
@@ -21,9 +23,9 @@ spring:
         password: nacos
   #redis集群
   redis:
-    host: 10.0.118.73
+    #host: 10.0.118.73
     #host: 192.168.2.202
-    #   host: 10.155.32.4
+    host: 10.83.68.94
     password:
     port: 6379
     timeout: 100000
@@ -41,15 +43,16 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 1
+    database: 19
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
-    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
-#    url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+    #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
+    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
     username: gdprod
     password: gd123
     oracle-schema=:
@@ -105,6 +108,7 @@ feign:
         connect-timeout: 60000
 provider:
   url: http://192.168.56.1:8171/
+  #url: http://10.83.68.97:8171/
   #url: http://192.168.2.216:8171/
 management:
   endpoints: