From bab858f8f11b1c0682cece6ca77e86110de52860 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 26 Apr 2022 23:00:08 +0800 Subject: [PATCH] =?UTF-8?q?face=200.36=20=E6=B5=81=E7=A8=8B=E5=8D=A1?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/hrm/serializers.py | 6 +++--- hb_server/apps/hrm/services.py | 4 ++-- hb_server/apps/hrm/views.py | 6 +++--- hb_server/apps/wpm/views.py | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hb_server/apps/hrm/serializers.py b/hb_server/apps/hrm/serializers.py index e6999f2..a79ca9c 100644 --- a/hb_server/apps/hrm/serializers.py +++ b/hb_server/apps/hrm/serializers.py @@ -20,15 +20,15 @@ class EmployeeNotWorkRemarkSerializer(ModelSerializer): fields = ['not_work_remark'] class FaceLoginSerializer(serializers.Serializer): base64 = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.38) + tolerance = serializers.FloatField(required=False, default=0.36) class FaceLoginPathSerializer(serializers.Serializer): path = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.38) + tolerance = serializers.FloatField(required=False, default=0.36) class FaceClockCreateSerializer(serializers.Serializer): base64 = serializers.CharField() - tolerance = serializers.FloatField(required=False, default=0.38) + tolerance = serializers.FloatField(required=False, default=0.36) class ClockRecordListSerializer(serializers.ModelSerializer): create_by_ = UserSimpleSerializer(source='create_by', read_only=True) diff --git a/hb_server/apps/hrm/services.py b/hb_server/apps/hrm/services.py index 8b220e8..3bb097e 100644 --- a/hb_server/apps/hrm/services.py +++ b/hb_server/apps/hrm/services.py @@ -10,7 +10,7 @@ from django.core.cache import cache class HRMService: @classmethod - def face_compare_from_path(cls, path, tolerance=0.38): + def face_compare_from_path(cls, path, tolerance=0.36): filepath = settings.BASE_DIR +path try: unknown_picture = face_recognition.load_image_file(filepath) @@ -43,7 +43,7 @@ class HRMService: return None, '匹配多张人脸:' + user_name_str @classmethod - def face_compare_from_base64(cls, base64_data, tolerance=0.38): + def face_compare_from_base64(cls, base64_data, tolerance=0.36): filename = str(uuid.uuid4()) filepath = settings.BASE_DIR +'/temp/' + filename +'.png' with open(filepath, 'wb') as f: diff --git a/hb_server/apps/hrm/views.py b/hb_server/apps/hrm/views.py index 2fa4eec..c167784 100644 --- a/hb_server/apps/hrm/views.py +++ b/hb_server/apps/hrm/views.py @@ -109,7 +109,7 @@ class ClockRecordViewSet(CreateModelMixin, ListModelMixin, GenericViewSet): if 8<=now_local.hour<=17: base64_data = base64.urlsafe_b64decode(tran64( request.data.get('base64').replace(' ', '+'))) - user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.38)) + user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.36)) if user: ins, created = ClockRecord.objects.get_or_create( create_by = user, create_time__hour__range = [8,18], @@ -160,7 +160,7 @@ class FaceLogin(CreateAPIView): 人脸识别登录 """ base64_data = base64.urlsafe_b64decode(tran64(request.data.get('base64').replace(' ', '+'))) - user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.38)) + user, msg = HRMService.face_compare_from_base64(base64_data, request.data.get('tolerance', 0.36)) if user: refresh = RefreshToken.for_user(user) # 可设为在岗 @@ -198,7 +198,7 @@ class FacePathLogin(CreateAPIView): """ 人脸识别登录-文件地址 """ - user, msg = HRMService.face_compare_from_path(request.data.get('path'), request.data.get('tolerance', 0.38)) + user, msg = HRMService.face_compare_from_path(request.data.get('path'), request.data.get('tolerance', 0.36)) if user: refresh = RefreshToken.for_user(user) # 可设为在岗 diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index 0f12002..36c5f9a 100644 --- a/hb_server/apps/wpm/views.py +++ b/hb_server/apps/wpm/views.py @@ -439,7 +439,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet): WpmService.add_wproduct_flow_log(instance=obj, change_str=change_str) return Response() - @action(methods=['get'], detail=True, perms_map={'get': 'wp_card'}) + @action(methods=['get'], detail=True, perms_map={'get': '*'}) def card(self, request, pk=None): """ 流程卡