重构超级密码

AdminController/UserManageController.py

@@ -773,6 +773,8 @@ class UserManagement(View):
         审核用户请求/生成超级密码
         @param request_dict:请求参数
         @param response:响应对象
+        @request_dict status: 0:未通过,1:通过
+        @request_dict hint: 温馨提示
         @return:
         """
         ID = request_dict.get('ID', None)
@@ -782,7 +784,7 @@ class UserManagement(View):
         hint = request_dict.get('hint', None)
         lang = request_dict.get('lang', 'en')
         if not all({ID, uid, userID}):
-            return response.json(444)
+            return response.json(444, 'ID, uid, userID')
         now = int(time.time())
         try:
             with transaction.atomic():
@@ -803,13 +805,13 @@ class UserManagement(View):
                         msg = "Your authorization code is " + super_code + ",valid within 24 hours"
                     else:
                         msg = "您的授权代码：" + super_code + "，24小时内有效"
+                    # eventType: 0系统消息，1 ipcamera消息，2 超级密码
                     SysMsgModel.objects.create(userID_id=userID, msg=msg, addTime=now, updTime=now, uid=uid,
                                                eventType=2)
                     return response.json(0)
                 if status == 0 and len(hint) > 1:
                     device_super_password_qs.update(status=status, hint=hint)
-                    msg = hint
-                    SysMsgModel.objects.create(userID_id=userID, msg=msg, addTime=now, updTime=now, uid=uid,
+                    SysMsgModel.objects.create(userID_id=userID, msg=hint, addTime=now, updTime=now, uid=uid,
                                                eventType=2)
                     return response.json(0)
                 return response.json(177)

Ansjer/urls.py

@@ -22,7 +22,7 @@ from Controller import FeedBack, EquipmentOTA, EquipmentInfo, AdminManage, AppIn
     OrderTaskController, HistoryUIDController, UIDManageUserController, SerialNumberController, CompanyController, \
     RegionController, VPGController, LanguageController, TestController, DeviceConfirmRegion, S3GetStsController, \
     DetectControllerV2, PcInfo, PctestController, DeviceDebug, PaymentCycle, \
-    DeviceLogController, CouponController, AiController, ShadowController, SuperPasswordTool, InitController
+    DeviceLogController, CouponController, AiController, ShadowController, AppAccountManagement, InitController
 from Controller.Cron import CronTaskController
 from Controller.MessagePush import EquipmentMessagePush
 from Controller.SensorGateway import SensorGatewayController, EquipmentFamilyController
@@ -256,7 +256,7 @@ urlpatterns = [
     re_path(r'^api/algorithm/', include("Ansjer.server_urls.algorithm_shop_url")),
     re_path(r'^kvs/', include("Ansjer.server_urls.kvs_url")),
     re_path(r'^icloud/', include("Ansjer.server_urls.icloud_url")),
-    re_path('appAccout/(?P<operation>.*)', SuperPasswordTool.SuperPasswordView.as_view()),
+    re_path('appAccout/(?P<operation>.*)', AppAccountManagement.SuperPasswordView.as_view()),
     re_path('sensorGateway/(?P<operation>.*)', SensorGatewayController.SensorGateway.as_view()),
     re_path(r'^api/surveys/(?P<operation>.*)$', CloudStorageController.CloudStorageView.as_view()),
     re_path(r'^api/device/share/(?P<operation>.*)$', UserDeviceShareController.UserDeviceShareView.as_view()),

Controller/SuperPasswordTool.py → Controller/AppAccountManagement.py

@@ -59,16 +59,16 @@ class SuperPasswordView(View):
         @return:
         """
         uid = request_dict.get('uid', None)
+        # 需求描述
         describe = request_dict.get('describe', None)
-        if not all([uid, describe]):
-            return response.json(444)
         purchase_channel = request_dict.get('purchase_channel', None)
         orderID = request_dict.get('orderID', None)
         buyTime = request_dict.get('buyTime', None)
         lang = request_dict.get('lang', 'en')
+        if not all([uid, describe]):
+            return response.json(444, 'uid, describe')
         try:
-            now = int(time.time())
-            addTime = now
+            nowTime = int(time.time())
             device_user_qs = Device_User.objects.filter(userID=userID)
             if not device_user_qs.exists():
                 return response.json(173)
@@ -76,7 +76,7 @@ class SuperPasswordView(View):
                 buyTime = datetime.datetime.strptime(buyTime, '%Y-%m-%d')
                 buyTime = CommonService.str_to_timestamp(str_time=str(buyTime))
             DeviceSuperPassword.objects.create(uid=uid, orderID=orderID, describe=describe,
-                                               purchase_channel=purchase_channel, addTime=addTime, userID_id=userID,
+                                               purchase_channel=purchase_channel, addTime=nowTime, userID_id=userID,
                                                buyTime=buyTime, status=0, lang=lang)
 
             return response.json(0)