AI识别反馈增加识别来源字段

Controller/FeedBack.py

@@ -11,8 +11,10 @@ from Model.models import FeedBackModel, StatResModel, PushInaccurateFeedback
 from Object.AWS.AmazonS3Util import AmazonS3Util
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
+from Object.utils import LocalDateTimeUtil
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
+from Service.EquipmentInfoService import EquipmentInfoService
 
 
 class FeedBackView(View):
@@ -345,6 +347,13 @@ class FeedBackView(View):
         now_time = int(time.time())
         is_st = int(is_st)
         try:
+            # 默认查询近七天内数据
+            end_time = int(time.time())
+            start_time = LocalDateTimeUtil.get_before_days_timestamp(end_time, 7)
+            uid_list = uid.split(',')
+            equipment_info_qs, count = EquipmentInfoService. \
+                union_equipment_info(user_id, uid_list, event_type, start_time, end_time, 1, 10)
+            identify_type = 1 if equipment_info_qs[0]['event_tag'] else 0
             s3 = AmazonS3Util(
                 aws_access_key_id=ACCESS_KEY_ID,
                 secret_access_key=SECRET_ACCESS_KEY,
@@ -365,7 +374,8 @@ class FeedBackView(View):
                         s3.copy_obj(PUSH_BUCKET, PUSH_INACCURATE_BUCKET, file_path)
             PushInaccurateFeedback.objects.create(equipment_info_id=equipment_info_id, user_id=user_id,
                                                   event_type=event_type, uid=uid, channel=channel,
-                                                  add_time=now_time, tag=tag, is_st=is_st, event_time=event_time)
+                                                  add_time=now_time, tag=tag, is_st=is_st, event_time=event_time,
+                                                  identify_type=identify_type)
             return response.json(0)
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))

Model/models.py

@@ -1505,6 +1505,7 @@ class PushInaccurateFeedback(models.Model):
     event_type = models.IntegerField(default=0, verbose_name='事件类型')
     event_time = models.CharField(default='', max_length=16, verbose_name='事件时间')
     is_st = models.SmallIntegerField(default=0, verbose_name='是否多图')  # 1:单图, 3:多图
+    identify_type = models.SmallIntegerField(default=0, verbose_name='AI识别类型')  # 0:云端检测, 1:本地检测
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
     tag = models.CharField(default='', max_length=128, verbose_name='标签')
 
@@ -4524,6 +4525,7 @@ class SwitchDimmingSettings(models.Model):
 class SwitchChronopher(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     device_id = models.CharField(max_length=32, default='', verbose_name='设备id')
+    chronopher_type = models.SmallIntegerField(default=0, verbose_name='任务类型')  # 0: 排程任务, 1: 计时器任务
     time_type_radio = models.SmallIntegerField(default=1, verbose_name='切换时间点/时间段')  # 1: 按时间点, 2: 按时间段
     time_point = models.IntegerField(default=0, verbose_name='时间点时间戳')
     time_quantum_start_time = models.IntegerField(default=0, verbose_name='时间段开始时间')