作者 王勇

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

@@ -29,21 +29,16 @@ public class DataWareHouseController { @@ -29,21 +29,16 @@ public class DataWareHouseController {
29 /** 29 /**
30 * 获取数据仓库服务的相关数据. 30 * 获取数据仓库服务的相关数据.
31 * 31 *
32 - * @param resultList {@link ResultExitData} 32 + * @param waybillNoMaster 运单号
33 * @return 33 * @return
34 */ 34 */
35 - @PutMapping("/getInfo")  
36 - public List<ResultExitData> getInfo(@RequestBody List<ResultExitData> resultList) {  
37 - System.out.println("开始调用数据仓库服务");  
38 - System.out.println("长度为" + resultList.size());  
39 - for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) {  
40 - ResultExitData result = resultList.get(i);  
41 - System.out.println(i + "运单号" + result.getWaybillNoMaster());  
42 - 35 + @GetMapping("/getInfo")
  36 + public ResultExitData getInfo(@RequestParam(value = "waybillNoMaster", required = false) String waybillNoMaster) {
  37 + ResultExitData result = new ResultExitData();
43 /** 38 /**
44 * 根据运单号,获取 TxdUdep 中的体积 39 * 根据运单号,获取 TxdUdep 中的体积
45 */ 40 */
46 - List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(result.getWaybillNoMaster()); 41 + List<TxdUdep> txdUdeps = txdUdepService.getTxdUdepInfo(waybillNoMaster);
47 if (txdUdeps != null && txdUdeps.size() > 0) { 42 if (txdUdeps != null && txdUdeps.size() > 0) {
48 //设置体积 43 //设置体积
49 result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure()); 44 result.setVolumeMeasure(txdUdeps.get(0).getVolumeMeasure());
@@ -51,13 +46,11 @@ public class DataWareHouseController { @@ -51,13 +46,11 @@ public class DataWareHouseController {
51 /** 46 /**
52 * 根据运单号,获取计费重量 47 * 根据运单号,获取计费重量
53 */ 48 */
54 - List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(result.getWaybillNoMaster()); 49 + List<TxdUfoh> txdUfoInfo = txdUfohService.getTxdUfoInfo(waybillNoMaster);
55 if (txdUfoInfo != null && txdUfoInfo.size() > 0) { 50 if (txdUfoInfo != null && txdUfoInfo.size() > 0) {
56 //设置计费重量 51 //设置计费重量
57 result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure()); 52 result.setTotalGrossWeightMeasure(txdUfoInfo.get(0).getTotalGrossWeightMeasure());
58 } 53 }
59 - }  
60 - System.out.println("数据仓库服务,调用完毕");  
61 - return resultList; 54 + return result;
62 } 55 }
63 } 56 }
@@ -14,8 +14,8 @@ import java.util.List; @@ -14,8 +14,8 @@ import java.util.List;
14 * Description: 14 * Description:
15 * 时间:2020/5/25 9:48 15 * 时间:2020/5/25 9:48
16 */ 16 */
17 -@Component  
18 -@FeignClient(value = "cgonms-provide", fallback = GetCgoNmsFeignHystrix.class) 17 +//@Component
  18 +//@FeignClient(value = "cgonms-provide", fallback = GetCgoNmsFeignHystrix.class)
19 public interface GetCgoNmsFeign { 19 public interface GetCgoNmsFeign {
20 /** 20 /**
21 * 根据航班日期、航班号,获取出出港业务统计数据 21 * 根据航班日期、航班号,获取出出港业务统计数据
@@ -68,11 +68,11 @@ eureka: @@ -68,11 +68,11 @@ eureka:
68 feign: 68 feign:
69 hystrix: 69 hystrix:
70 enabled: false 70 enabled: false
71 - client:  
72 - config:  
73 - default:  
74 - connectTimeout: 60000000 # feign \u7684\u8D85\u65F6\u8BBE\u7F6E  
75 - readTimeout: 60000000 71 +# client:
  72 +# config:
  73 +# default:
  74 +# connectTimeout: 60000000 # feign \u7684\u8D85\u65F6\u8BBE\u7F6E
  75 +# readTimeout: 60000000
76 # boot admin 76 # boot admin
77 management: 77 management:
78 endpoints: 78 endpoints: