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

寻息订阅bug/默认未知区域

This commit is contained in:
曹前明 2022-09-13 18:28:16 +08:00
parent 7441a481fc
commit 5a759d2fa4
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ecm/service.py
View File

@ -80,7 +80,7 @@ def notify_event(event: Event, voice_msg=''):
# 生成通知文本 # 生成通知文本
ep = event.employee ep = event.employee
obj_cate = event.obj_cate obj_cate = event.obj_cate
area_name = event.area.name if event.area else '' area_name = event.area.name if event.area else '未知区域'
params = {'area': area_name, 'employee': '', 'event': ''} params = {'area': area_name, 'employee': '', 'event': ''}
if event.opl: # 主要针对的是作业人员未就位事件 if event.opl: # 主要针对的是作业人员未就位事件
params['employee'] = event.opl.cate.name + '作业' params['employee'] = event.opl.cate.name + '作业'

15
apps/third/views.py
View File

@ -171,8 +171,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet):
authentication_classes=[], permission_classes=[], authentication_classes=[], permission_classes=[],
serializer_class=serializers.Serializer, logging_methods=[]) # 日志 serializer_class=serializers.Serializer, logging_methods=[]) # 日志
def c_location(self, request, pk=None): def c_location(self, request, pk=None):
myLogger.info('数据格式:' + str(request.body) + '-----' + str(request.body)) loc_change(data=request.data['data'])
loc_change(data=request.data.data)
return Response() return Response()
@action(methods=['post'], detail=False, @action(methods=['post'], detail=False,
@ -180,12 +179,12 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet):
serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志 serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志
def c_rail(self, request, pk=None): def c_rail(self, request, pk=None):
data = request.data data = request.data
if data.data.type == 1: if data['data']['type'] == 1:
# 围栏进入 # 围栏进入
rail_in(data=data.data) rail_in(data=data['data'])
elif data.data.type == 2: elif data['data']['type'] == 2:
# 围栏离开 # 围栏离开
rail_out(data=data.data) rail_out(data=data['data'])
return Response() return Response()
@action(methods=['post'], detail=False, @action(methods=['post'], detail=False,
@ -193,7 +192,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet):
serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志 serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志
def c_one_key_alarm(self, request, pk=None): def c_one_key_alarm(self, request, pk=None):
data = request.data data = request.data
handle_xx_event(name='one_key_alarm', data=data.data) handle_xx_event(name='one_key_alarm', data=data['data'])
return Response() return Response()
@action(methods=['post'], detail=False, @action(methods=['post'], detail=False,
@ -201,7 +200,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet):
serializer_class=serializers.Serializer, logging_methods=[]) # 日志 serializer_class=serializers.Serializer, logging_methods=[]) # 日志
def c_lowpower(self, request, pk=None): def c_lowpower(self, request, pk=None):
data = request.data data = request.data
handle_xx_event(name='low_power', data=data.data) handle_xx_event(name='low_power', data=data['data'])
return Response() return Response()