Merge remote-tracking branch 'origin/master'

2025-04-11 15:11:06 +08:00
commit 69f5f948ca
@@ -0,0 +1,78 @@
+package com.bsd.pjcloud.thirdparty.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import com.bsd.pjcloud.thirdparty.dto.ks.*;
+import com.bsd.pjcloud.thirdparty.vo.ks.*;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(contextId = "remoterThirdKsService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
+public interface RemoterThirdKsService {
+
+    /**
+     * 常规SKU提交审核
+     */
+    @NoToken
+    @PostMapping("/third-ks/sku-submit")
+    R<KsSkuSubmitVo> skuSubmit(@RequestBody KsSkuSubmitDto dto);
+
+    /**
+     * 集合SKU提交审核（未公开）
+     */
+    @NoToken
+    @PostMapping("/third-ks/sku-submit-collection")
+    R<KsSkuSubmitCollectionVo> skuSubmitCollection(@RequestBody KsSkuSubmitCollectionDto dto);
+
+    /**
+     * SKU审核结果主动获取
+     */
+    @NoToken
+    @PostMapping("/third-ks/sku-result")
+    R<KsSkuResultVo> skuResult(@RequestBody KsSkuResultDto dto);
+
+    /**
+     * SKU删除
+     */
+    @NoToken
+    @PostMapping("/third-ks/sku-delete")
+    R<KsSkuDeleteVo> skuDelete(@RequestBody KsSkuDeleteDto dto);
+
+    /**
+     * 根据69码查询标准库和私有库商品信息
+     */
+    @NoToken
+    @PostMapping("/third-ks/barcode-sku")
+    R<KsBarcodeSkuVo> barcodeSku(@RequestBody KsBarcodeSkuDto dto);
+
+    /**
+     * 根据ks_sku_id查询标准库和私有库商品信息
+     */
+    @NoToken
+    @PostMapping("/third-ks/barcode-sku-by-id")
+    R<KsBarcodeSkuVo> barcodeSkuById(@RequestParam Long ksSkuId);
+
+    /**
+     * 模糊查询标准库和私有库商品信息
+     */
+    @NoToken
+    @PostMapping("/third-ks/barcode-sku-like")
+    R<KsBarcodeLikeVo> barcodeSkuLike(@RequestBody KsBarcodeLikeDto dto);
+
+    /**
+     * SKU提交识别
+     */
+    @NoToken
+    @PostMapping("/third-ks/recognition")
+    R<KsRecognitionVo> recognition(@RequestBody KsRecognitionDto dto);
+
+    /**
+     * SKU识别结果主动获取
+     */
+    @NoToken
+    @PostMapping("/third-ks/recognition-result")
+    R<KsRecognitionResultVo> recognitionResult(@RequestBody KsRecognitionResultDto dto);
+}
@@ -1,18 +1,29 @@
 package com.bsd.pjcloud.thirdparty.constant.door;

 import cn.hutool.core.util.ObjectUtil;
-import com.bsd.pjcloud.thirdparty.constant.ThirdZyBizEnumType;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

 import java.util.Arrays;

+/**
+ * 柜子接口
+ */
@AllArgsConstructor
@Getter
 public enum ThirdDoorApiTypeEnum {

-    DOOR_API("10", "智能柜接口"),
-    DISCERN_API("20", "识别接口"),
+    REGISTER("10", "设备注册"),
+    BIND("20", "设备信息绑定"),
+    STATUS("30", "查询设备状态"),
+    RESTART("40", "设备重启"),
+    SETTING("50", "设备设置"),
+    VOLUME("60", "音量设置"),
+    OPEN("70", "请求开锁"),
+    VIDEO("80", "调取另一个摄像头视频"),
+    OPEN_CALLBACK("90", "门锁开关通知"),
+    VIDEO_CALLBACK("100", "视频地址通知"),
+    STATUS_CALLBACK("110", "设备状态通知"),
    ;

    private final String type;
@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.thirdparty.constant.door;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@AllArgsConstructor
+@Getter
+public enum ThirdDoorBizTypeEnum {
+
+    DOOR_API("10", "智能柜接口"),
+    DISCERN_API("20", "识别接口"),
+    ;
+
+    private final String type;
+    private final String description;
+
+    public static ThirdDoorBizTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+
+}
@@ -0,0 +1,34 @@
+package com.bsd.pjcloud.thirdparty.constant.door;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@AllArgsConstructor
+@Getter
+public enum ThirdDoorKsApiTypeEnum {
+
+    REGISTER("10", "常规SKU提交审核"),
+    SKU_SUBMIT_COLLECTION("20", "集合SKU提交审核（未公开）"),
+    SKU_RESULT("30", "SKU审核结果主动获取"),
+    SKU_EDIT("40", "常规SKU修改"),
+    SKU_DELETE("50", "SKU删除"),
+    BARCODE_SKU("60", "根据69码查询标准库和私有库商品信息"),
+    BARCODE_SKU_BY_ID("70", "根据ks_sku_id查询标准库和私有库商品信息"),
+    BARCODE_SKU_LIKE("80", "模糊查询标准库和私有库商品信息"),
+    RECOGNITION("90", "SKU提交识别"),
+    RECOGNITION_RESULT("100", "SKU识别结果主动获取"),
+    ;
+
+    private final String type;
+    private final String description;
+
+    public static ThirdDoorKsApiTypeEnum valueOfByType(String type) {
+        if (ObjectUtil.isEmpty(type)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
+    }
+
+}
@@ -1,37 +0,0 @@
-package com.bsd.pjcloud.thirdparty.constant.door;
-
-import cn.hutool.core.util.ObjectUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * 柜子接口
- */
-@AllArgsConstructor
-@Getter
-public enum ThordDoorApiTypeEnum {
-
-    REGISTER("10", "设备注册"),
-    BIND("20", "设备信息绑定"),
-    STATUS("30", "查询设备状态"),
-    RESTART("40", "设备重启"),
-    SETTING("50", "设备设置"),
-    VOLUME("60", "音量设置"),
-    OPEN("70", "请求开锁"),
-    VIDEO("80", "调取另一个摄像头视频"),
-    OPEN_CALLBACK("90", "门锁开关通知"),
-    VIDEO_CALLBACK("100", "视频地址通知"),
-    STATUS_CALLBACK("110", "设备状态通知"),
-    ;
-
-    private final String type;
-    private final String description;
-
-    public static ThordDoorApiTypeEnum valueOfByType(String type) {
-        if (ObjectUtil.isEmpty(type)) return null;
-        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
-    }
-
-}
@@ -45,6 +45,12 @@ public class ThirdDoorLogEntity extends Model<ThirdDoorLogEntity> {
    @Schema(description = "api类型id")
    private String bizId;

+    /**
+     * 请求id
+     */
+    @Schema(description = "请求id")
+    private String requestId;
+
    /**
     * api url
     */