From 270410daeab940ebd0e2784748d4bb4888dd1e92 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 26 Dec 2023 16:17:51 +0800 Subject: [PATCH] =?UTF-8?q?s=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/dev/DeviceInfoController.java | 5 +++-- .../glxp/api/req/dev/DeviceInfoDetailQuery.java | 6 ++++++ src/main/java/com/glxp/api/util/JasperUtils.java | 16 ++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java index 90c8cb3df..4f09217c6 100644 --- a/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInfoController.java @@ -335,7 +335,7 @@ public class DeviceInfoController extends BaseController { * @return */ @AuthRuleAnnotation("") - @PostMapping("/udiwms/inv/deptDevice/printOrder1") + @PostMapping("/udiwms/inv/deptDev/label/print") public BaseResponse printLabel(@RequestBody DeviceInfoDetailQuery query, HttpServletRequest request, HttpServletResponse response) throws Exception { List list = deviceInfoService.detail(query); @@ -343,7 +343,7 @@ public class DeviceInfoController extends BaseController { throw new JsonException("未找到该设备，无法生成"); } DeviceInfoVo obj = list.get(0); - SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId("5"); + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(query.getLabelId() + ""); if (null == sysPdfTemplateRelevanceLabelEntity) { return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); } @@ -370,6 +370,7 @@ public class DeviceInfoController extends BaseController { supData.put("supName", obj.getSupName() == null ? ' ' : obj.getSupName()); data.put("data", supData); String param = JSON.toJSONString(data); + log.error(param); JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); diff --git a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java index 0e5e22fb7..17266ec1c 100644 --- a/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceInfoDetailQuery.java @@ -44,5 +44,11 @@ public class DeviceInfoDetailQuery extends ListPageRequest { */ private Long planId; + /** + * 模版ID + */ + + private Integer labelId; + } diff --git a/src/main/java/com/glxp/api/util/JasperUtils.java b/src/main/java/com/glxp/api/util/JasperUtils.java index ac5e7fd27..8ea1e6102 100644 --- a/src/main/java/com/glxp/api/util/JasperUtils.java +++ b/src/main/java/com/glxp/api/util/JasperUtils.java @@ -2,12 +2,14 @@ package com.glxp.api.util; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; import net.sf.jasperreports.engine.*; import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter; import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory; import net.sf.jasperreports.engine.util.JRLoader; import net.sf.jasperreports.export.SimpleExporterInput; import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -27,6 +29,7 @@ import java.util.Map; * @author chenqf * @date 2021-11-10 22:23 */ +@Slf4j @Component public class JasperUtils { private static Logger logger = LoggerFactory.getLogger(JasperUtils.class); @@ -43,7 +46,7 @@ public class JasperUtils { public static void jasperReport(HttpServletRequest request, HttpServletResponse response, Map data, String jasperResource, String type) throws IOException, JRException { try { HashMap map = new HashMap(); - logger.error(JSON.toJSONString(data)); + log.error(JSON.toJSONString(data)); InputStream is = new ByteArrayInputStream(JSONUtil.toJsonStr(data).getBytes(StandardCharsets.UTF_8)); map.put("JSON_INPUT_STREAM", is); //填充报表数据 map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH); @@ -68,14 +71,14 @@ public class JasperUtils { os.close(); } } catch (Exception e) { - e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); } } public static void jasperReport(HttpServletRequest request, HttpServletResponse response, String data, String jasperResource, String type) throws IOException, JRException { try { HashMap map = new HashMap(); - logger.error(JSON.toJSONString(data)); + log.error(JSON.toJSONString(data)); InputStream is = new ByteArrayInputStream(data.getBytes("UTF-8")); map.put("JSON_INPUT_STREAM", is); //填充报表数据 map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH); @@ -100,8 +103,7 @@ public class JasperUtils { os.close(); } } catch (Exception e) { - - e.printStackTrace(); + log.error(ExceptionUtils.getStackTrace(e)); } } @@ -128,9 +130,7 @@ public class JasperUtils { JasperExportManager.exportReportToPdfFile(jasperPrint, filePath); } catch (Exception e) { - - e.printStackTrace(); - + log.error(ExceptionUtils.getStackTrace(e)); } }