:art: Record upload info
huangqimin001
Se han modificado 4 ficheros con 47 adiciones y 2 borrados
+ 1
- 1
api/eqpt_views.py
@@ -187,7 +187,7 @@ def upload_temperature(request): |
||
| 187 | 187 |
eqpt.last_submit_at = tc.utc_datetime() |
| 188 | 188 |
eqpt.save() |
| 189 | 189 |
|
| 190 |
- ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature) |
|
| 190 |
+ ThermometerMeasureLogInfo.objects.create(point_id=eqpt.point_id, macid=macid, name=name, sex=sex, birth_stamp=birth_stamp, phone=phone, start_stamp=start_stamp, end_stamp=end_stamp, temperature=temperature, upload_temperature_info=request.POST) |
|
| 191 | 191 |
|
| 192 | 192 |
if point_measure_window: |
| 193 | 193 |
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={
|
+ 1
- 1
equipment/admin.py
@@ -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', 'start_stamp', 'end_stamp', 'temperature', 'status', 'updated_at', 'created_at')
|
|
| 25 |
+ list_display = ('point_id', 'macid', 'sn', 'name', 'sex', 'birth_stamp', 'phone', 'start_stamp', 'end_stamp', 'temperature', 'status', 'updated_at', 'created_at')
|
|
| 26 | 26 |
list_filter = ('point_id', 'status')
|
| 27 | 27 |
|
| 28 | 28 |
|
+ 38
- 0
equipment/migrations/0004_auto_20210712_0035.py
@@ -0,0 +1,38 @@ |
||
| 1 |
+# Generated by Django 3.2.4 on 2021-07-11 16:35 |
|
| 2 |
+ |
|
| 3 |
+from django.db import migrations, models |
|
| 4 |
+ |
|
| 5 |
+ |
|
| 6 |
+class Migration(migrations.Migration): |
|
| 7 |
+ |
|
| 8 |
+ dependencies = [ |
|
| 9 |
+ ('equipment', '0003_auto_20210712_0002'),
|
|
| 10 |
+ ] |
|
| 11 |
+ |
|
| 12 |
+ operations = [ |
|
| 13 |
+ migrations.AddField( |
|
| 14 |
+ model_name='thermometermeasureloginfo', |
|
| 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='name', |
|
| 21 |
+ field=models.CharField(blank=True, help_text='用户姓名', max_length=255, null=True, verbose_name='name'), |
|
| 22 |
+ ), |
|
| 23 |
+ migrations.AddField( |
|
| 24 |
+ model_name='thermometermeasureloginfo', |
|
| 25 |
+ name='phone', |
|
| 26 |
+ field=models.CharField(blank=True, db_index=True, help_text='用户电话', max_length=11, null=True, verbose_name='phone'), |
|
| 27 |
+ ), |
|
| 28 |
+ migrations.AddField( |
|
| 29 |
+ model_name='thermometermeasureloginfo', |
|
| 30 |
+ name='sex', |
|
| 31 |
+ field=models.IntegerField(choices=[(0, '未知'), (1, '男'), (2, '女')], default=0, help_text='用户性别', verbose_name='sex'), |
|
| 32 |
+ ), |
|
| 33 |
+ migrations.AddField( |
|
| 34 |
+ model_name='thermometermeasureloginfo', |
|
| 35 |
+ name='upload_temperature_info', |
|
| 36 |
+ field=models.TextField(blank=True, help_text='测温结果上传信息', null=True, verbose_name='upload_temperature_info'), |
|
| 37 |
+ ), |
|
| 38 |
+ ] |
+ 7
- 0
equipment/models.py
@@ -153,11 +153,18 @@ class ThermometerMeasureLogInfo(BaseModelMixin): |
||
| 153 | 153 |
macid = models.CharField(_('macid'), max_length=32, blank=True, null=True, help_text='设备号')
|
| 154 | 154 |
sn = models.CharField(_('sn'), max_length=32, blank=True, null=True, help_text='序列号')
|
| 155 | 155 |
|
| 156 |
+ name = models.CharField(_('name'), max_length=255, blank=True, null=True, help_text='用户姓名')
|
|
| 157 |
+ sex = models.IntegerField(_('sex'), choices=SexModelMixin.SEX_TUPLE, default=SexModelMixin.UNKNOWN, help_text='用户性别')
|
|
| 158 |
+ birth_stamp = models.BigIntegerField(_('birth_stamp'), default=0, help_text='生日时间戳')
|
|
| 159 |
+ phone = models.CharField(_('phone'), max_length=11, blank=True, null=True, help_text='用户电话', db_index=True)
|
|
| 160 |
+ |
|
| 156 | 161 |
start_stamp = models.BigIntegerField(_('start_stamp'), default=0, help_text='测温开始时间戳')
|
| 157 | 162 |
end_stamp = models.BigIntegerField(_('end_stamp'), default=0, help_text='测温结束时间戳')
|
| 158 | 163 |
|
| 159 | 164 |
temperature = models.FloatField(_('temperature'), default=0, help_text='用户体温')
|
| 160 | 165 |
|
| 166 |
+ upload_temperature_info = models.TextField(_('upload_temperature_info'), blank=True, null=True, help_text='测温结果上传信息')
|
|
| 167 |
+ |
|
| 161 | 168 |
class Meta: |
| 162 | 169 |
verbose_name = _('测温记录信息')
|
| 163 | 170 |
verbose_name_plural = _('测温记录信息')
|