api/eqpt_views.py

@@ -291,19 +291,14 @@ def mqtt_upload_temperature(payload):

                     except Exception:
              

                         return
              

                 
              

                +    # 充电状态，true 充电，false 未充电
              

                     chg_sta = payload.get('chg_sta', False)
              

                -
              

                +    # 充电状态，温度忽略
              

                     if chg_sta:
              

                         return
              

                 
              

                -    macid = payload.get('mac', '')
              

                -    macid = f'{macid[:2]}:{macid[2:4]}:{macid[4:6]}:{macid[6:8]}:{macid[8:10]}:{macid[10:12]}'
              

                -    current_time = payload.get('current_time', '')
              

                -    start_stamp = end_stamp = tc.string_to_timestamp(current_time)
              

                -    # raw_temp = payload.get('raw_temp', '')
              

                     alg_temp = payload.get('alg_temp', '')
              

                 
              

                -    # temp = raw_temp.split(',') + alg_temp.split(',')
              

                     temp = alg_temp.split(',')
              

                     temp = [int(t) for t in temp if t]
              

                 
              
@@ -312,6 +307,17 @@ def mqtt_upload_temperature(payload):

                 
              

                     temperature = max(temp) / 100
              

                 
              

                +    # 电量剩余 65%，有效电量范围[0, 100]
              

                +    bat = payload.get('bat', 0)
              

                +    # 电量剩余 100% + 温度超过 37 度，温度忽略
              

                +    if bat == 100 and temperature > 37:
              

                +        return
              

                +
              

                +    macid = payload.get('mac', '')
              

                +    macid = f'{macid[:2]}:{macid[2:4]}:{macid[4:6]}:{macid[6:8]}:{macid[8:10]}:{macid[10:12]}'
              

                +    current_time = payload.get('current_time', '')
              

                +    start_stamp = end_stamp = tc.string_to_timestamp(current_time)
              

                +
              

                     try:
              

                         eqpt = ThermometerEquipmentInfo.objects.get(macid=macid, status=True)
              

                     except ThermometerEquipmentInfo.DoesNotExist: