支持用户不绑定体温计，体温计也无需跟用户绑定
3 changed files with 19 additions and 34 deletions
+ 0
- 30
api/eqpt_views.py
@@ -284,36 +284,6 @@ def screen_eqpt_result(request): |
||
| 284 | 284 |
|
| 285 | 285 |
@logit |
| 286 | 286 |
def upload_temperature(request): |
| 287 |
- macid = request.POST.get('macid', '')
|
|
| 288 |
- userid = request.POST.get('user_id', '')
|
|
| 289 |
- temperature = request.POST.get('temperature', '')
|
|
| 290 |
- |
|
| 291 |
- try: |
|
| 292 |
- eqpt = ThermometerEquipmentInfo.objects.get(macid=macid, status=True) |
|
| 293 |
- except ThermometerEquipmentInfo.DoesNotExist: |
|
| 294 |
- # ThermometerMeasureLogInfo.objects.create(macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MQTT, upload_temperature_info=payload, status=False) |
|
| 295 |
- return |
|
| 296 |
- |
|
| 297 |
- try: |
|
| 298 |
- point = IsolationPointInfo.objects.get(point_id=eqpt.point_id, status=True) |
|
| 299 |
- except IsolationPointInfo.DoesNotExist: |
|
| 300 |
- return |
|
| 301 |
- |
|
| 302 |
- |
|
| 303 |
- try: |
|
| 304 |
- ipui = IsolationPointUserInfo.objects.get(pk=eqpt.ipui_pk) |
|
| 305 |
- except IsolationPointUserInfo.DoesNotExist: |
|
| 306 |
- ipui = None |
|
| 307 |
- |
|
| 308 |
- ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MP, chg_sta=False, ignore_temperature=False, ignore_fever_temperature=False, upload_temperature_info='') |
|
| 309 |
- |
|
| 310 |
- ipui.observed_ymds = list(set(ipui.observed_ymds + [tc.local_string(format='%Y-%m-%d')])) |
|
| 311 |
- ipui.observed_days = len(ipui.observed_ymds) |
|
| 312 |
- ipui.temperature = temperature |
|
| 313 |
- |
|
| 314 |
- ipui.last_submit_at = tc.utc_datetime() |
|
| 315 |
- |
|
| 316 |
- ipui.save() |
|
| 317 | 287 |
|
| 318 | 288 |
return response() |
| 319 | 289 |
|
+ 18
- 3
api/point_views.py
@@ -116,8 +116,23 @@ def bind_eqpt(request): |
||
| 116 | 116 |
|
| 117 | 117 |
@logit |
| 118 | 118 |
def mp_upload_temperature(request): |
| 119 |
- point_id = request.POST.get('point_id', '')
|
|
| 120 |
- user_id = request.POST.get('user_id', '')
|
|
| 121 |
- temperature = request.POST.get('temperature', 0)
|
|
| 119 |
+ macid = request.POST.get('macid', '')
|
|
| 120 |
+ userid = request.POST.get('user_id', '')
|
|
| 121 |
+ temperature = request.POST.get('temperature', '')
|
|
| 122 |
+ |
|
| 123 |
+ try: |
|
| 124 |
+ ipui = IsolationPointUserInfo.objects.get(userid=userid, status=True) |
|
| 125 |
+ except IsolationPointUserInfo.DoesNotExist: |
|
| 126 |
+ ipui = None |
|
| 127 |
+ |
|
| 128 |
+ ThermometerMeasureLogInfo.objects.create(point_id=ipui.point_id, macid=macid, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MP, chg_sta=False, ignore_temperature=False, ignore_fever_temperature=False, upload_temperature_info='') |
|
| 129 |
+ |
|
| 130 |
+ ipui.observed_ymds = list(set(ipui.observed_ymds + [tc.local_string(format='%Y-%m-%d')])) |
|
| 131 |
+ ipui.observed_days = len(ipui.observed_ymds) |
|
| 132 |
+ ipui.temperature = temperature |
|
| 133 |
+ |
|
| 134 |
+ ipui.last_submit_at = tc.utc_datetime() |
|
| 135 |
+ |
|
| 136 |
+ ipui.save() |
|
| 122 | 137 |
|
| 123 | 138 |
return response() |
+ 1
- 1
equipment/admin.py
@@ -19,7 +19,7 @@ class IsolationPointUserInfoAdmin(admin.ModelAdmin): |
||
| 19 | 19 |
list_display = ('point_id', 'user_id', 'fields', 'observed_days', 'chg_sta', 'temperature', 'last_submit_at', 'leave_at', 'status', 'created_at', 'updated_at')
|
| 20 | 20 |
|
| 21 | 21 |
|
| 22 |
-class ThermometerEquipmentInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
|
| 22 |
+class ThermometerEquipmentInfoAdmin(admin.ModelAdmin): |
|
| 23 | 23 |
list_display = ('eqpt_id', 'point_id', 'macid', 'sn', 'active_status', 'active_at', 'ipui_pk', 'status', 'created_at', 'updated_at')
|
| 24 | 24 |
list_filter = ('point_id', 'status')
|
| 25 | 25 |
|