From 79044f17b06cdf8896c52c937a84db7ff3f5b205 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Fri, 15 Aug 2025 15:40:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E6=95=B0=E6=8D=AE=E9=A2=84?= =?UTF-8?q?=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LabelSettingController.java | 58 +------------------ .../Impl/ReportLabelListServiceImpl.java | 32 ---------- .../base/service/ReportLabelListService.java | 10 +--- 3 files changed, 2 insertions(+), 98 deletions(-) diff --git a/src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java b/src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java index 6048a9d..fc68d12 100644 --- a/src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java +++ b/src/main/java/com/gaotao/modules/base/controller/LabelSettingController.java @@ -826,62 +826,6 @@ public class LabelSettingController extends AbstractController { } } - /** - * @description: 预览标签（将数据源字段替换为真实数据） - * @author Kiro - * @date 2025/1/24 - * @version 1.0 - */ - @PostMapping("previewLabelWithData") - public R previewLabelWithData(@RequestBody Map params) { - try { - log.info("收到标签预览请求: {}", params); - - String reportId = (String) params.get("reportId"); - if (reportId == null || reportId.trim().isEmpty()) { - log.warn("标签ID为空"); - return R.error("标签ID不能为空"); - } - - @SuppressWarnings("unchecked") - Map dataMap = (Map) params.get("dataMap"); - if (dataMap == null) { - dataMap = new java.util.HashMap<>(); - } - - String previewType = (String) params.get("previewType"); - if (previewType == null) { - previewType = "elements"; - } - - log.info("处理标签预览: reportId={}, previewType={}, dataMap={}", reportId, previewType, dataMap); - - if ("zpl".equals(previewType)) { - // 返回ZPL代码预览 - log.info("生成ZPL代码预览"); - String zplCode = reportLabelListService.previewLabelWithData(reportId, dataMap); - log.info("ZPL代码生成成功，长度: {}", zplCode != null ? zplCode.length() : 0); - return R.ok() - .put("code", 200) - .put("msg", "ZPL代码生成成功") - .put("data", zplCode); - } else { - // 返回处理后的元素列表（默认） - log.info("生成元素预览"); - List processedElements = reportLabelListService.getProcessedElements(reportId, dataMap); - log.info("元素处理成功，元素数: {}", processedElements != null ? processedElements.size() : 0); - return R.ok() - .put("code", 200) - .put("msg", "标签元素处理成功") - .put("data", processedElements); - } - - } catch (Exception e) { - log.error("标签预览失败: {}", e.getMessage(), e); - return R.error("标签预览失败: " + e.getMessage()); - } - } - /** * @description: 使用真实数据预览标签（从数据库视图获取数据） * @author Kiro @@ -904,7 +848,7 @@ public class LabelSettingController extends AbstractController { // 使用真实数据生成ZPL代码预览 String zplCode = reportLabelListService.previewLabelWithRealData(reportId); log.info("使用真实数据的ZPL代码生成成功，长度: {}", zplCode != null ? zplCode.length() : 0); - + return R.ok() .put("code", 200) .put("msg", "使用真实数据的ZPL代码生成成功") diff --git a/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java b/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java index fe1b651..2c22c92 100644 --- a/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java +++ b/src/main/java/com/gaotao/modules/base/service/Impl/ReportLabelListServiceImpl.java @@ -471,38 +471,6 @@ public class ReportLabelListServiceImpl extends ServiceImpl dataMap) { - try { - // 获取标签元素 - List elements = getZplElements(reportId); - if (elements.isEmpty()) { - throw new RuntimeException("未找到标签元素"); - } - - // 获取标签设置信息 - LabelSettingData labelSettingData = new LabelSettingData(); - labelSettingData.setLabelNo(reportId); - List labelSettingDataList = baseService.getLabelSettingList(labelSettingData); - - if (labelSettingDataList.isEmpty()) { - throw new RuntimeException("未找到对应的标签设置"); - } - - LabelSettingData labelSetting = labelSettingDataList.get(0); - - // 使用新的ZPL生成服务 - String zplCode = labelDataProcessorService.generateZplWithData(elements, dataMap, labelSetting); - - log.info("标签预览生成成功，reportId: {}, 数据字段数: {}", reportId, dataMap.size()); - return zplCode; - - } catch (Exception e) { - log.error("标签预览失败: reportId={}, error={}", reportId, e.getMessage(), e); - throw new RuntimeException("标签预览失败: " + e.getMessage()); - } - } - @Override public List getProcessedElements(String reportId, Map dataMap) { try { diff --git a/src/main/java/com/gaotao/modules/base/service/ReportLabelListService.java b/src/main/java/com/gaotao/modules/base/service/ReportLabelListService.java index e33da0c..504b3c2 100644 --- a/src/main/java/com/gaotao/modules/base/service/ReportLabelListService.java +++ b/src/main/java/com/gaotao/modules/base/service/ReportLabelListService.java @@ -13,16 +13,8 @@ public interface ReportLabelListService extends IService { void saveZplElements(ZplDataDto zplDataDto); List getZplElements(String reportId); - - void printLabel(PrintLabelRequest printRequest); - /** - * 预览标签，将数据源字段替换为真实数据 - * @param reportId 标签ID - * @param dataMap 数据源映射，key为字段名，value为实际值 - * @return 预览用的ZPL代码 - */ - String previewLabelWithData(String reportId, Map dataMap); + void printLabel(PrintLabelRequest printRequest); /** * 获取处理后的标签元素（用于前端预览）