From e1a77a16146bcf14f03551951329fd461825b45f Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 21 Nov 2025 11:47:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E7=A7=BB=E9=99=A4=E6=8B=BC?=
 =?UTF-8?q?=E5=9B=BE=E7=85=A7=E7=89=87=E8=87=AA=E5=8A=A8=E8=A3=81=E5=89=AA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了从打印机配置获取打印尺寸的逻辑
- 移除了调用ImageUtils.smartCropAndFill进行图片裁剪的代码
- 去掉了裁剪后图片上传和临时文件清理的相关实现
- 简化了打印服务流程,直接使用原始图片URL
- 保留了cropUrl字段但不再进行实际裁剪操作
---
 .../printer/impl/PrinterServiceImpl.java      | 48 -------------------
 1 file changed, 48 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
index a4a38849..e4e2e696 100644
--- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java
@@ -1240,54 +1240,6 @@ public class PrinterServiceImpl implements PrinterService {
 
         // 获取打印尺寸并裁剪图片
         String cropUrl = resultImageUrl; // 默认使用原图
-        try {
-            // 从打印机表获取尺寸
-            Integer printWidth = null;
-            Integer printHeight = null;
-
-            List<PrinterResp> printers = printerMapper.listByScenicId(scenicId);
-            if (printers != null && !printers.isEmpty()) {
-                PrinterResp firstPrinter = printers.get(0);
-                printWidth = firstPrinter.getPreferW();
-                printHeight = firstPrinter.getPreferH();
-                log.debug("从打印机获取尺寸: scenicId={}, printerId={}, width={}, height={}",
-                        scenicId, firstPrinter.getId(), printWidth, printHeight);
-            }
-
-            // 如果打印机没有配置或配置无效,使用默认值
-            if (printWidth == null || printWidth <= 0) {
-                printWidth = 1020;
-                log.debug("打印机宽度未配置或无效,使用默认值: width={}", printWidth);
-            }
-            if (printHeight == null || printHeight <= 0) {
-                printHeight = 1520;
-                log.debug("打印机高度未配置或无效,使用默认值: height={}", printHeight);
-            }
-
-            // 使用smartCropAndFill裁剪图片
-            File croppedFile = ImageUtils.smartCropAndFill(resultImageUrl, printWidth, printHeight);
-
-            try {
-                // 上传裁剪后的图片
-                String[] split = croppedFile.getName().split("\\.");
-                String ext = split.length > 0 ? split[split.length - 1] : "jpg";
-
-                cropUrl = StorageFactory.use().uploadFile(null, croppedFile, "printer", UUID.randomUUID() + "." + ext);
-
-                log.info("拼图照片裁剪成功: memberId={}, scenicId={}, puzzleRecordId={}, 原图={}, 裁剪后={}, 尺寸={}x{}",
-                        memberId, scenicId, puzzleRecordId, resultImageUrl, cropUrl, printWidth, printHeight);
-            } finally {
-                // 清理临时文件
-                if (croppedFile != null && croppedFile.exists()) {
-                    croppedFile.delete();
-                }
-            }
-        } catch (Exception e) {
-            log.error("拼图照片裁剪失败,使用原图: memberId={}, scenicId={}, puzzleRecordId={}, url={}",
-                    memberId, scenicId, puzzleRecordId, resultImageUrl, e);
-            // 出现异常则使用原图
-            cropUrl = resultImageUrl;
-        }
 
         entity.setCropUrl(cropUrl);
         entity.setStatus(0);