feat:智能柜流程修改

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardDoorOpenTypeEnum.java

@@ -0,0 +1,26 @@
+package com.bsd.pjcloud.hard.api.constant;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 开门类型
+ */
+@AllArgsConstructor
+@Getter
+public enum HardDoorOpenTypeEnum {
+    RECORD_VIDEO("1", "录制视频"),
+    NO_RECORD_VIDEO("4", "不录制视频"),
+    MAINTENANCE_UNLOCK("5", "检修开锁"),
+    MAINTENANCE_LOCK("6", "检修关锁");;
+    private final String type;
+    private final String description;
+
+    public static HardDoorOpenTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowOpenDto.java

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.hard.api.dto;
 
 import com.bsd.pjcloud.hard.api.constant.HardDoorFlowEnum;
+import com.bsd.pjcloud.hard.api.constant.HardDoorOpenTypeEnum;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -20,10 +21,15 @@ public class HardDoorFlowOpenDto {
     @NotEmpty(message = "货柜编号不能为空")
     private String cabinetNo;
 
+    /**
+     * 流程类型
+     */
+    private HardDoorFlowEnum flowType;
+
     /**
      * 开门操作类型
      */
-    private HardDoorFlowEnum type;
+    private HardDoorOpenTypeEnum openType;
 
     /**
      * 开门用户id

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardDoorFlowEntity.java

@@ -24,7 +24,6 @@ import java.time.LocalDateTime;
 @Schema(description = "智能柜流程")
 public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
 
-
     /**
      * 编号
      */
@@ -57,16 +56,16 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     private Long authId;
 
     /**
-     * 开门事件编号
+     * 请求开门参数
      */
-    @Schema(description = "开门事件编号")
-    private String openEventId;
+    @Schema(description = "请求开门参数")
+    private String requestOpenDto;
 
     /**
-     * 商户自定义开门请求号
+     * 请求开门返回
      */
-    @Schema(description = "商户自定义开门请求号")
-    private String openOutOpenNo;
+    @Schema(description = "请求开门返回")
+    private String requestOpenVo;
 
     /**
      * 请求开门时间
@@ -75,10 +74,10 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     private LocalDateTime requestOpenTime;
 
     /**
-     * 开门回调结果
+     * 是否开门
      */
-    @Schema(description = "开门回调结果")
-    private String openCallbackRes;
+    @Schema(description = "是否开门")
+    private String isOpen;
 
     /**
      * 开门回调时间
@@ -86,11 +85,17 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     @Schema(description = "开门回调时间")
     private LocalDateTime openCallbackTime;
 
+    /**
+     * 开门回调结果
+     */
+    @Schema(description = "开门回调结果")
+    private String openCallbackVo;
+
     /**
      * 视频回调结果
      */
     @Schema(description = "视频回调结果")
-    private String videoCallbackRes;
+    private String videoCallbackVo;
 
     /**
      * 视频回调时间
@@ -99,10 +104,16 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     private LocalDateTime videoCallbackTime;
 
     /**
-     * 识别任务唯一ID,用于结果获取,重新发起售后识别
+     * sku识别提交参数
      */
-    @Schema(description = "识别任务唯一ID,用于结果获取,重新发起售后识别")
-    private String skuKsRecogId;
+    @Schema(description = "sku识别提交参数")
+    private String skuSubmitDto;
+
+    /**
+     * sku识别提交结果
+     */
+    @Schema(description = "sku识别提交结果")
+    private String skuSubmitVo;
 
     /**
      * sku识别提交时间
@@ -114,7 +125,7 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
      * sku识别回调结果
      */
     @Schema(description = "sku识别回调结果")
-    private String skuCallbackRes;
+    private String skuCallbackVo;
 
     /**
      * sku识别回调时间
@@ -122,11 +133,17 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     @Schema(description = "sku识别回调时间")
     private LocalDateTime skuCallbackTime;
 
+    /**
+     * sku识别主动获取参数
+     */
+    @Schema(description = "sku识别主动获取参数")
+    private String skuDrivingDto;
+
     /**
      * sku识别主动获取结果
      */
     @Schema(description = "sku识别主动获取结果")
-    private String skuDrivingRes;
+    private String skuDrivingVo;
 
     /**
      * sku识别主动获取时间