From 327df6ae83ee1d3cc61dd4589bf03e2217f40d4d Mon Sep 17 00:00:00 2001
From: colly <576734462@qq.com>
Date: Mon, 07 Aug 2017 15:01:12 +0800
Subject: [PATCH] 修改上传及添加聚合函数
---
Yfs/Domain/Data.php | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index c5851ec..8a447f1 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -22,6 +22,7 @@
foreach ($data['data'] as $value) {
$arr['value'] = $value['value'];
$arr['create_time'] = $value['time'];
+ $arr['date'] = date('Y-m-d', strtotime($value));
$this->model->add($arr);
if(isset($arr['_id']))
unset($arr['_id']);
@@ -32,6 +33,44 @@
}
+ public function getList(){
+ return $this->model->getList();
+ }
+
+ /**
+ * ���������������������������������������
+ * @param [type] $user_id [description]
+ * @param [type] $start_time [description]
+ * @param [type] $end_time [description]
+ * @return [type] [description]
+ */
+ public function getUserDataList($user_id, $start_time, $end_time){
+ $result = $this->model->aggregate(
+ array(
+ array(
+ '$match' => array('create_time' => array('$gte' => $start_time.' 00:00:00', '$lte' => $end_time.' 23:59:59'), 'user_id' => $user_id)
+ ),
+ array(
+ '$group' => array('_id' => '$date', 'day' => array('$avg' => '$value'))
+ ),
+ array(
+ '$project' => array('_id' => 0, 'date'=> '$_id', 'day' => 1)
+ )
+ )
+ );
+
+ print_r($result);
+ die();
+ return $this->model->getList(array('user_id' => $user_id, 'create_time' => array('$gte' => $start_time, '$lte' => $end_time)));
+ }
+
+
+ public function updateTime($data){
+ $id = $data['_id'];
+ unset($data['_id']);
+ return $this->model->update($data, array('_id' => $id));
+ }
+
}
--
Gitblit v1.8.0