修改消息推送间隔默认值，优化兑换码接口

AdminController/UnicomManageController.py

@@ -23,6 +23,7 @@ from Controller.UnicomCombo.UnicomComboController import UnicomComboView
 from Model.models import UnicomDeviceInfo, UnicomCombo, Pay_Type, UnicomComboOrderInfo, Device_User, Order_Model, \
     ExchangeCode, UnicomFlowPush, SysMsgModel, UnicomComboExperienceHistory, LogModel
 from Object.Enums.WXOperatorEnum import WXOperatorEnum
+from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UnicomObject import UnicomObjeect
@@ -50,8 +51,6 @@ class UnicomManageControllerView(View):
         # 获取套餐类型
         elif operation == 'combo/type':
             return self.get_unicom_combo_type(response)
-        elif operation == 'downloadCDK':  # 下载兑换码
-            return self.package_cdk_export_excel(response)
         else:
             tko = TokenObject(
                 request.META.get('HTTP_AUTHORIZATION'),
@@ -97,6 +96,8 @@ class UnicomManageControllerView(View):
                 return self.async_update_status(request_dict, response)
             elif operation == 'getFlowComboList':  # 获取流量套餐列表
                 return self.get_flow_combo_list(request_dict, response)
+            elif operation == 'downloadCDK':  # 下载兑换码
+                return self.package_cdk_export_excel(response)
             else:
                 return response.json(404)
 
@@ -135,6 +136,9 @@ class UnicomManageControllerView(View):
                 UnicomObjeect().change_device_to_disable(iccid)  # 重置流量停用设备
                 ip = CommonService.get_ip_address(request)
                 describe = '重置4G流量序列号{}，iccid:{}'.format(serial_number, iccid)
+                key = f'ASJ:UNICOM:CARD:ACTIVATE:{serial_number}'
+                redis = RedisObject()
+                redis.del_data(key)
                 cls.create_operation_log('unicom/manage/resetCardPackage', ip, request_dict, describe)
                 return response.json(0)
             return response.json(173)
@@ -958,7 +962,7 @@ class UnicomManageControllerView(View):
         获取4G流量套餐列表
         @return: 套餐列表
         """
-        combo_qs = UnicomCombo.objects.filter(is_del=False)
+        combo_qs = UnicomCombo.objects.filter(is_del=False, combo_type__in=[0, 3])
         if not combo_qs.exists():
             return response.json(173)
         combo_qs = combo_qs.values('id', 'combo_name').order_by('-created_time')

Controller/DetectControllerV2.py

@@ -152,9 +152,12 @@ class DetectControllerViewV2(View):
             # 检测类型
             if detect_group:
                 uid_set_data['detect_group'] = detect_group
+            uid_set_qs = UidSetModel.objects.filter(uid=uid)
             # 设置消息推送间隔
             if interval:
                 interval = int(interval)
+                if uid_set_qs.exists() and status == 1 and uid_set_qs.first().detect_status == 0:
+                    interval = 60
                 uid_set_data['detect_interval'] = interval
                 # 开通了ai服务的设备,通过mqtt通知设备修改消息推送间隔
                 ai_service_qs = AiService.objects.filter(uid=uid, use_status=1, endTime__gte=nowTime)
@@ -168,14 +171,18 @@ class DetectControllerViewV2(View):
                     }
                     CommonService.req_publish_mqtt_msg(uid, topic_name, msg)
 
-            uid_set_qs = UidSetModel.objects.filter(uid=uid)
             if uid_set_qs.exists():
                 msg_data = uid_set_qs.first().msg_notify
                 if status == 0 and msg_data:
                     msg_data['appPush'] = -1
                     uid_set_data['msg_notify'] = msg_data
-                elif status == 1 and msg_data:
-                    msg_data['appPush'] = 1
+                elif status == 1 and uid_set_qs.first().detect_status == 0:
+                    uid_set_data['detect_interval'] = 60
+                    msg_data = {'appPush': 1,
+                                'pushTime': {'allDay': 1, 'repeat': 127, 'endTime': 0, 'timeZone': '+08.00',
+                                             'startTime': 0},
+                                'eventTypes': {'device': [51], 'aiCloud': 1}
+                                }
                     uid_set_data['msg_notify'] = msg_data
                 uid_set_id = uid_set_qs[0].id
                 uid_set_data['updTime'] = nowTime
@@ -282,7 +289,7 @@ class DetectControllerViewV2(View):
             else:
                 return response.json(173)
         except Exception as e:
-            return response.json(500, repr(e))
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
     def do_delete_redis(self, uid, detect_interval=0):
         keyPattern = '{uid}*'.format(uid=uid)

Controller/UnicomCombo/UnicomComboController.py

@@ -320,6 +320,8 @@ class UnicomComboView(View):
                 UnicomObjeect().change_device_to_disable(iccid)
                 logger.info('4GResetFlow相关订单号：{}'.format(order_list))
                 describe = '重置4G流量序列号{}，iccid:{}'.format(serial_no, iccid)
+                key = f'ASJ:UNICOM:CARD:ACTIVATE:{serial_no}'
+                redis.del_data(key)
                 ip = CommonService.get_ip_address(request)
                 cls.create_operation_log('unicom/api/device-status', ip, request_dict, describe)
                 return response.json(0)