初始化进港服务，新舱单

@@ -56,7 +56,7 @@ public class NmsController {
     private GetTransportFeign getTransportFeign;
     private GetTransportFeign getTransportFeign;
 
 
     /**
     /**
-     * 线程数量
+     * 线程队列数量
      */
      */
     private final static int THREAD_ACCOUNT = 50;
     private final static int THREAD_ACCOUNT = 50;
 
 
@@ -149,7 +149,6 @@ public class NmsController {
                     resultList.set(i, result);
                     resultList.set(i, result);
                     ResultWs resultWs = new ResultWs("获取数据,第" + i + "条", "201", i, resultList.size());
                     ResultWs resultWs = new ResultWs("获取数据,第" + i + "条", "201", i, resultList.size());
                     String resultJs = GsonUtils.toJsonStr(resultWs);
                     String resultJs = GsonUtils.toJsonStr(resultWs);
-
                     sendMsgByWebsocket(resultJs, sid);
                     sendMsgByWebsocket(resultJs, sid);
                 }
                 }
                 /*完成一次，就等待。等所有的全部完成，再一起返回 */
                 /*完成一次，就等待。等所有的全部完成，再一起返回 */
@@ -228,7 +227,7 @@ public class NmsController {
 
 
                     /**
                     /**
                      * 获取代理人的相关数据
                      * 获取代理人的相关数据
-
+                     */
                     ResultArrivalData asmInfo = new ResultArrivalData();
                     ResultArrivalData asmInfo = new ResultArrivalData();
                     asmInfo = getCgoAsmFeign.getInfo(result.getWaybillNoMaster());
                     asmInfo = getCgoAsmFeign.getInfo(result.getWaybillNoMaster());
                     //设置结算代理人
                     //设置结算代理人
@@ -240,7 +239,27 @@ public class NmsController {
                     //设置二级类名称
                     //设置二级类名称
                     result.setTwoTypeName(asmInfo.getTwoTypeName());
                     result.setTwoTypeName(asmInfo.getTwoTypeName());
                     //设置一级类名称
                     //设置一级类名称
-                    result.setTypeName(asmInfo.getTypeName());*/
+                    result.setTypeName(asmInfo.getTypeName());
+
+                    /**
+                     * 获取运输工具的对应数据
+                     */
+                    ResultArrivalData transportInfo = new ResultArrivalData();
+                    transportInfo = getTransportFeign.getInfo(result.getFlightNo(), result.getFlightDate());
+                    //设置航班公司
+                    result.setAirCompany(transportInfo.getAirCompany());
+                    //设置机型
+                    result.setCfTp(transportInfo.getCfTp());
+                    //设置机号
+                    result.setCfNo(transportInfo.getCfNo());
+                    //设置出港日期
+                    result.setArrivalDate(transportInfo.getArrivalDate());
+                    //设置航班计划日期
+                    result.setFlightPlanDate(transportInfo.getFlightPlanDate());
+                    //设置航班（起飞）时间
+                    result.setFlightTime(transportInfo.getFlightTime());
+                    //设置航班计划时间
+                    result.setFlightPlanTime(transportInfo.getFlightPlanTime());
                 } catch (Exception e) {
                 } catch (Exception e) {
                     latch.countDown();
                     latch.countDown();
                     e.printStackTrace();
                     e.printStackTrace();

 package com.sunyo.wlpt.cgonms.arrival.domain;
 package com.sunyo.wlpt.cgonms.arrival.domain;
 
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
 /**
  * @author 子诚
  * @author 子诚
  * Description：进港统计结果集
  * Description：进港统计结果集
@@ -123,4 +123,43 @@ public class ResultArrivalData implements Serializable {
      * 20.一级类名称
      * 20.一级类名称
      */
      */
     private String typeName;
     private String typeName;
+
+    /**
+     * 21.航空公司
+     */
+    private String airCompany;
+
+    /**
+     * 22.机型
+     */
+    private String cfTp;
+
+    /**
+     * 23.机号
+     */
+    private String cfNo;
+
+    /**
+     * 24.航班（起飞）时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date flightTime;
+
+    /**
+     * 25.航班计划日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date flightPlanDate;
+
+    /**
+     * 26.航班计划时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date flightPlanTime;
+
+    /**
+     * 27.出港日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date arrivalDate;
 }
 }

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * 时间：2020/5/21 17:43
  * 时间：2020/5/21 17:43
  */
  */
 @Component
 @Component
-@FeignClient(value = "cgoasm-provide", fallback = GetCgoAsmFeginHystrix.class)
+@FeignClient(value = "cgoasm-arrival", fallback = GetCgoAsmFeginHystrix.class)
 public interface GetCgoAsmFeign {
 public interface GetCgoAsmFeign {
     /**
     /**
      * 根据运单号查询代理人服务的相关数据
      * 根据运单号查询代理人服务的相关数据

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.Date;
 import java.util.Date;
 
 
 @Component
 @Component
-@FeignClient(value = "transport-provide", fallback = GetTransportFeignHystrix.class)
+@FeignClient(value = "transport-arrival", fallback = GetTransportFeignHystrix.class)
 public interface GetTransportFeign {
 public interface GetTransportFeign {
     /**
     /**
      * 根据承运人二字码、航班号、航班日期，获取，运输工具服务中的相关数据
      * 根据承运人二字码、航班号、航班日期，获取，运输工具服务中的相关数据