From 38d32cf992f9d5aa822bab85281b509a269bf113 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 29 Mar 2018 17:20:51 +0800
Subject: [PATCH] 增加平均值及状态
---
Yfs/Api/Data.php | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 3ccdf4e..8b0a200 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -56,19 +56,48 @@
*/
public function getUserDataList(){
$rs = array('code' => 0, 'msg' => '', 'info' => array());
- $data_service = new Domain_Data();
- $data_list = $data_service->getUserDataList($this->user_id, $this->start_time, $this->end_time);
- if($data_list){
- $rs['msg'] = '������������������';
- $rs['info'] = $data_list;
+ $data_daily_service = new Domain_DataDaily();
+ if($this->start_time == $this->end_time || $data_daily_service->checkTime($this->start_time, $this->end_time)){
+ $result = $data_daily_service->getUserDataList($this->user_id, $this->start_time, $this->end_time);
+ if($result){
+ $res_avg = $data_daily_service->getUserDataAvg($this->user_id, $this->start_time, $this->end_time);
+ if($res_avg < 0.25){
+ $res_status = '������';
+ }
+ elseif($res_avg >= 0.25 && $res_avg < 0.8){
+ $res_status = '������';
+ }
+ elseif($res_avg >= 8 && $res_avg < 2){
+ $res_status = '������';
+ }
+ else{
+ $res_status = '������';
+ }
+ $rs['msg'] = '������������������';
+ $rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);
+ }
+ else{
+ $rs['msg'] = '������������';
+ }
}
- else{print_r($data_lsit);
+ else{
$rs['code'] = 1;
- $rs['msg'] = '������������������';
+ $rs['msg'] = '���������������������������������������������������������������������������7���';
}
return $rs;
}
+ //public function updateTime(){
+ // $data_service = new Domain_Data();
+ // $datas = $data_service->getList();
+ // foreach ($datas as $value) {
+ // $data['_id'] = $value['_id'];
+ // $data['date'] = date('Y-m-d', strtotime($value['create_time']));
+ // $data_service->updateTime($data);
+ // }
+
+ // }
+
--
Gitblit v1.8.0