jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段

Browse Source
This commit is contained in:
jinling.yang
2024-02-28 15:53:46 +08:00
parent ab6a3f8b6b
commit 0538763059
8 changed files with 378 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sf_mrs_connect/models/ftp_operate.py
View File

@@ -41,29 +41,26 @@ class FtpController():
# 下载目录下的检测文件
def download_reportfile_tree(self, target_dir, serverdir, reportpath):
if not os.path.exists(serverdir):
os.makedirs(serverdir)
try:
logging.info("进入FTP目录 ")
logging.info('FTP目录1:%s' % target_dir)
logging.info("进入FTP目录-检测文件")
logging.info('serverdir:%s' % serverdir)
logging.info('reportpath:%s' % reportpath)
target_dir1 = target_dir.split('/')
logging.info('target_dir1:%s' % target_dir1[1])
target_dir = os.path.join('/', target_dir1[1])
logging.info('target_dir:%s' % target_dir)
self.ftp.cwd(target_dir) # 切换工作路径
logging.info('FTP目录111111:%s' % target_dir[2])
logging.info('目录1:%s' % target_dir1[1])
self.ftp.cwd(target_dir1[1]) # 切换工作路径
logging.info('目录2:%s' % target_dir[2])
self.ftp.cwd(target_dir[2]) # 切换工作路径
logging.info('FTP目录:%s' % target_dir)
remotenames = self.ftp.nlst()
logging.info('FTP目录检测报告文件:%s' % remotenames)
for file in remotenames:
server = os.path.join(serverdir, file)
logging.info('server' % server)
if file.find(reportpath) != -1:
logging.info('server' % server)
self.download_file(server, file)
return 1
except:
return False
except Exception:
return 0
# 下载指定目录下的指定文件
def download_file(self, serverfile, remotefile):