From d50ec1d43fd3b57305425d38ecc7c84f201e74cf Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Sat, 28 Apr 2018 14:38:13 +0800
Subject: [PATCH] 优化回报数据
---
Yfs/Domain/Data.php | 3 ++-
Yfs/Api/Data.php | 12 ++++++------
Yfs/Domain/DataDaily.php | 14 ++++++++++++--
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index cc47faf..bffe44c 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -98,17 +98,17 @@
$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 = '������';
+ if($res_avg < 0.16){
+ $res_status = '������������';
}
- elseif($res_avg >= 0.25 && $res_avg < 0.8){
- $res_status = '������';
+ elseif($res_avg >= 0.16 && $res_avg < 0.8){
+ $res_status = '������������';
}
elseif($res_avg >= 0.8 && $res_avg < 2){
- $res_status = '������';
+ $res_status = '������������';
}
else{
- $res_status = '������';
+ $res_status = '������������';
}
$rs['msg'] = '������������������';
$rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index e1b51c4..a9be7c0 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -49,9 +49,10 @@
$this->hourly_model->add($arr);
}
$task_arr = array();
- $task_date = $this->task_model->get(array('date' => $arr['date']));
+ $task_date = $this->task_model->get(array('date' => $arr['date'], 'user_id' => $arr['user_id']));
if(!$task_date){
$task_arr['date'] = $arr['date'];
+ $task_arr['user_id'] = $arr['user_id'];
$this->task_model->add($task_arr);
}
diff --git a/Yfs/Domain/DataDaily.php b/Yfs/Domain/DataDaily.php
index 9bcfc23..11d97e9 100644
--- a/Yfs/Domain/DataDaily.php
+++ b/Yfs/Domain/DataDaily.php
@@ -7,7 +7,7 @@
public function __construct(){
//DI()->redis = new Redis_Lite(DI()->config->get('app.redis.servers'));
$this->model = new Model_DataDaily();
- $this->hourly_model = new Model_DataHourly();
+ $this->data_three_hourly_model = new Model_DataThreeHourly();
}
/**
@@ -31,7 +31,17 @@
$result = $this->model->getList(array('user_id' => $user_id, 'date' => array('$in' => $days_arr)));
}
else{
- $result = $this->hourly_model->getList(array('user_id' => $user_id, 'date' => date('Y-m-d', $start_time)), array(), array('time_level' => 1));
+ $result = $this->data_three_hourly_model->get(array('user_id' => $user_id, 'date' => date('Y-m-d', $start_time)));
+ $_result = array();
+ if($result){
+ for($i = 1; $i <=8 ; $i++){
+ array_push($_result, array('hour_avg' => $result['time_slot_'.$i], 'time_level' => $i));
+ }
+ }
+ else{
+ $_result = null;
+ }
+ return $_result;
}
return $result;
--
Gitblit v1.8.0