From 677ae8c10c44eaf10e960ca7f0ed107e581f2faa Mon Sep 17 00:00:00 2001 From: RogerWork Date: Tue, 6 Jan 2026 15:24:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E8=AE=B0=E5=BD=B1?= =?UTF-8?q?=E9=99=A2=E7=8A=B6=E6=80=81=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mock/mock_templates/download_film_info_tmp.py | 4 ++-- update/models.py | 3 +++ update/utils/get_version.py | 9 ++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mock/mock_templates/download_film_info_tmp.py b/mock/mock_templates/download_film_info_tmp.py index f9c7551..93986de 100644 --- a/mock/mock_templates/download_film_info_tmp.py +++ b/mock/mock_templates/download_film_info_tmp.py @@ -14,9 +14,9 @@ def get(): 'duration': 90, 'aliasName': None, 'keyEndtime': '2050-12-31', - 'keyStarttime': '2022-01-01', + 'keyStarttime': '2026-01-01', 'reshowFlag': False, - 'publishDate': '2023-01-01', + 'publishDate': '2026-01-01', 'filmName': 'Mock测试影片(不要排片！)', 'producer': '无', 'publisher': '暂空', diff --git a/update/models.py b/update/models.py index c40e4c9..fccabf1 100644 --- a/update/models.py +++ b/update/models.py @@ -23,6 +23,7 @@ class Cinema(BaseModels): ver_id = models.IntegerField(verbose_name='版本id', null=False, default=0, help_text='版本id') is_delete = models.BooleanField(verbose_name='是否删除', default=False, help_text='是否删除') is_online = models.BooleanField(verbose_name='是否在线', default=False, help_text='是否在线') + is_check = models.BooleanField(verbose_name='是否在线', default=False, help_text='是否需要拉取版本') comments = models.TextField(verbose_name='备注', null=True, help_text='备注') def __str__(self): @@ -88,6 +89,8 @@ class ClientRelease(BaseModels): client_type = models.CharField(verbose_name='类型', max_length=10, default='test', help_text='类型 test 测试 prd 线上') is_delete = models.BooleanField(verbose_name='是否有效', default=False, help_text='是否有效') + # dev_id = models.IntegerField(verbose_name='打包服务器版本ID', null=True, default=0, help_text='打包服务器版本ID') + # is_cached = models.BooleanField(verbose_name='是否本地缓存', default=False, help_text='是否本地缓存') def __str__(self): return self.upload_name diff --git a/update/utils/get_version.py b/update/utils/get_version.py index 13f9200..264003b 100644 --- a/update/utils/get_version.py +++ b/update/utils/get_version.py @@ -18,9 +18,9 @@ class GetVersion(object): def get_all_cinema(self): print('get_all_cinema') if self.cinema_ip_list is None: - all_cinema_obj = Cinema.objects.filter(is_delete=False).all() + all_cinema_obj = Cinema.objects.filter(Q(is_delete=False) & Q(is_check=True)).all() else: - all_cinema_obj = Cinema.objects.filter(Q(ip__in=self.cinema_ip_list) & Q(is_delete=False)).all() + all_cinema_obj = Cinema.objects.filter(Q(ip__in=self.cinema_ip_list) & Q(is_delete=False) & Q(is_check=True)).all() for cinema_obj in all_cinema_obj: print(cinema_obj) data = { @@ -61,8 +61,8 @@ class GetVersion(object): 'database': 'cine', 'connect_timeout': 5, } - db_conn = pymysql.Connect(**db_config) try: + db_conn = pymysql.Connect(**db_config) with db_conn.cursor(cursor=DictCursor) as db_cursor: db_cursor.execute(sql_str) res = db_cursor.fetchone() @@ -85,12 +85,11 @@ class GetVersion(object): } print(ip, update_data, db_config) cinema_obj = Cinema.objects.filter(ip=ip).update(**update_data) + db_conn.close() except Exception as e: print('-----get_cinema_ver-----') print(e) cinema_obj = Cinema.objects.filter(ip=ip).update(is_online=False) - finally: - db_conn.close() def get_cinema_ver_by_ip(ip):