Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/CreateReservedDTO.java

@@ -40,6 +40,11 @@ public class CreateReservedDTO {
      */
     private String freq;
 
+    /**
+     * 验证身份(1-是; 0-否)
+     */
+    private String verifyIdentity;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)

jsowell-pile/src/main/java/com/jsowell/pile/dto/PersonPileStopChargingDTO.java

@@ -0,0 +1,24 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class PersonPileStopChargingDTO {
+    private String memberId;
+    private String firstLevelMerchantId;
+
+    private String pileSn;
+
+    private String ConnectorCode;
+
+    /**
+     * 桩枪口号
+     */
+    private String pileConnectorCode;
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java

@@ -38,5 +38,5 @@ public class PileMemberBindingDTO {
     /**
      * 一级运营商id
      */
-    private String merchantId;
+    private String firstLevelMerchantId;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java

@@ -23,11 +23,31 @@ public class PileReservationDTO {
      */
     private String status;
 
+    /**
+     * 验证身份(1-是; 0-否)
+     */
+    private String verifyIdentity;
+
     /**
      * 桩编号
      */
     private String pileSn;
 
+    /**
+     * 充电桩枪口编号
+     */
+    private String pileConnectorCode;
+
+    /**
+     * 开始时间 hh:mm:ss
+     */
+    private String startTime;
+
+    /**
+     * 结束时间 hh:mm:ss
+     */
+    private String endTime;
+
     private Integer pageNo;
 
     private Integer pageSize;
@@ -38,6 +58,11 @@ public class PileReservationDTO {
                 .append("memberId", memberId)
                 .append("reservedId", reservedId)
                 .append("status", status)
+                .append("pileSn", pileSn)
+                .append("startTime", startTime)
+                .append("endTime", endTime)
+                .append("pageNo", pageNo)
+                .append("pageSize", pageSize)
                 .toString();
     }
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/ReservationChargingStartupResult.java

@@ -0,0 +1,42 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ReservationChargingStartupResult {
+    /**
+     * 交易流水号
+     */
+    private String transactionCode;
+
+    /**
+     * 桩编号
+     */
+    private String pileSn;
+
+    /**
+     * 枪口号
+     */
+    private String connectorCode;
+
+    /**
+     * vin
+     */
+    private String vinCode;
+
+    /**
+     * 启动结果
+     */
+    private String startupResult;
+
+    /**
+     * 失败原因
+     */
+    private String failReason;
+}