定时汇总业务数据、设备首页大小写、子设备房间ID

Controller/Cron/CronTaskController.py

@@ -563,8 +563,8 @@ class CronCollectDataView(View):
                         if device_type_name in device_type_temp_dict:
                             if is_pay == 0:
                                 device_type_temp_dict[device_type_name]['数量'] += 1
-                                device_type_temp_dict[device_type_name]['销售额'] = str(
-                                    round(float(device_type_temp_dict[device_type_name]['销售额']) + price, 2))
+                                device_type_temp_dict[device_type_name]['销售额'] = round(
+                                    device_type_temp_dict[device_type_name]['销售额'] + price, 2)
                             else:
                                 device_type_temp_dict[device_type_name] += 1
                         else:
@@ -577,8 +577,8 @@ class CronCollectDataView(View):
                         if store_meal_name in store_meal_temp_dict:
                             if is_pay == 0:
                                 store_meal_temp_dict[store_meal_name]['数量'] += 1
-                                store_meal_temp_dict[store_meal_name]['销售额'] = str(
-                                    round(float(store_meal_temp_dict[store_meal_name]['销售额']) + price, 2))
+                                store_meal_temp_dict[store_meal_name]['销售额'] = round(
+                                    store_meal_temp_dict[store_meal_name]['销售额'] + price, 2)
                             else:
                                 store_meal_temp_dict[store_meal_name] += 1
                         else:
@@ -681,7 +681,8 @@ class CronCollectDataView(View):
                         type_name = device_type_dict.get(item['device_type'], '未知设备类型')
                         increase_device_type_dict[type_name] = item['count']
                     # 云存设备类型数据
-                    increase_device_vod_list = increase_device_qs.filter(~Q(cloud_vod=2)).values('device_type').annotate(
+                    increase_device_vod_list = increase_device_qs.filter(~Q(cloud_vod=2)).values(
+                        'device_type').annotate(
                         count=Count('device_type')).order_by('count')
                     increase_device_vod_dict = {}
                     for item in increase_device_vod_list:
@@ -695,7 +696,8 @@ class CronCollectDataView(View):
                         type_name = device_type_dict.get(item['device_type'], '未知设备类型')
                         increase_device_ai_dict[type_name] = item['count']
                     # 联通设备类型数据
-                    increase_device_unicom_list = increase_device_qs.filter(~Q(mobile_4g=2)).values('device_type').annotate(
+                    increase_device_unicom_list = increase_device_qs.filter(~Q(mobile_4g=2)).values(
+                        'device_type').annotate(
                         count=Count('device_type')).order_by('count')
                     increase_device_unicom_dict = {}
                     for item in increase_device_unicom_list:

Controller/EquipmentManagerV3.py

@@ -741,7 +741,7 @@ class EquipmentManagerV3(View):
                     img_sign = bucket.sign_url('GET', obj, 300)
                     p['preview'].append(img_sign)
 
-            p_uid = p['UID']
+            p_uid = p['UID'].upper()
 
             # 返回设备初始化字符
             uid_qs = UIDModel.objects.filter(uid=p_uid).values('platform', 'init_string', 'init_string_app')

Controller/SensorGateway/SubDeviceController.py

@@ -558,7 +558,8 @@ class GatewaySubDeviceView(View):
                         'srcAddr': device_qs[0]['src_addr'],
                         'status': device_qs[0]['status'],
                         'createdTime': device_qs[0]['created_time'],
-                        'roomName': room_name
+                        'roomName': room_name,
+                        'familyId': family_id
                     }
                     device_list.append(res)
             return response.json(0, device_list)