修改智能开关日志参数

Controller/SensorGateway/SmartSwitchController.py

@@ -387,14 +387,16 @@ class SmartSwitchView(View):
         @param response: 响应对象
         @return: response
         """
-        serial_number = request_dict.get('serialNumber', None)
-        chronopher_id = request_dict.get('taskId', None)
+        serial_number = request_dict.get('serial_number', None)
+        chronopher_id = request_dict.get('task_id', None)
         operate_status = request_dict.get('status', None)
-        switch_status = request_dict.get('switchStatus', None)
-        implement_time = request_dict.get('implementTime', None)
+        switch_status = request_dict.get('switch_status', None)
+        implement_time = request_dict.get('implement_time', None)
+        brightness = request_dict.get('brightness', None)
 
-        if not all([serial_number, chronopher_id, operate_status, switch_status, implement_time]):
-            return response.json(444, {'error param': 'deviceId or chronopherId'})
+        if not all([serial_number, chronopher_id, operate_status, switch_status, implement_time, brightness]):
+            return response.json(444, {
+                'error param': 'serial_number, chronopher_id, status, switch_status, implement_time, brightness'})
         device_qs = Device_Info.objects.filter(serial_number=serial_number).values('id')
         if not device_qs.exists():
             return response.json(173)
@@ -420,6 +422,7 @@ class SmartSwitchView(View):
                 'device_id': device_id,
                 'status': switch_status,
                 'operate_type': 2,
+                'brightness': brightness,
                 'created_time': implement_time
             }
             operate_qs = SwitchOperateLog.objects.filter(**operate_log)
@@ -460,15 +463,15 @@ class SmartSwitchView(View):
     @staticmethod
     def reset(request_dict, response):
         """
-        查询执行日志
+        重置设备
         @param request_dict: 请求参数
         @request_dict serialNumber: 设备序列号
         @param response: 响应对象
         @return: response
         """
-        serial_number = request_dict.get('serialNumber', None)
+        serial_number = request_dict.get('serial_number', None)
         if not serial_number:
-            return response.json(444, {'error param': 'serialNumber'})
+            return response.json(444, {'error param': 'serial_number'})
         device_qs = Device_Info.objects.filter(serial_number=serial_number).values('id')
         if not device_qs.exists():
             return response.json(173)
@@ -531,12 +534,12 @@ class SmartSwitchView(View):
         @param response: 响应对象
         @return: response
         """
-        serial_number = request_dict.get('serialNumber', None)
-        status = request_dict.get('switchStatus', None)
-        implement_time = request_dict.get('implementTime', None)
+        serial_number = request_dict.get('serial_number', None)
+        status = request_dict.get('switch_status', None)
+        implement_time = request_dict.get('implement_time', None)
 
         if not all([serial_number, status, implement_time]):
-            return response.json(444, {'error param': 'deviceId or chronopherId'})
+            return response.json(444, {'error param': 'serial_number, switch_status, implement_time'})
         device_qs = Device_Info.objects.filter(serial_number=serial_number).values('id')
         if not device_qs.exists():
             return response.json(173)

Model/models.py

@@ -3909,6 +3909,7 @@ class SocketSchedule(models.Model):
 class SwitchOperateLog(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     device_id = models.CharField(max_length=32, default='', verbose_name='设备id')
+    brightness = models.CharField(max_length=32, default='', verbose_name='预设亮度')
     status = models.SmallIntegerField(default=0, verbose_name='开关状态')
     operate_type = models.SmallIntegerField(default=1, verbose_name='操作类型')  # 1：普通操作；2排程操作
     created_time = models.IntegerField(default=0, verbose_name='创建时间')