Showing
1 changed file
with
11 additions
and
11 deletions
... | @@ -7,8 +7,8 @@ from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist | ... | @@ -7,8 +7,8 @@ from django.core.exceptions import FieldDoesNotExist, ObjectDoesNotExist |
7 | from django.shortcuts import render | 7 | from django.shortcuts import render |
8 | 8 | ||
9 | from api.videorecord import record | 9 | from api.videorecord import record |
10 | -from api.models import Video, Device, History, Lock, Record, Door | 10 | +from api.models import Video, Device, RemoteHistory, Lock, Record, Door |
11 | -from api.serializers import VideoSerializer, DeviceSerializer, HistorySerializer, RecordSerializer | 11 | +from api.serializers import VideoSerializer, DeviceSerializer, RemoteHistorySerializer, RecordSerializer |
12 | 12 | ||
13 | from rest_framework import status | 13 | from rest_framework import status |
14 | from rest_framework.views import APIView | 14 | from rest_framework.views import APIView |
... | @@ -27,9 +27,9 @@ from datetime import datetime, timedelta | ... | @@ -27,9 +27,9 @@ from datetime import datetime, timedelta |
27 | #로그인 및 토큰 반환 | 27 | #로그인 및 토큰 반환 |
28 | class Login(APIView) : | 28 | class Login(APIView) : |
29 | def get(self, request, format = None) : # request query에 door_id 포함되어있음 : api/auth?door_id=12345 | 29 | def get(self, request, format = None) : # request query에 door_id 포함되어있음 : api/auth?door_id=12345 |
30 | - try : | 30 | + try : |
31 | request_id = request.GET.get('door_id', None) | 31 | request_id = request.GET.get('door_id', None) |
32 | - if request_id == 'None' : | 32 | + if request_id == 'None' : |
33 | raise FieldDoesNotExist | 33 | raise FieldDoesNotExist |
34 | queryset = Door.objects.filter(door_id = request_id) # door_id 유효성 검색 | 34 | queryset = Door.objects.filter(door_id = request_id) # door_id 유효성 검색 |
35 | if queryset.exists() # 유효할 때 | 35 | if queryset.exists() # 유효할 때 |
... | @@ -63,10 +63,10 @@ class Device(APIView) : | ... | @@ -63,10 +63,10 @@ class Device(APIView) : |
63 | 63 | ||
64 | 64 | ||
65 | # 기기 추가 | 65 | # 기기 추가 |
66 | - def post(self, request, format = None) : # request body에 device_id 포함되어있음 | 66 | + def post(self, request, format = None) : # request body에 rfid_id 포함되어있음 |
67 | try : | 67 | try : |
68 | data = json.loads(request.body) | 68 | data = json.loads(request.body) |
69 | - request_id = data.get('device_id', None) | 69 | + request_id = data.get('rfid_id', None) |
70 | if request_id == 'None' : | 70 | if request_id == 'None' : |
71 | raise FieldDoesNotExist | 71 | raise FieldDoesNotExist |
72 | queryset = Device.objects.create(rfid_id = request_id) | 72 | queryset = Device.objects.create(rfid_id = request_id) |
... | @@ -80,10 +80,9 @@ class Device(APIView) : | ... | @@ -80,10 +80,9 @@ class Device(APIView) : |
80 | 80 | ||
81 | 81 | ||
82 | # 기기 삭제 | 82 | # 기기 삭제 |
83 | - def delete(self, request, format = None): # request body에 device_id 포함 | 83 | + def delete(self, request, device_id, format = None): # request URI에 device_id(자동생성되는 기기 고유 번호 != rfid_id) 포함 |
84 | try : | 84 | try : |
85 | - data = json.loads(request.body) | 85 | + request_id = device_id |
86 | - request_id = data.get('device_id', None) | ||
87 | if request_id == 'None': | 86 | if request_id == 'None': |
88 | raise FieldDoesNotExist | 87 | raise FieldDoesNotExist |
89 | queryset = Device.objects.get(device_id=request_id) | 88 | queryset = Device.objects.get(device_id=request_id) |
... | @@ -100,8 +99,8 @@ class Remote(APIView): | ... | @@ -100,8 +99,8 @@ class Remote(APIView): |
100 | # 원격 잠금 해제 기록 조회 | 99 | # 원격 잠금 해제 기록 조회 |
101 | def get(self, request, format = None) : | 100 | def get(self, request, format = None) : |
102 | #models.py의 class History 사용. | 101 | #models.py의 class History 사용. |
103 | - queryset = History.objects.all() | 102 | + queryset = RemoteHistory.objects.all() |
104 | - serializer = HistorySerializer(queryset, many = True) | 103 | + serializer = RemoteHistorySerializer(queryset, many = True) |
105 | res = { | 104 | res = { |
106 | "remoteHistoryList": serializer.data | 105 | "remoteHistoryList": serializer.data |
107 | } | 106 | } |
... | @@ -110,6 +109,7 @@ class Remote(APIView): | ... | @@ -110,6 +109,7 @@ class Remote(APIView): |
110 | 109 | ||
111 | 110 | ||
112 | 111 | ||
112 | + | ||
113 | # 비디오 목록 조회 | 113 | # 비디오 목록 조회 |
114 | class VideoList(APIView) : | 114 | class VideoList(APIView) : |
115 | def get(self, request, format = None) : | 115 | def get(self, request, format = None) : | ... | ... |
-
Please register or login to post a comment