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

Accept Merge Request #2064: (feature/6694 -> develop)

Browse Source 
Merge Request: 增加传输文件列表返回

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2064?initial=true
This commit is contained in:
胡尧
2025-04-25 14:05:10 +08:00
committed by Coding
parent 9bab687080 df53989f22
commit 5997c24895
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jikimo_work_reporting_api/controllers/main.py
View File

@@ -1,7 +1,7 @@
import json
from odoo import http
from odoo.http import request
from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_nc_files
from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_files
from odoo.addons.sf_base.decorators.api_log import api_log
class MainController(http.Controller):
@@ -54,15 +54,15 @@ class MainController(http.Controller):
}
# 传输nc文件
try:
result = transfer_nc_files(
result = transfer_files(
source_ftp_info,
target_ftp_info,
'/' + str(model_id),
'/',
match_str=r'^\d*_\d*-' + tool_groups_id.name + r'-\w{2}-all\.nc$'
)
if result:
return {'code': 200, 'message': 'success'}
if len(result) > 0:
return {'code': 200, 'message': '传输成功', 'file_list': result}
else:
return {'code': 404, 'message': '未找到编程文件'}
except Exception as e:

8
sf_machine_connect/models/ftp_operate.py
View File

@@ -133,7 +133,7 @@ class FtpController:
def transfer_nc_files(
def transfer_files(
source_ftp_info,
target_ftp_info,
source_dir,
@@ -151,7 +151,7 @@ def transfer_nc_files(
target_dir: str, 目标FTP上的目标目录
keep_dir: bool, 是否保持目录结构,默认False
"""
trans_status = [False]
transfered_file_list = []
try:
# 连接源FTP
source_ftp = FtpController(
@@ -217,7 +217,7 @@ def transfer_nc_files(
with open(temp_path, 'rb') as f:
target_ftp.ftp.storbinary(f'STOR {target_path}', f)
trans_status[0] = True
transfered_file_list.append(item)
# 删除临时文件
os.remove(temp_path)
logging.info(f"已传输文件: {item}")
@@ -259,7 +259,7 @@ def transfer_nc_files(
traverse_dir(source_dir)
logging.info("所有文件传输完成")
return trans_status[0]
return transfered_file_list
except Exception as e:
logging.error(f"传输过程出错: {str(e)}")