From 40417edce32320cc8f6f558adf9b8ee8b4ff23c2 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 26 Apr 2018 16:44:14 +0800
Subject: [PATCH] 调整上传接口
---
Yfs/Api/Data.php | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 6e104ea..a6f7ffd 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -8,7 +8,19 @@
public function getRules() {
return array(
'upload' => array(
- 'data' => array('name' => 'data', 'type' => 'string' ,'require' => true, 'desc' => '������������'),
+ 'data' => array('name' => 'data', 'type' => 'string' ,'require' => false, 'source' => 'post', 'desc' => '������������'),
+ 'data_1' => array('name' => 'data_1', 'type' => 'array' ,'require' => false, 'source' => 'post', 'desc' => '������������'),
+ ),
+ '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(
@@ -34,17 +46,50 @@
public function upload(){
$rs = array('code' => 0, 'msg' => '');
$data_service = new Domain_Data();
- $data = json_decode($this->data, true);
+
+ if(!empty($this->data)){
+ $data = json_decode($this->data,true);
+ }
+ else{
+ $data = $this->data_1;
+ }
+ //$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($data) > 0){
+
$data_service->upload($data);
$rs['msg'] = "������������������";
}
- else{
- $rs['code'] = 1;
- $rs['msg'] = "json������������";
- }
+ // }
+ // else{
+ // $rs['code'] = 1;
+ // $rs['msg'] = "json������������";
+ // }
return $rs;
+ }
+
+ /**
+ * ������������������
+ * @return [type] [description]
+ */
+ 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'] = "������������������������";
+ }
}
/**
@@ -57,15 +102,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($data_list){
+ 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'] = $data_list;
+ $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