From 508d2afba3893f58f3bf48562f628fa6f59cf5a4 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Wed, 16 Aug 2023 13:03:32 +0800
Subject: [PATCH] updates

---
 .../controller/OcrIdentifyDetailController.java   |  3 ++-
 .../modules/ocr/entity/OcrIdentifyDetail.java     |  4 ++++
 .../ocr/service/impl/OcrIdentifyServiceImpl.java  | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java
index 2bf504b..444604a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrIdentifyDetailController.java
@@ -105,7 +105,8 @@ public class OcrIdentifyDetailController extends JeecgController<OcrIdentifyDeta
 							if (!thumbnailFile.exists()) {
 								ImageUtils.compressImage(file.getAbsolutePath(), outputImagePath, maxWidth, maxHeight);
 							}
-							String imagePreviewUrl="http://47.103.213.109:8072/files"+record.getImageUrl()+","+"http://47.103.213.109:8072/files"+outputImagePath;
+							record.setThumbnailImagePreviewUrl("http://47.103.213.109:8072/files"+outputImagePath);
+							String imagePreviewUrl="http://47.103.213.109:8072/files"+record.getImageUrl();
 							record.setImagePreviewUrl(imagePreviewUrl);
 						}
 					}else{
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentifyDetail.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentifyDetail.java
index e8c7332..927ca05 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentifyDetail.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/entity/OcrIdentifyDetail.java
@@ -91,10 +91,14 @@ public class OcrIdentifyDetail implements Serializable {
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
 
+
     @TableField(exist = false)
     @ApiModelProperty(value = "图片预览地址")
 	private String imagePreviewUrl;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "缩率图片预览地址")
+    private String thumbnailImagePreviewUrl;
     ///===========================================
     /*字段校验成功对象.*//*
     @TableField(exist = false)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index e1dc8f1..9b18668 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -456,21 +456,6 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                     //匹配成功.
                     updateWrapper.set(OcrIdentify::getTaskResult, 1);
                 }
-//                }else if (configRuleTypeMap.containsKey(OcrConstant.ruleCheckOrChar)){
-//                    Map<String, String> fieldMap = configRuleTypeMap.get(OcrConstant.ruleCheckSplitChar);
-//                    //获取成功的字段.
-//                    List<String> successFields = ocrResults.stream().filter(o -> o.getRuleValidation()).map(c->c.getTag()).collect(Collectors.toList());
-//
-//                    updateWrapper.set(OcrIdentify::getErrorMsg, errorMsg);
-//                    updateWrapper.set(OcrIdentify::getTaskResult, 0);
-//
-//                    fieldMapFor: for (String s : fieldMap.keySet()) {
-//                        if (successFields.contains(s)) {
-//                            updateWrapper.set(OcrIdentify::getTaskResult, 1);
-//                            break fieldMapFor;
-//                        }
-//                    }
-//                }
                 String taskResultInfo = JSONArray.toJSONString(ocrResults);
                 updateWrapper.set(OcrIdentify::getStatus,"1");
                 updateWrapper.set(OcrIdentify::getEndTime,new Date());