From 5a759d2fa4f8389149c1be00515be5a2d2c5d4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 13 Sep 2022 18:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E6=81=AF=E8=AE=A2=E9=98=85bug/?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=9C=AA=E7=9F=A5=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/service.py |  2 +-
 apps/third/views.py | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

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()