Commit c89d3864 by tinywell

阅读在线率数据总结 bug;预警消息占比参数名称修正

parent 8c390c1f
...@@ -173,7 +173,7 @@ class RegionRateTool(BaseRateTool): ...@@ -173,7 +173,7 @@ class RegionRateTool(BaseRateTool):
# 排序 # 排序
result_data = sorted(result_data.items(), key=lambda x: x[0]) result_data = sorted(result_data.items(), key=lambda x: x[0])
self.logger.debug(f"查询结果: {df.resultdata}") self.logger.info(f"查询结果: {result_data}")
# markdown = self.to_markdown(df.resultdata) # markdown = self.to_markdown(df.resultdata)
# table_header = list(result_data[0].keys()) # table_header = list(result_data[0].keys())
...@@ -189,7 +189,7 @@ class RegionRateTool(BaseRateTool): ...@@ -189,7 +189,7 @@ class RegionRateTool(BaseRateTool):
data = { data = {
'region': region_name, 'region': region_name,
'region_code': code, 'region_code': code,
'summary': f"找到符合条件的数据 {len(result_data)} 条,包含{year}年{result_data.keys()}月份的数据", 'summary': f"找到符合条件的数据 {len(result_data)} 条,包含{year}年{','.join([item[0] for item in result_data])}月份的数据",
'rate_data': result_data 'rate_data': result_data
} }
......
...@@ -77,13 +77,13 @@ class WarningTool(BaseTool): ...@@ -77,13 +77,13 @@ class WarningTool(BaseTool):
"虚警消息个数": response.resultdata["falsenum"], "虚警消息个数": response.resultdata["falsenum"],
"虚警率": response.resultdata["falseper"], "虚警率": response.resultdata["falseper"],
"红色预警消息个数": response.resultdata["rednum"], "红色预警消息个数": response.resultdata["rednum"],
"红色处置消息个数": response.resultdata["redcloseper"], "红色预警消息占比": response.resultdata["redcloseper"],
"橙色预警消息个数": response.resultdata["orangenum"], "橙色预警消息个数": response.resultdata["orangenum"],
"橙色处置消息个数": response.resultdata["orangecloseper"], "橙色预警消息占比": response.resultdata["orangecloseper"],
"黄色预警消息个数": response.resultdata["yellownum"], "黄色预警消息个数": response.resultdata["yellownum"],
"黄色处置消息个数": response.resultdata["yellowcloseper"], "黄色预警消息占比": response.resultdata["yellowcloseper"],
"蓝色预警消息个数": response.resultdata["bluenum"], "蓝色预警消息个数": response.resultdata["bluenum"],
"蓝色处置消息个数": response.resultdata["bluecloseper"], "蓝色预警消息占比": response.resultdata["bluecloseper"],
"数据异常消息个数": response.resultdata["datanum"], "数据异常消息个数": response.resultdata["datanum"],
"数据异常消息占比": response.resultdata["datacloseper"], "数据异常消息占比": response.resultdata["datacloseper"],
"设备维护": response.resultdata["devicemainnum"], "设备维护": response.resultdata["devicemainnum"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment