Merge remote-tracking branch 'origin/test' into test

cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java

@@ -1,7 +1,10 @@
 package com.czg.controller.admin;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.URLUtil;
 import com.czg.log.annotation.OperationLog;
 import com.czg.product.dto.ConsStockFlowDTO;
+import com.czg.product.dto.OcrDTO;
 import com.czg.product.param.ConsCheckStockParam;
 import com.czg.product.param.ConsInOutStockHeadParam;
 import com.czg.product.param.ConsReportDamageParam;
@@ -18,6 +21,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
 import java.util.List;
 
 
@@ -35,13 +40,14 @@ public class ConsStockFlowController {
 
     /**
      * 入库单识别
-     * @param file 文件
      * @return
      * @throws IOException
      */
     @PostMapping("/ocr")
-    public CzgResult<Integer> ocr(@RequestParam MultipartFile file) throws IOException {
-        return CzgResult.success(consStockFlowService.ocr(file.getOriginalFilename(), file.getInputStream()));
+    public CzgResult<Integer> ocr(@RequestBody OcrDTO ocrDTO) throws IOException {
+        URL url = new URL(ocrDTO.getUrl());
+        InputStream stream = URLUtil.getStream(url);
+        return CzgResult.success(consStockFlowService.ocr(FileUtil.getName(ocrDTO.getUrl()), stream));
     }
 
     /**

cash-common/cash-common-service/src/main/java/com/czg/product/dto/OcrDTO.java

@@ -0,0 +1,10 @@
+package com.czg.product.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class OcrDTO {
+    @NotBlank
+    private String url;
+}