From 230e87a9f1e5d97f3d9b530c0534bebf8e85b3a3 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 20 Nov 2024 10:29:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_machine_connect/controllers/controllers.py | 1 + sf_maintenance/models/sf_maintenance_oee.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index ab03dff2..7eaac8aa 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -1264,6 +1264,7 @@ class Sf_Dashboard_Connect(http.Controller): """ 获取 """ + logging.info("kw=============:%s" % kw) res = {'status': 1, 'message': '成功', 'data': {}} # 连接数据库 conn = psycopg2.connect(**db_config) diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py index eef42a60..95dd74a4 100644 --- a/sf_maintenance/models/sf_maintenance_oee.py +++ b/sf_maintenance/models/sf_maintenance_oee.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re import json +import logging import datetime import requests from odoo import api, fields, models, _ @@ -90,11 +91,18 @@ class SfMaintenanceEquipmentOEE(models.Model): def get_running_datas(self): base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url') - url_time = base_url + '/api/RunningTimeDetail' + logging.info("base_url=============:%s" % base_url) + # 只有当原始 URL 使用 http 时才替换为 https + if base_url.startswith("http://"): + secure_base_url = base_url.replace("http://", "https://") + else: + secure_base_url = base_url + url_time = secure_base_url + '/api/RunningTimeDetail' + logging.info("url_time=============:%s" % url_time) cnc_list_obj = self.env['maintenance.equipment'].sudo().search( [('function_type', '!=', False), ('active', '=', True)]) machine_list = list(map(lambda x: x.code, cnc_list_obj)) - # print('machine_list: %s' % machine_list) + logging.info("machine_list=============:%s" % machine_list) data_time = { "machine_list": str(machine_list)