From 942d6661f20ffd26b7d4a70eeadbb42633a4afa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Fri, 23 May 2025 10:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9api=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_request/__manifest__.py |  2 +-
 sf_base/decorators/api_log.py           |  7 +++++--
 sf_base/models/api_log.py               |  2 +-
 sf_base/views/api_log_views.xml         | 10 +++++++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jikimo_purchase_request/__manifest__.py b/jikimo_purchase_request/__manifest__.py
index 2cca8da7..2ae6ce67 100644
--- a/jikimo_purchase_request/__manifest__.py
+++ b/jikimo_purchase_request/__manifest__.py
@@ -14,7 +14,7 @@
         'views/purchase_request_view.xml',
         'wizard/purchase_request_line_make_purchase_order_view.xml',
         'views/purchase_request_line_view.xml',
-        'views/stock_picking_views.xml'
+        'views/stock_picking_views.xml',
         'wizard/purchase_request_wizard_views.xml',
         'views/purchase_request_menu_views.xml',
     ],
diff --git a/sf_base/decorators/api_log.py b/sf_base/decorators/api_log.py
index 07a7bd00..05cae1da 100644
--- a/sf_base/decorators/api_log.py
+++ b/sf_base/decorators/api_log.py
@@ -34,17 +34,20 @@ def api_log(name=None, requester=None):
                 # 计算响应时间
                 end_time = datetime.now()
                 response_time = (end_time - start_time).total_seconds()
+
+                # 获取响应状态
+                status = result.get('code') if 'code' in result else result.get('ErrorCode') if 'ErrorCode' in result else 500
                 
                 # 创建日志记录
                 log_vals = {
                     'name': name or func.__name__,
                     'path': path,
-                    'method': method,
+                    'method': method.upper(),
                     'request_data': json.dumps(request_data, ensure_ascii=False),
                     'response_data': json.dumps(result, ensure_ascii=False),
                     'remote_addr': remote_addr,
                     'response_time': response_time,
-                    'status': result.get('code') or result.get('ErrorCode') or 500,
+                    'status': 200 if status == 0 else status,
                     'requester': requester,
                     'responser': '智能工厂'
                 }
diff --git a/sf_base/models/api_log.py b/sf_base/models/api_log.py
index 7d54ac80..6fbecf3d 100644
--- a/sf_base/models/api_log.py
+++ b/sf_base/models/api_log.py
@@ -59,7 +59,7 @@ class ApiRequestLog(models.Model):
         self.sudo().create({
             'name': name,
             'path': url,
-            'method': method,
+            'method': method.upper(),
             'request_data': request_body,
             'response_data': response_body,
             'remote_addr': None,
diff --git a/sf_base/views/api_log_views.xml b/sf_base/views/api_log_views.xml
index 05389fc7..ebfe7376 100644
--- a/sf_base/views/api_log_views.xml
+++ b/sf_base/views/api_log_views.xml
@@ -5,13 +5,15 @@
         <field name="model">api.request.log</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="create_date"/>
                 <field name="name"/>
                 <field name="path"/>
                 <field name="method"/>
                 <field name="remote_addr"/>
-                <field name="response_time"/>
-                <field name="status"/>
+                <field name="response_time" sum="0"/>
+                <field name="requester"/>
+                <field name="responser"/>
+                <field name="create_date" string="请求时间"/>
+                <field name="status" sum="0"/>
             </tree>
         </field>
     </record>
@@ -32,6 +34,8 @@
                         <group>
                             <field name="response_time"/>
                             <field name="status"/>
+                            <field name="requester"/>
+                            <field name="responser"/>
                             <field name="create_date" string="请求时间"/>
                         </group>
                     </group>