Merge pull request 'syl' (#2) from syl into master

Reviewed-on: #2

bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOLogMake.java

@@ -0,0 +1,47 @@
+package com.bwie.common.pojo.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DTOLogMake {
+
+    /*
+    预约编号
+    */
+    private Integer makeId;
+
+    /*
+    车牌号
+     */
+    private String carNum;
+
+    /*
+    车位状态(空: 1, 已预约: 2, 无: 3)
+     */
+    private Integer makeState;
+    /*
+    预约时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date makeTime;
+
+    /*
+    停车场id
+     */
+    private Integer parkingId;
+
+    /*
+    用户id
+     */
+    private Integer userId;
+
+}

bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOStop.java

@@ -0,0 +1,64 @@
+package com.bwie.common.pojo.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DTOStop {
+    /*
+停车编号
+ */
+    private Integer stopId;
+    /*
+    车辆编号
+     */
+    private Integer carId;
+    /*
+    用户编号
+     */
+    private Integer userId;
+    /*
+    停车场编号
+     */
+    private Integer parkingId;
+    /*
+    开始停车时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date stopStart;
+    /*
+    结束停车时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date stopEnd;
+    /*
+    停车时长
+     */
+    private Integer stopTime;
+    /*
+    停车状态(1-待缴费 2-已交费)
+     */
+    private Integer stopState;
+    /*
+    停车费用
+     */
+    private Integer stopPrice;
+    /*
+    停车支付金额
+     */
+    private Integer stopPay;
+
+    /*
+    计算出来的停车时长
+     */
+    private Integer time;
+}

bwie-common/src/main/java/com/bwie/common/pojo/vo/VOLogMake.java

@@ -0,0 +1,33 @@
+package com.bwie.common.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VOLogMake {
+
+    /*
+    车牌号
+     */
+    private String carNum;
+
+    /*
+  预约时间
+   */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date makeTime;
+
+    /*
+    用户id
+     */
+    private Integer userId;
+
+}

bwie-common/src/main/java/com/bwie/common/pojo/vo/VOStop.java

@@ -0,0 +1,29 @@
+package com.bwie.common.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VOStop {
+
+    /*
+    车牌号
+     */
+    private String carNum;
+    /*
+    停车应支付费用
+     */
+    private Integer stopPrice;
+    /*
+    停车支付金额
+     */
+    private Integer stopPay;
+
+    public VOStop(String carNum, Integer stopPrice) {
+        this.carNum = carNum;
+        this.stopPrice = stopPrice;
+    }
+}