:art: Update upload_temperature
huangqimin001
Se han modificado 4 ficheros con 43 adiciones y 7 borrados
+ 9
- 5
api/eqpt_views.py
@@ -155,12 +155,16 @@ def eqpt_result(request): |
||
| 155 | 155 |
|
| 156 | 156 |
@logit |
| 157 | 157 |
def upload_temperature(request): |
| 158 |
- macid = request.POST.get('macid', '')
|
|
| 158 |
+ request.POST = request.POST or json.loads(request.body) |
|
| 159 |
+ macid = request.POST.get('mac', '')
|
|
| 159 | 160 |
name = request.POST.get('name', '')
|
| 160 |
- sex = request.POST.get('sex', 0)
|
|
| 161 |
+ sex = request.POST.get('gender', 0)
|
|
| 162 |
+ birth_stamp = request.POST.get('birthday', 0)
|
|
| 161 | 163 |
age = request.POST.get('age', 0)
|
| 162 |
- phone = request.POST.get('phone', '')
|
|
| 163 |
- temperature = request.POST.get('temperature', 0)
|
|
| 164 |
+ phone = request.POST.get('mobile', '')
|
|
| 165 |
+ start_stamp = request.POST.get('startTime', '')
|
|
| 166 |
+ end_stamp = request.POST.get('endTime', '')
|
|
| 167 |
+ temperature = request.POST.get('maxTempValue', 0)
|
|
| 164 | 168 |
|
| 165 | 169 |
try: |
| 166 | 170 |
eqpt = ThermometerEquipmentInfo.objects.get(macid=macid, status=True) |
@@ -182,7 +186,7 @@ def upload_temperature(request): |
||
| 182 | 186 |
eqpt.last_submit_at = tc.utc_datetime() |
| 183 | 187 |
eqpt.save() |
| 184 | 188 |
|
| 185 |
- ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, temperature=temperature) |
|
| 189 |
+ ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature) |
|
| 186 | 190 |
|
| 187 | 191 |
if point_measure_window: |
| 188 | 192 |
ThermometerMeasureInfo.objects.update_or_create(point_id=eqpt.point_id, point_measure_ymd=point_measure_ymd, point_measure_window=point_measure_window, macid=macid, defaults={
|
+ 2
- 2
equipment/admin.py
@@ -12,7 +12,7 @@ class IsolationPointInfoAdmin(admin.ModelAdmin): |
||
| 12 | 12 |
|
| 13 | 13 |
|
| 14 | 14 |
class ThermometerEquipmentInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
| 15 |
- list_display = ('eqpt_id', 'point_id', 'macid', 'sn', 'active_status', 'active_at', 'name', 'sex', 'age', 'phone', 'remark', 'last_submit_at', 'eqpt_register_status', 'eqpt_register_result', 'status', 'updated_at', 'created_at')
|
|
| 15 |
+ list_display = ('eqpt_id', 'point_id', 'macid', 'sn', 'active_status', 'active_at', 'name', 'sex', 'birth_stamp', 'age', 'phone', 'remark', 'last_submit_at', 'eqpt_register_status', 'eqpt_register_result', 'status', 'updated_at', 'created_at')
|
|
| 16 | 16 |
list_filter = ('point_id', 'status')
|
| 17 | 17 |
|
| 18 | 18 |
|
@@ -22,7 +22,7 @@ class ThermometerMeasureInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
||
| 22 | 22 |
|
| 23 | 23 |
|
| 24 | 24 |
class ThermometerMeasureLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
| 25 |
- list_display = ('point_id', 'macid', 'sn', 'temperature', 'status', 'updated_at', 'created_at')
|
|
| 25 |
+ list_display = ('point_id', 'macid', 'sn', 'start_stamp', 'end_stamp', 'temperature', 'status', 'updated_at', 'created_at')
|
|
| 26 | 26 |
list_filter = ('point_id', 'status')
|
| 27 | 27 |
|
| 28 | 28 |
|
+ 28
- 0
equipment/migrations/0003_auto_20210712_0002.py
@@ -0,0 +1,28 @@ |
||
| 1 |
+# Generated by Django 3.2.4 on 2021-07-11 16:02 |
|
| 2 |
+ |
|
| 3 |
+from django.db import migrations, models |
|
| 4 |
+ |
|
| 5 |
+ |
|
| 6 |
+class Migration(migrations.Migration): |
|
| 7 |
+ |
|
| 8 |
+ dependencies = [ |
|
| 9 |
+ ('equipment', '0002_auto_20210710_2358'),
|
|
| 10 |
+ ] |
|
| 11 |
+ |
|
| 12 |
+ operations = [ |
|
| 13 |
+ migrations.AddField( |
|
| 14 |
+ model_name='thermometerequipmentinfo', |
|
| 15 |
+ name='birth_stamp', |
|
| 16 |
+ field=models.BigIntegerField(default=0, help_text='生日时间戳', verbose_name='birth_stamp'), |
|
| 17 |
+ ), |
|
| 18 |
+ migrations.AddField( |
|
| 19 |
+ model_name='thermometermeasureloginfo', |
|
| 20 |
+ name='end_stamp', |
|
| 21 |
+ field=models.BigIntegerField(default=0, help_text='测温结束时间戳', verbose_name='end_stamp'), |
|
| 22 |
+ ), |
|
| 23 |
+ migrations.AddField( |
|
| 24 |
+ model_name='thermometermeasureloginfo', |
|
| 25 |
+ name='start_stamp', |
|
| 26 |
+ field=models.BigIntegerField(default=0, help_text='测温开始时间戳', verbose_name='start_stamp'), |
|
| 27 |
+ ), |
|
| 28 |
+ ] |
+ 4
- 0
equipment/models.py
@@ -72,6 +72,7 @@ class ThermometerEquipmentInfo(BaseModelMixin): |
||
| 72 | 72 |
# 用户基本信息 |
| 73 | 73 |
name = models.CharField(_('name'), max_length=255, blank=True, null=True, help_text='用户姓名')
|
| 74 | 74 |
sex = models.IntegerField(_('sex'), choices=SexModelMixin.SEX_TUPLE, default=SexModelMixin.UNKNOWN, help_text='用户性别')
|
| 75 |
+ birth_stamp = models.BigIntegerField(_('birth_stamp'), default=0, help_text='生日时间戳')
|
|
| 75 | 76 |
age = models.IntegerField(_('age'), default=0, help_text='用户年龄')
|
| 76 | 77 |
phone = models.CharField(_('phone'), max_length=11, blank=True, null=True, help_text='用户电话', db_index=True)
|
| 77 | 78 |
|
@@ -152,6 +153,9 @@ class ThermometerMeasureLogInfo(BaseModelMixin): |
||
| 152 | 153 |
macid = models.CharField(_('macid'), max_length=32, blank=True, null=True, help_text='设备号')
|
| 153 | 154 |
sn = models.CharField(_('sn'), max_length=32, blank=True, null=True, help_text='序列号')
|
| 154 | 155 |
|
| 156 |
+ start_stamp = models.BigIntegerField(_('start_stamp'), default=0, help_text='测温开始时间戳')
|
|
| 157 |
+ end_stamp = models.BigIntegerField(_('end_stamp'), default=0, help_text='测温结束时间戳')
|
|
| 158 |
+ |
|
| 155 | 159 |
temperature = models.FloatField(_('temperature'), default=0, help_text='用户体温')
|
| 156 | 160 |
|
| 157 | 161 |
class Meta: |