Commit 0823b3f5 by tinywell

监测点 key 使用 行政区域编码;监测点查询数据超长之后截断

parent e2bab94d
......@@ -78,16 +78,6 @@ class MonitorPointTool(BaseTool):
Returns:
Dict: 包含查询结果的字典
"""
if len(device_type) > 0:
query_type = "2"
if query_type == "2":
return self._get_device_info(key, start_time, end_time, device_type)
else:
year = start_time.split("-")[0]
return self._get_points_info(key, year, disaster_type, three_d_model, ortho_image, disaster_threat_people_range_start, disaster_threat_people_range_end, disaster_scale_start, disaster_scale_end, device_type)
def _get_device_info(self, key: str, start_time: str = "", end_time: str = "", device_type: str = ""):
self.logger.info(f"开始查询设备信息,区域: {key}")
code = ""
if key != "":
self.logger.debug(f"查找区域代码: {key}")
......@@ -98,6 +88,18 @@ class MonitorPointTool(BaseTool):
return {'code': 400, 'message': error_msg}
code = codes[0][1]
self.logger.debug(f"找到区域代码: {code}")
self.logger.info(f"查询地区: {key}, 区域代码: {code}" if key != "" else "查询全国监测点信息")
if len(device_type) > 0:
query_type = "2"
if query_type == "2":
return self._get_device_info(code, start_time, end_time, device_type)
else:
year = start_time.split("-")[0]
return self._get_points_info(code, year, disaster_type, three_d_model, ortho_image, disaster_threat_people_range_start, disaster_threat_people_range_end, disaster_scale_start, disaster_scale_end, device_type)
def _get_device_info(self, code: str, start_time: str = "", end_time: str = "", device_type: str = ""):
self.logger.info(f"开始查询设备信息,区域: {key}")
try:
response = self.client.query_device_and_sensor(code, start_time, end_time, device_type)
self.logger.debug(f"API响应: {response}")
......@@ -214,7 +216,9 @@ class MonitorPointTool(BaseTool):
table_data = []
for item in points_info:
table_data.append(list(item.values()))
if len(table_data) > 50:
table_data = table_data[:50]
table_data.append(["..."])
result = {
'code': 200,
'message': f"在{key}找到{len(points_info)}个监测点信息",
......
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