添加/health/warehouse接口

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

@@ -4,6 +4,7 @@ package com.gyee.consumer.config;
 import com.gyee.consumer.fallback.alarm.AlarmServiceFallbackFactory;
 import com.gyee.consumer.fallback.compare.CompareServiceFallbackFactory;
 import com.gyee.consumer.fallback.goodness.WindturbineGoodnessServiceFallbackFactory;
+import com.gyee.consumer.fallback.health.HealthServiceFallbackFactory;
 import com.gyee.consumer.fallback.leaderboard.LeaderboardServiceFallbackFactory;
 import com.gyee.consumer.fallback.monitor.*;
 import com.gyee.consumer.fallback.outputspeed.InputoroutputspeedtotalServiceFallbackFactory;
@@ -129,5 +130,10 @@ public class FeignConfiguration {
         return new ReliabilityServiceFallbackFactory();
     }
 
+    @Bean
+    public HealthServiceFallbackFactory healthServiceFallbackFactory() {
+        return new HealthServiceFallbackFactory();
+    }
+
 
 }

web/consumer-hb/src/main/java/com/gyee/consumer/controller/alarm/AlarmController.java

@@ -0,0 +1,151 @@
+package com.gyee.consumer.controller.alarm;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.alarm.AlarmService;
+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.text.ParseException;
+
+/**
+ * @ClassName : AlarmController
+ * @Description : 报警管理消费
+ */
+@Controller
+@RequestMapping("/alarm")
+@Api(value = "报警管理信息",tags =  "报警管理信息")
+public class AlarmController {
+
+    @Resource
+    private AlarmService alarmService;
+
+
+    /**
+     * 预警分析
+     */
+    @GetMapping("/findEarlyWarningAnalysis")
+    @ResponseBody
+    @ApiOperation(value = "查询预警分析信息", notes = "查询预警分析信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "stationid", value = "风场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "startdate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "enddate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult findEarlyWarningAnalysis(
+            @RequestParam(value = "stationid", required = true)   String stationid,
+            @RequestParam(value = "startdate", required = true) String startdate,
+            @RequestParam(value = "enddate", required = true) String enddate
+    ) throws ParseException {
+
+        AjaxResult ajax=alarmService.querynew2(stationid,startdate,enddate);
+
+        return ajax;
+    }
+
+    /**
+     * 故障分析
+     */
+    @GetMapping("/findRecentFault")
+    @ResponseBody
+    @ApiOperation(value = "查询故障分析信息", notes = "查询故障分析信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "stId", value = "风场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "startdate", value = "开始日期", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "enddate", value = "结束日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult  findRecentFault(
+            @RequestParam(value = "stId", required = true) String stId,
+            @RequestParam(value = "startDate", required = true) String endDate,
+            @RequestParam(value = "endDate", required = true) String startDate
+
+    )throws Exception {
+
+
+        AjaxResult ajax=alarmService.getRecentFault(stId,startDate,endDate);
+
+        return ajax;
+
+    }
+
+
+    /**
+     * 预警分析
+     */
+    @GetMapping("/findWarningHistory")
+    @ResponseBody
+    @ApiOperation(value = "查询预警分析信息", notes = "查询预警分析信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pagenum", value = "页号", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "pagesize", value = "每页显示内容", required = true, dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "stationid", value = "风场站编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "windturbineid", value = "风机编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "category1", value = "分类1", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "category2", value = "分类2", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "rank", value = "排名", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "modelid", value = "型号编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "snapid", value = "快照编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "messagetype", value = "信息类型", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "keyword", value = "关键字", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "starttime", value = "开始时间", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endtime", value = "结束时间", required = true, dataType = "string", paramType = "query")
+           })
+    public AjaxResult findWarningHistory(
+            @RequestParam(value = "pagenum")Integer pagenum,
+            @RequestParam(value = "pagesize")Integer pagesize,
+            @RequestParam(value = "stationid", required = false) String stationid,
+            @RequestParam(value = "windturbineid",required = false) String windturbineid,
+            @RequestParam(value = "category1",required = false) String category1,
+            @RequestParam(value = "category2",required = false) String category2,
+            @RequestParam(value = "rank",required = false) String rank,
+            @RequestParam(value = "modelid",required = false) String modelid,
+            @RequestParam(value = "snapid",required = false) Long snapid,
+            @RequestParam(value = "messagetype",required = false) Integer messagetype,
+            @RequestParam(value = "keyword",required = false) String keyword,
+            @RequestParam(value = "starttime", required = false) String starttime,
+            @RequestParam(value = "endtime", required = false) String endtime
+    ){
+        AjaxResult ajax=alarmService.queryByPage(pagenum,pagesize,stationid,windturbineid,category1,category2,rank,modelid,snapid,messagetype,keyword,starttime,endtime);
+
+        return ajax;
+
+    }
+
+
+    /**
+     * 自定义报警统计
+     */
+    @GetMapping(value = "/findCustomAlarmStatistics")
+    @ResponseBody
+    @ApiOperation(value = "查询自定义报警统计", notes = "查询自定义报警统计")
+    public AjaxResult findCustomAlarmStatistics(
+            @RequestParam(value = "stationid", required = true) String stationid,
+            @RequestParam(value = "datebegin", required = true) String datebegin,
+            @RequestParam(value = "dateend", required = true) String dateend,
+            @RequestParam(value = "windturbineid", required = false) String windturbineid
+    ) throws ParseException {
+
+        AjaxResult ajax=alarmService.query2(stationid,datebegin,dateend,windturbineid);
+
+        return ajax;
+    }
+
+
+    /**
+     * 查询停机类型
+     */
+    @GetMapping(value = "/treeType")
+    @ResponseBody
+    @ApiOperation(value = "查询停机类型", notes = "查询停机类型")
+    public AjaxResult  getRecentFault()throws Exception {
+
+        AjaxResult ajax=alarmService.getRecentFault();
+
+        return ajax;
+    }
+}

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

