ftp 个人保安新增修改

Administrator

2022-06-08 5190a58ae8668c1f46ae17f6178622cbb40f9d3d

 src/main/java/org/springblade/modules/FTP/Monitor.java

@@ -77,7 +77,6 @@
                  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);
                  //匹配上了删除文件
@@ -89,7 +88,7 @@
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                     ftp.dele(fileName);
                     //返回
                     return result.getData().get(0);
                     return result;
                  }
                  ftp.completePendingCommand();
                  ftp.logout();
@@ -174,7 +173,6 @@
                     //删除 ftp 文件
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//                     ftp.dele(fileName);

                     //返回
                     return result;
                  }
@@ -261,16 +259,16 @@
                     //删除 ftp 文件
//                     ftp.dele(fileName);
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, 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) {
@@ -440,16 +438,17 @@
                     //删除 ftp 文件
//                     ftp.dele(fileName);
                     FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, 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) {