优化数据系统报错

AdminController/dataSystemManagement/BusinessDataController.py

@@ -112,7 +112,7 @@ class BusinessDataView(View):
                     play_device_count += int(result['result']['playDeviceCount'])
                     vod_list += result['result']['vodData']
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'uploadDeviceCount': upload_device_count,
                 'playDeviceCount': play_device_count,

AdminController/dataSystemManagement/HomeDataController.py

@@ -185,67 +185,70 @@ class HomeDataView(View):
                 url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
-                user_increase_count += result['result']['userIncreaseCount']
-                user_active_count += result['result']['userActiveCount']
-                user_all_count += result['result']['userAllCount']
-                device_increase_count += result['result']['deviceIncreaseCount']
-                device_active_count += result['result']['deviceActiveCount']
-                device_all_count += result['result']['deviceAllCount']
-                order_total += result['result']['orderTotal']
-                vod_order_total += result['result']['vodOrderTotal']
-                ai_order_total += result['result']['aiOrderTotal']
-                unicom_order_total += result['result']['unicomOrderTotal']
-                order_all_total += result['result']['orderAllTotal']
-                vod_order_all_total += result['result']['vodOrderAllTotal']
-                ai_order_all_total += result['result']['aiOrderAllTotal']
-                unicom_order_all_total += result['result']['unicomOrderAllTotal']
-                for item in result['result']['userIncreaseRegion']:
-                    flag = 0
-                    for each in user_increase_temp_list:
-                        if item['countryName'] == each['countryName']:
-                            each['count'] += item['count']
-                            flag = 1
-                            break
-                    if flag == 0:
-                        user_increase_temp_list.append(item)
+                if result['result_code'] == 0:
+                    user_increase_count += result['result']['userIncreaseCount']
+                    user_active_count += result['result']['userActiveCount']
+                    user_all_count += result['result']['userAllCount']
+                    device_increase_count += result['result']['deviceIncreaseCount']
+                    device_active_count += result['result']['deviceActiveCount']
+                    device_all_count += result['result']['deviceAllCount']
+                    order_total += result['result']['orderTotal']
+                    vod_order_total += result['result']['vodOrderTotal']
+                    ai_order_total += result['result']['aiOrderTotal']
+                    unicom_order_total += result['result']['unicomOrderTotal']
+                    order_all_total += result['result']['orderAllTotal']
+                    vod_order_all_total += result['result']['vodOrderAllTotal']
+                    ai_order_all_total += result['result']['aiOrderAllTotal']
+                    unicom_order_all_total += result['result']['unicomOrderAllTotal']
+                    for item in result['result']['userIncreaseRegion']:
+                        flag = 0
+                        for each in user_increase_temp_list:
+                            if item['countryName'] == each['countryName']:
+                                each['count'] += item['count']
+                                flag = 1
+                                break
+                        if flag == 0:
+                            user_increase_temp_list.append(item)
 
