From d3e775b7203d43646f691a4fe358adfcf10e05c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9F=B3=E5=A4=B4=E4=BA=BA?= <3076767823@qq.com> Date: Tue, 18 Mar 2025 19:21:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E6=89=93=E5=8D=B0=E6=9C=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../print/service/impl/MS439PrintServiceImpl.java | 10 ++-------- .../print/service/impl/RegisterServiceImpl.java | 12 ++++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java index 6457f2c..e89d6cd 100644 --- a/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java +++ b/src/main/java/com/dpkj/modules/print/service/impl/MS439PrintServiceImpl.java @@ -1,7 +1,6 @@ package com.dpkj.modules.print.service.impl; import com.alibaba.fastjson.JSONObject; -import com.dpkj.common.constant.ErrorCodeConstants; import com.dpkj.common.dto.LexMarkDTO; import com.dpkj.common.dto.LexMarkResultDTO; import com.dpkj.common.exception.RRException; @@ -33,8 +32,6 @@ public class MS439PrintServiceImpl implements MS439PrintService { @Override public LexMarkResultDTO printImage(MS439Request request) { LexMarkResultDTO status = this.getStatus(request.getPagesource()); - thirdService.open("HtmPrinter", 0); - PrinterStatus ms439 = status.getData(); // 如果是要盖章，校验盖章机器是否正常 @@ -55,7 +52,6 @@ public class MS439PrintServiceImpl implements MS439PrintService { } } - LexMarkDTO lexMarkDTO = new LexMarkDTO(); lexMarkDTO.setActionName("PrintText"); lexMarkDTO.setCallID(19283); @@ -88,8 +84,6 @@ public class MS439PrintServiceImpl implements MS439PrintService { @Override public LexMarkResultDTO getStatus(String papersource) { - thirdService.open("HtmPrinter", 0); - LexMarkDTO lexMarkDTO = new LexMarkDTO(); lexMarkDTO.setActionName("GetStatus"); lexMarkDTO.setCallID(19283); @@ -98,7 +92,8 @@ public class MS439PrintServiceImpl implements MS439PrintService { LexMarkResultDTO status = thirdService.callDevice(lexMarkDTO, PrinterStatus.class); if ( status.getResult() != 0){ - throw new RRException(ErrorCodeConstants.MS439_PRINT_ERROR_CODE.get(status.getResult())); + thirdService.open("HtmPrinter", 0); + status = thirdService.callDevice(lexMarkDTO, PrinterStatus.class); } String stPaperEx = status.getData().getStPaperEx(); @@ -144,7 +139,6 @@ public class MS439PrintServiceImpl implements MS439PrintService { throw new RRException(500, ms439.getStInk()); } - thirdService.close("HtmPrinter"); return status; } diff --git a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java index 08e8be6..1315384 100644 --- a/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java +++ b/src/main/java/com/dpkj/modules/print/service/impl/RegisterServiceImpl.java @@ -2,7 +2,6 @@ package com.dpkj.modules.print.service.impl; import com.alibaba.fastjson.JSONObject; -import com.dpkj.common.constant.ErrorCodeConstants; import com.dpkj.common.dto.LexMarkDTO; import com.dpkj.common.dto.LexMarkResultDTO; import com.dpkj.common.exception.RRException; @@ -34,8 +33,7 @@ public class RegisterServiceImpl implements PrintService { @Override public LexMarkResultDTO printImage(JSONObject data, String template, int width, int height, String saveDir) { - thirdService.open("ReceiptPrinter", 1); - + this.getStatus(); StringBuilder filePath = new StringBuilder(saveDir); // 校验是否选中了模板,如果没选中模板的话则不需要另外生成了 if ( !StringUtils.isEmpty(template) && !StringUtils.isEmpty(saveDir)){ @@ -61,7 +59,7 @@ public class RegisterServiceImpl implements PrintService { lexMarkDTO.setParam(param.toJSONString()); LexMarkResultDTO paramLexMarkResultDTO = thirdService.callDevice(lexMarkDTO, LexMarkResultDTO.Param.class); // 切纸 - this.thirdService.cutPaper("ReceiptPrinter", "ControlMedia", 4); + // this.thirdService.cutPaper("ReceiptPrinter", "ControlMedia", 4); File file = new File(filePath.toString()); // 检查文件是否存在 @@ -82,8 +80,6 @@ public class RegisterServiceImpl implements PrintService { @Override public LexMarkResultDTO getStatus() { - thirdService.open("ReceiptPrinter", 1); - LexMarkDTO lexMarkDTO = new LexMarkDTO(); lexMarkDTO.setActionName("GetStatus"); lexMarkDTO.setCallID(11225); @@ -92,7 +88,8 @@ public class RegisterServiceImpl implements PrintService { // lexMarkDTO.setMethodType(0); LexMarkResultDTO status = thirdService.callDevice(lexMarkDTO, PrinterStatus.class); if ( status.getResult() != 0){ - throw new RRException(ErrorCodeConstants.MS439_PRINT_ERROR_CODE.get(status.getResult())); + thirdService.open("ReceiptPrinter", 1); + status = thirdService.callDevice(lexMarkDTO, PrinterStatus.class); } PrinterStatus ms439 = status.getData(); @@ -131,7 +128,6 @@ public class RegisterServiceImpl implements PrintService { throw new RRException(500, ms439.getStInk()); } - this.thirdService.close("ReceiptPrinter"); return status; }