diff --git a/apps/am/models.py b/apps/am/models.py index d6d66eb0..a3d27083 100755 --- a/apps/am/models.py +++ b/apps/am/models.py @@ -30,7 +30,7 @@ class Area(CommonBModel): level = models.PositiveSmallIntegerField('区域风险等级') cate = models.PositiveSmallIntegerField('区域分类') number = models.CharField('编号', max_length=20, null=True, blank=True) - access_list = models.JSONField('准入人员类型', default=list, null=False, blank=True, help_text='employee/remployee/visitor') + access_list = models.JSONField('准入人员类型', default=list, null=False, blank=True, help_text='employee/remployee/visitor/driver') count_people_min = models.PositiveIntegerField('最小人员数', default=0) count_people_max = models.PositiveIntegerField('最大人员数', default=1000) count_people = models.PositiveIntegerField('当前人数', default=0) diff --git a/apps/am/views.py b/apps/am/views.py index c1f300b4..5bc97458 100755 --- a/apps/am/views.py +++ b/apps/am/views.py @@ -25,6 +25,8 @@ class AreaViewSet(CustomModelViewSet): serializer_class=serializers.Serializer) def bind_rail(self, request, pk=None): """ + 绑定围栏 + 绑定围栏 """ data = request.data diff --git a/apps/develop/views.py b/apps/develop/views.py index 52d0d0bc..3d3ef559 100755 --- a/apps/develop/views.py +++ b/apps/develop/views.py @@ -252,8 +252,7 @@ class TestViewSet(CustomGenericViewSet): 位置信息改变 """ - data = {'buildId': '204878', 'floorNo': 'Floor1', 'userId': '1918B20019F5', 'timestampMillisecond': 1663064881805, 'xMillimeter': 316654, 'yMillimeter': 361852, - 'zMillimeter': 0, 'pointProperties': 0, 'locationType': 1, 'status': 2, 'src': 0, 'longitude': 114.7395738002794, 'latitude': 38.621726856149856} + data = {'buildId': '204878', 'floorNo': 'Floor1', 'userId': '1918B2001A26', 'timestampMillisecond': 1663749630302, 'xMillimeter': 314364, 'yMillimeter': 362752, 'zMillimeter': 0, 'pointProperties': 0, 'locationType': 1, 'status': 0, 'src': 0, 'longitude': 114.63020038067505, 'latitude': 38.81357371331778} res = loc_change(data=data) return Response(res) diff --git a/apps/ecm/service.py b/apps/ecm/service.py index 2accbbd7..8465c258 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -478,7 +478,6 @@ def loc_change(data): ep_loc_dict['time1'] = time2 ep_loc_dict['area_fix_id'] = area_fix['id'] if area_fix else None cache.set(key_str, ep_loc_dict) - myLogger.info('人员位置:' + str(ep_loc_dict)) return ep_loc_dict diff --git a/apps/hrm/serializers.py b/apps/hrm/serializers.py index 63fe2347..405c23e6 100755 --- a/apps/hrm/serializers.py +++ b/apps/hrm/serializers.py @@ -135,12 +135,10 @@ class EmployeeDetailSerializer(EmployeeSerializer): if dh_face_card: _, res = dhClient.request(**dhapis['card_detail'], params={'cardNumber': dh_face_card}) return [res['startDate'], res['endDate']] - + def get_location(self, obj): key_str = 'ep_{}'.format(obj.id) - ep_loc_dict = cache.get_or_set( - key_str, get_ep_default(), timeout=None - ) + ep_loc_dict = cache.get(key_str, None) return ep_loc_dict diff --git a/apps/third/views_d.py b/apps/third/views_d.py index 1eacba7d..04f40e66 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -285,12 +285,14 @@ class TDeviceViewSet(ListModelMixin, UpdateModelMixin, DestroyModelMixin, Custom vdata['blt'] = blt BltBind.objects.create(**vdata) elif vdata['type'] == BltBind.BLT_UNBIND: + ep_old = blt.employee if blt.employee: blt.employee = None blt.save() vdata['obj_cate'] = 'people' vdata.pop('code') vdata['blt'] = blt + vdata['employee'] = ep_old BltBind.objects.create(**vdata) else: raise ParseError('该定位卡在系统中不存在')