Bladeren bron

修改feign

txf 3 jaren geleden
bovenliggende
commit
a41fc21f38

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @ time      :2021/10/8 21:56
  */
 
-@FeignClient(value = "dil-bmsship-api-dev", url = "192.168.0.107:8078")
+@FeignClient(value = "dil-bmsship-api-dev", url = "${openfeign.BmsShipFeign.url}")
 public interface BmsShipFeign {
     @PostMapping("api/v1/bmsship/bmsshipdetailsorder/addDetailsOrder/{resultId}")
     public RESTfulResult addDetailsOrder(@PathVariable("resultId") BigDecimal resultId) throws Exception ;

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * @ time      :2021/10/8 22:02
  */
 
-@FeignClient(value = "dil-bmstruck-api-dev", url = "192.168.0.107:8076")
+@FeignClient(value = "dil-bmstruck-api-dev", url = "${openfeign.BmsTruckFeign.url}")
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")

+ 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);

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

@@ -12,12 +12,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-wsm-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);
 }

+ 3 - 8
src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -1,23 +1,18 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.feign.WmsBoundFeign;
+import com.steerinfo.dil.feign.WmshBoundFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
-import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckLoadResult;
-import com.steerinfo.dil.model.TmstruckTotalResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -49,7 +44,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     private OmstruckOrderMapper omstruckOrderMapper;
 
     @Autowired
-    private WmsBoundFeign wmsBoundFeign;
+    private WmshBoundFeign wmshBoundFeign;
 
     /**
      * 查询所有装车实绩
@@ -118,7 +113,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 hashMap.put("portId", portId);
                 hashMap.put("resultTonnage",resultMeasuredTonnage);
                 hashMap.put("isClean", resultIsclear);
-                wmsBoundFeign.addResult(hashMap);
+                wmshBoundFeign.addResult(hashMap);
             }
         }
 

+ 13 - 0
src/main/resources/bootstrap.yml

@@ -13,6 +13,19 @@ spring:
     static-path-pattern:
 
 
+#feign设置
+openfeign:
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+  BmsShipFeign:
+    url: ${BMSSHIPFEIGN_URL:localhost:8078}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
+  WmsBoundFeign:
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
+
+
+
 #eureka设置
 eureka:
   client: