From fc09b075f5a946f982119497cb7c4f637ebcea1e Mon Sep 17 00:00:00 2001
From: ZiCheng-Web <523186180@qq.com>
Date: Mon, 25 May 2020 15:46:11 +0800
Subject: [PATCH] 新舱单服务，简单改动
---
src/main/java/com/sunyo/wlpt/cgonms/provide/controller/CgoNmsController.java | 15 +++++++++++----
src/main/java/com/sunyo/wlpt/cgonms/provide/domain/ResultExitData.java | 11 +++++++++++
src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeign.java | 21 +++++++++++++++++++++
src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeignHystrix.java | 20 ++++++++++++++++++++
src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetTransportFeignHystrix.java | 4 +++-
5 files changed, 66 insertions(+), 5 deletions(-)
create mode 100644 src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeign.java
create mode 100644 src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeignHystrix.java
diff --git a/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/CgoNmsController.java b/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/CgoNmsController.java
index 084db31..3698ec1 100644
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/CgoNmsController.java
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/controller/CgoNmsController.java
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.cgonms.provide.controller;
import com.sunyo.wlpt.cgonms.provide.domain.*;
import com.sunyo.wlpt.cgonms.provide.feign.GetCgoAsmFeign;
+import com.sunyo.wlpt.cgonms.provide.feign.GetDataWareHouseFeign;
import com.sunyo.wlpt.cgonms.provide.feign.GetTransportFeign;
import com.sunyo.wlpt.cgonms.provide.service.*;
import org.springframework.web.bind.annotation.*;
@@ -41,10 +42,14 @@ public class CgoNmsController {
@Resource
private GetTransportFeign getTransportFeign;
+ @Resource
+ GetDataWareHouseFeign getDataWareHouseFeign;
+
/**
- * 根据航班日期获取出新舱单服务中的响应数据
+ * 根据航班日期、航班号，获取出出港业务统计数据
*
* @param flightDate 航班日期
+ * @param flightNo 航班号
* @return {@link ResultExitData}
*/
@GetMapping("/getInfo")
@@ -117,11 +122,13 @@ public class CgoNmsController {
result.setAimStation(pm.get(0).getDestinationStation());
}
}
- System.out.println("新舱单服务，获取完毕");
System.out.println("代理人服务，开始获取");
- List<ResultExitData> asmInfo = getCgoAsmFeign.getInfo(resultList);
+ List<ResultExitData> asmInfo = getCgoAsmFeign.getInfo(resultList);
System.out.println("运输工具服务，开始获取");
- List<ResultExitData> info = getTransportFeign.getInfo(asmInfo);
+ List<ResultExitData> transportInfo = getTransportFeign.getInfo(asmInfo);
+ System.out.println("数据仓库服务，开始获取");
+ List<ResultExitData> info = getDataWareHouseFeign.getInfo(transportInfo);
+ System.out.println("出港基本数据，获取完毕");
return info;
}
}
diff --git a/src/main/java/com/sunyo/wlpt/cgonms/provide/domain/ResultExitData.java b/src/main/java/com/sunyo/wlpt/cgonms/provide/domain/ResultExitData.java
index 3b5be0d..6269a58 100644
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/domain/ResultExitData.java
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/domain/ResultExitData.java
@@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -155,4 +156,14 @@ public class ResultExitData implements Serializable {
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date flightPlanTime;
+
+ /**
+ * 27.计费重量
+ */
+ private BigDecimal totalGrossWeightMeasure;
+
+ /**
+ * 28.体积
+ */
+ private BigDecimal volumeMeasure;
}
diff --git a/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeign.java b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeign.java
new file mode 100644
index 0000000..f90dbe9
--- /dev/null
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeign.java
@@ -0,0 +1,21 @@
+package com.sunyo.wlpt.cgonms.provide.feign;
+
+import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：数据仓库的feign
+ * 时间：2020/5/25 14:47
+ */
+@Component
+@FeignClient(value = "data-warehouse", fallback = GetDataWareHouseFeignHystrix.class)
+public interface GetDataWareHouseFeign {
+ @PutMapping("/data/getInfo")
+ List<ResultExitData> getInfo(@RequestBody List<ResultExitData> resultList);
+}
diff --git a/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeignHystrix.java b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeignHystrix.java
new file mode 100644
index 0000000..025b8aa
--- /dev/null
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetDataWareHouseFeignHystrix.java
@@ -0,0 +1,20 @@
+package com.sunyo.wlpt.cgonms.provide.feign;
+
+import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author 子诚
+ * Description：数据仓库的feign的熔断器
+ * 时间：2020/5/25 14:48
+ */
+@Service
+public class GetDataWareHouseFeignHystrix implements GetDataWareHouseFeign {
+ @Override
+ public List<ResultExitData> getInfo(List<ResultExitData> resultList) {
+ System.out.println("与 数据仓库 服务 断开连接,获取 数据仓库 服务信息失败");
+ return null;
+ }
+}
diff --git a/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetTransportFeignHystrix.java b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetTransportFeignHystrix.java
index 219b03b..55be7dc 100644
--- a/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetTransportFeignHystrix.java
+++ b/src/main/java/com/sunyo/wlpt/cgonms/provide/feign/GetTransportFeignHystrix.java
@@ -1,14 +1,16 @@
package com.sunyo.wlpt.cgonms.provide.feign;
import com.sunyo.wlpt.cgonms.provide.domain.ResultExitData;
+import org.springframework.stereotype.Service;
import java.util.List;
/**
* @author 子诚
- * Description：
+ * Description：运输工具feign的熔断器
* 时间：2020/5/22 14:32
*/
+@Service
public class GetTransportFeignHystrix implements GetTransportFeign {
@Override
public List<ResultExitData> getInfo(List<ResultExitData> resultList) {
--
libgit2 0.24.0