zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取apk信息bug

This commit is contained in:
曹前明 2022-09-22 15:55:24 +08:00
parent 6b088e8111
commit a2f156926d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/ecm/service.py
View File

@ -476,8 +476,7 @@ def loc_change(data):
# 触发超时滞留事件 # 触发超时滞留事件
code_name = 'stand_area' code_name = 'stand_area'
if code_name: # 2分钟不再次触发 if code_name: # 2分钟不再次触发
last_event = Event.objects.filter(cates__code=code_name, employee=blts.employee, last_event = Event.objects.filter(cates__code=code_name, employee=blts.employee).order_by('-create_time').first()
handle_user=None).order_by('-create_time').first()
if last_event and last_event.create_time + timedelta(minutes=2) > timezone.now(): if last_event and last_event.create_time + timedelta(minutes=2) > timezone.now():
pass pass
else: else:
@ -498,8 +497,7 @@ def handle_xx_event(name: str, data: dict):
cate = EventCate.objects.filter(code=name).first() cate = EventCate.objects.filter(code=name).first()
# 找到最近未处理同一人发生的事件 # 找到最近未处理同一人发生的事件
if cate: # 5分钟内不再次触发 if cate: # 5分钟内不再次触发
last_event = Event.objects.filter(cates__code=name, employee=blts.employee, last_event = Event.objects.filter(cates__code=name, employee=blts.employee).order_by('-create_time').first()
handle_user=None).order_by('-create_time').first()
if last_event and last_event.create_time + timedelta(minutes=5) > timezone.now(): if last_event and last_event.create_time + timedelta(minutes=5) > timezone.now():
return return
event = Event() event = Event()

2
apps/system/views.py
View File

@ -620,7 +620,6 @@ class FileViewSet(CustomCreateModelMixin, RetrieveModelMixin, ListModelMixin, Cu
config = configparser.ConfigParser() config = configparser.ConfigParser()
# 读取配置文件 # 读取配置文件
filename = os.path.join(settings.BASE_DIR, 'server/conf.ini') filename = os.path.join(settings.BASE_DIR, 'server/conf.ini')
config.read(filename, encoding='utf-8')
class ApkView(MyLoggingMixin, ListCreateAPIView): class ApkView(MyLoggingMixin, ListCreateAPIView):
@ -633,6 +632,7 @@ class ApkView(MyLoggingMixin, ListCreateAPIView):
获取apk信息 获取apk信息
""" """
config.read(filename, encoding='utf-8')
file = config.get('apk', 'file') file = config.get('apk', 'file')
# if not file.startswith('http'): # if not file.startswith('http'):
# file = settings.BASE_URL + file # file = settings.BASE_URL + file