Merge branch 'test' of ssh://192.168.136.99:10022/servers/ASJServer into ghl

Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -538,11 +538,11 @@ class GatewayFamilyMemberView(View):
         if not user_family_qs.exists():
             return response.json(173)
         user_family_qs = user_family_qs.values('id', 'name', 'user__userEmail',
-                                               'user__userIconUrl',
+                                               'user__userIconPath',
                                                'user__phone', 'user__NickName',
                                                'user__username')
         user_icon_url = ''
-        userIconPath = str(user_family_qs[0]['userIconPath'])
+        userIconPath = str(user_family_qs[0]['user__userIconPath'])
         if userIconPath and userIconPath.find('static/') != -1:
             userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
             user_icon_url = SERVER_DOMAIN + 'account/getAvatar/' + userIconPath

Controller/SensorGateway/SmartSceneController.py

@@ -189,8 +189,6 @@ class SmartSceneView(View):
         tasks = request_dict.get('tasks', None)
         is_all_day = request_dict.get('isAllDay', None)
 
-        if not any([device_id, sub_device_id]):
-            return response.json(444, {'error param': 'deviceId or subDeviceId'})
         if not all([conditions, tasks]):
             return response.json(444, {'error param': 'conditions and tasks'})
 
@@ -238,7 +236,7 @@ class SmartSceneView(View):
                 msg['scene_status'] = 1
                 msg['sensor_type'] = conditions_dict['sensor']['device_type']
                 msg['sensor_src'] = int(sub_device_qs[0]['src_addr'], 16)
-                msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['value'])
+                msg['sensor_status'] = int(conditions_dict['sensor']['eventValues'][0]['event_type'])
 
             with transaction.atomic():
                 if is_all_day is None:  # 不设置时间

Controller/UnicomCombo/UnicomComboController.py

@@ -102,13 +102,14 @@ class UnicomComboView(View):
             combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, status=1, is_del=False) \
                 .values('iccid', 'status', 'combo__status', 'combo__combo_name', 'combo__combo_type',
                         'combo__flow_total', 'combo__remark', 'combo__expiration_days', 'combo__expiration_type',
-                        'year', 'month', 'flow_total_usage', 'expire_time', 'activation_time')
+                        'year', 'month', 'flow_total_usage', 'expire_time', 'activation_time', 'combo__is_unlimited')
             if combo_order_qs.exists():
                 combo_order = combo_order_qs.first()
                 flow_details = {
                     'flowInvalid': 0,
                     'iccid': iccid,
                     'status': combo_order['status'],
+                    'is_unlimited': combo_order['combo__is_unlimited'],
                     'comboName': combo_order['combo__combo_name'],
                     'comboType': combo_order['combo__combo_type'],
                     'flowTotal': combo_order['combo__flow_total'],
@@ -162,12 +163,13 @@ class UnicomComboView(View):
         combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, is_del=False) \
             .values('iccid', 'status', 'combo__combo_name', 'combo__flow_total',
                     'combo__remark', 'combo__expiration_days', 'combo__expiration_type', 'flow_total_usage',
-                    'expire_time').order_by('sort')
+                    'expire_time', 'combo__is_unlimited').order_by('sort')
         for item in combo_order_qs:
             combo_list.append({
                 'iccid': iccid,
                 'status': item['status'],
                 'comboName': item['combo__combo_name'],
+                'is_unlimited': item['combo__is_unlimited'],
                 'flowTotal': item['combo__flow_total'],
                 'comboRemark': item['combo__remark'],
                 'expirationDays': item['combo__expiration_days'],
@@ -679,6 +681,11 @@ class UnicomComboView(View):
                     if status == 1:
                         unicom_api.change_device_to_activate(iccid)
                         flow_total_usage = unicom_api.get_flow_usage_total(year, month, iccid)
+                        if flow_total_usage > 0:
+                            flow_total_usage = Decimal(flow_total_usage)
+                            flow_total_usage = flow_total_usage.quantize(Decimal('0.00'))
+                        else:
+                            flow_total_usage = 0
                         combo_order_data['flow_total_usage'] = str(flow_total_usage)
                     UnicomComboOrderInfo.objects.create(**combo_order_data)
                     logger.info('保存套餐支付信息success')

Controller/UnicomCombo/UnicomComboTaskController.py

@@ -9,6 +9,7 @@
 import datetime
 import logging
 import time
+from decimal import Decimal
 
 from django.db import transaction
 from django.db.models import Q
@@ -86,6 +87,8 @@ class UnicomComboTaskView(View):
                             continue
                         # 查询当月用量情况
                         flow_total_usage = unicom_api.get_flow_usage_total(year, month, item['iccid'])
+                        flow_total_usage = Decimal(flow_total_usage).quantize(
+                            Decimal('0.00')) if flow_total_usage > 0 else 0
                         flow_total_usage = str(flow_total_usage)
                         iccid = item['iccid']
                         # 检查激活iccid
@@ -107,7 +110,7 @@ class UnicomComboTaskView(View):
         logger.info('--->进入监控流量使用情况')
         try:
             unicom_api = UnicomObjeect()
-            combo_order_qs = UnicomComboOrderInfo.objects.filter(status=1, is_del=False).values()
+            combo_order_qs = UnicomComboOrderInfo.objects.filter(status=1, is_del=False, combo__is_unlimited=0).values()
             if not combo_order_qs.exists():
                 return response.json(0)
             today = datetime.datetime.today()

Object/UnicomObject.py

@@ -304,7 +304,7 @@ class UnicomObjeect:
             result = UnicomObjeect().query_device_status(**re_data)
             res_dict = UnicomObjeect().get_text_dict(result)
             if res_dict['data']['status'] != 3:
-                unicom_api.update_device_state(**re_data)
+                UnicomObjeect().update_device_state(**re_data)
             return True
         return None