From 3ce10f10de4df614b849fe2d837347cc62917bc3 Mon Sep 17 00:00:00 2001 From: ngfchl Date: Thu, 26 Jan 2023 15:07:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E7=AB=99=E7=82=B9=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BB=8A=E6=97=A5=E5=A2=9E=E9=87=8F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto_pt/views.py | 3 ++- pt_site/UtilityTool.py | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/auto_pt/views.py b/auto_pt/views.py index 7b5d935..b9d6976 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -623,7 +623,7 @@ def site_status_api(request): pass else: if level_info.level_id == 0: - site_info.update({ + out_site_info.update({ 'level_info': model_to_dict(level_info), }) else: @@ -870,6 +870,7 @@ def update_site_api(request): if res.code != StatusCodeEnum.OK.code: return JsonResponse(data=res.to_dict(), safe=False) status = res.data[0] + pt_spider.today_data() if isinstance(status, SiteStatus): message = message_template.format( my_site.site.name, diff --git a/pt_site/UtilityTool.py b/pt_site/UtilityTool.py index 986033b..222c80e 100644 --- a/pt_site/UtilityTool.py +++ b/pt_site/UtilityTool.py @@ -2500,3 +2500,40 @@ class PtSpider: return CommonResponse.success( data=data.get(cmd) ) + + def today_data(self): + """测试代码""" + today_site_status_list = SiteStatus.objects.filter(created_at__date=datetime.today()) + # yesterday_site_status_list = SiteStatus.objects.filter( + # created_at__day=datetime.today() - timedelta(days=1)) + increase_list = [] + total_upload = 0 + total_download = 0 + for site_state in today_site_status_list: + my_site = site_state.site + yesterday_site_status_list = SiteStatus.objects.filter(site=my_site) + if len(yesterday_site_status_list) >= 2: + yesterday_site_status = SiteStatus.objects.filter(site=my_site).order_by('-created_at')[1] + uploaded_increase = site_state.uploaded - yesterday_site_status.uploaded + downloaded_increase = site_state.downloaded - yesterday_site_status.downloaded + else: + uploaded_increase = site_state.uploaded + downloaded_increase = site_state.downloaded + total_upload += uploaded_increase + total_download += downloaded_increase + increase_list.append(f'\n\n- 站点：{my_site.site.name}' + f'\n\t\t上传：{FileSizeConvert.parse_2_file_size(uploaded_increase)}' + f'\n\t\t下载：{FileSizeConvert.parse_2_file_size(downloaded_increase)}') + # incremental = { + # '总上传': FileSizeConvert.parse_2_file_size(total_upload), + # '总下载': FileSizeConvert.parse_2_file_size(total_download), + # '说明': '数据均相较于本站今日之前最近的一条数据，可能并非昨日', + # '数据列表': increase_list, + # } + incremental = f'#### 总上传：{FileSizeConvert.parse_2_file_size(total_upload)}\n' \ + f'#### 总下载：{FileSizeConvert.parse_2_file_size(total_download)}\n' \ + f'> 说明: 数据均相较于本站今日之前最近的一条数据，可能并非昨日\n' \ + f'#### 数据列表：{"".join(increase_list)}' + logger.info(incremental) + self.send_text(title='通知：今日数据', message=incremental) + """测试代码结束"""