影院数据表增加删除标记

update/models.py

@@ -21,6 +21,7 @@ class Cinema(BaseModels):
     remote_label = models.CharField(verbose_name='远程办公id', max_length=20, null=True, default='',
                                     help_text='远程办公id')
     ver_id = models.IntegerField(verbose_name='版本id', null=False, default=0, help_text='版本id')
+    is_delete = models.BooleanField(verbose_name='是否删除', default=False, help_text='是否删除')
 
     def __str__(self):
         return self.ip

update/serializers.py

@@ -9,7 +9,7 @@ class CinemaSerializer(serializers.ModelSerializer):
         model = Cinema
         fields = (
             'id', 'name', 'ip', 'zz_num', 'inner_id', 'db_user', 'db_pwd', 'sys_ver', 'client_ver', 'user',
-            'update_time', 'is_cloud', 'remote_label', 'ver_id')
+            'update_time', 'is_cloud', 'remote_label', 'ver_id', 'is_delete')
 
 
 class CinemaUserSerializer(serializers.ModelSerializer):

update/utils/get_version.py

@@ -5,6 +5,7 @@ from update.models import Cinema, CinemaUser
 import queue
 import threading
 from django.utils import timezone
+from django.db.models import Q
 import datetime
 
 
@@ -17,9 +18,9 @@ class GetVersion(object):
     def get_all_cinema(self):
         print('get_all_cinema')
         if self.cinema_ip_list is None:
-            all_cinema_obj = Cinema.objects.all()
+            all_cinema_obj = Cinema.objects.filter(is_delete=False).all()
         else:
-            all_cinema_obj = Cinema.objects.filter(ip__in=self.cinema_ip_list)
+            all_cinema_obj = Cinema.objects.filter(Q(ip__in=self.cinema_ip_list) & Q(is_delete=False)).all()
         for cinema_obj in all_cinema_obj:
             print(cinema_obj)
             data = {

update/views.py

@@ -41,8 +41,9 @@ class CinemaViewSet(CacheResponseMixin, viewsets.ModelViewSet):
     retrieve: 获取某个影院的信息
     update: 更新某个影院的信息
     delete: 删除指定影院
+    .filter(is_delete=False)
     """
-    queryset = Cinema.objects.all()
+    queryset = Cinema.objects.filter(is_delete=False).all()
     serializer_class = CinemaSerializer
     # permission_classes = (permissions.IsAuthenticated,)
     filter_backends = (filters.SearchFilter, DjangoFilterBackend, OrderingFilter)
@@ -56,7 +57,7 @@ class CinemaViewSet(CacheResponseMixin, viewsets.ModelViewSet):
     @method_decorator(cache_page(60 * 1))
     def refresh(self, request, *args, **kwargs):
         GetVersion().main_process()
-        queryset = Cinema.objects.all().order_by('ip')
+        queryset = Cinema.objects.filter(is_delete=False).all().order_by('ip')
         serializer = self.get_serializer(instance=queryset, many=True)
         return Response(serializer.data)
 
@@ -85,7 +86,7 @@ class UpdateAlterViewSet(CacheResponseMixin, viewsets.ModelViewSet):
 def update_user(request, *args, **kwargs):
     cinema_id = request.GET.dict().get('id')
     user = json.loads(request.body).get('user', '暂无')
-    result = Cinema.objects.filter(id=cinema_id).update(user=user)
+    result = Cinema.objects.filter(Q(id=cinema_id) & Q(is_delete=False)).update(user=user)
     return JsonResponse({'result': 'success'} if result == 1 else {'result': 'fail'})