lloyd 3 years ago
parent
commit
d1f783aed9

+ 10 - 9
src/main/java/com/gct/aoid/feignclient/BaseDataClient.java

@@ -13,19 +13,20 @@ import org.springframework.web.bind.annotation.RequestParam;
13
  * @version 1.0
13
  * @version 1.0
14
  * @since 2021/1/25 下午6:02
14
  * @since 2021/1/25 下午6:02
15
  */
15
  */
16
-@FeignClient(value = "centralbase",fallback = BaseDataHystrix.class,url = "192.168.1.6:9002")
16
+@FeignClient(value = "centralbase", fallback = BaseDataHystrix.class)
17
 public interface BaseDataClient {
17
 public interface BaseDataClient {
18
-    @RequestMapping(value = "/getLatestA2DailyData/{WellID}",method = RequestMethod.GET)
19
-    String getLatestA2DailyData(@PathVariable("WellID") String wellID) ;
18
+    @RequestMapping(value = "/getLatestA2DailyData/{WellID}", method = RequestMethod.GET)
19
+    String getLatestA2DailyData(@PathVariable("WellID") String wellID);
20
 
20
 
21
-    @RequestMapping(value = "/WellSeriesInfo/WellSeriesInfo",method = RequestMethod.GET)
21
+    @RequestMapping(value = "/WellSeriesInfo/WellSeriesInfo", method = RequestMethod.GET)
22
     String getWellSeriesInfo();
22
     String getWellSeriesInfo();
23
 
23
 
24
-    @RequestMapping(value = "/cbPcProWellboreStatusDaily/getA2DataForCalProduction/{WellName}/{dateTime}",method = RequestMethod.GET)
25
-    String getA2DataForCalProduction(@PathVariable("WellName") String wellName,@PathVariable("dateTime") String dateTime);
26
-    @RequestMapping(value = "/cbPcProWellboreVolDaily/getA2DataForCalVolDaily/{WellName}/{dateTime}",method = RequestMethod.GET)
27
-    String getA2DataForCalVolDaily(@PathVariable("WellName") String wellName,@PathVariable("dateTime") String dateTime);
24
+    @RequestMapping(value = "/cbPcProWellboreStatusDaily/getA2DataForCalProduction/{WellName}/{dateTime}", method = RequestMethod.GET)
25
+    String getA2DataForCalProduction(@PathVariable("WellName") String wellName, @PathVariable("dateTime") String dateTime);
28
 
26
 
29
-    @RequestMapping(value = "/WellSource/jh",method = RequestMethod.GET)
27
+    @RequestMapping(value = "/cbPcProWellboreVolDaily/getA2DataForCalVolDaily/{WellName}/{dateTime}", method = RequestMethod.GET)
28
+    String getA2DataForCalVolDaily(@PathVariable("WellName") String wellName, @PathVariable("dateTime") String dateTime);
29
+
30
+    @RequestMapping(value = "/WellSource/jh", method = RequestMethod.GET)
30
     String getWellListByOrgID(@RequestParam("orgid") String org);
31
     String getWellListByOrgID(@RequestParam("orgid") String org);
31
 }
32
 }

+ 1 - 1
src/main/java/com/gct/aoid/feignclient/DiagnoseClient.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
11
  * @version 1.0
11
  * @version 1.0
12
  * @since 2021/1/29 下午9:43
12
  * @since 2021/1/29 下午9:43
13
  */
13
  */
14
-@FeignClient(value = "dgns-diagnose",url = "192.168.1.6:9000")
14
+@FeignClient(value = "dgns-diagnose")
15
 public interface DiagnoseClient {
15
 public interface DiagnoseClient {
16
 
16
 
17
     @GetMapping(path = "/dgnsGtbaseparam/getBaseparamById/{id}")
17
     @GetMapping(path = "/dgnsGtbaseparam/getBaseparamById/{id}")

+ 3 - 3
src/main/java/com/gct/aoid/feignclient/WarningClint.java

@@ -5,9 +5,9 @@ import org.springframework.web.bind.annotation.PathVariable;
5
 import org.springframework.web.bind.annotation.RequestMapping;
5
 import org.springframework.web.bind.annotation.RequestMapping;
6
 import org.springframework.web.bind.annotation.RequestMethod;
6
 import org.springframework.web.bind.annotation.RequestMethod;
7
 
7
 
8
-@FeignClient(value = "warning",fallback = WarningHystrix.class)
8
+@FeignClient(value = "warning", fallback = WarningHystrix.class)
9
 public interface WarningClint {
9
 public interface WarningClint {
10
 
10
 
11
-    @RequestMapping(value = "/wnGkMsg/extractWorkingConditionDiagnosis/{WellID}",method = RequestMethod.GET)
12
-    String extractWorkingConditionDiagnosis(@PathVariable("WellID") String wellID,@PathVariable("date") String date) ;
11
+    @RequestMapping(value = "/wnGkMsg/extractWorkingConditionDiagnosis/{WellID}", method = RequestMethod.GET)
12
+    String extractWorkingConditionDiagnosis(@PathVariable("WellID") String wellID, @PathVariable("date") String date);
13
 }
13
 }