diff --git a/apps/hrm/views.py b/apps/hrm/views.py index 52cd3899..a6a0556b 100644 --- a/apps/hrm/views.py +++ b/apps/hrm/views.py @@ -1,31 +1,36 @@ +from datetime import datetime + +from django.conf import settings +from django.db import transaction from django.shortcuts import render from django.utils import timezone -from rest_framework.response import Response -from rest_framework.mixins import UpdateModelMixin, RetrieveModelMixin, CreateModelMixin, ListModelMixin -from apps.hrm.errors import NO_NEED_LEVEL_REMARK -from apps.hrm.filters import ClockRecordFilterSet, EmployeeFilterSet, NotWorkRemarkFilterSet -from apps.hrm.models import ClockRecord, Employee, NotWorkRemark -from apps.hrm.serializers import ClockRecordListSerializer, ChannelAuthoritySerializer, EmployeeCreateUpdateSerializer, EmployeeNotWorkRemarkSerializer, EmployeeSerializer, NotWorkRemarkListSerializer - - - +from rest_framework import exceptions, serializers, status +from rest_framework.decorators import action +from rest_framework.exceptions import ParseError from rest_framework.generics import CreateAPIView -from rest_framework import status +from rest_framework.mixins import (CreateModelMixin, ListModelMixin, + RetrieveModelMixin, UpdateModelMixin) +from rest_framework.permissions import AllowAny +from rest_framework.response import Response from rest_framework_simplejwt.tokens import RefreshToken -from rest_framework import exceptions + +from apps.hrm.errors import NO_NEED_LEVEL_REMARK +from apps.hrm.filters import (ClockRecordFilterSet, EmployeeFilterSet, + NotWorkRemarkFilterSet) +from apps.hrm.models import ClockRecord, Employee, NotWorkRemark +from apps.hrm.serializers import (ChannelAuthoritySerializer, + ClockRecordListSerializer, + EmployeeCreateUpdateSerializer, + EmployeeNotWorkRemarkSerializer, + EmployeeSerializer, + NotWorkRemarkListSerializer) from apps.system.models import User from apps.system.serializers import UserSimpleSerializer -from rest_framework.permissions import AllowAny -from rest_framework.decorators import action -from apps.utils.serializers import PkSerializer -from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet -from rest_framework.exceptions import ParseError -from django.db import transaction -from datetime import datetime -from rest_framework import serializers from apps.third.clients import dhClient from apps.third.tapis import dhapis -from server import settings +from apps.utils.serializers import PkSerializer +from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet + # Create your views here. class EmployeeViewSet(CustomModelViewSet): @@ -184,4 +189,4 @@ class NotWorkRemarkViewSet(ListModelMixin, CustomGenericViewSet): select_related_fields = ['user'] serializer_class = NotWorkRemarkListSerializer filterset_class = NotWorkRemarkFilterSet - ordering = ['-pk'] \ No newline at end of file + ordering = ['-pk'] diff --git a/apps/third/views.py b/apps/third/views.py index 17d9e6ed..7107555a 100644 --- a/apps/third/views.py +++ b/apps/third/views.py @@ -15,7 +15,7 @@ from rest_framework.decorators import action from apps.third.serializers import RequestCommonSerializer from rest_framework import serializers import stomp -from server import settings +from django.conf import settings # Create your views here. @@ -50,6 +50,7 @@ class XxTestView(APIView): else: raise APIException(**res) +# 寻息事件订阅 class XxListener(stomp.ConnectionListener): def on_error(self, frame): print('received an error "%s"' % frame.body) @@ -58,11 +59,11 @@ class XxListener(stomp.ConnectionListener): print('received a message "%s"' % frame.body) -# if settings.XX_ENABLED: -# c = stomp.Connection([(settings.XX_MQ_HOST, settings.XX_MQ_PORT)]) -# c.set_listener('', XxListener()) -# c.connect(settings.XX_USERNAME, settings.XX_LICENCE) -# c.subscribe(settings.XX_QUEUE, id='') +if settings.XX_ENABLED: + c = stomp.Connection([(settings.XX_MQ_HOST, settings.XX_MQ_PORT)]) + c.set_listener('', XxListener()) + c.connect(settings.XX_USERNAME, settings.XX_LICENCE) + c.subscribe(settings.XX_QUEUE, id='') class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): """ @@ -142,7 +143,7 @@ class DhCommonViewSet(CreateModelMixin, CustomGenericViewSet): "param": { "monitors": [ { - "monitor": "http://127.0.0.1:8000/test", + "monitor": settings.BASE_URL + request.path, "monitorType": "url", "events": [ { diff --git a/apps/utils/dahua.py b/apps/utils/dahua.py index 9b4d9bdf..f1ddd3f5 100644 --- a/apps/utils/dahua.py +++ b/apps/utils/dahua.py @@ -3,7 +3,7 @@ import traceback import requests from apps.utils.errors import DH_REQUEST_ERROR from apps.utils.tools import print_roundtrip -from server import settings +from django.conf import settings import json import time from rest_framework.exceptions import APIException, ParseError diff --git a/apps/utils/xunxi.py b/apps/utils/xunxi.py index 9886b162..9c0fadfa 100644 --- a/apps/utils/xunxi.py +++ b/apps/utils/xunxi.py @@ -3,7 +3,7 @@ import requests import json from apps.utils.errors import XX_REQUEST_ERROR from apps.utils.tools import print_roundtrip -from server import settings +from django.conf import settings import time from rest_framework.exceptions import APIException, ParseError requests.packages.urllib3.disable_warnings() diff --git a/media/default/alarm.mp3 b/media/default/alarm.mp3 new file mode 100644 index 00000000..2727033d Binary files /dev/null and b/media/default/alarm.mp3 differ diff --git a/server/settings.py b/server/settings.py index f67a5419..ee64fff8 100644 --- a/server/settings.py +++ b/server/settings.py @@ -305,6 +305,9 @@ LOGGING = { # 实例化myLogger myLogger = logging.getLogger('log') +# 项目地址 +BASE_URL = conf.BASE_URL + # 大华ICC平台 DAHUA_ENABLED = conf.DAHUA_ENABLED DAHUA_BASE_URL = conf.DAHUA_BASE_URL