优化接口

Controller/VseesWeb/VseesController.py

@@ -35,13 +35,12 @@ class VseesManagement(View):
 
     def validation(self, request_dict, operation, request):
         response = ResponseObject()
-
         if operation == 'get-state':  # 获取sate值
             return self.get_state(response)
         elif operation == 'get-device-info':  # 查询微瞳设备类型图标信息
             return self.get_device_info(response)
         elif operation == 'get-product-info':  # 获取产品信息
-            return self.get_product_info(request_dict, request)
+            return self.get_product_info(request_dict, response)
         elif operation == 'get-user':  # 获取用户
             return self.get_user(request_dict, response)
         else:
@@ -130,7 +129,7 @@ class VseesManagement(View):
                 content = json.loads(json.dumps(request_dict))
                 log = {
                     'ip': CommonService.get_ip_address(request),
-                    'user_id': user_id,
+                    'user_id': 2,
                     'status': 200,
                     'time': int(time.time()),
                     'url': 'vsees/upload-file',
@@ -219,7 +218,7 @@ class VseesManagement(View):
                 content = json.loads(json.dumps(request_dict))
                 log = {
                     'ip': ip,
-                    'user_id': user_id,
+                    'user_id': 2,
                     'status': 200,
                     'time': int(time.time()),
                     'url': 'vsees/upload-file',
@@ -247,20 +246,24 @@ class VseesManagement(View):
         # 只下架
         if int(status) == 0:
             return response.json(177)
-        vseesProductInfo.objects.filter(id=product_id).update(status=status)
-        # 记录操作日志
-        content = json.loads(json.dumps(request_dict))
-        log = {
-            'ip': CommonService.get_ip_address(request),
-            'user_id': user_id,
-            'status': 200,
-            'time': int(time.time()),
-            'url': 'vsees/edit-status',
-            'content': json.dumps(content),
-            'operation': '{}修改资源状态'.format(user_id),
-        }
-        LogModel.objects.create(**log)
-        return response.json(0)
+        try:
+            vseesProductInfo.objects.filter(id=product_id).update(status=status)
+            # 记录操作日志
+            content = json.loads(json.dumps(request_dict))
+            log = {
+                'ip': CommonService.get_ip_address(request),
+                'user_id': 2,
+                'status': 200,
+                'time': int(time.time()),
+                'url': 'vsees/edit-status',
+                'content': json.dumps(content),
+                'operation': '{}修改资源状态'.format(user_id),
+            }
+            LogModel.objects.create(**log)
+            return response.json(0)
+        except Exception as e:
+            print(e)
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     @staticmethod
     def edit_info(request_dict, response, request, user_id):
@@ -287,7 +290,7 @@ class VseesManagement(View):
         content = json.loads(json.dumps(request_dict))
         log = {
             'ip': ip,
-            'user_id': user_id,
+            'user_id': 2,
             'status': 200,
             'time': int(time.time()),
             'url': 'vsees/edit-info',
@@ -326,8 +329,8 @@ class VseesManagement(View):
             return response.json(444, 'vsees_id')
         try:
             product_info_qs = vseesProductInfo.objects.all()
-            if not title and product_type:
-                product_info_qs = product_info_qs.filter(vsees__id=vsees_id, status=0).values('title').order_by(
+            if not (title and product_type):
+                product_info_qs = product_info_qs.filter(vsees_id=vsees_id, status=0).values('title').order_by(
                     '-add_time')
                 return response.json(0, list(product_info_qs))
             else:
@@ -340,7 +343,7 @@ class VseesManagement(View):
             print(e)
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
-# -------------------企业微信扫码登录--------------------------------
+    # -------------------企业微信扫码登录--------------------------------
     @staticmethod
     def get_state(response):
         """
@@ -363,6 +366,12 @@ class VseesManagement(View):
 
     @classmethod
     def get_user(cls, request_dict, response):
+        """
+        获取用户信息
+        @request_dict code:唯一标识
+        @request_dict state:唯一标识
+        return:
+        """
         code = request_dict.get('code', None)
         state = request_dict.get('state', None)
         if not all([code, state]):
@@ -387,7 +396,7 @@ class VseesManagement(View):
                     cls.get_user_info(access_token, userid, response)
                 tko = TokenObject()
                 rest = tko.generate(data={'userID': userid, 'user': 'come@on'})
-                return response.json(0, {'rest': rest})
+                return response.json(0, rest)
             else:
                 errcode = data.get('errcode')
                 errmsg = data.get('errmsg')