udpate

apps/Equipment/men_tou_gou.py

@@ -82,11 +82,12 @@ class QxData(APIView):
         data = qxz_data.find(query, fields).sort("uptime", pymongo.DESCENDING).limit(1)
         data = data[0]
         tmp = {}
+        print(conf)
         for k, v in data.items():
             tp = conf.get(k)
             if tp:
                 tp_m = tp.split("#")
-                tmp[tp_m[0]] = v.split("#")[0] + tp_m[-1]
+                tmp[k] = v.split("#")[0] + tp_m[-1]
 
         sa_nd_qxz_status = db.sa_nd_qxz_status
         qxz_obj = sa_nd_qxz_status.find({"device_id": "860181067701570"}, {"_id": 0}).sort("upl_time", pymongo.DESCENDING).limit(1)
@@ -104,8 +105,9 @@ class QxData(APIView):
 
         myclient.close()
         return Response({
-            "气象站":tmp,
-            "墒情站": data
+            "qxz":tmp,
+            "qxz_conf": conf,
+            "sqz": data
         })
 
 
@@ -115,8 +117,11 @@ class QxWarning(APIView):
         myclient = get_table()
         db = myclient.smartfarming
         qxz_alarm = db.sa_qxz_alarm_log_new
+        k = qxz_alarm.find_one(sort=[("id", -1)])["id"] + 1
+        print(k)
+
         query = {'device_id': "864865060482180"}
-        data = qxz_alarm.find(query, {"_id":0, "warning_content": 1}).sort("uptime", pymongo.DESCENDING).limit(5)
+        data = qxz_alarm.find(query, {"_id":0, "warning_content": 1, "upl_time": 1}).sort("upl_time", pymongo.DESCENDING).limit(5)
         myclient.close()
         return Response(list(data))