Commit f1fcb634 by tinywell

监测点、设备 summary 调整

parent cf11f1bf
...@@ -143,7 +143,7 @@ class MonitorPointTool(BaseTool): ...@@ -143,7 +143,7 @@ class MonitorPointTool(BaseTool):
result = { result = {
'code': 200, 'code': 200,
'summary': f"在{key}找到{len(devices_info)}个设备信息, {len(sensors_info)}个传感器信息", 'summary': f"找到{len(devices_info)}个设备信息, {len(sensors_info)}个传感器信息",
# 'devices': { # 'devices': {
# 'table_header': device_table_header, # 'table_header': device_table_header,
# 'table_data': device_table_data # 'table_data': device_table_data
...@@ -223,7 +223,7 @@ class MonitorPointTool(BaseTool): ...@@ -223,7 +223,7 @@ class MonitorPointTool(BaseTool):
table_data.append(["..."]) table_data.append(["..."])
result = { result = {
'code': 200, 'code': 200,
'summary': f"在{key}找到{len(points_info)}个满足条件的监测点信息", 'summary': f"找到{len(points_info)}个满足条件的监测点信息",
'points': { 'points': {
'table_header': table_header, 'table_header': table_header,
'table_data': table_data 'table_data': table_data
......
...@@ -98,7 +98,7 @@ class RegionRateTool(BaseRateTool): ...@@ -98,7 +98,7 @@ class RegionRateTool(BaseRateTool):
self.logger.debug(f"找到区域代码: {code}") self.logger.debug(f"找到区域代码: {code}")
if month_statistics: if month_statistics:
return self.get_region_online_rate_of_month(region_name, code, start_time, end_time) return self.get_region_online_rate_of_month(region_name, code, start_time, end_time, device_items)
else: else:
return self.get_region_online_rate(start_time, end_time, region_name, code, month_statistics, device_items, manufacturer_name) return self.get_region_online_rate(start_time, end_time, region_name, code, month_statistics, device_items, manufacturer_name)
......
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