定制化推送2

AdminController/UserManageController.py

@@ -274,6 +274,10 @@ class UserManagement(View):
             return self.replyFeedBack(request_dict, response)
         elif operation == 'sendSysMsgToUser':
             return self.sendSysMsgToUser(request_dict, response)
+        elif operation == 'getCountryList':  # 查询国家列表
+            return self.getCountryList(response)
+        elif operation == 'getDeviceTypeList':  # 查询设备型号列表
+            return self.getDeviceTypeList(response)
         else:
             tko = TokenObject(request.META.get('HTTP_AUTHORIZATION'), returntpye='pc')
             if tko.code != 0:
@@ -298,14 +302,19 @@ class UserManagement(View):
                 return self.collectFeedBack(request_dict, response)
             elif operation == 'exportFeedBack':
                 return self.exportFeedBack(request_dict, response)
-            if operation == 'customerServiceManagement':  # 审核用户请求/生成超级密码
+            elif operation == 'customerServiceManagement':  # 审核用户请求/生成超级密码
                 return self.customerServiceManagement(request_dict, response)
-            if operation == 'getDeviceSuperPassword':  # 查询超级密码请求表
+            elif operation == 'getDeviceSuperPassword':  # 查询超级密码请求表
                 return self.getDeviceSuperPassword(request_dict, response)
-            if operation == 'deleteInformation':  # 删除超级密码请求表
+            elif operation == 'deleteInformation':  # 删除超级密码请求表
                 return self.deleteInformation(request_dict, response)
+            # 定制推送
+            elif operation == 'getCustomizedPushList':  # 查询定制推送列表
+                return self.getCustomizedPushList(request_dict, response)
+            elif operation == 'addOrEditCustomizedPush':  # 新增/编辑推送内容
+                return self.addOrEditCustomizedPush(request, request_dict, response)
             else:
-                return response.json(404)
+                return response.json(414)
 
     def getUserInfo(self, userID, request_dict, response):
         """
@@ -378,7 +387,7 @@ class UserManagement(View):
             return response.json(0, {'list': user_list, 'total': total})
         except Exception as e:
             print(e)
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def AddOrEditAccount(self, userID, request_dict, response):
         """