设备分组

Ansjer/server_urls/device_group_url.py

@@ -0,0 +1,10 @@
+# @Author    : Rocky
+# @File      : device_group_url.py
+# @Time      : 2025/1/22 9:47
+from django.urls import re_path
+
+from Controller.DeviceManagement import DeviceGroupController
+
+urlpatterns = [
+    re_path(r'^manage/(?P<operation>.*)$', DeviceGroupController.DeviceGroupView.as_view()),
+]

Ansjer/urls.py

@@ -390,6 +390,7 @@ urlpatterns = [
     re_path('customCustomer/(?P<operation>.*)$', CustomCustomerController.CustomCustomerView.as_view()),
     re_path('adDepartment/(?P<operation>.*)$', AdDepartmentController.AdDepartmentView.as_view()),
     re_path('shopify/(?P<operation>.*)$', ShopifyController.ShopifyView.as_view()),
+    re_path('^deviceGroup/', include('Ansjer.server_urls.device_group_url')),
     # 根据版本号获取设备配置信息
     re_path('open/device/configuration/(?P<operation>.*)', DeviceVersionInfoController.DeviceVersionInfoView.as_view()),
     # 获取APN配置信息

Controller/DeviceManagement/DeviceGroupController.py

@@ -0,0 +1,230 @@
+# @Author    : Rocky
+# @File      : DeviceGroupController.py
+# @Time      : 2025/1/22 9:51
+from collections import Counter
+
+from django.db import transaction
+from django.db.models import Q
+from django.views import View
+
+from Ansjer.config import LOGGER
+from Model.models import DeviceGroup, Device_Info
+from Service.CommonService import CommonService
+
+
+class DeviceGroupView(View):
+    def get(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.GET, request, operation)
+
+    def post(self, request, *args, **kwargs):
+        request.encoding = 'utf-8'
+        operation = kwargs.get('operation')
+        return self.validation(request.POST, request, operation)
+
+    def validation(self, request_dict, request, operation):
+        token_code, user_id, response = CommonService.verify_token_get_user_id(request_dict, request)
+        if token_code != 0:
+            return response.json(token_code)
+        if operation == 'queryGroupQuantity':  # 查询分组数量
+            return self.query_group_quantity(request_dict, user_id, response)
+        elif operation == 'queryGroupDevice':  # 查询分组设备
+            return self.query_group_device(request_dict, user_id, response)
+        elif operation == 'queryOtherGroupDevice':  # 查询其他分组设备
+            return self.query_other_group_device(request_dict, user_id, response)
+        elif operation == 'creat':  # 创建分组
+            return self.creat(request_dict, user_id, response)
+        elif operation == 'update':  # 重命名分组
+            return self.update(request_dict, user_id, response)
+        elif operation == 'delete':  # 删除分组
+            return self.delete(request_dict, user_id, response)
+        elif operation == 'transferGroup':  # 转移分组
+            return self.transfer_group(request_dict, user_id, response)
+        else:
+            return response.json(414)
+
+    @staticmethod
+    def query_group_quantity(request_dict, user_id, response):
+        """
+        完全重写的分组数量查询（确保正确性）
+        """
+        try:
+            groups = DeviceGroup.objects.filter(user_id=user_id)
+            if not groups.exists():
+                return response.json(0, {'total': 0, 'device_groups': []})
+
+            device_group_ids = Device_Info.objects.filter(
+                userID_id=user_id,
+                isExist=1
+            ).values_list('device_group_id', flat=True)
+
+            count_map = Counter(device_group_ids)
+
+            device_groups = []
+            total_count = 0
+
+            for group in groups:
+                device_count = count_map.get(group.id, 0)
+                device_groups.append({
+                    'id': group.id,
+                    'group_name': group.group_name,
+                    'device_quantity': device_count
+                })
+                total_count += device_count
+
+            return response.json(0, {
+                'total': total_count,
+                'device_groups': device_groups
+            })
+
+        except Exception as e:
+            LOGGER.error(f"查询分组数量失败: {str(e)}")
+            return response.json(1, "系统错误")
+
+    @staticmethod
+    def query_group_device(request_dict, user_id, response):
+        """
+        查询分组设备
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        device_group_id = request_dict.get('device_group_id', None)
+        if not device_group_id:
+            return response.json(444)
+        device_info_qs = Device_Info.objects.filter(device_group_id=device_group_id).values('id', 'NickName', 'Type')
+        if not device_info_qs.exists():
+            return response.json(0, [])
+        res = list(device_info_qs)
+        return response.json(0, res)
+
+    @staticmethod
+    def query_other_group_device(request_dict, user_id, response):
+        """
+        查询其他分组设备
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        device_group_id = request_dict.get('device_group_id', None)
+        if not device_group_id:
+            return response.json(444)
+        try:
+            res = []
+            # 查询全部设备
+            if device_group_id != '0':
+                device_info_qs = Device_Info.objects.filter(~Q(device_group_id=device_group_id), userID=user_id). \
+                    values('id', 'NickName', 'Type')
+                if device_info_qs.exists():
+                    data = {
+                        'id': 0,
+                        'group_name': 'all'
+                    }
+                    device_info_list = []
+                    for device_info in device_info_qs:
+                        device_info_list.append(device_info)
+                    data['device_info_list'] = device_info_list
+                    res.append(data)
+
+            # 查询设备数量不为0的其他分组
+            device_group_qs = DeviceGroup.objects.filter(~Q(id=device_group_id), user_id=user_id). \
+                values('id', 'group_name')
+            if device_group_qs.exists():
+                # 查询各组的设备id和昵称
+                for device_group in device_group_qs:
+                    device_info_list = []
+                    device_info_qs = Device_Info.objects.filter(device_group_id=device_group['id']). \
+                        values('id', 'NickName', 'Type')
+                    for device_info in device_info_qs:
+                        device_info_list.append(device_info)
+                    device_group['device_info_list'] = device_info_list
+                    res.append(device_group)
+            return response.json(0, res)
+        except Exception as e:
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
+    @staticmethod
+    def creat(request_dict, user_id, response):
+        """
+        创建分组
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        group_name = request_dict.get('group_name', None)
+        if not group_name:
+            return response.json(444)
+        # 该用户已存在该组名的分组
+        device_group_qs = DeviceGroup.objects.filter(user_id=user_id, group_name=group_name)
+        if device_group_qs.exists():
+            return response.json(174)
+        DeviceGroup.objects.create(user_id=user_id, group_name=group_name)
+        return response.json(0)
+
+    @staticmethod
+    def update(request_dict, user_id, response):
+        """
+        重命名分组
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        device_group_id = request_dict.get('device_group_id', None)
+        group_name = request_dict.get('group_name', None)
+        if not all([device_group_id, group_name]):
+            return response.json(444)
+        # 该用户已存在该组名的分组
+        device_group_qs = DeviceGroup.objects.filter(user_id=user_id, group_name=group_name)
+        if device_group_qs.exists():
+            return response.json(174)
+        DeviceGroup.objects.filter(id=device_group_id).update(group_name=group_name)
+        return response.json(0)
+
+    @staticmethod
+    def delete(request_dict, user_id, response):
+        """
+        删除分组
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        device_group_id = request_dict.get('device_group_id', None)
+        if not device_group_id:
+            return response.json(444)
+        try:
+            device_group_id = int(device_group_id)
+            with transaction.atomic():
+                # 删除设备分组数据,重置设备信息表的分组id
+                DeviceGroup.objects.filter(id=device_group_id).delete()
+                Device_Info.objects.filter(device_group_id=device_group_id).update(device_group_id=0)
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
+    @staticmethod
+    def transfer_group(request_dict, user_id, response):
+        """
+        转移分组
+        @param request_dict:
+        @param user_id:
+        @param response:
+        @return: res
+        """
+        device_group_id = request_dict.get('device_group_id', None)
+        device_id_list = request_dict.get('device_id_list', None)
+        if not all([device_group_id, device_id_list]):
+            return response.json(444)
+        try:
+            device_group_id = int(device_group_id)
+            device_id_list = device_id_list.split(',')
+            # 更新设备信息表的分组id
+            Device_Info.objects.filter(id__in=device_id_list).update(device_group_id=device_group_id)
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))

Controller/EquipmentManagerV3.py

@@ -823,8 +823,9 @@ class EquipmentManagerV3(View):
         if tko.code != 0:
             return response.json(tko.code)
         userID = tko.userID
+        group_id = int(request_dict.get('groupId', 0))
         # 查询设备列表以及设备uid集合
-        dv_list, uid_list = UserDeviceService.query_device_list(userID, uid, NickName, page, line)
+        dv_list, uid_list = UserDeviceService.query_device_list(userID, uid, NickName, page, line, group_id)
         ub_qs = UserDeviceService.query_device_uid_bucket(uid_list)  # 根据uid集合查询云存套餐
         up_qs = UserDeviceService.query_device_preview(uid_list)  # 根据uid集合查询设备预览图
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)

Model/models.py

@@ -270,6 +270,7 @@ class Device_Info(models.Model):
     serial_number = models.CharField(blank=True, max_length=9, default='', verbose_name='关联序列号')
     # 分享用户备注名
     noteName = models.CharField(max_length=64, verbose_name=u'用户备注名', default='', blank=True)
+    device_group_id = models.IntegerField(default=0, db_index=True, verbose_name='关联设备分组表id')
     ###
     REQUIRED_FIELDS = []
 
@@ -5511,6 +5512,16 @@ class CountryAPN(models.Model):
         verbose_name = 'APN配置表'
 
 
+class DeviceGroup(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='自增标记ID')
+    user_id = models.CharField(default='', max_length=32, verbose_name='用户id')
+    group_name = models.CharField(default='', max_length=32, verbose_name='组名')
+
+    class Meta:
+        db_table = 'device_group'
+        verbose_name = '设备分组'
+
+
 class DeviceNetInfo(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增标记ID')
     device_id = models.CharField(default='', max_length=32, verbose_name='关联设备信息表id')

Service/UserDeviceService.py

@@ -20,7 +20,7 @@ LOGGER = logging.getLogger('info')
 class UserDeviceService:
 
     @classmethod
-    def query_device_list(cls, user_id, uid, nickname, page, line):
+    def query_device_list(cls, user_id, uid, nickname, page, line, group_id=0):
         """
         查询设备列表
         @param user_id: 用户user_id
@@ -37,6 +37,8 @@ class UserDeviceService:
             dv_qs = dv_qs.filter(NickName=nickname)
         if uid:
             dv_qs = dv_qs.filter(UID=uid)
+        if group_id > 0:
+            dv_qs = dv_qs.filter(device_group_id=group_id)
         # 周视首页过滤网关以及插座类型
         dv_qs = dv_qs.exclude(Type__in=[200, 201])
         dv_qs = dv_qs.values('id', 'userID', 'NickName', 'UID', 'View_Account', 'View_Password', 'ChannelIndex',