exit_data_analysis / cgonms_provide · 提交

转到一个项目

作者 王勇
提交 f0a8233b2da01f6a5860708cd324ee1791db74ff 1 个父辈 54f07eaa

完成基本查询业务

内嵌 并排对比
正在显示 6 个修改的文件 包含 102 行增加 和 96 行删除
... ... @@ -10,7 +10,7 @@ import java.util.List;
/**
* @author 子诚
* Description：
* Description：获取新舱单服务的相关信息
* 时间：2020/5/20 14:58
*/
... ... @@ -39,7 +39,7 @@ public class CgoNmsController {
* @param flightDate 航班日期
* @return {@link ResultExitData}
*/
@GetMapping("/getData")
@GetMapping("/getInfo")
public List<ResultExitData> getData(
@RequestParam(value = "flightDate", required = false) Date flightDate,
@RequestParam(value = "flightNo", required = false) String flightNo) {
... ... @@ -57,34 +57,21 @@ public class CgoNmsController {
*/
List<ResultExitData> resultList = resultExitDataService.getResultExitDataInfo(resultExitData);
//取出resultList的长度，不必每次都判断
//遍历获取出所有需要的信息
for (int i = 0; i < resultList.size(); i++) {
for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) {
ResultExitData result = resultList.get(i);
//设置航班
result.setSegment(result.getOriginatingStation() + " — " + result.getDestinationStation());
//设置承运人二字码
result.setCarrier(result.getFlightNo().substring(0, 2));
/**
* 2.根据 理货信息 中的运单号，获取预配表中的相应数据
*
* 承运人二字码
* 发货人名称
* 收货人名称
*/
System.out.println(result.getWaybillNoMaster());
PrepareMaster pm = prepareMasterService.getPrepareMasterInfo(result.getWaybillNoMaster());
//发货人名称
result.setShipperName(pm.getShipperName());
//收货人名称
result.setConsigneeName(pm.getConsigneeName());
//承运人二字码
result.setCarrier(pm.getCarrier());
/**
* 3.根据 理货信息 中的目的站代码，获取 新舱单机场代码表 中的相应数据
*
* 机场所属城市代码
*/
System.out.println(result.getDestinationStation());
BasAirport ba = basAirportService.getBasAirportInfo(result.getDestinationStation());
/**
... ... @@ -94,10 +81,7 @@ public class CgoNmsController {
* 区域id
* 国家代码
*/
System.out.println(ba.getCityId());
TbAirportCode ta = tbAirportCodeService.getTbAirportCodeInfo(ba.getCityId());
// 航班目的城市代码
result.setCityCode(ta.getCityCode());
// 所属国家
result.setCountry(ta.getCountry());
... ... @@ -108,12 +92,29 @@ public class CgoNmsController {
* 国际国内标识；1，国外；2，国内
* 区域描述，中文
*/
System.out.println(ta.getArea());
BasArea basArea = basAreaService.getBasAreaInfo(ta.getArea());
//航班目的区域，中文描述，所属洲
result.setAreaDescChn(basArea.getAreaDescChn());
/**
* 6.根据 理货信息 中的运单号，获取预配表中的相应数据
*
* 承运人二字码
* 发货人名称
* 收货人名称
* 航班目的站
*/
List<PrepareMaster> pm = prepareMasterService.getPrepareMasterInfo(result.getWaybillNoMaster());
if (pm == null) {
continue;
}
//发货人名称
result.setShipperName(pm.get(0).getShipperName());
//收货人名称
result.setConsigneeName(pm.get(0).getConsigneeName());
//获取目的货物目的站
result.setAimStation(pm.get(0).getDestinationStation());
}
return resultList;
}
}
... ...
... ... @@ -42,12 +42,6 @@ public class ResultExitData implements Serializable {
private Date flightDate;
/**
* 航班时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dischargeDate;
/**
* 航段
*/
private String segment;
... ... @@ -88,9 +82,9 @@ public class ResultExitData implements Serializable {
private String consigneeName;
/**
* 航班目的城市代码
* 货物目的站
*/
private String cityCode;
private String aimStation;
/**
* 国家代码
*/
... ... @@ -101,44 +95,46 @@ public class ResultExitData implements Serializable {
*/
private String areaDescChn;
private String tcdName;
private String tcdTypeCode;
private String tallType;
private String oName;
private String fdName;
private String totalWeight;
private String totalGrossWeightMeasureuc;
private String totalPiece;
private String grossWeightMeasureuc;
private Date loadStartTime;
private Date loadEndTime;
private String status;
private String customsCode;
private String productName;
private String receiptInformation;
private Date createDate;
private String dealFlag;
private String billTallyFlag;
private Date dealTime;
private String transportSplitDescription;
// private String tcdName;
//
// private String tcdTypeCode;
//
// private String tallType;
//
// private String oName;
//
// private String fdName;
//
// private String totalWeight;
//
// private String totalGrossWeightMeasureuc;
//
// private String totalPiece;
//
// private String grossWeightMeasureuc;
//
// private Date loadStartTime;
//
// private Date loadEndTime;
//
// private String status;
//
// private String customsCode;
//
// private String productName;
//
// private String receiptInformation;
//
// private Date createDate;
//
// private String dealFlag;
//
// private String billTallyFlag;
//
// private Date dealTime;
//
// private Date dischargeDate;
//
// private String transportSplitDescription;
}
... ...
... ... @@ -2,6 +2,8 @@ package com.sunyo.wlpt.cgonms.provide.mapper;
import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
import java.util.List;
/**
* @author 子诚
* Description：
... ... @@ -14,5 +16,5 @@ public interface PrepareMasterMapper {
* @param waybillNoMaster 运单号
* @return {@link PrepareMaster}
*/
PrepareMaster getPrepareMasterInfo(String waybillNoMaster);
List<PrepareMaster> getPrepareMasterInfo(String waybillNoMaster);
}
... ...
... ... @@ -2,6 +2,8 @@ package com.sunyo.wlpt.cgonms.provide.service;
import com.sunyo.wlpt.cgonms.provide.domain.PrepareMaster;
import java.util.List;
/**
* @author 子诚
* Description：
... ... @@ -15,5 +17,5 @@ public interface PrepareMasterService {
* @param waybillNoMaster 运单号
* @return {@link PrepareMaster}
*/
PrepareMaster getPrepareMasterInfo(String waybillNoMaster);
List<PrepareMaster> getPrepareMasterInfo(String waybillNoMaster);
}
... ...
... ... @@ -5,6 +5,9 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import com.sunyo.wlpt.cgonms.provide.mapper.PrepareMasterMapper;
import com.sunyo.wlpt.cgonms.provide.service.PrepareMasterService;
import java.util.List;
/**
* @author 子诚
* Description：
... ... @@ -17,7 +20,7 @@ public class PrepareMasterServiceImpl implements PrepareMasterService{
private PrepareMasterMapper prepareMasterMapper;
@Override
public PrepareMaster getPrepareMasterInfo(String waybillNoMaster) {
public List<PrepareMaster> getPrepareMasterInfo(String waybillNoMaster) {
return prepareMasterMapper.getPrepareMasterInfo(waybillNoMaster);
}
}
... ...
... ... @@ -6,34 +6,36 @@
<!--@Table TALLYMASTER-->
<result column="AUTOID" jdbcType="VARCHAR" property="autoId"/>
<result column="WAYBILLNOMASTER" jdbcType="VARCHAR" property="waybillNoMaster"/>
<result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName"/>
<result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypeCode"/>
<result column="TALLTYPE" jdbcType="VARCHAR" property="tallType"/>
<result column="FLIGHTNO" jdbcType="VARCHAR" property="flightNo"/>
<result column="FLIGHTDATE" jdbcType="TIMESTAMP" property="flightDate"/>
<result column="SEGMENT" jdbcType="VARCHAR" property="segment"/>
<result column="ORIGINATINGSTATION" jdbcType="VARCHAR" property="originatingStation"/>
<result column="O_NAME" jdbcType="VARCHAR" property="oName"/>
<result column="DESTINATIONSTATION" jdbcType="VARCHAR" property="destinationStation"/>
<result column="FD_NAME" jdbcType="VARCHAR" property="fdName"/>
<result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>
<result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalGrossWeightMeasureuc"/>
<result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>
<result column="TALLYTOTALPIECE" jdbcType="VARCHAR" property="tallyTotalPiece"/>
<result column="TALLYTOTALWEIGHT" jdbcType="VARCHAR" property="tallyTotalWeight"/>
<result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossWeightMeasureuc"/>
<result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadStartTime"/>
<result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadEndTime"/>
<result column="STATUS" jdbcType="VARCHAR" property="status"/>
<result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>
<result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>
<result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargeDate"/>
<result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>
<result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag"/>
<result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag"/>
<result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime"/>
<result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportSplitDescription"/>
<!-- <result column="O_NAME" jdbcType="VARCHAR" property="oName"/>-->
<!-- <result column="TCD_NAME" jdbcType="VARCHAR" property="tcdName"/>-->
<!-- <result column="TCD_TYPECODE" jdbcType="VARCHAR" property="tcdTypeCode"/>-->
<!-- <result column="TALLTYPE" jdbcType="VARCHAR" property="tallType"/>-->
<!-- <result column="FD_NAME" jdbcType="VARCHAR" property="fdName"/>-->
<!-- <result column="TOTALWEIGHT" jdbcType="VARCHAR" property="totalWeight"/>-->
<!-- <result column="TOTALGROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="totalGrossWeightMeasureuc"/>-->
<!-- <result column="TOTALPIECE" jdbcType="VARCHAR" property="totalPiece"/>-->
<!-- <result column="GROSSWEIGHTMEASUREUC" jdbcType="VARCHAR" property="grossWeightMeasureuc"/>-->
<!-- <result column="LOADSTARTTIME" jdbcType="TIMESTAMP" property="loadStartTime"/>-->
<!-- <result column="LOADENDTIME" jdbcType="TIMESTAMP" property="loadEndTime"/>-->
<!-- <result column="STATUS" jdbcType="VARCHAR" property="status"/>-->
<!-- <result column="CUSTOMSCODE" jdbcType="VARCHAR" property="customsCode"/>-->
<!-- <result column="PRODUCTNAME" jdbcType="VARCHAR" property="productName"/>-->
<!-- <result column="DISCHARGEDATE" jdbcType="TIMESTAMP" property="dischargeDate"/>-->
<!-- <result column="RECEIPTINFORMATION" jdbcType="VARCHAR" property="receiptInformation"/>-->
<!-- <result column="CREATEDATE" jdbcType="TIMESTAMP" property="createDate"/>-->
<!-- <result column="DEAL_FLAG" jdbcType="VARCHAR" property="dealFlag"/>-->
<!-- <result column="BILL_TALLY_FLAG" jdbcType="VARCHAR" property="billTallyFlag"/>-->
<!-- <result column="DEAL_TIME" jdbcType="TIMESTAMP" property="dealTime"/>-->
<!-- <result column="TRANSPORTSPLITDESCRIPTION" jdbcType="VARCHAR" property="transportSplitDescription"/>-->
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
... ...