瀏覽代碼

查询子设备信息-智能按钮返回紧急开关状态

locky 3 年之前
父節點
當前提交
d3edc2d8e1
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 5 1
      Controller/SensorGateway/SubDeviceController.py
  2. 2 1
      Model/models.py

+ 5 - 1
Controller/SensorGateway/SubDeviceController.py

@@ -130,7 +130,9 @@ class GatewaySubDeviceView(View):
         try:
         try:
             gateway_sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('manufacturer',
             gateway_sub_device_qs = GatewaySubDevice.objects.filter(id=sub_device_id).values('manufacturer',
                                                                                              'device_model',
                                                                                              'device_model',
-                                                                                             'mac', 'sensor_serial')
+                                                                                             'mac', 'sensor_serial',
+                                                                                             'device_type',
+                                                                                             'is_tampered')
             if not gateway_sub_device_qs.exists():
             if not gateway_sub_device_qs.exists():
                 return response.json(173)
                 return response.json(173)
             res = {
             res = {
@@ -139,6 +141,8 @@ class GatewaySubDeviceView(View):
                 'mac': gateway_sub_device_qs[0]['mac'],
                 'mac': gateway_sub_device_qs[0]['mac'],
                 'sensor_serial': gateway_sub_device_qs[0]['sensor_serial'],
                 'sensor_serial': gateway_sub_device_qs[0]['sensor_serial'],
             }
             }
+            if gateway_sub_device_qs[0]['device_type'] == 216:  # 智能按钮返回紧急开关状态
+                res['emergency_status'] = gateway_sub_device_qs[0]['is_tampered']
             return response.json(0, res)
             return response.json(0, res)
         except Exception as e:
         except Exception as e:
             return response.json(500, repr(e))
             return response.json(500, repr(e))

+ 2 - 1
Model/models.py

@@ -2558,7 +2558,8 @@ class GatewaySubDevice(models.Model):
     ieee_addr = models.CharField(default='', max_length=64, verbose_name=u'长地址')
     ieee_addr = models.CharField(default='', max_length=64, verbose_name=u'长地址')
     src_addr = models.CharField(default='', max_length=16, verbose_name=u'短地址')
     src_addr = models.CharField(default='', max_length=16, verbose_name=u'短地址')
     status = models.SmallIntegerField(default=0, verbose_name='状态')  # 0:关闭, 1:开启
     status = models.SmallIntegerField(default=0, verbose_name='状态')  # 0:关闭, 1:开启
-    is_tampered = models.SmallIntegerField(default=0, verbose_name='拆动状态')  # 0:正常, 1:被拆动
+    # 0:正常, 1:被拆动, 智能按钮紧急开关状态: 0:关闭, 1:开启
+    is_tampered = models.SmallIntegerField(default=0, verbose_name='拆动状态')
     mac = models.CharField(default='', max_length=32, verbose_name=u'mac地址')
     mac = models.CharField(default='', max_length=32, verbose_name=u'mac地址')
     device_model = models.CharField(default='', max_length=16, verbose_name=u'设备型号')
     device_model = models.CharField(default='', max_length=16, verbose_name=u'设备型号')
     manufacturer = models.CharField(default='', max_length=16, verbose_name=u'制造商')
     manufacturer = models.CharField(default='', max_length=16, verbose_name=u'制造商')