Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitignore
#	pom.xml
#	src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT520X.java

-# Created by .ignore support plugin (hsz.mobi)
-### Java template
-# Compiled class file
-*.class
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+/logs/
+/out/
+.mvn
+/xmlFromImf/
+kakoRevice/
+/errorLogs/
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
 
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### Maven template
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
 
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/

@@ -3,12 +3,34 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
+    <packaging>jar</packaging>
     <groupId>com.sunyo.wlpt</groupId>
     <artifactId>base</artifactId>
     <version>1.0-SNAPSHOT</version>
 
-
+    <name>wlpt-base</name>
+    <description>物流平台基础实体包</description>
+    <properties>
+        <lombok_sersion>1.18.8</lombok_sersion>
+    </properties>
+    <dependencies>
+        <!--<dependency>-->
+            <!--<groupId>com.fasterxml.jackson.core</groupId>-->
+            <!--<artifactId>jackson-annotations</artifactId>-->
+            <!--<version>2.9.5</version>-->
+            <!--<scope>compile</scope>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok_sersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.10.0</version>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -31,22 +53,5 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.9.5</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.10.3</version>
-        </dependency>
-    </dependencies>
+
 </project>

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT3201 {
 
     private Integer piece;
 
-    private Long weight;
+    private BigDecimal weight;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date arrivetime;
@@ -127,11 +128,11 @@ public class NMMS_CUSTOM_MT3201 {
         this.piece = piece;
     }
 
-    public Long getWeight() {
+    public BigDecimal getWeight() {
         return weight;
     }
 
-    public void setWeight(Long weight) {
+    public void setWeight(BigDecimal weight) {
         this.weight = weight;
     }
 

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,7 @@ public class NMMS_CUSTOM_MT4201 {
 
     private Integer lodingpiece;
 
-    private Long lodingweight;
+    private BigDecimal lodingweight;
 
     private String customcode;
 
@@ -129,11 +130,11 @@ public class NMMS_CUSTOM_MT4201 {
         this.lodingpiece = lodingpiece;
     }
 
-    public Long getLodingweight() {
+    public BigDecimal getLodingweight() {
         return lodingweight;
     }
 
-    public void setLodingweight(Long lodingweight) {
+    public void setLodingweight(BigDecimal lodingweight) {
         this.lodingweight = lodingweight;
     }
 

@@ -3,6 +3,7 @@ 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;
 
@@ -29,16 +30,19 @@ public class NMMS_CUSTOM_MT520X {
 
     private Integer piece;
 
-    private Long weight;
+    private BigDecimal weight;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date starttime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endtime;
 
     private String customcode;
 
     private String goodsname;
 
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date actime;
 
     private String rcfdep;

 package com.sunyo.wlpt.base.model;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public class NMMS_CUSTOM_MT8205 {
@@ -11,7 +12,7 @@ public class NMMS_CUSTOM_MT8205 {
 
     private Integer transpiece;
 
-    private Long transweight;
+    private BigDecimal transweight;
 
     private String goodsname;
 
@@ -74,11 +75,11 @@ public class NMMS_CUSTOM_MT8205 {
         this.transpiece = transpiece;
     }
 
-    public Long getTransweight() {
+    public BigDecimal getTransweight() {
         return transweight;
     }
 
-    public void setTransweight(Long transweight) {
+    public void setTransweight(BigDecimal transweight) {
         this.transweight = transweight;
     }
 

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class NMMS_CUSTOM_RESPONSE {
@@ -23,7 +24,7 @@ public class NMMS_CUSTOM_RESPONSE {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date busdate;
 
-    private Long busweight;
+    private BigDecimal busweight;
 
     private Integer buspiece;
 
@@ -125,11 +126,11 @@ public class NMMS_CUSTOM_RESPONSE {
         this.busdate = busdate;
     }
 
-    public Long getBusweight() {
+    public BigDecimal getBusweight() {
         return busweight;
     }
 
-    public void setBusweight(Long busweight) {
+    public void setBusweight(BigDecimal busweight) {
         this.busweight = busweight;
     }
 

@@ -2,6 +2,7 @@ package com.sunyo.wlpt.base.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public class NMMS_CUSTOM_TRANS {
@@ -19,7 +20,7 @@ public class NMMS_CUSTOM_TRANS {
 
     private String turnpiece;
 
-    private Long turnweight;
+    private BigDecimal turnweight;
 
     private String customcode;
 
@@ -101,11 +102,11 @@ public class NMMS_CUSTOM_TRANS {
         this.turnpiece = turnpiece == null ? null : turnpiece.trim();
     }
 
-    public Long getTurnweight() {
+    public BigDecimal getTurnweight() {
         return turnweight;
     }
 
-    public void setTurnweight(Long turnweight) {
+    public void setTurnweight(BigDecimal turnweight) {
         this.turnweight = turnweight;
     }
 

+package com.sunyo.wlpt.base.model.response;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ResultJson<T> implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    // 状态码 正确为200
+    private String code = "200";
+    // 描述
+    private String msg = "";
+
+    private String error;
+    // 返回对象
+    private T data;
+    //返回的JWT
+    private String jwtToken;
+
+    public ResultJson() {
+    }
+
+    public ResultJson(String code) {
+        this.code = code;
+    }
+
+    public ResultJson(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public ResultJson(T data) {
+        this.data = data;
+    }
+
+    public ResultJson(String code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+}