get_screen_data排序时增加充电中条件
共有 1 個文件被更改，包括 7 次插入 和 4 次删除
+ 7
- 4
api/eqpt_views.py
@@ -220,22 +220,25 @@ def get_screen_data(point=None, point_id=None): |
||
| 220 | 220 |
'observed_days': eqpt.get('observed_days', 0),
|
| 221 | 221 |
} for eqpt in eqpts] |
| 222 | 222 |
|
| 223 |
- # 排序：发烧 > 未上报 > 时间 |
|
| 223 |
+ # 排序：发烧 > 未上报 > 充电中 > 时间 |
|
| 224 | 224 |
eqpts_fever = [] |
| 225 | 225 |
eqpts_not_upload = [] |
| 226 |
+ eqpts_chg = [] |
|
| 226 | 227 |
eqpts_other = [] |
| 227 | 228 |
for eqpt in eqpts: |
| 228 |
- has_upload = eqpt.get('status')
|
|
| 229 |
+ status = eqpt.get('status')
|
|
| 229 | 230 |
temperature = eqpt.get('temperature')
|
| 230 | 231 |
if temperature > settings.FEVER_TEMPERATURE: |
| 231 | 232 |
eqpts_fever.append(eqpt) |
| 232 |
- elif has_upload == IsolationPointUserInfo.HAS_NOT_UPLOAD and temperature <= settings.FEVER_TEMPERATURE: |
|
| 233 |
+ elif status == IsolationPointUserInfo.HAS_NOT_UPLOAD and temperature <= settings.FEVER_TEMPERATURE: |
|
| 233 | 234 |
eqpts_not_upload.append(eqpt) |
| 235 |
+ elif status == IsolationPointUserInfo.CHG_STA_CHARGING: |
|
| 236 |
+ eqpts_chg.append(eqpt) |
|
| 234 | 237 |
else: |
| 235 | 238 |
eqpts_other.append(eqpt) |
| 236 | 239 |
|
| 237 | 240 |
return {
|
| 238 |
- 'eqpts': eqpts_fever + eqpts_not_upload + eqpts_other, |
|
| 241 |
+ 'eqpts': eqpts_fever + eqpts_not_upload + eqpts_chg + eqpts_other, |
|
| 239 | 242 |
'reminds': reminds, |
| 240 | 243 |
'total_active_eqpt_num': total_active_eqpt_num, |
| 241 | 244 |
'has_upload_temperature_num': has_upload_temperature_num, |