Merge remote-tracking branch 'remotes/origin/locky' into test

Model/models.py

@@ -582,7 +582,7 @@ class EquipmentInfo1(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -611,7 +611,7 @@ class EquipmentInfo2(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -640,7 +640,7 @@ class EquipmentInfo3(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -669,7 +669,7 @@ class EquipmentInfo4(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -698,7 +698,7 @@ class EquipmentInfo5(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -727,7 +727,7 @@ class EquipmentInfo6(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -756,7 +756,7 @@ class EquipmentInfo7(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -785,7 +785,7 @@ class EquipmentInfo8(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -814,7 +814,7 @@ class EquipmentInfo9(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -843,7 +843,7 @@ class EquipmentInfo10(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -872,7 +872,7 @@ class EquipmentInfo11(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -901,7 +901,7 @@ class EquipmentInfo12(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -930,7 +930,7 @@ class EquipmentInfo13(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -959,7 +959,7 @@ class EquipmentInfo14(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -988,7 +988,7 @@ class EquipmentInfo15(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -1017,7 +1017,7 @@ class EquipmentInfo16(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -1046,7 +1046,7 @@ class EquipmentInfo17(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -1075,7 +1075,7 @@ class EquipmentInfo18(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -1104,7 +1104,7 @@ class EquipmentInfo19(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -1133,7 +1133,7 @@ class EquipmentInfo20(models.Model):
     # 0:空字符,1:ai人,2:ai动物,3:车,123:组合类型(人/车/动物),
     # 51:移动侦测,52:传感器报警,53:影像遗失,54:PIR,55:门磁报警,56:外部发报,57:人型报警,
     # 702:摄像头休眠,703:摄像头唤醒,704：电量过低
-    event_type = models.PositiveSmallIntegerField(default=0, verbose_name='事件类型')
+    event_type = models.IntegerField(default=0, verbose_name='事件类型')
     # （51,）表示一个事件标签。（51,57,）两个事件标签
     event_tag = models.CharField(default='', max_length=128, db_index=True, verbose_name='事件标签')
     alarm = models.CharField(default='', max_length=256, verbose_name='报警信息')
@@ -4333,6 +4333,8 @@ class IPAddr(models.Model):
     city = models.CharField(default='', max_length=32, verbose_name='市')
     region = models.CharField(default='', max_length=32, verbose_name='省/州')
     country_code = models.CharField(default='', max_length=8, verbose_name='国家编码')
+    lat = models.FloatField(default=0, verbose_name='经度')
+    lon = models.FloatField(default=0, verbose_name='纬度')
 
     class Meta:
         db_table = 'ip_addr'