大屏数据未返回温度正常
1 geänderte Dateien mit 5 neuen Zeilen und 1 gelöschten Zeilen
+ 5
- 1
api/eqpt_views.py
@@ -212,6 +212,7 @@ def get_screen_data(point=None, point_id=None): |
||
| 212 | 212 |
ipuis_fever = [] |
| 213 | 213 |
ipuis_not_upload = [] |
| 214 | 214 |
ipuis_unused = [] |
| 215 |
+ ipui_other = [] |
|
| 215 | 216 |
|
| 216 | 217 |
for ipui in ipuis: |
| 217 | 218 |
temperature = ipui.get('temperature', 0.0)
|
@@ -228,6 +229,9 @@ def get_screen_data(point=None, point_id=None): |
||
| 228 | 229 |
if (start_dt < last_submit_at < end_dt) and temperature > settings.FEVER_TEMPERATURE: |
| 229 | 230 |
ipui['status'] = '已上报' |
| 230 | 231 |
ipuis_fever.append(ipui) |
| 232 |
+ elif (start_dt < last_submit_at < end_dt) and temperature <= settings.FEVER_TEMPERATURE: |
|
| 233 |
+ ipui['status'] = '已上报' |
|
| 234 |
+ ipuis_other.append(ipui) |
|
| 231 | 235 |
else: |
| 232 | 236 |
ipui['temperature'] = '-' |
| 233 | 237 |
ipui['status'] = '未测温' |
@@ -238,7 +242,7 @@ def get_screen_data(point=None, point_id=None): |
||
| 238 | 242 |
normal_num = has_upload_temperature_num - len(ipuis_fever) |
| 239 | 243 |
|
| 240 | 244 |
return {
|
| 241 |
- 'eqpts': ipuis_fever + ipuis_unused + ipuis_not_upload, |
|
| 245 |
+ 'eqpts': ipuis_fever + ipuis_unused + ipuis_not_upload + ipuis_other, |
|
| 242 | 246 |
'reminds': reminds, |
| 243 | 247 |
'total_active_eqpt_num': total_active_eqpt_num, |
| 244 | 248 |
'has_upload_temperature_num': has_upload_temperature_num, |