Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into locky

 Conflicts:

	Service/EquipmentInfoService.py

Controller/SensorGateway/EquipmentFamilyController.py

@@ -1018,7 +1018,7 @@ class EquipmentFamilyView(View):
         if not permission or permission == '003':
             return response.json(404)
         family_room_device_qs = FamilyRoomDevice.objects \
-            .filter(Q(family_id=family_id), ~Q(device_id__isExist=2), Q(device__userID=user_id)) \
+            .filter(Q(family_id=family_id), ~Q(device_id__isExist=2)) \
             .values().order_by('sort', '-device__data_joined')
         if not family_room_device_qs.exists():
             return response.json(0, device_dict)

Controller/SensorGateway/GatewayDeviceController.py

@@ -447,7 +447,7 @@ class GatewayDeviceView(View):
             return response.json(444)
         try:
             redis_obj = RedisObject()
-            result = redis_obj.set_data(user_id, serial_number, 60)
+            result = redis_obj.set_data(user_id, serial_number, 300)
             if not result:
                 return response.json(178)
             return response.json(0)

Service/EquipmentInfoService.py

@@ -11,7 +11,7 @@ import itertools
 import logging
 import time
 
-from django.db.models import Value, CharField
+from django.db.models import Value, CharField, Q
 
 from Model.models import EquipmentInfoMonday, EquipmentInfoTuesday, EquipmentInfoWednesday, EquipmentInfoThursday, \
     EquipmentInfoFriday, EquipmentInfoSaturday, EquipmentInfoSunday
@@ -169,9 +169,10 @@ class EquipmentInfoService:
         if event_type:
             # 多类型查询
             eventTypeList = cls.get_comb_event_type(event_type)
-            eventTypeList += cls.get_combo_type_bins(event_type)
+            # eventTypeList += cls.get_combo_type_bins(event_type)
             eventTypeList = list(set(eventTypeList))
-            qs = qs.filter(event_type__in=eventTypeList)
+            tags = cls.get_event_tag(event_type)
+            qs = qs.filter(Q(event_type__in=eventTypeList) | Q(event_tag__regex=tags))
         if start_time and end_time:
             qs = qs.filter(event_time__range=(start_time, end_time))
         else:
@@ -425,6 +426,24 @@ class EquipmentInfoService:
             print('推送错误异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return res_list
 
+    @staticmethod
+    def get_event_tag(event_type):
+        """
+        获取标签用于筛选推送消息
+        """
+        if ',' in event_type:
+            tags = ''
+            res_list = event_type.split(',')
+            tag_size = len(res_list)
+            for i, item in enumerate(res_list):
+                tags += ',' + str(item) + ','
+                if i < (tag_size - 1):
+                    tags += '|'
+            return tags
+
+        else:
+            return ',' + str(event_type) + ','
+
     @staticmethod
     def update_equipment_answer_status(user_id, uid, event_time):
         """