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

Accept Merge Request #2142: (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/2142?initial=true
This commit is contained in:
胡尧
2025-05-23 11:11:10 +08:00
committed by Coding
parent 51ae598aac 51c8287bbc
commit ae7e49e307
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jikimo_purchase_request/__manifest__.py
View File

@@ -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',
],

7
sf_base/decorators/api_log.py
View File

@@ -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': '智能工厂'
}

2
sf_base/models/api_log.py
View File

@@ -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,

27
sf_base/views/api_log_views.xml
View File

@@ -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>
@@ -48,6 +52,23 @@
</field>
</record>
<record model="ir.ui.view" id="view_api_request_log_search">
<field name="name">api.request.log.search</field>
<field name="model">api.request.log</field>
<field name="arch" type="xml">
<search string="API请求日志">
<field name="name"/>
<field name="requester"/>
<field name="responser"/>
<group>
<filter name="name" context="{'group_by':'name'}"/>
<filter name="requester" context="{'group_by':'requester'}"/>
<filter name="responser" context="{'group_by':'responser'}"/>
</group>
</search>
</field>
</record>
<record id="action_api_request_log" model="ir.actions.act_window">
<field name="name">API请求日志</field>
<field name="res_model">api.request.log</field>