-                for item in result['result']['userAllRegion']:
-                    flag = 0
-                    for each in user_all_temp_list:
-                        if item['countryName'] == each['countryName']:
-                            each['count'] += item['count']
-                            flag = 1
-                            break
-                    if flag == 0:
-                        user_all_temp_list.append(item)
-            if user_increase_temp_list:
-                for item in user_increase_temp_list:
-                    if user_increase_count:
-                        rate = round(item['count'] / user_increase_count * 100, 2)
-                    else:
-                        rate = 0
-                    if rate >= 10:
-                        item['rate'] = rate
-                        user_increase_list.append(item)
-                    else:
-                        user_increase_other_dict['count'] += item['count']
-                if user_increase_count:
-                    user_increase_other_dict['rate'] = round(user_increase_other_dict['count'] / user_increase_count * 100, 2)
-                user_increase_list.append(user_increase_other_dict)
-            if user_all_temp_list:
-                for item in user_all_temp_list:
-                    if user_all_count:
-                        rate = round(item['count'] / user_all_count * 100, 2)
-                    else:
-                        rate = 0
-                    if rate >= 10:
-                        item['rate'] = rate
-                        user_all_list.append(item)
-                    else:
-                        user_all_other_dict['count'] += item['count']
-                if user_all_count:
-                    user_all_other_dict['rate'] = round(user_all_other_dict['count'] / user_all_count * 100, 2)
-                user_all_list.append(user_all_other_dict)
+                    for item in result['result']['userAllRegion']:
+                        flag = 0
+                        for each in user_all_temp_list:
+                            if item['countryName'] == each['countryName']:
+                                each['count'] += item['count']
+                                flag = 1
+                                break
+                        if flag == 0:
+                            user_all_temp_list.append(item)
+                    if user_increase_temp_list:
+                        for item in user_increase_temp_list:
+                            if user_increase_count:
+                                rate = round(item['count'] / user_increase_count * 100, 2)
+                            else:
+                                rate = 0
+                            if rate >= 10:
+                                item['rate'] = rate
+                                user_increase_list.append(item)
+                            else:
+                                user_increase_other_dict['count'] += item['count']
+                        if user_increase_count:
+                            user_increase_other_dict['rate'] = round(user_increase_other_dict['count'] / user_increase_count * 100, 2)
+                        user_increase_list.append(user_increase_other_dict)
+                    if user_all_temp_list:
+                        for item in user_all_temp_list:
+                            if user_all_count:
+                                rate = round(item['count'] / user_all_count * 100, 2)
+                            else:
+                                rate = 0
+                            if rate >= 10:
+                                item['rate'] = rate
+                                user_all_list.append(item)
+                            else:
+                                user_all_other_dict['count'] += item['count']
+                        if user_all_count:
+                            user_all_other_dict['rate'] = round(user_all_other_dict['count'] / user_all_count * 100, 2)
+                        user_all_list.append(user_all_other_dict)
+                else:
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'userIncreaseCount': user_increase_count,
                 'userActiveCount': user_active_count,
@@ -287,14 +290,17 @@ class HomeDataView(View):
                 url = url + request.path.replace('global/', '')
                 res = requests.get(url=url, params=request_dict, headers=headers)
                 result = res.json()
-                for item in result['result']:
-                    flag = 0
-                    for each in order_list:
-                        if item['startTime'] == each['startTime'] and item['endTime'] == each['endTime']:
-                            each['total'] += item['total']
-                            break
-                    if flag == 0:
-                        order_list.append(item)
+                if result['result_code'] == 0:
+                    for item in result['result']:
+                        flag = 0
+                        for each in order_list:
+                            if item['startTime'] == each['startTime'] and item['endTime'] == each['endTime']:
+                                each['total'] += item['total']
+                                break
+                        if flag == 0:
+                            order_list.append(item)
+                else:
+                    return response.json(result['result_code'], result['result'])
             return response.json(0, order_list)
         except Exception as e:
             return response.json(500, repr(e))

AdminController/dataSystemManagement/ServiceDataController.py

@@ -650,7 +650,7 @@ class ServiceDataView(View):
                         item['rate'] = rate
                         item['totalRate'] = total_rate
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'orders': order_list,
                 'regions': CommonService.list_sort(region_list),
@@ -737,7 +737,7 @@ class ServiceDataView(View):
                     new_device_count += int(result['result']['newDeviceCount'])
                     order_device_count += int(result['result']['orderDeviceCount'])
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             if new_device_count:
                 inversion_rate = round(order_device_count / new_device_count * 100, 2)
             else:
@@ -825,7 +825,7 @@ class ServiceDataView(View):
                             type_rate = 0
                         item['typeRate'] = type_rate
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'orders': order_list,
                 'regions': CommonService.list_sort(region_list),
@@ -911,7 +911,7 @@ class ServiceDataView(View):
                     repeat_count += result['result']['repeatCount']
                     order_count += result['result']['orderCount']
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             if order_count:
                 repeat_rate = round(repeat_count / order_count * 100, 2)
             else:

AdminController/dataSystemManagement/UserDataController.py

@@ -276,7 +276,7 @@ class UserDataView(View):
                         else:
                             item['rate'] = 0
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'user': user_list,
                 'region': CommonService.list_sort(region_list)
@@ -341,7 +341,7 @@ class UserDataView(View):
                         else:
                             item['rate'] = 0
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'user': user_list,
                 'region': CommonService.list_sort(region_list)
@@ -403,7 +403,7 @@ class UserDataView(View):
                         else:
                             item['rate'] = 0
                 else:
-                    return response.json(result['result_code'])
+                    return response.json(result['result_code'], result['result'])
             res = {
                 'countries': CommonService.list_sort(user_list[:20]),
                 'continent': CommonService.list_sort(region_list)