@@ -447,5 +447,15 @@ public class HealthController {
         return ajax;
     }
     /***********************************************************************************************************************/
+    @GetMapping("/warehouse")
+    @ResponseBody
+    @ApiOperation(value = "仓库列表", notes = "仓库列表")
+    @ApiImplicitParams({})
+    public AjaxResult warehouse() throws Exception  {
+
+        AjaxResult ajax=healthMainService.warehouse();
+
+        return ajax;
+    }
     /***********************************************************************************************************************/
 }

web/consumer-hb/src/main/java/com/gyee/consumer/controller/reliability/ReliabilityController.java

@@ -2,6 +2,7 @@ package com.gyee.consumer.controller.reliability;
 
 
 import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.reliability.ReliabilityService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -16,6 +17,7 @@ public class ReliabilityController {
     @Autowired
     private ReliabilityService reliabilityService;
 
+
     /**
      * 获得风场预警分类信息
      * @param wpid
@@ -58,4 +60,53 @@ public class ReliabilityController {
     }
 
 
+
+    @PostMapping(value = "/equoperationrecordList" )
+    @ResponseBody
+    @ApiOperation(value = "获得单机性能总览列表信息", notes = "获得单机性能总览列表信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tablepar", value = "分页排序对象", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "starttime", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "endtime", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "wtid", value = "风场编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "type", value = "日期", required = true, dataType = "string", paramType = "query")})
+
+    public AjaxResult equoperationrecordList(Tablepar tablepar,
+                                          @RequestParam(value = "starttime", required = false) String startTime,
+                                          @RequestParam(value = "endtime", required = false) String endTime,
+                                          @RequestParam(value = "wtid",required = false)String wtid,
+                                          @RequestParam(value = "type",required = false)String type)  {
+
+        AjaxResult ajax=reliabilityService.equoperationrecordList(tablepar, startTime, endTime, wtid, type);
+
+        return ajax;
+    }
+
+
+    @GetMapping("/windturbine")
+    @ResponseBody
+    @ApiOperation(value = "获得两票风机信息", notes = "获得两票风机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtnum", value = "风机编号", required = true, dataType = "string", paramType = "query")
+    })
+
+    public AjaxResult windturbine(@RequestParam("wtnum") String wtnum)  {
+
+        AjaxResult ajax=reliabilityService.windturbine(wtnum);
+
+        return ajax;
+    }
+
+    @GetMapping("/companies")
+    @ResponseBody
+    @ApiOperation(value = "获得两票公司信息", notes = "获得两票公司信息")
+    @ApiImplicitParams({ })
+
+    public AjaxResult companies()  {
+
+        AjaxResult ajax=reliabilityService.companies();
+
+        return ajax;
+    }
+
 }

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

@@ -0,0 +1,68 @@
+package com.gyee.consumer.fallback.alarm;
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.service.alarm.AlarmService;
+import feign.hystrix.FallbackFactory;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.text.ParseException;
+
+public class AlarmServiceFallbackFactory implements FallbackFactory<AlarmService> {
+
+    @Override
+    public AlarmService create(Throwable throwable) {
+        return new AlarmService() {
+
+        @Override
+        public AjaxResult querynew2(@RequestParam(value = "stationid", required = true)   String stationid,
+                                    @RequestParam(value = "startdate", required = true) String startdate,
+                                    @RequestParam(value = "enddate", required = true) String enddate)  throws ParseException {
+            return AjaxResult.error(throwable.getMessage());
+        }
+
+        @Override
+        public AjaxResult  getRecentFault(
+                @RequestParam(value = "stId", required = true) String stId,
+                @RequestParam(value = "startDate", required = true) String startDate,
+                @RequestParam(value = "endDate", required = true) String endDate)throws Exception{
+            return AjaxResult.error(throwable.getMessage());
+        }
+
+        @Override
+        public AjaxResult queryByPage(
+                @RequestParam(value = "pagenum")Integer pagenum,
+                @RequestParam(value = "pagesize")Integer pagesize,
+                @RequestParam(value = "stationid", required = false) String stationid,
+                @RequestParam(value = "windturbineid",required = false) String windturbineid,
+                @RequestParam(value = "category1",required = false) String category1,
+                @RequestParam(value = "category2",required = false) String category2,
+                @RequestParam(value = "rank",required = false) String rank,
+                @RequestParam(value = "modelid",required = false) String modelid,
+                @RequestParam(value = "snapid",required = false) Long snapid,
+                @RequestParam(value = "messagetype",required = false) Integer messagetype,
+                @RequestParam(value = "keyword",required = false) String keyword,
+                @RequestParam(value = "starttime", required = false) String starttime,
+                @RequestParam(value = "endtime", required = false) String endtime
+        ){
+            return AjaxResult.error(throwable.getMessage());
+        }
+
+        @Override
+        public AjaxResult query2(
+                @RequestParam(value = "stationid", required = true) String stationid,
+                @RequestParam(value = "datebegin", required = true) String datebegin,
+                @RequestParam(value = "dateend", required = true) String dateend,
+                @RequestParam(value = "windturbineid", required = false) String windturbineid
+        ) throws ParseException{
+            return AjaxResult.error(throwable.getMessage());
+        }
+
+
+        @Override
+        public AjaxResult  getRecentFault()throws Exception{
+            return AjaxResult.error(throwable.getMessage());
+        }
+
+        };
+    }
+}

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

@@ -188,6 +188,11 @@ public class HealthServiceFallbackFactory implements FallbackFactory<HealthServi
         return  AjaxResult.error(throwable.getMessage());
     }
 
+    @Override
+    public AjaxResult warehouse(){
+        return  AjaxResult.error(throwable.getMessage());
+    }
+
       /***********************************************************************************************************************/
 
 

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

@@ -1,6 +1,7 @@
 package com.gyee.consumer.fallback.reliability;
 
 import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.model.Tablepar;
 import com.gyee.consumer.service.reliability.ReliabilityService;
 import feign.hystrix.FallbackFactory;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,8 +24,24 @@ public class ReliabilityServiceFallbackFactory implements FallbackFactory<Reliab
                 return  AjaxResult.error(throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult equoperationrecordList(Tablepar tablepar,
+                                                     @RequestParam(value = "starttime", required = false) String startTime,
+                                                     @RequestParam(value = "endtime", required = false) String endTime,
+                                                     @RequestParam(value = "wtid",required = false)String wtid,
+                                                     @RequestParam(value = "type",required = false)String type){
+                return  AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult windturbine(@RequestParam("wtnum") String wtnum){
+                return  AjaxResult.error(throwable.getMessage());
+            }
 
+            @Override
+            public AjaxResult companies(){
+                return  AjaxResult.error(throwable.getMessage());
+            }
         };
     }
 }

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

