修改feign

src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java

@@ -13,9 +13,8 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-//@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.10.178:8083")
 @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);

src/main/java/com/steerinfo/dil/feign/QueueResult.java

@@ -1,20 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-
-@FeignClient(value = "DIL-TRICK-QUEUE-DEV",url = "192.168.10.167:8083")
-
-//@FeignClient(value = "DIL-TRICK-QUEUE-DEV",url = "10.244.97.87:80")
-public interface QueueResult {
-    @RequestMapping(value = "/api/v1/tq/queue/getResultById/{resultId}",method = RequestMethod.GET)
-    List<Map<String, Object>> getResultById(@PathVariable("resultId") Integer resultId);
-}

src/main/java/com/steerinfo/dil/feign/WmsBoundFeign.java → src/main/java/com/steerinfo/dil/feign/WmshBoundFeign.java

@@ -15,12 +15,12 @@ import java.util.Map;
  * @Date 2021/6/23 9:58
  * @Version 1.0
  */
-@FeignClient(value = "dil-wsm-api",url = "192.168.0.104:8091")
-public interface WmsBoundFeign {
+@FeignClient(value = "dil-wsmh-api",url = "${openfeign.WmsBoundFeign.url}")
+public interface WmshBoundFeign {
 
-    @PostMapping("api/v1/wms/wmshinboundresults/addWarehousingResult")
+    @PostMapping("api/v1/wmsh/wmshinboundresults/addWarehousingResult")
     RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String,Object> wmshInboundResult);
 
-    @PostMapping("api/v1/wms/wmshoutboundresults/addResult")
+    @PostMapping("api/v1/wmsh/wmshoutboundresults/addResult")
     RESTfulResult addResult(@RequestBody(required = false) Map<String,Object> map);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstrainLoadingResultServiceImpl.java

@@ -1,6 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.feign.WmsBoundFeign;
+import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.TmstrainLoadingResultMapper;
 import com.steerinfo.dil.model.TmstrainLoadingResult;
 import com.steerinfo.dil.service.ITmstrainLoadingResultService;
@@ -34,7 +34,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
     private TmstrainLoadingResultMapper tmstrainLoadingResultMapper;
 
     @Autowired
-    private WmsBoundFeign wmsBoundFeign;
+    private WmshBoundFeign wmshBoundFeign;
 
 
     @Override
@@ -75,7 +75,7 @@ public class TmstrainLoadingResultServiceImpl implements ITmstrainLoadingResultS
         //通过发站查询发站的所属港口
         BigDecimal portId = tmstrainLoadingResultMapper.getPortIdBySendStationId(tmstrainLoadingResult.getSendStationId());
         map.put("portId", portId);
-        wmsBoundFeign.addResult(map);
+        wmshBoundFeign.addResult(map);
 
         return tmstrainLoadingResultMapper.insertSelective(tmstrainLoadingResult);
     }

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -42,13 +42,19 @@ 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;
+            }
         }
         return new BigDecimal(0);
     }

src/main/resources/application-dev.yml

@@ -5,5 +5,5 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-tms-truck-dev
 

src/main/resources/application-prod.yml

@@ -5,4 +5,4 @@ spring:
     username: DIL0901
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: [name]
+    name: dil-tms-truck-dev

src/main/resources/bootstrap.yml

@@ -18,6 +18,15 @@ eureka:
     service-url:
       defaultZone: http://root:root@discovery.steerinfo.com/eureka/
 
+#feign设置
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:localhost:8089}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+  WmsBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+
 genxml:
   pth: com/a
 cache: