111

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 开门类型
@@ -19,6 +20,10 @@ public enum HardDoorOpenTypeEnum {
     private final String type;
     private final String description;
 
+    public static List<String> getMaintenanceListCodes() {
+        return List.of(MAINTENANCE_UNLOCK.getType(), MAINTENANCE_LOCK.getType());
+    }
+
     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/entity/HardDoorFlowEntity.java

@@ -121,6 +121,7 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     @Schema(description = "视频回调时间")
     private LocalDateTime videoCallbackTime;
 
+
     /**
      * sku识别提交参数
      */
@@ -133,6 +134,12 @@ public class HardDoorFlowEntity extends Model<HardDoorFlowEntity> {
     @Schema(description = "sku识别提交结果")
     private String skuSubmitVo;
 
+    /**
+     * sku识别提交id(用于查询)
+     */
+    @Schema(description = "sku识别提交id(用于查询)")
+    private String skuSubmitRecogId;
+
     /**
      * sku识别提交时间
      */

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

@@ -36,12 +36,6 @@ public class HardSpuRepertoryEntity extends Model<HardSpuRepertoryEntity> {
     @Schema(description = "用户id")
     private Long userId;
 
-    /**
-     * 设备id
-     */
-    @Schema(description = "设备id")
-    private Long hardId;
-
     /**
      * 商品id
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/spu/HardSpuRepertoryVo.java

@@ -2,12 +2,11 @@ package com.bsd.pjcloud.hard.api.vo.spu;
 
 import com.bsd.pjcloud.admin.api.vo.base.BaseUserInterface;
 import com.bsd.pjcloud.hard.api.entity.spu.HardSpuRepertoryEntity;
-import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
 import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
 import lombok.Data;
 
 @Data
-public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMchInterface, BaseHardInterface, BaseUserInterface {
+public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMchInterface, BaseUserInterface {
 
     /**
      * 商品相关
@@ -34,13 +33,6 @@ public class HardSpuRepertoryVo extends HardSpuRepertoryEntity implements BaseMc
 
     private String logoPic;
 
-    /**
-     * 设备相关
-     */
-    private String hardName;
-
-    private String hardType;
-
     /**
      * 用户相关
      */