智慧保安后台管理-外网
Administrator
2022-06-08 7f36a55767f870937a473f9c0eebf0240300a5ef
src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -77,6 +77,7 @@
                  FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
                  // 解析数据
                  String s = OutJson.TestJson(fileName);
                  System.out.println("s = " + s);
                  //数据处理
                  Result result = DataHandler.handler(s,uuid);
                  //匹配上了删除文件
@@ -87,16 +88,16 @@
                     //删除 ftp 文件
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                     ftp.dele(fileName);
                     ftp.completePendingCommand();
                     ftp.logout();
                     //返回
                     return result;
                     return result.getData().get(0);
                  }
                  ftp.completePendingCommand();
                  ftp.logout();
               }
            }
            if (!flag){
               ftp.logout();
            }
//            if (!flag){
//               ftp.logout();
//            }
            return new Result(400,null,"未读取到对应的文件",null);
         }
      } catch (Exception e) {
@@ -173,16 +174,17 @@
                     //删除 ftp 文件
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                     ftp.dele(fileName);
                     ftp.completePendingCommand();
                     ftp.logout();
                     //返回
                     return result;
                  }
                  ftp.completePendingCommand();
                  ftp.logout();
               }
            }
            if (!flag){
               ftp.logout();
            }
//            if (!flag){
//               ftp.logout();
//            }
            return new Result(400,null,"未读取到对应的文件",null);
         }
      } catch (Exception e) {