diff --git a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java index 225f0e9..9afb163 100644 --- a/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java +++ b/inspect-base/inspect-base-core/src/main/java/com/inspect/base/core/sftp/SftpClient.java @@ -89,7 +89,7 @@ public class SftpClient { = fileFullPath.startsWith(sftpLoginConfig.getBasePath()) ? fileFullPath : sftpLoginConfig.getBasePath() + fileFullPath; final String fileFullNameTmpEx = StringUtils.isNotEmpty(sftpLoginConfig.getPrefix()) ? sftpLoginConfig.getPrefix() + fileFullPathTmp : fileFullPathTmp; - log.info("[FTP] fileFullNameTmpEx: {}", fileFullPathTmp); + log.info(Color.CYAN + "[FTP] fileFullPath: {}, fileFullNameTmpEx: {}" + Color.END, fileFullPath, fileFullPathTmp); connect((ftps) -> { InputStream inputStream = ftps.retrieveFileStream(fileFullNameTmpEx); if (inputStream == null) { @@ -175,19 +175,20 @@ public class SftpClient { // ftps.connect("192.168.1.198", 21); // boolean loginRes = ftps.login("hangtian", "123qweasd"); // ftps.connect("124.221.104.159", 10990); - ftps.connect("k", 10990); + ftps.connect("124.221.104.159", 10990); + // ftps.connect("192.168.1.116", 1990); boolean loginRes = ftps.login("ftpuser", "atia2018"); System.out.println(loginRes); ftps.setFileType(2); // ftps.enterLocalPassiveMode(); -// ftps.enterLocalPassiveMode(); + ftps.enterLocalPassiveMode(); ftps.setControlEncoding("UTF-8"); ftps.setFileTransferMode(10); ftps.execPROT("P"); - ftps.storeFile("11.jpg", new FileInputStream("E:/1.jpg")); + ftps.storeFile("1122234567.jpg", new FileInputStream("E:/1.jpg")); - String fileFullPathTmp = "1/2025/02/26/1339/CCD/1339_20250226095445_2023833_02160558340721910141.jpg"; + String fileFullPathTmp = "1122.jpg"; //String fileFullPathTmp = "/home/hangtian/11.jpg"; InputStream inputStream = ftps.retrieveFileStream(fileFullPathTmp); if (inputStream == null) { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 12f6fe4..4faeb58 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -592,7 +592,7 @@ public class PatrolTaskController extends BaseController { } } else { List infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId())); - logger.info("-----------------patrolTask.getTaskId(): " + patrolTask.getTaskId()); + logger.info("[TASK] taskId: {}", patrolTask.getTaskId()); if (!infoList.isEmpty()) { patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList)); } else { diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml index 82eff10..e7a42fe 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml @@ -104,7 +104,7 @@