测试工具删除设备接口

Controller/EquipmentManagerV3.py

@@ -38,12 +38,13 @@ class EquipmentManagerV3(View):
 
     def validation(self, request_dict, request, operation):
         response = ResponseObject()
-        token = request_dict.get('token', None)
-        # 设备主键uid
 
         if operation == 'notLoginMainUserDevice':
             return self.not_login_do_mainUserDevice(request_dict, response)
+        elif operation == 'notLoginMainDelDevice':
+            return self.test_tool_del_device(request_dict, response)
 
+        token = request_dict.get('token', None)
         tko = TokenObject(token)
         if tko.code != 0:
             return response.json(tko.code)
@@ -943,6 +944,35 @@ class EquipmentManagerV3(View):
                 qs[0]['phone'] = NickName
         return response.json(0, qs)
 
+    @staticmethod
+    def test_tool_del_device(request_dict, response):
+        """
+        测试工具删除设备
+        @param request_dict: 请求数据
+        @request_dict user_id: 用户id
+        @request_dict uid: uid
+        @request_dict time_stamp: 时间戳
+        @request_dict time_stamp_token: 时间戳token
+        @param response: 响应
+        @return: response
+        """
+        user_id = request_dict.get('user_id')
+        uid = request_dict.get('uid')
+        time_stamp = request_dict.get('time_stamp', None)
+        time_stamp_token = request_dict.get('time_stamp_token', None)
+
+        if not all([user_id, uid, time_stamp, time_stamp_token]):
+            return response.json(444)
+
+        try:
+            # 时间戳token校验
+            if not CommonService.check_time_stamp_token(time_stamp_token, time_stamp):
+                return response.json(13)
+
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
     def do_get_device_features(self, request_dict, response):
         uid = request_dict.get('uid', None)
 

Controller/RegionController.py

@@ -310,13 +310,9 @@ class RegionView(View):
             is_app = False
 
         try:
-            # 校验时间戳token
-            time_stamp_token = int(CommonService.decode_data(time_stamp_token))
-            time_stamp = int(time_stamp)
-            now_time = int(time.time())
-            distance = now_time - time_stamp
-            if time_stamp_token != time_stamp or distance > 60000 or distance < -60000:  # 为了全球化时间控制在一天内
-                return response.json(404)
+            # 时间戳token校验
+            if not CommonService.check_time_stamp_token(time_stamp_token, time_stamp):
+                return response.json(13)
 
             # 查询app名
             app_inf_qs = App_Info.objects.filter(appBundleId=app_bundle_id).values('appName')