代码模块修改

Ansjer/server_urls/loocam_url.py

@@ -8,8 +8,8 @@
 """
 from django.urls import re_path
 
-from SensorGateway import EquipmentFamilyController, GatewayFamilyRoomController, GatewayFamilyMemberController, \
-    SubDeviceController
+from Controller.SensorGateway import GatewayFamilyRoomController, SubDeviceController, GatewayFamilyMemberController, \
+    EquipmentFamilyController
 
 urlpatterns = [
     re_path(r'^sensor/gateway/(?P<operation>.*)$', EquipmentFamilyController.EquipmentFamilyView.as_view()),

Ansjer/urls.py

@@ -26,7 +26,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
 from Controller.Cron import CronTaskController
 from Controller.MessagePush import EquipmentMessagePush
 from Controller.Surveys import CloudStorageController
-from SensorGateway import SensorGatewayController, EquipmentFamilyController
+from Controller.SensorGateway import SensorGatewayController, EquipmentFamilyController
 from django.urls import include
 
 urlpatterns = [

SensorGateway/GatewayFamilyMemberController.py → Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -7,12 +7,17 @@
 @Software: PyCharm
 """
 
+import json
+import time
+
 from django.views.generic.base import View
 
-from Model.models import FamilyMemberJoin, UserFamily
+from Model.models import FamilyMemberJoin, UserFamily, Device_Info, Device_User
+from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from SensorGateway.EquipmentFamilyController import EquipmentFamilyView
+from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
+from Service.CommonService import CommonService
 
 
 # 家庭房间管理

SensorGateway/GatewayFamilyRoomController.py → Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -14,7 +14,7 @@ from django.views.generic.base import View
 from Model.models import FamilyRoomDevice, FamilyRoom
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from SensorGateway.EquipmentFamilyController import EquipmentFamilyView
+from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
 
 
 # 家庭房间管理