@@ -0,0 +1,62 @@
+package com.gyee.consumer.service.alarm;
+
+
+import com.gyee.common.domain.AjaxResult;
+import com.gyee.consumer.config.FeignConfiguration;
+import com.gyee.consumer.fallback.alarm.AlarmServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.text.ParseException;
+
+@FeignClient(name = "alarm",url = "${provider.alarmurl}",
+        fallbackFactory = AlarmServiceFallbackFactory.class,
+        configuration = FeignConfiguration.class)
+public interface AlarmService {
+
+    @GetMapping("/alarm/count/query/new2")
+    public AjaxResult querynew2(@RequestParam(value = "stationid", required = true)   String stationid,
+                                @RequestParam(value = "startdate", required = true) String startdate,
+                                @RequestParam(value = "enddate", required = true) String enddate) throws ParseException;
+
+    @GetMapping("/shutdown/list")
+    public AjaxResult  getRecentFault(
+            @RequestParam(value = "stId", required = true) String stId,
+            @RequestParam(value = "startDate", required = true) String startDate,
+            @RequestParam(value = "endDate", required = true) String endDate) throws Exception;
+
+
+    @GetMapping("/alarm/history/page2")
+    public AjaxResult queryByPage(
+            @RequestParam(value = "pagenum")Integer pagenum,
+            @RequestParam(value = "pagesize")Integer pagesize,
+            @RequestParam(value = "stationid", required = false) String stationid,
+            @RequestParam(value = "windturbineid",required = false) String windturbineid,
+            @RequestParam(value = "category1",required = false) String category1,
+            @RequestParam(value = "category2",required = false) String category2,
+            @RequestParam(value = "rank",required = false) String rank,
+            @RequestParam(value = "modelid",required = false) String modelid,
+            @RequestParam(value = "snapid",required = false) Long snapid,
+            @RequestParam(value = "messagetype",required = false) Integer messagetype,
+            @RequestParam(value = "keyword",required = false) String keyword,
+            @RequestParam(value = "starttime", required = false) String starttime,
+            @RequestParam(value = "endtime", required = false) String endtime
+    );
+
+
+    @GetMapping(value = "/alarm/count/querymap2")
+    public AjaxResult query2(
+            @RequestParam(value = "stationid", required = true) String stationid,
+            @RequestParam(value = "datebegin", required = true) String datebegin,
+            @RequestParam(value = "dateend", required = true) String dateend,
+            @RequestParam(value = "windturbineid", required = false) String windturbineid
+    ) throws ParseException;
+
+
+    /**
+     * 查询停机类型
+     */
+    @GetMapping(value = "/Stoptype/treeType")
+    public AjaxResult  getRecentFault()throws Exception;
+}

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

