rommumy喂养日记

Roomumy/Controller/FeedDiaryController.py

@@ -65,11 +65,11 @@ class FeedDiaryView(View):
         if not all([start_time, end_time, baby_id]):
             return response.json(444, {'error param': 'start_time, end_time or baby_id'})
         try:
-            feed_diary = FeedDiary.objects.filter(created_time__gte=start_time, created_time__lt=end_time,
+            feed_diary = FeedDiary.objects.filter(date_time__gte=start_time, date_time__lt=end_time,
                                                   baby_id=baby_id)
             if feed_type:
                 feed_diary = feed_diary.filter(feed_type=feed_type)
-            feed_diary = feed_diary.values('feed_type__name', 'feed_type__icon_url', 'feed_content', 'created_time',
+            feed_diary = feed_diary.values('feed_type__name', 'feed_type__icon_url', 'feed_content', 'date_time',
                                            'id', 'feed_type')
             return response.json(0, list(feed_diary))
         except Exception as e:
@@ -127,7 +127,7 @@ class FeedDiaryView(View):
     @classmethod
     def add_or_edit_feed_diary(cls, request_dict, response):
         """
-        查询喂养记录
+        添加编辑喂养记录
         @param request_dict: 请求参数
         @request_dict date_time: 喂养时间戳
         @request_dict baby_id: 宝宝id
@@ -146,16 +146,17 @@ class FeedDiaryView(View):
             return response.json(444, {'error param': 'date_time, feed_content, feed_type or baby_id'})
         feed_content = eval(feed_content)
         try:
+            now_time = int(time.time())
             feed_type_qs = FeedType.objects.filter(id=feed_type)
             if not feed_type_qs:
                 return response.json(444, {'error param': 'feed_type'})
             if feed_id:
-                now_time = int(time.time())
-                FeedDiary.objects.filter(id=feed_id, baby_id=baby_id).update(updated_time=now_time,
+                FeedDiary.objects.filter(id=feed_id, baby_id=baby_id).update(date_time=date_time,
+                                                                             updated_time=now_time,
                                                                              feed_content=feed_content)
             else:
                 FeedDiary.objects.create(baby_id=baby_id, feed_type_id=feed_type, feed_content=feed_content,
-                                         created_time=date_time, updated_time=date_time)
+                                         date_time=date_time, created_time=now_time, updated_time=now_time)
             return response.json(0)
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
@@ -189,7 +190,7 @@ class FeedDiaryView(View):
         @return: response
         """
         try:
-            feed_type = FeedType.objects.filter(is_show=True).values('id', 'name', 'icon_url')
+            feed_type = FeedType.objects.filter(is_show=True).values('id', 'name', 'icon_url', 'sort')
             return response.json(0, list(feed_type))
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))

Roomumy/models.py

@@ -25,6 +25,7 @@ class FeedType(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     name = models.CharField(default='', max_length=10, verbose_name='名称')
     # 1：母乳亲喂 2：母乳瓶喂 3：奶粉 4：辅食 5：换尿布 6：身高体重 7：户外活动 8：育儿日记 9：自定义
+    sort = models.IntegerField(default=0, verbose_name='排序')
     icon_url = models.TextField(default='', verbose_name='图标地址')
     is_show = models.BooleanField(default=True, verbose_name='是否展示')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
@@ -45,6 +46,7 @@ class FeedDiary(models.Model):
     # 1：母乳亲喂 2：母乳瓶喂 3：奶粉 4：辅食 5：换尿布 6：身高体重 7：户外活动 8：育儿日记 9：自定义
     feed_content = models.JSONField(null=True, verbose_name='事件内容')
     # 当类型为5时，sub_event_type为 1:嘘嘘 2:臭臭 3：嘘嘘+臭臭 4：干爽
+    date_time = models.IntegerField(default=0, verbose_name='事件时间')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
     updated_time = models.IntegerField(default=0, verbose_name='更新时间')