Merge remote-tracking branch 'origin/master'
# Conflicts: # .gitignore # pom.xml # src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT520X.java
正在显示
49 个修改的文件
包含
122 行增加
和
73 行删除
1 | -# Created by .ignore support plugin (hsz.mobi) | ||
2 | -### Java template | ||
3 | -# Compiled class file | ||
4 | -*.class | 1 | +/target/ |
2 | +!.mvn/wrapper/maven-wrapper.jar | ||
3 | +/logs/ | ||
4 | +/out/ | ||
5 | +.mvn | ||
6 | +/xmlFromImf/ | ||
7 | +kakoRevice/ | ||
8 | +/errorLogs/ | ||
9 | +### STS ### | ||
10 | +.apt_generated | ||
11 | +.classpath | ||
12 | +.factorypath | ||
13 | +.project | ||
14 | +.settings | ||
15 | +.springBeans | ||
16 | +.sts4-cache | ||
5 | 17 | ||
6 | -# Log file | ||
7 | -*.log | ||
8 | - | ||
9 | -# BlueJ files | ||
10 | -*.ctxt | ||
11 | - | ||
12 | -# Mobile Tools for Java (J2ME) | ||
13 | -.mtj.tmp/ | ||
14 | - | ||
15 | -# Package Files # | ||
16 | -*.jar | ||
17 | -*.war | ||
18 | -*.nar | ||
19 | -*.ear | ||
20 | -*.zip | ||
21 | -*.tar.gz | ||
22 | -*.rar | ||
23 | - | ||
24 | -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||
25 | -hs_err_pid* | ||
26 | - | ||
27 | -### Maven template | ||
28 | -target/ | ||
29 | -pom.xml.tag | ||
30 | -pom.xml.releaseBackup | ||
31 | -pom.xml.versionsBackup | ||
32 | -pom.xml.next | ||
33 | -release.properties | ||
34 | -dependency-reduced-pom.xml | ||
35 | -buildNumber.properties | ||
36 | -.mvn/timing.properties | ||
37 | -.mvn/wrapper/maven-wrapper.jar | 18 | +### IntelliJ IDEA ### |
19 | +.idea | ||
20 | +*.iws | ||
21 | +*.iml | ||
22 | +*.ipr | ||
38 | 23 | ||
24 | +### NetBeans ### | ||
25 | +/nbproject/private/ | ||
26 | +/build/ | ||
27 | +/nbbuild/ | ||
28 | +/dist/ | ||
29 | +/nbdist/ | ||
30 | +/.nb-gradle/ |
@@ -3,12 +3,34 @@ | @@ -3,12 +3,34 @@ | ||
3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 3 | xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
6 | - | 6 | + <packaging>jar</packaging> |
7 | <groupId>com.sunyo.wlpt</groupId> | 7 | <groupId>com.sunyo.wlpt</groupId> |
8 | <artifactId>base</artifactId> | 8 | <artifactId>base</artifactId> |
9 | <version>1.0-SNAPSHOT</version> | 9 | <version>1.0-SNAPSHOT</version> |
10 | 10 | ||
11 | - | 11 | + <name>wlpt-base</name> |
12 | + <description>物流平台基础实体包</description> | ||
13 | + <properties> | ||
14 | + <lombok_sersion>1.18.8</lombok_sersion> | ||
15 | + </properties> | ||
16 | + <dependencies> | ||
17 | + <!--<dependency>--> | ||
18 | + <!--<groupId>com.fasterxml.jackson.core</groupId>--> | ||
19 | + <!--<artifactId>jackson-annotations</artifactId>--> | ||
20 | + <!--<version>2.9.5</version>--> | ||
21 | + <!--<scope>compile</scope>--> | ||
22 | + <!--</dependency>--> | ||
23 | + <dependency> | ||
24 | + <groupId>org.projectlombok</groupId> | ||
25 | + <artifactId>lombok</artifactId> | ||
26 | + <version>${lombok_sersion}</version> | ||
27 | + </dependency> | ||
28 | + <dependency> | ||
29 | + <groupId>com.fasterxml.jackson.core</groupId> | ||
30 | + <artifactId>jackson-annotations</artifactId> | ||
31 | + <version>2.10.0</version> | ||
32 | + </dependency> | ||
33 | + </dependencies> | ||
12 | <build> | 34 | <build> |
13 | <plugins> | 35 | <plugins> |
14 | <plugin> | 36 | <plugin> |
@@ -31,22 +53,5 @@ | @@ -31,22 +53,5 @@ | ||
31 | </plugin> | 53 | </plugin> |
32 | </plugins> | 54 | </plugins> |
33 | </build> | 55 | </build> |
34 | - <dependencies> | ||
35 | - <dependency> | ||
36 | - <groupId>com.fasterxml.jackson.core</groupId> | ||
37 | - <artifactId>jackson-annotations</artifactId> | ||
38 | - <version>2.9.5</version> | ||
39 | - <scope>compile</scope> | ||
40 | - </dependency> | ||
41 | - <dependency> | ||
42 | - <groupId>org.projectlombok</groupId> | ||
43 | - <artifactId>lombok</artifactId> | ||
44 | - <version>1.18.8</version> | ||
45 | - </dependency> | ||
46 | - <dependency> | ||
47 | - <groupId>joda-time</groupId> | ||
48 | - <artifactId>joda-time</artifactId> | ||
49 | - <version>2.10.3</version> | ||
50 | - </dependency> | ||
51 | - </dependencies> | 56 | + |
52 | </project> | 57 | </project> |
src/main/java/com/sunyo/wlpt/base/dao/AWB_AWBINFOMapper.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/dao/NMMS_FFM_INFOMapper.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/model/AWB_AWBINFO.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/model/CONFIG_USER_CARRIER.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT1201.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT2201.java
100644 → 100755
src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT3201.java
100644 → 100755
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | 4 | ||
5 | +import java.math.BigDecimal; | ||
5 | import java.util.Date; | 6 | import java.util.Date; |
6 | import java.util.List; | 7 | import java.util.List; |
7 | 8 | ||
@@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT3201 { | @@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT3201 { | ||
25 | 26 | ||
26 | private Integer piece; | 27 | private Integer piece; |
27 | 28 | ||
28 | - private Long weight; | 29 | + private BigDecimal weight; |
29 | 30 | ||
30 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | 31 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
31 | private Date arrivetime; | 32 | private Date arrivetime; |
@@ -127,11 +128,11 @@ public class NMMS_CUSTOM_MT3201 { | @@ -127,11 +128,11 @@ public class NMMS_CUSTOM_MT3201 { | ||
127 | this.piece = piece; | 128 | this.piece = piece; |
128 | } | 129 | } |
129 | 130 | ||
130 | - public Long getWeight() { | 131 | + public BigDecimal getWeight() { |
131 | return weight; | 132 | return weight; |
132 | } | 133 | } |
133 | 134 | ||
134 | - public void setWeight(Long weight) { | 135 | + public void setWeight(BigDecimal weight) { |
135 | this.weight = weight; | 136 | this.weight = weight; |
136 | } | 137 | } |
137 | 138 |
src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT4201.java
100644 → 100755
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | 4 | ||
5 | +import java.math.BigDecimal; | ||
5 | import java.util.Date; | 6 | import java.util.Date; |
6 | import java.util.List; | 7 | import java.util.List; |
7 | 8 | ||
@@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT4201 { | @@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT4201 { | ||
25 | 26 | ||
26 | private Integer lodingpiece; | 27 | private Integer lodingpiece; |
27 | 28 | ||
28 | - private Long lodingweight; | 29 | + private BigDecimal lodingweight; |
29 | 30 | ||
30 | private String customcode; | 31 | private String customcode; |
31 | 32 | ||
@@ -129,11 +130,11 @@ public class NMMS_CUSTOM_MT4201 { | @@ -129,11 +130,11 @@ public class NMMS_CUSTOM_MT4201 { | ||
129 | this.lodingpiece = lodingpiece; | 130 | this.lodingpiece = lodingpiece; |
130 | } | 131 | } |
131 | 132 | ||
132 | - public Long getLodingweight() { | 133 | + public BigDecimal getLodingweight() { |
133 | return lodingweight; | 134 | return lodingweight; |
134 | } | 135 | } |
135 | 136 | ||
136 | - public void setLodingweight(Long lodingweight) { | 137 | + public void setLodingweight(BigDecimal lodingweight) { |
137 | this.lodingweight = lodingweight; | 138 | this.lodingweight = lodingweight; |
138 | } | 139 | } |
139 | 140 |
@@ -3,6 +3,7 @@ package com.sunyo.wlpt.base.model; | @@ -3,6 +3,7 @@ package com.sunyo.wlpt.base.model; | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | import lombok.Data; | 4 | import lombok.Data; |
5 | 5 | ||
6 | +import java.math.BigDecimal; | ||
6 | import java.util.Date; | 7 | import java.util.Date; |
7 | import java.util.List; | 8 | import java.util.List; |
8 | 9 | ||
@@ -29,16 +30,19 @@ public class NMMS_CUSTOM_MT520X { | @@ -29,16 +30,19 @@ public class NMMS_CUSTOM_MT520X { | ||
29 | 30 | ||
30 | private Integer piece; | 31 | private Integer piece; |
31 | 32 | ||
32 | - private Long weight; | 33 | + private BigDecimal weight; |
33 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") | 34 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
34 | private Date starttime; | 35 | private Date starttime; |
35 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8") | 36 | + |
37 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") | ||
36 | private Date endtime; | 38 | private Date endtime; |
37 | 39 | ||
38 | private String customcode; | 40 | private String customcode; |
39 | 41 | ||
40 | private String goodsname; | 42 | private String goodsname; |
41 | 43 | ||
44 | + | ||
45 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | ||
42 | private Date actime; | 46 | private Date actime; |
43 | 47 | ||
44 | private String rcfdep; | 48 | private String rcfdep; |
src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT8205.java
100644 → 100755
1 | package com.sunyo.wlpt.base.model; | 1 | package com.sunyo.wlpt.base.model; |
2 | 2 | ||
3 | +import java.math.BigDecimal; | ||
3 | import java.util.List; | 4 | import java.util.List; |
4 | 5 | ||
5 | public class NMMS_CUSTOM_MT8205 { | 6 | public class NMMS_CUSTOM_MT8205 { |
@@ -11,7 +12,7 @@ public class NMMS_CUSTOM_MT8205 { | @@ -11,7 +12,7 @@ public class NMMS_CUSTOM_MT8205 { | ||
11 | 12 | ||
12 | private Integer transpiece; | 13 | private Integer transpiece; |
13 | 14 | ||
14 | - private Long transweight; | 15 | + private BigDecimal transweight; |
15 | 16 | ||
16 | private String goodsname; | 17 | private String goodsname; |
17 | 18 | ||
@@ -74,11 +75,11 @@ public class NMMS_CUSTOM_MT8205 { | @@ -74,11 +75,11 @@ public class NMMS_CUSTOM_MT8205 { | ||
74 | this.transpiece = transpiece; | 75 | this.transpiece = transpiece; |
75 | } | 76 | } |
76 | 77 | ||
77 | - public Long getTransweight() { | 78 | + public BigDecimal getTransweight() { |
78 | return transweight; | 79 | return transweight; |
79 | } | 80 | } |
80 | 81 | ||
81 | - public void setTransweight(Long transweight) { | 82 | + public void setTransweight(BigDecimal transweight) { |
82 | this.transweight = transweight; | 83 | this.transweight = transweight; |
83 | } | 84 | } |
84 | 85 |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | 4 | ||
5 | +import java.math.BigDecimal; | ||
5 | import java.util.Date; | 6 | import java.util.Date; |
6 | 7 | ||
7 | public class NMMS_CUSTOM_RESPONSE { | 8 | public class NMMS_CUSTOM_RESPONSE { |
@@ -23,7 +24,7 @@ public class NMMS_CUSTOM_RESPONSE { | @@ -23,7 +24,7 @@ public class NMMS_CUSTOM_RESPONSE { | ||
23 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | 24 | @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") |
24 | private Date busdate; | 25 | private Date busdate; |
25 | 26 | ||
26 | - private Long busweight; | 27 | + private BigDecimal busweight; |
27 | 28 | ||
28 | private Integer buspiece; | 29 | private Integer buspiece; |
29 | 30 | ||
@@ -125,11 +126,11 @@ public class NMMS_CUSTOM_RESPONSE { | @@ -125,11 +126,11 @@ public class NMMS_CUSTOM_RESPONSE { | ||
125 | this.busdate = busdate; | 126 | this.busdate = busdate; |
126 | } | 127 | } |
127 | 128 | ||
128 | - public Long getBusweight() { | 129 | + public BigDecimal getBusweight() { |
129 | return busweight; | 130 | return busweight; |
130 | } | 131 | } |
131 | 132 | ||
132 | - public void setBusweight(Long busweight) { | 133 | + public void setBusweight(BigDecimal busweight) { |
133 | this.busweight = busweight; | 134 | this.busweight = busweight; |
134 | } | 135 | } |
135 | 136 |
@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | @@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model; | ||
2 | 2 | ||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | 3 | import com.fasterxml.jackson.annotation.JsonFormat; |
4 | 4 | ||
5 | +import java.math.BigDecimal; | ||
5 | import java.util.Date; | 6 | import java.util.Date; |
6 | 7 | ||
7 | public class NMMS_CUSTOM_TRANS { | 8 | public class NMMS_CUSTOM_TRANS { |
@@ -19,7 +20,7 @@ public class NMMS_CUSTOM_TRANS { | @@ -19,7 +20,7 @@ public class NMMS_CUSTOM_TRANS { | ||
19 | 20 | ||
20 | private String turnpiece; | 21 | private String turnpiece; |
21 | 22 | ||
22 | - private Long turnweight; | 23 | + private BigDecimal turnweight; |
23 | 24 | ||
24 | private String customcode; | 25 | private String customcode; |
25 | 26 | ||
@@ -101,11 +102,11 @@ public class NMMS_CUSTOM_TRANS { | @@ -101,11 +102,11 @@ public class NMMS_CUSTOM_TRANS { | ||
101 | this.turnpiece = turnpiece == null ? null : turnpiece.trim(); | 102 | this.turnpiece = turnpiece == null ? null : turnpiece.trim(); |
102 | } | 103 | } |
103 | 104 | ||
104 | - public Long getTurnweight() { | 105 | + public BigDecimal getTurnweight() { |
105 | return turnweight; | 106 | return turnweight; |
106 | } | 107 | } |
107 | 108 | ||
108 | - public void setTurnweight(Long turnweight) { | 109 | + public void setTurnweight(BigDecimal turnweight) { |
109 | this.turnweight = turnweight; | 110 | this.turnweight = turnweight; |
110 | } | 111 | } |
111 | 112 |
src/main/java/com/sunyo/wlpt/base/model/NMMS_FFM_INFO.java
100644 → 100755
1 | +package com.sunyo.wlpt.base.model.response; | ||
2 | + | ||
3 | +import lombok.Data; | ||
4 | + | ||
5 | +import java.io.Serializable; | ||
6 | + | ||
7 | +@Data | ||
8 | +public class ResultJson<T> implements Serializable{ | ||
9 | + private static final long serialVersionUID = 1L; | ||
10 | + | ||
11 | + // 状态码 正确为200 | ||
12 | + private String code = "200"; | ||
13 | + // 描述 | ||
14 | + private String msg = ""; | ||
15 | + | ||
16 | + private String error; | ||
17 | + // 返回对象 | ||
18 | + private T data; | ||
19 | + //返回的JWT | ||
20 | + private String jwtToken; | ||
21 | + | ||
22 | + public ResultJson() { | ||
23 | + } | ||
24 | + | ||
25 | + public ResultJson(String code) { | ||
26 | + this.code = code; | ||
27 | + } | ||
28 | + | ||
29 | + public ResultJson(String code, String msg) { | ||
30 | + this.code = code; | ||
31 | + this.msg = msg; | ||
32 | + } | ||
33 | + | ||
34 | + public ResultJson(T data) { | ||
35 | + this.data = data; | ||
36 | + } | ||
37 | + | ||
38 | + public ResultJson(String code, String msg, T data) { | ||
39 | + this.code = code; | ||
40 | + this.msg = msg; | ||
41 | + this.data = data; | ||
42 | + } | ||
43 | +} |
src/main/resources/mapping/AWB_AWBINFOMapper.xml
100644 → 100755
src/main/resources/mapping/CONFIG_USER_CARRIERMapper.xml
100644 → 100755
src/main/resources/mapping/CONFIG_USER_CUSTOMCODEMapper.xml
100644 → 100755
src/main/resources/mapping/CONFIG_USER_EnterpriseCodeMapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT1201Mapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT2201Mapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT3201Mapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT4201Mapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT520XMapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_MT8205Mapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_CUSTOM_RESPONSEMapper.xml
100644 → 100755
src/main/resources/mapping/NMMS_FFM_INFOMapper.xml
100644 → 100755
src/main/resources/mapping/STATIC_CUSTOM_RESPONSE_BASEMapper.xml
100644 → 100755
-
请 注册 或 登录 后发表评论