Home Explore Help
Register Sign In
CarePatch
/
thermometer
Watch 2
Star 0
Fork 0

Browse Source
增加接口， admin_point_user_temperature_history

FFIB 3 years ago
parent
d1b8a25670
commit
26a72e180c
5 changed files with 104 additions and 1 deletions
Show Diff Stats
  1. 23 0
      account/migrations/0008_auto_20220606_1536.py
  2. 22 1
      api/point_views.py
  3. 2 0
      api/urls.py
  4. 53 0
      equipment/migrations/0026_auto_20220606_1536.py
  5. 4 0
      equipment/models.py

+ 23 - 0
account/migrations/0008_auto_20220606_1536.py
View File 

@@ -0,0 +1,23 @@
1 
+# Generated by Django 2.2.15 on 2022-06-06 07:36
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('account', '0007_auto_20210821_2258'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AlterField(
14 
+            model_name='administratorinfo',
15 
+            name='status',
16 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='userinfo',
20 
+            name='status',
21 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+    ]

+ 22 - 1
api/point_views.py
View File 

@@ -211,4 +211,25 @@ def admin_point_user_remark(request):
211 211 
         ipui.remarks += [remark]
212 212 
         ipui.save()
213 213
214 
-    return response()
214 
+    return response()
215 
+
216 
+
217 
+@logit
218 
+def admin_point_user_temperature_history(request):
219 
+    user_id = request.POST.get('user_id', '')
220 
+    point_id = request.POST.get('remark', '')
221 
+    page = request.POST.get('page', 1)
222 
+    num = request.POST.get('num', 20)
223 
+
224 
+    logs = ThermometerMeasureLogInfo.objects.filter(point_id=point_id, user_id=user_id, status=True)
225 
+    count = ipuis.count()
226 
+    logs, left = pagination(logs, page, num)
227 
+
228 
+    logs = [log.data for log in logs]
229 
+
230 
+
231 
+    return response(data={
232 
+        'logs': ipuis,
233 
+        'left': left,
234 
+        'count': count,
235 
+    })

+ 2 - 0
api/urls.py
View File 

@@ -53,6 +53,8 @@ urlpatterns += [
53 53
54 54 
     url(r'^admin/point/user/remark$', point_views.admin_point_user_remark, name='admin_point_user_remark'),
55 55 
     url(r'^admin/point/user/unbind$', point_views.admin_point_user_unbind, name='admin_point_user_unbind'),
56 
+
57 
+    url(r'^admin/point/user/temperature/history$', point_views.admin_point_user_temperature_history, name='admin_point_user_temperature_history'),
56 58 
 ]
57 59
58 60

+ 53 - 0
equipment/migrations/0026_auto_20220606_1536.py
View File 

@@ -0,0 +1,53 @@
1 
+# Generated by Django 2.2.15 on 2022-06-06 07:36
2 
+
3 
+from django.db import migrations, models
4 
+
5 
+
6 
+class Migration(migrations.Migration):
7 
+
8 
+    dependencies = [
9 
+        ('equipment', '0025_auto_20220411_1521'),
10 
+    ]
11 
+
12 
+    operations = [
13 
+        migrations.AddField(
14 
+            model_name='thermometermeasureloginfo',
15 
+            name='user_id',
16 
+            field=models.CharField(blank=True, help_text='用户唯一标识', max_length=32, null=True, verbose_name='user_id'),
17 
+        ),
18 
+        migrations.AlterField(
19 
+            model_name='aepthermometermeasureloginfo',
20 
+            name='status',
21 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
22 
+        ),
23 
+        migrations.AlterField(
24 
+            model_name='isolationpointfieldpoolinfo',
25 
+            name='status',
26 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
27 
+        ),
28 
+        migrations.AlterField(
29 
+            model_name='isolationpointinfo',
30 
+            name='status',
31 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
32 
+        ),
33 
+        migrations.AlterField(
34 
+            model_name='isolationpointuserinfo',
35 
+            name='status',
36 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
37 
+        ),
38 
+        migrations.AlterField(
39 
+            model_name='thermometerequipmentinfo',
40 
+            name='status',
41 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
42 
+        ),
43 
+        migrations.AlterField(
44 
+            model_name='thermometermeasureloginfo',
45 
+            name='status',
46 
+            field=models.BooleanField(db_index=True, default=True, help_text='Status', verbose_name='status'),
47 
+        ),
48 
+        migrations.AlterField(
49 
+            model_name='thermometermeasureloginfo',
50 
+            name='temperature_src',
51 
+            field=models.IntegerField(choices=[(1, '接口回调'), (2, 'MQTT'), (3, '小程序')], default=1, help_text='用户体温来源', verbose_name='temperature_src'),
52 
+        ),
53 
+    ]

+ 4 - 0
equipment/models.py
View File 

@@ -246,6 +246,8 @@ class ThermometerMeasureLogInfo(BaseModelMixin):
246 246
247 247 
     point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
248 248
249 
+    user_id = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='用户唯一标识')
250 
+
249 251 
     macid = models.CharField(_('macid'), max_length=32, blank=True, null=True, help_text='设备号')
250 252 
     sn = models.CharField(_('sn'), max_length=32, blank=True, null=True, help_text='序列号')
251 253 
 
@@ -274,7 +276,9 @@ class ThermometerMeasureLogInfo(BaseModelMixin):
274 276 
             'point_id': self.point_id,
275 277 
             'macid': self.macid,
276 278 
             'sn': self.sn,
279 
+            'user_id': self.user_id,
277 280 
             'temperature': self.temperature,
281 
+            'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d'),
278 282 
         }
279 283
280 284