@@ -3,7 +3,7 @@ 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.fallback.health.HealthServiceFallbackFactory;
 import com.gyee.consumer.model.Tablepar;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "health",url = "${provider.healthurl}",
-        fallbackFactory = CompareServiceFallbackFactory.class,
+        fallbackFactory = HealthServiceFallbackFactory.class,
         configuration = FeignConfiguration.class)
 public interface HealthService {
 
@@ -132,5 +132,9 @@ public interface HealthService {
     @GetMapping("/wtHealthList/windTurbineHealthList")
     public AjaxResult windTurbineHealthList(@RequestParam("wpId") String wpId) throws Exception;
     /***********************************************************************************************************************/
+    /**风机健康列表**/
+    @GetMapping("/ticket/warehouse")
+    public AjaxResult warehouse() throws Exception ;
+    /***********************************************************************************************************************/
 
 }

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

@@ -4,8 +4,11 @@ package com.gyee.consumer.service.reliability;
 import com.gyee.common.domain.AjaxResult;
 import com.gyee.consumer.config.FeignConfiguration;
 import com.gyee.consumer.fallback.reliability.ReliabilityServiceFallbackFactory;
+import com.gyee.consumer.model.Tablepar;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "reliability",url = "${provider.healthurl}",
@@ -20,4 +23,19 @@ public interface ReliabilityService {
 
     @GetMapping("/reliability/failurestatistics")
     public AjaxResult failurestatistics(@RequestParam("wpid") String wpid, @RequestParam("date") String date);
- }
+
+
+    @PostMapping(value = "/ticket/equoperationrecordList" )
+    public AjaxResult equoperationrecordList(@RequestBody Tablepar tablepar,
+                                             @RequestParam(value = "starttime", required = false) String startTime,
+                                             @RequestParam(value = "endtime", required = false) String endTime,
+                                             @RequestParam(value = "wtid",required = false)String wtid,
+                                             @RequestParam(value = "type",required = false)String type);
+
+
+    @GetMapping("/ticket/windturbine")
+    public AjaxResult windturbine(@RequestParam("wtnum") String wtnum);
+
+    @GetMapping("/ticket/companies")
+    public AjaxResult companies();
+}

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

