开启消息推送默认接收所有类型提醒，新增查询序列号出厂套餐接口

AdminController/UnicomManageController.py

@@ -14,7 +14,7 @@ from decimal import Decimal
 import openpyxl
 import requests
 from django.db import transaction, connection
-from django.db.models import Q
+from django.db.models import Q, F
 from django.http import HttpResponse
 from django.views.generic.base import View
 
@@ -103,9 +103,60 @@ class UnicomManageControllerView(View):
                 return self.upload_file(tko.user, request, request_dict, response)
             elif operation == 'iccidBatchReset':  # 上传序列号文件绑定4G套餐
                 return self.iccid_batch_reset(tko.user, request, request_dict, response)
+            elif operation == 'orderFlowPackage':  # 订购流量套餐包
+                return self.order_flow_package(request_dict, response, userID)
+            elif operation == 'getSerialNumberPackagePage':  # 订购流量套餐包
+                return self.serial_number_package_page(request_dict, response)
+            elif operation == 'serialNumberPackageUpdate':  # 订购流量套餐包
+                return self.serial_number_package_update(request_dict, response, tko.user)
             else:
                 return response.json(404)
 
+    @classmethod
+    def order_flow_package(cls, request_dict, response, user):
+        """
+        订购流量套餐包
+        """
+        try:
+            serial_number = request_dict.get('serialNumber', None)
+            package_id = request_dict.get('packageId', None)
+            if not all([serial_number, package_id]):
+                return response.json(444)
+            u_device_info_qs = UnicomDeviceInfo.objects.filter(serial_no=serial_number, card_type=0) \
+                .exclude(Q(user_id__isnull=True) | Q(user_id=''))
+            if not u_device_info_qs.exists():
+                return response.json(173)
+            package_id = int(package_id)
+            combo_qs = UnicomCombo.objects.filter(id=package_id) \
+                .values('id', 'combo_name', 'price', 'virtual_price', 'remark').order_by('sort')
+            if not combo_qs.exists():
+                return response.json(173)
+
+            now_time = int(time.time())
+            combo_info_vo = combo_qs[0]
+            u_device_info = u_device_info_qs.first()
+            rank_id, ai_rank_id = UnicomComboView.get_cloud_or_ai_combo()  # 生成订单必须添加该字段
+            uid = CommonService.query_uid_with_serial(serial_number)
+
+            order_id = CommonService.createOrderID()
+            order_dict = {'orderID': order_id, 'UID': uid, 'rank_id': rank_id, 'ai_rank_id': ai_rank_id,
+                          'userID_id': u_device_info.user_id, 'desc': combo_info_vo['combo_name'], 'payType': 10,
+                          'payTime': now_time, 'price': combo_info_vo['price'], 'addTime': now_time,
+                          'updTime': now_time, 'status': 1,
+                          'unify_combo_id': str(combo_info_vo['id']), 'order_type': 2,
+                          'store_meal_name': combo_info_vo['combo_name']
+                          }
+            Order_Model.objects.create(**order_dict)
+            LOGGER.info(f'{serial_number}订购流量套餐包,createdBy：{user}')
+            UnicomComboView.create_combo_order_info(order_id, 0, u_device_info.iccid, package_id)
+            if u_device_info.status != 2:
+                UnicomDeviceInfo.objects.filter(iccid=u_device_info.iccid).update(status=2, updated_time=now_time)
+            return response.json(0)
+        except Exception as e:
+            LOGGER.info('UnicomManageControllerView.order_flow_package,errLine:{}, errMsg:{}'
+                        .format(e.__traceback__.tb_lineno, repr(e)))
+            return response.json(500)
+
     @classmethod
     def reset_card_package(cls, request, request_dict, response, user):
         try:
@@ -1081,3 +1132,65 @@ class UnicomManageControllerView(View):
             except Exception as e:
                 err_data.append({'serialNumber': serial_number, 'msg': '重置流量异常:{}'.format(repr(e))})
         return response.json(0, err_data)
