diff --git a/src/api/routes.py b/src/api/routes.py index 24fe28d..ab80922 100644 --- a/src/api/routes.py +++ b/src/api/routes.py @@ -342,7 +342,8 @@ async def process_file_core( html_file_path = html_generator.generate_and_save_visualization( geometry_data, - Path(file_path).name + Path(file_path).name, + cavity_data=detailed_cavity_json ) # 保存HTML文件信息 diff --git a/src/utils/html_generator.py b/src/utils/html_generator.py index 9b8dac1..4e4e21c 100644 --- a/src/utils/html_generator.py +++ b/src/utils/html_generator.py @@ -275,25 +275,30 @@ class HTMLGenerator: raise def generate_and_save_visualization( - self, - geometry_data: Dict[str, Any], - stp_filename: str + self, + geometry_data: Dict[str, Any], + stp_filename: str, + cavity_data: Optional[Dict[str, Any]] = None ) -> str: """生成并保存可视化HTML文件""" try: # 生成HTML内容 - html_content = self.generate_3d_viewer_html(geometry_data, stp_filename) - + html_content = self.generate_3d_viewer_html( + geometry_data, + stp_filename, + cavity_data=cavity_data + ) + # 创建文件名 timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") safe_filename = stp_filename.replace('.', '_').replace(' ', '_') html_filename = f"{safe_filename}_{timestamp}.html" - + # 保存文件 file_path = self.save_html_file(html_content, html_filename) - + return file_path - + except Exception as e: logger.error(f"生成可视化文件失败: {e}") raise