From 1a17702bd7a44352e6a4d64cb146ff47ac0470f2 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Wed, 21 Sep 2022 15:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=202022=E5=B9=B49=E6=9C=8821?=
 =?UTF-8?q?=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java        | 3 ---
 .../modules/print/service/impl/RollPrintServiceImpl.java       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
index 661d675..9fba689 100644
--- a/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
+++ b/src/main/java/com/gaotao/modules/ftp/util/FTPUtils.java
@@ -554,7 +554,6 @@ public class FTPUtils {
 			}
 		} catch (IOException e) {
 			log.info("ftp下载出错！错误信息："+e.getMessage());
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}finally {
 			//关闭流和链接
@@ -564,7 +563,6 @@ public class FTPUtils {
 				}
 			} catch (IOException e) {
 				log.info("关闭流和链接出错！错误信息："+e.getMessage());
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
@@ -579,7 +577,6 @@ public class FTPUtils {
          File file = new File(ipPath);
 		try {
 			OutputStream os = new FileOutputStream(file);
-
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		}
diff --git a/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java b/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
index e2aa233..6b70db0 100644
--- a/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/print/service/impl/RollPrintServiceImpl.java
@@ -21,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -176,6 +175,7 @@ public class RollPrintServiceImpl implements RollPrintService {
                     throw new XJException(ResponseEnum.USER_PRINT_NAME_NOT_FUND);
                 }
                 apiAddress = "http://" + userprinter.getIpaddress() + ":" + bartenderPrintBatch;
+                log.info("打印地址: "+ apiAddress);
                 // 2.获取模板信息
                 List<Reportcontentitem> reportcontentitemList = reportcontentitemService.getReportcontentitemList(reportFileVo.getReportId());
                 Map<String, String> itemMap = reportcontentitemList.stream().collect(Collectors.toMap(Reportcontentitem::getObjectgroup, Reportcontentitem::getDbfieldname));