+
+    @classmethod
+    def serial_number_package_page(cls, request_dict, response):
+        """
+        分页查询序列号无限流量套餐
+        """
+        serial_number = request_dict.get('serialNumber', None)
+        pageSize = request_dict.get('pageSize', None)
+        pageNo = request_dict.get('pageNo', None)
+        package_id = request_dict.get('packageId', None)
+
+        if not all({pageNo, pageSize}):
+            return response.json(444)
+        page = int(pageNo)
+        line = int(pageSize)
+        serial_package_qs = SerialNumberPackage.objects.all()
+        if serial_number:
+            serial_package_qs = serial_package_qs.filter(serial_number=serial_number)
+        if package_id:
+            serial_package_qs = serial_package_qs.filter(package_id=int(package_id))
+        serial_package_qs = serial_package_qs.annotate(serialNumber=F('serial_number'), packageId=F('package_id'),
+                                                       createdTime=F('created_time'), createdBy=F('created_by'),
+                                                       updatedTime=F('updated_time'), updatedBy=F('updated_by')) \
+            .values('id', 'serialNumber', 'status', 'packageId', 'createdTime', 'createdBy', 'updatedTime', 'updatedBy')
+        serial_package_qs = serial_package_qs.order_by('-created_time')[(page - 1) * line:page * line]
+        if not serial_package_qs.exists():
+            return response.json(0, [])
+        serial_list = []
+        for item in serial_package_qs:
+            data = item
+            data['packageName'] = UnicomCombo.objects.filter(id=item['packageId']).values('combo_name')[0]['combo_name']
+            serial_list.append(data)
+        return response.json(0, serial_list)
+
+    @classmethod
+    def serial_number_package_update(cls, request_dict, response, user):
+        """
+        修改序列号绑定无限流量套餐
+        """
+        try:
+            s_id = request_dict.get('id', None)
+            package_id = request_dict.get('packageId', None)
+            status = request_dict.get('status', None)
+            if not s_id:
+                return response.json(444)
+            if not package_id and not status:
+                return response.json(444)
+            s_package_qs = SerialNumberPackage.objects.filter(id=int(s_id))
+            if not s_package_qs.exists():
+                return response.json(173)
+            n_time = int(time.time())
+            data = {'updated_time': n_time, 'updated_by': user}
+            if package_id:
+                data['package_id'] = int(package_id)
+            if status:
+                data['status'] = int(status)
+            s_package_qs.update(**data)
+            return response.json(0)
+        except Exception as e:
+            LOGGER.info('UnicomManageControllerView.serial_number_package_update,'
+                        'errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+            return response.json(500)

Ansjer/config.py

@@ -457,6 +457,8 @@ APP_TYPE = {
     2: 'android'
 }
 
+ALGORITHM_COMBO_TYPES = [51, 57, 58, 60, 59, 61, 62, 63, 64, 65, 66, 67, 68, 69]
+
 # 联通Unicom config
 # 应用地址，请向开发人员索取
 unicomAppUrl = 'https://iot-cop.unimip.cn'

Controller/DetectControllerV2.py

@@ -9,7 +9,7 @@ from django.http import JsonResponse
 from django.views.generic.base import View
 
 from Ansjer.config import DETECT_PUSH_DOMAIN, DETECT_PUSH_DOMAINS, DETECT_PUSH_DOMAIN_JIUAN, DETECT_PUSH_DOMAINS_JIUAN, \
-    OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, LOGGER
+    OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, LOGGER, ALGORITHM_COMBO_TYPES
 from Model.models import Device_Info, Equipment_Info, UidSetModel, UidPushModel, CompanyModel, SysMsgModel, \
     AiService, VodBucketModel
 from Object.ETkObject import ETkObject
@@ -181,7 +181,7 @@ class DetectControllerViewV2(View):
                     msg_data = {'appPush': 1,
                                 'pushTime': {'allDay': 1, 'repeat': 127, 'endTime': 0, 'timeZone': '+08.00',
                                              'startTime': 0},
-                                'eventTypes': {'device': [51], 'aiCloud': 1}
+                                'eventTypes': {'device': ALGORITHM_COMBO_TYPES, 'aiCloud': 1}
                                 }
                     uid_set_data['msg_notify'] = msg_data
                 uid_set_id = uid_set_qs[0].id