@@ -3,34 +3,34 @@ gyee:
   #API访问ip
   #swaggerip: 10.83.68.97:8170
   #swaggerip: 192.168.56.1:8170
-  swaggerip: 192.168.2.216:8170
+  swaggerip: 192.168.2.198:8170
 server:
   port: 8170
 
 spring:
   application:
     name: monitor-web-hb-consumer
-#  cloud:
-#    sentinel:
-#      transport:
-#        dashboard: 192.168.2.216:8849
-#        port: 8169
-#      datasource:
-#        ds1:
-#          nacos:
-#            server-addr: 192.168.2.216:8848
-#            data-id: ${spring.application.name}.json
-#            group-id: DEFAULT_GROUP
-#            data-type: json
-#            rule-type: flow
-#      filter:
-#        enabled: true
-#      eager: true
+  cloud:
+    sentinel:
+      transport:
+        dashboard: 192.168.2.198:8849
+        port: 8169
+      datasource:
+        ds1:
+          nacos:
+            server-addr: 192.168.2.198:8848
+            data-id: ${spring.application.name}.json
+            group-id: DEFAULT_GROUP
+            data-type: json
+            rule-type: flow
+      filter:
+        enabled: true
+      eager: true
     nacos:
       discovery:
-        server-addr: 192.168.56.1:8848
+        #server-addr: 192.168.56.1:8848
         #server-addr: 10.83.68.97:8848
-        #server-addr: 192.168.2.216:8848
+        server-addr: 192.168.2.198:8848
         #指定yaml格式的配置
         file-extension: yaml
         cluster-name: master
@@ -39,10 +39,10 @@ spring:
   #redis集群
   redis:
     #host: 10.0.118.73
-    host: 123.60.213.70
-    #host: 192.168.2.202
+    #host: 123.60.213.70
+    host: 192.168.2.202
     #host: 10.83.68.94
-    password: gdnxfd123
+    password:
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开
@@ -59,7 +59,7 @@ 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:
@@ -67,13 +67,13 @@ spring:
     driver-class-name: oracle.jdbc.OracleDriver
     #外网
     #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
-    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    #url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
     #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    username: gdprod
-#    password: gd123
-    username: nxfdprod
-    password: gdnxfd123
+    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    username: gdprod
+    password: gd123
+#    username: nxfdprod
+#    password: gdnxfd123
     oracle-schema=:
     druid:
       max-active: 20
@@ -116,8 +116,8 @@ logging:
     com.example: debug
 
 url:
-  benchmaring: http://192.168.2.216:8081
-  analysis: http://192.168.2.216:8082
+  benchmaring: http://192.168.2.198:8081
+  analysis: http://192.168.2.198:8082
 
 feign:
   sentinel:
@@ -130,16 +130,16 @@ feign:
         read-timeout: 60000
         connect-timeout: 60000
 provider:
-  monitorurl: http://192.168.56.1:8171/
-  healthurl: http://192.168.56.1:8172/
-  analysisurl: http://192.168.56.1:8173/
-  adminurl: http://192.168.56.1:8174/
-  alarmurl: http://192.168.56.1:8176/
-#  monitorurl: http://192.168.2.216:8171/
-#  healthurl: http://192.168.2.216:8172/
-#  analysisurl: http://192.168.2.216:8173/
-#  adminurl: http://192.168.2.216:8174/
-#  alarmurl: http://192.168.2.216:8176/
+#  monitorurl: http://192.168.56.1:8171/
+#  healthurl: http://192.168.56.1:8172/
+#  analysisurl: http://192.168.56.1:8173/
+#  adminurl: http://192.168.56.1:8174/
+#  alarmurl: http://192.168.56.1:8176/
+  monitorurl: http://192.168.2.198:8171/
+  healthurl: http://192.168.2.198:8172/
+  analysisurl: http://192.168.2.198:8173/
+  adminurl: http://192.168.2.198:8174/
+  alarmurl: http://192.168.2.198:8176/
 management:
   endpoints:
     jmx: