浏览代码

修改feign

txf 3 年之前
父节点
当前提交
d7dc1cc181

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -14,7 +14,7 @@ import java.util.Map;
  * @Version 1.0
  */
 @Service
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "localhost:8083")
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
 public interface ColumnDataFeign {
     @RequestMapping("getColumnData")
     List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);

+ 0 - 18
src/main/java/com/steerinfo/dil/feign/ContractFeignService.java

@@ -1,18 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author zhangnan
- * @Date 2021/6/8 9:24
- * @Version 1.0
- */
-@FeignClient("DIL-API")
-public interface ContractFeignService {
-    @RequestMapping("/getContractPurchaseByNumber")
-    List<Map<String, Object>> avc(Map<String, Object> map);
-}

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -14,7 +14,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "dil-tms-truck-dev",url = "localhost:8088")
+@FeignClient(value = "dil-tms-truck-dev",url = "${openfeign.TmsTruckFeign.url}")
 public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/updateEnactoryResult")

+ 5 - 2
src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -44,13 +44,16 @@ public class DataChange {
         if (data != null){
             if(data instanceof String){
                 String data1 = (String) data;
-                int i = Integer.parseInt(data1);
-                return new BigDecimal(i);
+                return new BigDecimal(data1);
             }
             if(data instanceof Integer){
                 Integer data2 = (Integer) data;
                 return new BigDecimal(data2);
             }
+            if(data instanceof Double){
+                Double data3 = (Double) data;
+                return new BigDecimal(data3);
+            }
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
             }

+ 10 - 1
src/main/resources/bootstrap.yml

@@ -50,6 +50,15 @@ eureka:
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 
+#feign设置
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:localhost:8089}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+  TmsTruckFeign:
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model
@@ -60,4 +69,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8082
+  port: 8087