From 1b5b71eae2287c1ff8e85d0fe5016d0eb3057887 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Fri, 18 Aug 2023 16:45:53 +0800
Subject: [PATCH] updates

---
 .../ocr/controller/OcrIdentifyDetailController.java        | 7 ++++---
 .../modules/ocr/service/impl/OcrIdentifyServiceImpl.java   | 2 --
 .../main/java/org/jeecg/modules/ocr/utils/ImageUtils.java  | 2 +-
 3 files changed, 5 insertions(+), 6 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 1a25e81..65278f8 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
@@ -89,6 +89,8 @@ public class OcrIdentifyDetailController extends JeecgController<OcrIdentifyDeta
 				if (StringUtils.isNotBlank(record.getImageUrl())&&"customer_test".equals(systemProjectEnv)) {
 					//客户测试服务器
 					if (!record.getImageUrl().contains("http:")&&!record.getImageUrl().contains("https:")) {
+						String imagePreviewUrl="http://47.103.213.109:8072/files"+record.getImageUrl();
+						record.setImagePreviewUrl(imagePreviewUrl);
 						//压缩图片
 						if (StringUtils.isNotBlank(record.getThumbnailImageUrl())) {
 							File file=new File(record.getThumbnailImageUrl());
@@ -100,13 +102,12 @@ public class OcrIdentifyDetailController extends JeecgController<OcrIdentifyDeta
 						//虚线图片
 						if (StringUtils.isNotBlank(record.getDrawDashedImageUrl())) {
 							File file=new File(record.getDrawDashedImageUrl());
-							//当原图片存在时.
+							//当虚线图片存在时，替换原图字段
 							if (file.exists()) {
 								record.setDrawDashedImagePreviewUrl("http://47.103.213.109:8072/files"+record.getDrawDashedImageUrl());
+								record.setImagePreviewUrl("http://47.103.213.109:8072/files"+record.getDrawDashedImageUrl());
 							}
 						}
-						String imagePreviewUrl="http://47.103.213.109:8072/files"+record.getImageUrl();
-						record.setImagePreviewUrl(imagePreviewUrl);
 					}else{
 						record.setImagePreviewUrl(record.getImageUrl());
 					}
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 d695039..0447f09 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
@@ -130,8 +130,6 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
                     //判断新目录是否存在，不存在则新建
                     FileOUtils.folderCreate(fileUrl);
                     String outputImagePath = fileUrl + imgPath.substring(i + 1, imgPath.length());
-                    File thumbnailFile = new File(outputImagePath);
-
                     List<List<Point>> resultToPoints = ImageUtils.semanticResultToPoints(semanticResult);
                     if (resultToPoints.size()>0) {
                         ImageUtils.drawDashedRectangleOnImages(file.getAbsolutePath(),resultToPoints,outputImagePath);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/ImageUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/ImageUtils.java
index a4056f9..08358a0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/ImageUtils.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/utils/ImageUtils.java
@@ -31,7 +31,7 @@ public class ImageUtils {
     /*
     当涉及到图像压缩时，Java中有几个可以使用的库，比如ImageIO、Thumbnails和Java Advanced Imaging API（JAI）。以下是一个使用ImageIO库来进行图片压缩的示例：
      */
-    public static void main(String[] args) throws FileNotFoundException {
+    public static void main1(String[] args) throws FileNotFoundException {
         String sourceImagePath = "C:\\Users\\Denim\\Desktop\\aabebdf71887c6c2707c65211cac2d3a.jpeg";
         String outputImagePath = "C:\\Users\\Denim\\Desktop\\ds-aabebdf71887c6c2707c65211cac2d3a.jpeg";
         //compressImage(sourceImagePath,outputImagePath,0.25f,0.25f);