From 342b189c98dc0202c8e4dbab2e02c30c7fe7aa24 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Tue, 24 Apr 2018 16:42:21 +0800
Subject: [PATCH] 修改
---
Yfs/Api/Data.php | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 4fdbede..65ed71f 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -8,7 +8,7 @@
public function getRules() {
return array(
'upload' => array(
- 'data' => array('name' => 'data', 'type' => 'string' ,'require' => true, 'desc' => '������������'),
+ 'data' => array('name' => 'data', 'type' => 'array' ,'require' => true, 'desc' => '������������'),
),
'getUserDataList' => array(
'user_id' => array(
@@ -34,16 +34,18 @@
public function upload(){
$rs = array('code' => 0, 'msg' => '');
$data_service = new Domain_Data();
- $data = json_decode($this->data, true);
+ //$data = json_decode($this->data, true);
//print_r(count($data['data']));die();
- if(json_last_error() == JSON_ERROR_NONE){
+ //if(json_last_error() == JSON_ERROR_NONE){
+ if(count($this->data) > 0){
$data_service->upload($data);
$rs['msg'] = "������������������";
}
- else{
- $rs['code'] = 1;
- $rs['msg'] = "json������������";
- }
+ // }
+ // else{
+ // $rs['code'] = 1;
+ // $rs['msg'] = "json������������";
+ // }
return $rs;
}
@@ -57,15 +59,28 @@
public function getUserDataList(){
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$data_daily_service = new Domain_DataDaily();
- if($data_daily_service->checkTime($this->start_time, $this->end_time)){
+ 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 >= 0.8 && $res_avg < 2){
+ $res_status = '������';
+ }
+ else{
+ $res_status = '������';
+ }
$rs['msg'] = '������������������';
- $rs['info'] = $result;
+ $rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);
}
else{
- $rs['code'] = 1;
- $rs['msg'] = '������������������';
+ $rs['msg'] = '������������';
+ $rs['info'] = array('data' => array(), 'avg' => 0, 'status' => '������');
}
}
else{
--
Gitblit v1.8.0