diff --git a/apps/ecm/service.py b/apps/ecm/service.py index 9a09e427..dfac315d 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -80,7 +80,7 @@ def notify_event(event: Event, voice_msg=''): # 生成通知文本 ep = event.employee 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': ''} if event.opl: # 主要针对的是作业人员未就位事件 params['employee'] = event.opl.cate.name + '作业' diff --git a/apps/third/views.py b/apps/third/views.py index 2a9d3b77..7ee353c2 100755 --- a/apps/third/views.py +++ b/apps/third/views.py @@ -171,8 +171,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): authentication_classes=[], permission_classes=[], serializer_class=serializers.Serializer, logging_methods=[]) # 日志 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() @action(methods=['post'], detail=False, @@ -180,12 +179,12 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志 def c_rail(self, request, pk=None): data = request.data - if data.data.type == 1: + if data['data']['type'] == 1: # 围栏进入 - rail_in(data=data.data) - elif data.data.type == 2: + rail_in(data=data['data']) + elif data['data']['type'] == 2: # 围栏离开 - rail_out(data=data.data) + rail_out(data=data['data']) return Response() @action(methods=['post'], detail=False, @@ -193,7 +192,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): serializer_class=serializers.Serializer, logging_methods=['POST']) # 日志 def c_one_key_alarm(self, request, pk=None): 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() @action(methods=['post'], detail=False, @@ -201,7 +200,7 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): serializer_class=serializers.Serializer, logging_methods=[]) # 日志 def c_lowpower(self, request, pk=None): data = request.data - handle_xx_event(name='low_power', data=data.data) + handle_xx_event(name='low_power', data=data['data']) return Response()