分离查询温湿度传感器记录接口

Controller/SensorGateway/SubDeviceController.py

@@ -31,8 +31,8 @@ class GatewaySubDeviceView(View):
         lang = request_dict.get('lang', None)
         response = ResponseObject(lang if lang else token_obj.lang)
 
-        if token_obj.code != 0:
-            return response.json(token_obj.code)
+        # if token_obj.code != 0:
+        #     return response.json(token_obj.code)
         user_id = token_obj.userID
         if operation == 'add':  # 添加子设备
             return self.add(request_dict, user_id, response)
@@ -42,8 +42,12 @@ class GatewaySubDeviceView(View):
             return self.sensor_update(request_dict, response)
         elif operation == 'delete':  # 删除子设备
             return self.delete(request_dict, user_id, response)
-        elif operation == 'records':  # 查询子设备记录数据
+        elif operation == 'records/tem-hum':  # 查询温湿度传感器记录
+            return self.records_tem_hum(request_dict, response)
+        elif operation == 'records':  # 查询其他传感器记录
             return self.records(request_dict, response)
+        elif operation == 'recordsDate':  # 查询传感器记录日期
+            return self.records_date(request_dict, response)
         else:
             return response.json(414)
 
@@ -176,120 +180,156 @@ class GatewaySubDeviceView(View):
             return response.json(500, repr(e))
 
     @staticmethod
-    def records(request_dict, response):
+    def records_tem_hum(request_dict, response):
         """
-        查询子设备记录数据
+        查询温湿度传感器记录
         @param request_dict: 请求参数
         @request_dict gatewaySubId: 子设备id
         @request_dict cycle: 时间周期
-        @request_dict page: 页数
-        @request_dict size: 条数
+        @request_dict eventType: 事件类型, 18:温度,19:湿度
         @param response: 响应对象
         @return: response
         """
         sub_device_id = request_dict.get('gatewaySubId', None)
         cycle = request_dict.get('cycle', None)
-        if not all([sub_device_id]):
-            return response.json(444, {'error param': 'gatewaySubId'})
+        event_type = request_dict.get('eventType', None)
+        if not all([sub_device_id, cycle, event_type]):
+            return response.json(444, {'error param': 'gatewaySubId or cycle or eventType'})
         now_time = int(time.time())
         try:
-            if not cycle:
-                page = request_dict.get('page', None)
-                size = request_dict.get('size', None)
-                start_time = request_dict.get('startTime', None)
-                end_time = request_dict.get('endTime', None)
-                if not all([page, size]):
-                    return response.json(444, {'error param': 'page or size'})
-                page, size = int(page), int(size)
+            record_dict = OrderedDict()
+            record_list = []
+            if cycle == 'Hours':
+                start_time = now_time - 24 * 60 * 60
+                sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
+                                                               event_type=event_type,
+                                                               created_time__range=(start_time, now_time)). \
+                    values('alarm', 'created_time').order_by('created_time')
+                if not sensor_record_qs.exists():
+                    return response.json(0, {'records': [], 'time': now_time})
+
+                for sensor_record in sensor_record_qs:
+                    created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
+                    hour = int(created_time[-7:-5])
+                    minute = int(created_time[-4:-2])
+                    if hour != 23 and minute > 30:  # 不为23时且分钟大于30,hour+1
+                        hour += 1
+                    alarm = float(sensor_record['alarm'])
+                    # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
+                    if str(hour) in record_dict:
+                        record_dict[str(hour)].append(alarm)
+                    else:
+                        record_dict[str(hour)] = [alarm]
 
-                if start_time and end_time:
-                    sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
-                                                                   created_time__range=(start_time, end_time)). \
-                                           values('alarm', 'created_time').order_by('-created_time')[
-                                       (page - 1) * size:page * size]
-                else:
-                    sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id). \
-                                           values('alarm', 'created_time').order_by('-created_time')[
-                                       (page - 1) * size:page * size]
+            elif cycle == 'Week':
+                start_time = now_time - 24 * 60 * 60 * 7
+                sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
+                                                               event_type=event_type,
+                                                               created_time__range=(start_time, now_time)). \
+                    values('alarm', 'created_time').order_by('created_time')
                 if not sensor_record_qs.exists():
-                    return response.json(0)
-                return response.json(0, list(sensor_record_qs))
-            else:
-                event_type = int(request_dict.get('eventType', None))
-                if not event_type:
-                    return response.json(444, {'error param': 'eventType'})
-                record_dict = OrderedDict()
-                record_list = []
-                if cycle == 'Hours':
-                    start_time = now_time - 24 * 60 * 60
-                    sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
-                                                                   event_type=event_type,
-                                                                   created_time__range=(start_time, now_time)). \
-                        values('alarm', 'created_time').order_by('created_time')
-                    if not sensor_record_qs.exists():
-                        return response.json(0, {'records': [], 'time': now_time})
+                    return response.json(0, {'records': [], 'time': now_time})
 
-                    for sensor_record in sensor_record_qs:
-                        created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
-                        hour = int(created_time[-7:-5])
-                        minute = int(created_time[-4:-2])
-                        if hour != 23 and minute > 30:  # 不为23时且分钟大于30,hour+1
-                            hour += 1
-                        alarm = float(sensor_record['alarm'])
-                        # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
-                        if str(hour) in record_dict:
-                            record_dict[str(hour)].append(alarm)
-                        else:
-                            record_dict[str(hour)] = [alarm]
+                for sensor_record in sensor_record_qs:
+                    created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
+                    week = int(created_time[-1:])
+                    alarm = float(sensor_record['alarm'])
+                    # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
+                    if str(week) in record_dict:
+                        record_dict[str(week)].append(alarm)
+                    else:
+                        record_dict[str(week)] = [alarm]
 
