WLPT_CLOUD / Base_Model · 提交

转到一个项目

作者 xudada
提交 f069b7f5f391e3a6717d664d565f7782a82e71fe 2 个父辈 8c2e221d 9e3d90ef

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 9 个修改的文件 包含 401 行增加 和 210 行删除
... ... @@ -28,7 +28,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.10.0</version>
<version>2.10.5</version>
</dependency>
</dependencies>
<build>
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class AWB_AWBINFO {
private String billid;
... ... @@ -96,6 +98,14 @@ public class AWB_AWBINFO {
private String shpcustomerid;
private String shpstate;
private String shpzipCode;
private String cnszipCode;
private String cnsstate;
private String cnsnname;
private String cnsrmobiletype;
... ... @@ -268,6 +278,10 @@ public class AWB_AWBINFO {
private String cnscomidno;
private String uldType;
private String goodsAttribute;
public String getBillid() {
return billid;
}
... ...
package com.sunyo.wlpt.base.model;
public class FILE {
private Integer id;
private String absolutePath;
private String relativePath;
private String fileName;
private String type;
private String awba;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getAbsolutePath() {
return absolutePath;
}
public void setAbsolutePath(String absolutePath) {
this.absolutePath = absolutePath == null ? null : absolutePath.trim();
}
public String getRelativePath() {
return relativePath;
}
public void setRelativePath(String relativePath) {
this.relativePath = relativePath == null ? null : relativePath.trim();
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName == null ? null : fileName.trim();
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
public String getAwba() {
return awba;
}
public void setAwba(String awba) {
this.awba = awba == null ? null : awba.trim();
}
}
\ No newline at end of file
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class NMMS_CUSTOM_MT2201 {
private String uuid;
private String awba;
... ... @@ -61,6 +64,62 @@ public class NMMS_CUSTOM_MT2201 {
private List<NMMS_CUSTOM_MT2201> children;
private List<FILE> fileList;
private Integer consignorId;
private Integer operatingAgentId;
private Integer bookingAgentId;
private String shipmentCargo;
private String shipType;
private String userId;
private String enterpriseId;
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public Integer getConsignorId() {
return consignorId;
}
public void setConsignorId(Integer consignorId) {
this.consignorId = consignorId;
}
public Integer getOperatingAgentId() {
return operatingAgentId;
}
public void setOperatingAgentId(Integer operatingAgentId) {
this.operatingAgentId = operatingAgentId;
}
public Integer getBookingAgentId() {
return bookingAgentId;
}
public void setBookingAgentId(Integer bookingAgentId) {
this.bookingAgentId = bookingAgentId;
}
public String getUuid() {
return uuid;
}
... ... @@ -206,11 +265,11 @@ public class NMMS_CUSTOM_MT2201 {
}
public String getCustomtype() {
return customtype;
return "MT2201";
}
public void setCustomtype(String customtype) {
this.customtype = customtype;
this.customtype = "MT2201";
}
public String getExt2() {
... ... @@ -268,4 +327,28 @@ public class NMMS_CUSTOM_MT2201 {
public void setUser(NMMS_CUSTOM_USER user) {
this.user = user;
}
public List<FILE> getFileList() {
return fileList;
}
public void setFileList(List<FILE> fileList) {
this.fileList = fileList;
}
public String getShipmentCargo() {
return shipmentCargo;
}
public void setShipmentCargo(String shipmentCargo) {
this.shipmentCargo = shipmentCargo;
}
public String getShipType() {
return shipType;
}
public void setShipType(String shipType) {
this.shipType = shipType;
}
}
... ...
... ... @@ -44,6 +44,8 @@ public class NMMS_CUSTOM_MT3201 {
private Boolean isdelete;
private String customtype;
private String ext1;
private String ext2;
... ... @@ -243,4 +245,12 @@ public class NMMS_CUSTOM_MT3201 {
public void setChildren(List<NMMS_CUSTOM_MT3201> children) {
this.children = children;
}
public String getCustomtype() {
return "MT3201";
}
public void setCustomtype(String customtype) {
this.customtype = "MT3201";
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class NMMS_CUSTOM_MT4201 {
private String uuid;
... ... @@ -54,8 +56,12 @@ public class NMMS_CUSTOM_MT4201 {
private String ext5;
private String customtype;
private AWB_AWBINFO awbinfo;
private NMMS_CUSTOM_USER user;
private List<NMMS_CUSTOM_MT4201> children;
public String getUuid() {
... ... @@ -249,4 +255,12 @@ public class NMMS_CUSTOM_MT4201 {
public void setChildren(List<NMMS_CUSTOM_MT4201> children) {
this.children = children;
}
public String getCustomtype() {
return "MT3201";
}
public void setCustomtype(String customtype) {
this.customtype = "MT3201";
}
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class NMMS_CUSTOM_RESPONSE {
private String id;
... ... @@ -62,211 +64,5 @@ public class NMMS_CUSTOM_RESPONSE {
private String opertel;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id == null ? null : id.trim();
}
public Date getFlightdate() {
return flightdate;
}
public void setFlightdate(Date flightdate) {
this.flightdate = flightdate;
}
public String getFlightno() {
return flightno;
}
public void setFlightno(String flightno) {
this.flightno = flightno == null ? null : flightno.trim();
}
public String getCarrier() {
return carrier;
}
public void setCarrier(String carrier) {
this.carrier = carrier == null ? null : carrier.trim();
}
public String getAwbano() {
return awbano;
}
public void setAwbano(String awbano) {
this.awbano = awbano == null ? null : awbano.trim();
}
public String getAwbhno() {
return awbhno;
}
public void setAwbhno(String awbhno) {
this.awbhno = awbhno == null ? null : awbhno.trim();
}
public String getBustype() {
return bustype;
}
public void setBustype(String bustype) {
this.bustype = bustype == null ? null : bustype.trim();
}
public Date getBusdate() {
return busdate;
}
public void setBusdate(Date busdate) {
this.busdate = busdate;
}
public BigDecimal getBusweight() {
return busweight;
}
public void setBusweight(BigDecimal busweight) {
this.busweight = busweight;
}
public Integer getBuspiece() {
return buspiece;
}
public void setBuspiece(Integer buspiece) {
this.buspiece = buspiece;
}
public String getOpertype() {
return opertype;
}
public void setOpertype(String opertype) {
this.opertype = opertype == null ? null : opertype.trim();
}
public String getCusmsgid() {
return cusmsgid;
}
public void setCusmsgid(String cusmsgid) {
this.cusmsgid = cusmsgid == null ? null : cusmsgid.trim();
}
public String getCussenderid() {
return cussenderid;
}
public void setCussenderid(String cussenderid) {
this.cussenderid = cussenderid == null ? null : cussenderid.trim();
}
public String getCusreciverid() {
return cusreciverid;
}
public void setCusreciverid(String cusreciverid) {
this.cusreciverid = cusreciverid == null ? null : cusreciverid.trim();
}
public String getCusversion() {
return cusversion;
}
public void setCusversion(String cusversion) {
this.cusversion = cusversion == null ? null : cusversion.trim();
}
public String getCusfunctioncode() {
return cusfunctioncode;
}
public void setCusfunctioncode(String cusfunctioncode) {
this.cusfunctioncode = cusfunctioncode == null ? null : cusfunctioncode.trim();
}
public Date getCusresrcvtime() {
return cusresrcvtime;
}
public void setCusresrcvtime(Date cusresrcvtime) {
this.cusresrcvtime = cusresrcvtime;
}
public Date getCusressendtime() {
return cusressendtime;
}
public void setCusressendtime(Date cusressendtime) {
this.cusressendtime = cusressendtime;
}
public String getCusrescode() {
return cusrescode;
}
public void setCusrescode(String cusrescode) {
this.cusrescode = cusrescode == null ? null : cusrescode.trim();
}
public String getCusresstatus() {
return cusresstatus;
}
public void setCusresstatus(String cusresstatus) {
this.cusresstatus = cusresstatus == null ? null : cusresstatus.trim();
}
public String getOperusername() {
return operusername;
}
public void setOperusername(String operusername) {
this.operusername = operusername == null ? null : operusername.trim();
}
public String getOpersystemname() {
return opersystemname;
}
public void setOpersystemname(String opersystemname) {
this.opersystemname = opersystemname == null ? null : opersystemname.trim();
}
public String getCusrestext() {
return cusrestext;
}
public void setCusrestext(String cusrestext) {
this.cusrestext = cusrestext == null ? null : cusrestext.trim();
}
public String getOperreason() {
return operreason;
}
public void setOperreason(String operreason) {
this.operreason = operreason;
}
public String getOperperson() {
return operperson;
}
public void setOperperson(String operperson) {
this.operperson = operperson;
}
public String getOpertel() {
return opertel;
}
public void setOpertel(String opertel) {
this.opertel = opertel;
}
private String userId;
}
... ...
package com.sunyo.wlpt.base.model;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
public class SecurityDeclaration {
private Integer id;
private String sdWaybill;
private String sdCargoShipperName;
private String sdCargoAgentName;
private String sdIataNumber;
private String sdTransportCertificate;
private String sdTransportationProve;
private Integer userId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date operationTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
private Integer piece;
private BigDecimal weight;
private String destination;
private String carrier;
private String flightno;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date flightdate;
private String customcode;
private String cargoName;
private String cargoType;
private String status;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getSdWaybill() {
return sdWaybill;
}
public void setSdWaybill(String sdWaybill) {
this.sdWaybill = sdWaybill == null ? null : sdWaybill.trim();
}
public String getSdCargoShipperName() {
return sdCargoShipperName;
}
public void setSdCargoShipperName(String sdCargoShipperName) {
this.sdCargoShipperName = sdCargoShipperName == null ? null : sdCargoShipperName.trim();
}
public String getSdCargoAgentName() {
return sdCargoAgentName;
}
public void setSdCargoAgentName(String sdCargoAgentName) {
this.sdCargoAgentName = sdCargoAgentName == null ? null : sdCargoAgentName.trim();
}
public String getSdIataNumber() {
return sdIataNumber;
}
public void setSdIataNumber(String sdIataNumber) {
this.sdIataNumber = sdIataNumber == null ? null : sdIataNumber.trim();
}
public String getSdTransportCertificate() {
return sdTransportCertificate;
}
public void setSdTransportCertificate(String sdTransportCertificate) {
this.sdTransportCertificate = sdTransportCertificate == null ? null : sdTransportCertificate.trim();
}
public String getSdTransportationProve() {
return sdTransportationProve;
}
public void setSdTransportationProve(String sdTransportationProve) {
this.sdTransportationProve = sdTransportationProve == null ? null : sdTransportationProve.trim();
}
public Integer getUserId() {
return userId;
}
public void setUserId(Integer userId) {
this.userId = userId;
}
public Date getOperationTime() {
return operationTime;
}
public void setOperationTime(Date operationTime) {
this.operationTime = operationTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getPiece() {
return piece;
}
public void setPiece(Integer piece) {
this.piece = piece;
}
public BigDecimal getWeight() {
return weight;
}
public void setWeight(BigDecimal weight) {
this.weight = weight;
}
public String getDestination() {
return destination;
}
public void setDestination(String destination) {
this.destination = destination == null ? null : destination.trim();
}
public String getCarrier() {
return carrier;
}
public void setCarrier(String carrier) {
this.carrier = carrier == null ? null : carrier.trim();
}
public String getFlightno() {
return flightno;
}
public void setFlightno(String flightno) {
this.flightno = flightno == null ? null : flightno.trim();
}
public Date getFlightdate() {
return flightdate;
}
public void setFlightdate(Date flightdate) {
this.flightdate = flightdate;
}
public String getCustomcode() {
return customcode;
}
public void setCustomcode(String customcode) {
this.customcode = customcode == null ? null : customcode.trim();
}
public String getCargoName() {
return cargoName;
}
public void setCargoName(String cargoName) {
this.cargoName = cargoName == null ? null : cargoName.trim();
}
public String getCargoType() {
return cargoType;
}
public void setCargoType(String cargoType) {
this.cargoType = cargoType == null ? null : cargoType.trim();
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status == null ? null : status.trim();
}
}
\ No newline at end of file
... ...