Merge branch 'refs/heads/v18.5_pound_list_ocr_20240701' into test

performance-web/src/main/java/com/clx/performance/model/OcrRecognition.java

@@ -53,6 +53,12 @@ public class OcrRecognition implements HasKey<Integer> {
     @ApiModelProperty(value = "皮重")
     private Double tareWeight;
 
+    /**
+     * OCR识别的原始结果
+     */
+    @ApiModelProperty(value = "OCR识别的原始结果")
+    private String originalResult;
+
     /**
      * 创建时间
      */

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -2819,10 +2819,12 @@ public class OrderChildServiceImpl implements OrderChildService {
             req.setImageUrl(ossDomain+param.getImageUrl());
             req.setItemNames(itemNames);
             SmartStructuralOCRV2Response resp = client.SmartStructuralOCRV2(req);
+            Map<String,String> originalResultMap = new HashMap<>();
             for (GroupInfo groupInfo : resp.getStructuralList()) {
                 ItemInfo itemInfo = groupInfo.getGroups()[0].getLines()[0];
                 String autoName = itemInfo.getKey().getAutoName();
                 String autoContent = itemInfo.getValue().getAutoContent();
+                originalResultMap.put(autoName,autoContent);
                 if (NumberUtils.isCreatable(autoContent)) {
                     if ("毛重".equals(autoName)) {
                         vo.setGrossWeight(Double.valueOf(autoContent));
@@ -2839,6 +2841,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             ocrRecognition.setImageUrl(param.getImageUrl());
             ocrRecognition.setGrossWeight(vo.getGrossWeight());
             ocrRecognition.setTareWeight(vo.getTareWeight());
+            ocrRecognition.setOriginalResult(JSONUtil.toJsonStr(originalResultMap));
             ocrRecognitionDao.saveEntity(ocrRecognition);
         } catch (TencentCloudSDKException e) {
             log.error(e.getMessage(),e);