update 预约充电

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java

@@ -47,6 +47,11 @@ public class PileReservationInfo {
      */
     private String reservationType;
 
+    /**
+     * 验证身份(1-是; 0-否)
+     */
+    private String verifyIdentity;
+
     /**
      * 预约开始时间
      */

jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java

@@ -46,6 +46,11 @@ public class ReservationChargingCommand {
      */
     private String reservationType;
 
+    /**
+     * 身份验证
+     */
+    private String verifyIdentity;
+
     /**
      * vin1
      */

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/PileReservationDTO.java

@@ -23,6 +23,11 @@ public class PileReservationDTO {
      */
     private String status;
 
+    /**
+     * 验证身份(1-是; 0-否)
+     */
+    private String verifyIdentity;
+
     /**
      * 桩编号
      */

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java

@@ -176,6 +176,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
                     .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), ""))
                     .operation("01")
                     .reservationType(type)
+                    .verifyIdentity(dto.getVerifyIdentity())
                     .vin1(vinCodes.get(0))
                     .vin2(vinCodes.get(1))
                     .vin3(vinCodes.get(2))
@@ -226,6 +227,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
                     .connectorCode(pileReservationInfo.getPileConnectorCode().replace(pileReservationInfo.getPileSn(), ""))
                     .operation("02")
                     .reservationType(type)
+                    .verifyIdentity(dto.getVerifyIdentity())
                     .vin1(vinCodes.get(0))
                     .vin2(vinCodes.get(1))
                     .vin3(vinCodes.get(2))

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java

@@ -505,6 +505,10 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
         String reservationType = command.getReservationType();
         byte[] reservationTypeByteArr = BytesUtil.str2Bcd(reservationType);
 
+        // 身份验证
+        String verifyIdentity = command.getVerifyIdentity();
+        byte[] verifyIdentityByteArr = BytesUtil.str2Bcd(verifyIdentity);
+
         // VIN1
         String vin1 = command.getVin1();
         byte[] vin1ByteArr = BytesUtil.str2Asc(vin1);
@@ -532,7 +536,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService {
 
         // 拼装msg信息
         byte[] msg = Bytes.concat(transactionCodeArr, pileSnByteArr, connectorCodeByteArr, operateByteArr,
-                reservationTypeByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr,
+                reservationTypeByteArr, verifyIdentityByteArr, vin1ByteArr, vin2ByteArr, vin3ByteArr,
                 reservedStartTimeByteArr, reservedEndTimeByteArr, amountByteArr);
 
         this.push(msg, pileSn, YKCFrameTypeCode.RESERVATION_CHARGING_CODE);

jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml

@@ -10,6 +10,7 @@
     <result column="pile_connector_code" jdbcType="VARCHAR" property="pileConnectorCode" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="reservation_type" jdbcType="VARCHAR" property="reservationType" />
+    <result column="verify_identity" jdbcType="VARCHAR" property="verifyIdentity" />
     <result column="start_time" jdbcType="TIME" property="startTime" />
     <result column="end_time" jdbcType="TIME" property="endTime" />
     <result column="freq" jdbcType="VARCHAR" property="freq" />
@@ -21,7 +22,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, member_id, pile_sn, pile_connector_code, `status`, reservation_type, start_time,
+    id, member_id, pile_sn, pile_connector_code, `status`, reservation_type, verify_identity, start_time,
     end_time, freq, create_by, create_time, update_by, update_time, del_flag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -39,12 +40,10 @@
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.PileReservationInfo" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into pile_reservation_info (member_id, pile_sn, pile_connector_code,
-    `status`, reservation_type, start_time,
+    `status`, reservation_type, verify_identity, start_time, end_time, freq, create_by,
-    end_time, freq, create_by,
+    create_time, update_by, update_time, del_flag)
-    create_time, update_by, update_time,
-    del_flag)
     values (#{memberId,jdbcType=VARCHAR}, #{pileSn,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR},
-    #{status,jdbcType=VARCHAR}, #{reservationType,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME},
+    #{status,jdbcType=VARCHAR}, #{reservationType,jdbcType=VARCHAR}, #{verifyIdentity,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME},
     #{endTime,jdbcType=TIME}, #{freq,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},
     #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
     #{delFlag,jdbcType=CHAR})