diff --git a/apps/ecm/service.py b/apps/ecm/service.py index a058f5de..d4a4518c 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -476,8 +476,7 @@ def loc_change(data): # 触发超时滞留事件 code_name = 'stand_area' if code_name: # 2分钟不再次触发 - last_event = Event.objects.filter(cates__code=code_name, employee=blts.employee, - handle_user=None).order_by('-create_time').first() + last_event = Event.objects.filter(cates__code=code_name, employee=blts.employee).order_by('-create_time').first() if last_event and last_event.create_time + timedelta(minutes=2) > timezone.now(): pass else: @@ -498,8 +497,7 @@ def handle_xx_event(name: str, data: dict): cate = EventCate.objects.filter(code=name).first() # 找到最近未处理同一人发生的事件 if cate: # 5分钟内不再次触发 - last_event = Event.objects.filter(cates__code=name, employee=blts.employee, - handle_user=None).order_by('-create_time').first() + last_event = Event.objects.filter(cates__code=name, employee=blts.employee).order_by('-create_time').first() if last_event and last_event.create_time + timedelta(minutes=5) > timezone.now(): return event = Event() diff --git a/apps/system/views.py b/apps/system/views.py index 06471fcc..238a3409 100755 --- a/apps/system/views.py +++ b/apps/system/views.py @@ -620,7 +620,6 @@ class FileViewSet(CustomCreateModelMixin, RetrieveModelMixin, ListModelMixin, Cu config = configparser.ConfigParser() # 读取配置文件 filename = os.path.join(settings.BASE_DIR, 'server/conf.ini') -config.read(filename, encoding='utf-8') class ApkView(MyLoggingMixin, ListCreateAPIView): @@ -633,6 +632,7 @@ class ApkView(MyLoggingMixin, ListCreateAPIView): 获取apk信息 """ + config.read(filename, encoding='utf-8') file = config.get('apk', 'file') # if not file.startswith('http'): # file = settings.BASE_URL + file