|
@@ -81,10 +81,14 @@ class QxzDeviceDetailView(APIView):
|
|
|
conf_m = MongoDBTools(db_name='smartfarming', table_name='sa_qxz_conf')
|
|
conf_m = MongoDBTools(db_name='smartfarming', table_name='sa_qxz_conf')
|
|
|
conf_data = conf_m.find_one(wheres=conf_wheres)
|
|
conf_data = conf_m.find_one(wheres=conf_wheres)
|
|
|
if conf_data:
|
|
if conf_data:
|
|
|
- conf_data.pop("id")
|
|
|
|
|
- conf_data.pop("device_id")
|
|
|
|
|
- conf_data.pop("uptime")
|
|
|
|
|
- conf_data = dict(sorted(conf_data.items(), key=lambda e:int(e[0].split("e")[1])))
|
|
|
|
|
|
|
+ conf_data_temp = {}
|
|
|
|
|
+ for k, v in conf_data.items():
|
|
|
|
|
+ if v:
|
|
|
|
|
+ conf_data_temp[k] = v
|
|
|
|
|
+ conf_data_temp.pop("id")
|
|
|
|
|
+ conf_data_temp.pop("device_id")
|
|
|
|
|
+ conf_data_temp.pop("uptime")
|
|
|
|
|
+ conf_data = dict(sorted(conf_data_temp.items(), key=lambda e:int(e[0].split("e")[1])))
|
|
|
result = {"conf":conf_data,"total_counts":0,"items":[]}
|
|
result = {"conf":conf_data,"total_counts":0,"items":[]}
|
|
|
|
|
|
|
|
data_m = MongoDBTools(db_name='smartfarming', table_name='sa_qxz_data')
|
|
data_m = MongoDBTools(db_name='smartfarming', table_name='sa_qxz_data')
|