udpate

apps/Equipment/men_tou_gou.py

@@ -133,7 +133,8 @@ class CameraDetail(APIView):
         db = myclient.smartfarming
         sa_device_camera = db.sa_device_camera
         sa_device_camera_account = db.sa_device_camera_account
-        result = {}
+        sa_device = db.sa_device
+        result = []
         for device_id in ["L31671797-1", "L42185263-1"]:
             camera = sa_device_camera.find_one({"device_id": device_id}, {"device_info": 1, "account_id": 1, "_id": 0})
             addr = camera.get("device_info")
@@ -147,7 +148,14 @@ class CameraDetail(APIView):
                     pass
             else:
                 addr = addr.replace("http://", "https://")
-            result[device_id] = addr
+            device_info = sa_device.find_one({"device_id": device_id}, {"_id": 0, "device_name":1})
+            device_name = device_info.get("device_name")
+            result.append({
+                "device_id": device_id,
+                "device_name": device_name if device_name else device_id,
+                "device_info": addr,
+                "is_name": device_name 
+            })
         myclient.close()
         return Response(result)