-                elif cycle == 'Week':
-                    start_time = now_time - 24 * 60 * 60 * 7
-                    sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
-                                                                   event_type=event_type,
-                                                                   created_time__range=(start_time, now_time)). \
-                        values('alarm', 'created_time').order_by('created_time')
-                    if not sensor_record_qs.exists():
-                        return response.json(0, {'records': [], 'time': now_time})
+            elif cycle == 'Month':
+                start_time = now_time - 24 * 60 * 60 * 30
+                sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
+                                                               event_type=event_type,
+                                                               created_time__range=(start_time, now_time)). \
+                    values('alarm', 'created_time').order_by('created_time')
+                if not sensor_record_qs.exists():
+                    return response.json(0, {'records': [], 'time': now_time})
 
-                    for sensor_record in sensor_record_qs:
-                        created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
-                        week = int(created_time[-1:])
-                        alarm = float(sensor_record['alarm'])
-                        # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
-                        if str(week) in record_dict:
-                            record_dict[str(week)].append(alarm)
-                        else:
-                            record_dict[str(week)] = [alarm]
+                for sensor_record in sensor_record_qs:
+                    created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
+                    month = int(created_time[:2])
+                    day = int(created_time[3:5])
+                    date = str(month) + '/' + str(day)
+                    alarm = float(sensor_record['alarm'])
+                    # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
+                    if date in record_dict:
+                        record_dict[date].append(alarm)
+                    else:
+                        record_dict[date] = [alarm]
 
-                elif cycle == 'Month':
-                    start_time = now_time - 24 * 60 * 60 * 30
-                    sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
-                                                                   event_type=event_type,
-                                                                   created_time__range=(start_time, now_time)). \
-                        values('alarm', 'created_time').order_by('created_time')
-                    if not sensor_record_qs.exists():
-                        return response.json(0, {'records': [], 'time': now_time})
+            # 组织响应数据列表,value为每 小时/天 的平均值
+            for k, v in record_dict.items():
+                record_list.append({'key': k, 'value': round(sum(v) / len(v), 1)})
 
-                    for sensor_record in sensor_record_qs:
-                        created_time = time.strftime('%m/%d %H:%M %w', time.localtime(sensor_record['created_time']))
-                        month = int(created_time[:2])
-                        day = int(created_time[3:5])
-                        date = str(month) + '/' + str(day)
-                        alarm = float(sensor_record['alarm'])
-                        # 组织数据,record_dict:{"0": [1.0, 2.0, 3.0], "1": [1.0, 2.0, 3.0]...}
-                        if date in record_dict:
-                            record_dict[date].append(alarm)
-                        else:
-                            record_dict[date] = [alarm]
+            res = {
+                'records': record_list,
+                'time': now_time
+            }
+            return response.json(0, res)
+        except Exception as e:
+            return response.json(500, repr(e))
 
-                # 组织响应数据列表,value为每 小时/天 的平均值
-                for k, v in record_dict.items():
-                    record_list.append({'key': k, 'value': round(sum(v) / len(v), 1)})
+    @staticmethod
+    def records(request_dict, response):
+        """
+        查询其他传感器记录
+        @param request_dict: 请求参数
+        @request_dict gatewaySubId: 子设备id
+        @request_dict page: 页数
+        @request_dict size: 条数
+        @request_dict startTime: 开始时间
+        @request_dict endTime: 结束时间
+        @param response: 响应对象
+        @return: response
+        """
+        sub_device_id = request_dict.get('gatewaySubId', None)
+        page = request_dict.get('page', None)
+        size = request_dict.get('size', None)
+        if not all([sub_device_id, page, size]):
+            return response.json(444, {'error param': 'gatewaySubId or page or size'})
+
+        start_time = request_dict.get('startTime', None)
+        end_time = request_dict.get('endTime', None)
+
+        try:
+            page, size = int(page), int(size)
+            if start_time and end_time:
+                sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id,
+                                                               created_time__range=(start_time, end_time)). \
+                                       values('alarm', 'created_time').order_by('-created_time')[
+                                   (page - 1) * size:page * size]
+            else:
+                sensor_record_qs = SensorRecord.objects.filter(gateway_sub_device_id=sub_device_id). \
+                                       values('alarm', 'created_time').order_by('-created_time')[
+                                   (page - 1) * size:page * size]
+            if not sensor_record_qs.exists():
+                return response.json(0, [])
+            return response.json(0, list(sensor_record_qs))
+        except Exception as e:
+            return response.json(500, repr(e))
+
+    @staticmethod
+    def records_date(request_dict, response):
+        """
+        查询传感器记录日期
+        @param request_dict: 请求参数
+        @request_dict gatewaySubId: 子设备id
+        @request_dict startTime: 开始时间
+        @request_dict endTime: 结束时间
+        @param response: 响应对象
+        @return: response
+        """
+        sub_device_id = request_dict.get('gatewaySubId', None)
+        start_time = request_dict.get('startTime', None)
+        end_time = request_dict.get('endTime', None)
+        if not all([sub_device_id, start_time, end_time]):
+            return response.json(444, {'error param': 'gatewaySubId or startTime or endTime'})
 
-                res = {
-                    'records': record_list,
-                    'time': now_time
-                }
-                return response.json(0, res)
+        try:
+            return response.json(0)
         except Exception as e:
             return response.json(500, repr(e))