:art: Update mp_upload_temperature
huangqimin001
共有 4 個文件被更改，包括 16 次插入 和 3 次删除
+ 3
- 3
api/eqpt_views.py
@@ -364,9 +364,9 @@ def mqtt_upload_temperature(payload): |
||
| 364 | 364 |
except IsolationPointInfo.DoesNotExist: |
| 365 | 365 |
return |
| 366 | 366 |
|
| 367 |
- # 非配置的隔离点上报时间内 |
|
| 368 |
- if not point.match_upload_period: |
|
| 369 |
- return |
|
| 367 |
+ # # 非配置的隔离点上报时间内 |
|
| 368 |
+ # if not point.match_upload_period: |
|
| 369 |
+ # return |
|
| 370 | 370 |
|
| 371 | 371 |
ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, temperature_src=ThermometerMeasureLogInfo.MQTT, chg_sta=chg_sta, ignore_temperature=ignore_temperature, ignore_fever_temperature=ignore_fever_temperature, upload_temperature_info=payload) |
| 372 | 372 |
|
+ 9
- 0
api/point_views.py
@@ -112,3 +112,12 @@ def bind_eqpt(request): |
||
| 112 | 112 |
ipui.save() |
| 113 | 113 |
|
| 114 | 114 |
return response() |
| 115 |
+ |
|
| 116 |
+ |
|
| 117 |
+@logit |
|
| 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)
|
|
| 122 |
+ |
|
| 123 |
+ return response() |
+ 2
- 0
api/urls.py
@@ -59,6 +59,8 @@ urlpatterns += [ |
||
| 59 | 59 |
url(r'^mp/get_point_fields$', point_views.get_point_fields, name='get_point_fields'), |
| 60 | 60 |
url(r'^mp/save_point_fields$', point_views.save_point_fields, name='save_point_fields'), |
| 61 | 61 |
url(r'^mp/bind_eqpt$', point_views.bind_eqpt, name='bind_eqpt'), |
| 62 |
+ |
|
| 63 |
+ url(r'^mp/upload/temperature$', point_views.mp_upload_temperature, name='mp_upload_temperature'), |
|
| 62 | 64 |
] |
| 63 | 65 |
|
| 64 | 66 |
# Screen |
+ 2
- 0
equipment/models.py
@@ -236,10 +236,12 @@ class ThermometerEquipmentInfo(BaseModelMixin): |
||
| 236 | 236 |
class ThermometerMeasureLogInfo(BaseModelMixin): |
| 237 | 237 |
CALLBACK = 1 |
| 238 | 238 |
MQTT = 2 |
| 239 |
+ MP = 3 |
|
| 239 | 240 |
|
| 240 | 241 |
TEMPERATURE_SRC_TUPLE = ( |
| 241 | 242 |
(CALLBACK, '接口回调'), |
| 242 | 243 |
(MQTT, 'MQTT'), |
| 244 |
+ (MP, '小程序'), |
|
| 243 | 245 |
) |
| 244 | 246 |
|
| 245 | 247 |
point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
|