From b4bde7598ab60302644add309197f4320f95e15a Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Fri, 18 May 2018 09:25:44 +0800
Subject: [PATCH] 修改名称
---
Yfs/Api/Data.php | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 97cce4e..0bbf1f2 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -14,6 +14,13 @@
'originalUpload' => array(
'data' => array('name' => 'data', 'type' => 'string' ,'require' => false, 'source' => 'post', 'desc' => '������������'),
'data_1' => array('name' => 'data_1', 'type' => 'array' ,'require' => false, 'source' => 'post', 'desc' => '������������'),
+ 'user_id' => array(
+ 'name' => 'user_id', 'type' => 'string', 'require' => true, 'desc' => '������id'
+ ),
+ 'time' => array(
+ 'name' => 'time', 'type' => 'string', 'require' => true, 'desc' => '������'
+ ),
+
),
'getUserDataList' => array(
'user_id' => array(
@@ -41,7 +48,7 @@
$data_service = new Domain_Data();
if(!empty($this->data)){
- $data = $this->data;
+ $data = json_decode($this->data,true);
}
else{
$data = $this->data_1;
@@ -70,19 +77,11 @@
public function originalUpload(){
$rs = array('code' => 0, 'msg' => '');
$data_service = new Domain_Data();
-
- if(!empty($this->data)){
- $data = $this->data;
- }
- else{
- $data = $this->data_1;
- }
-
- if(count($data) > 0){
-
- $data_service->originalUpload($data);
- $rs['msg'] = "������������������������";
- }
+ if($data_service->originalUpload($this))
+ $rs['msg'] = "������������������������";
+ else
+ $rs['msg'] = "������������������������";
+ return $rs;
}
/**
@@ -99,24 +98,25 @@
$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);
}
else{
$rs['msg'] = '������������';
- $rs['info'] = array('data' => array(), 'avg' => 0, 'status' => '������');
+ $rs['info'] = array('data' => array(), 'avg' => 0, 'status' => '������������');
}
}
else{
--
Gitblit v1.8.0