逻辑修改，减少for循环。关闭熔断器与超时

@@ -29,35 +29,28 @@ public class DataWareHouseController {
     /**
      * 获取数据仓库服务的相关数据.
      *
-     * @param resultList {@link ResultExitData}
+     * @param waybillNoMaster 运单号
      * @return
      */
-    @PutMapping("/getInfo")
-    public List<ResultExitData> getInfo(@RequestBody List<ResultExitData> resultList) {
-        System.out.println("开始调用数据仓库服务");
-        System.out.println("长度为" + resultList.size());
-        for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) {
-            ResultExitData result = resultList.get(i);
-            System.out.println(i + "运单号" + result.getWaybillNoMaster());
-
-            /**
-             * 根据运单号，获取 TxdUdep 中的体积
-             */
-            List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(result.getWaybillNoMaster());
-            if (txdUdeps != null && txdUdeps.size() > 0) {
-                //设置体积
-                result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure());
-            }
-            /**
-             * 根据运单号，获取计费重量
-             */
-            List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(result.getWaybillNoMaster());
-            if (txdUfoInfo != null && txdUfoInfo.size() > 0) {
-                //设置计费重量
-                result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure());
-            }
+    @GetMapping("/getInfo")
+    public ResultExitData getInfo(@RequestParam(value = "waybillNoMaster", required = false) String waybillNoMaster) {
+        ResultExitData result = new ResultExitData();
+        /**
+         * 根据运单号，获取 TxdUdep 中的体积
+         */
+        List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(waybillNoMaster);
+        if (txdUdeps != null && txdUdeps.size() > 0) {
+            //设置体积
+            result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure());
+        }
+        /**
+         * 根据运单号，获取计费重量
+         */
+        List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(waybillNoMaster);
+        if (txdUfoInfo != null && txdUfoInfo.size() > 0) {
+            //设置计费重量
+            result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure());
         }
-        System.out.println("数据仓库服务，调用完毕");
-        return resultList;
+        return result;
     }
 }

@@ -14,8 +14,8 @@ import java.util.List;
  * Description：
  * 时间：2020/5/25 9:48
  */
-@Component
-@FeignClient(value = "cgonms-provide", fallback = GetCgoNmsFeignHystrix.class)
+//@Component
+//@FeignClient(value = "cgonms-provide", fallback = GetCgoNmsFeignHystrix.class)
 public interface GetCgoNmsFeign {
     /**
      * 根据航班日期、航班号，获取出出港业务统计数据

@@ -68,11 +68,11 @@ eureka:
 feign:
   hystrix:
     enabled: false
-  client:
-    config:
-      default:
-        connectTimeout: 60000000 # feign \u7684\u8D85\u65F6\u8BBE\u7F6E
-        readTimeout: 60000000
+#  client:
+#    config:
+#      default:
+#        connectTimeout: 60000000 # feign \u7684\u8D85\u65F6\u8BBE\u7F6E
+#        readTimeout: 60000000
 # boot admin
 management:
   endpoints: