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/Domain/Data.php | 20 +++++++++++++++++---
Yfs/Model/Task.php | 7 +++++++
Yfs/Api/Data.php | 2 +-
Yfs/Model/DataOriginal.php | 2 +-
Library/MyRequest.php | 5 +++--
Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05 | 0
Yfs/Model/.phpintel/index | 0
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e | 0
Yfs/Model/Base.php | 2 +-
Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec | 0
10 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Library/MyRequest.php b/Library/MyRequest.php
index 4feb330..92e95f8 100644
--- a/Library/MyRequest.php
+++ b/Library/MyRequest.php
@@ -5,8 +5,9 @@
parent::__construct($data);
// json������
- $this->post = file_get_contents('php://input');
-
+ if(!$_POST)
+ $this->post = json_decode(file_get_contents('php://input'),true);
+
// ������xml������
//$this->post = simplexml_load_string (
// file_get_contents('php://input'),
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 8cb651d..a6f7ffd 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -48,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;
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index b70b495..6cfa98c 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -24,6 +24,7 @@
$arr['lat'] = $data['lat'];
$arr['address'] = $data['address'];
foreach ($data['data'] as $value) {
+
$arr['value'] = $value['value'];
$arr['create_time'] = $value['time'];
$arr['date'] = date('Y-m-d', strtotime($value['time']));
@@ -34,11 +35,24 @@
}
}
elseif($value['type'] == 1){
- $this->hourly_model->add($arr);
+
+ $arr['hour'] = date('H', strtotime($value['time']));
+ $hourly = $this->hourly_model->get(array('hour' => $arr['hour'], 'date' => $arr['date'], 'user_id' => $arr['user_id']));
+
+ if($hourly){
+ $_id = $hourly['_id'];
+ //������������������
+ $hourly = $arr;
+ $this->hourly_model->update($hourly, array('_id' => $_id));
+ }
+ else{
+ $this->hourly_model->add($arr);
+ }
$task_arr = array();
- if(!in_arrar($task_arr)){
+ $task_date = $this->hourly_model->get(array('date' => $arr['date']));
+ if(!$task_date){
$task_arr['date'] = $arr['date'];
- $this->task_model->add($arr);
+ $this->task_model->add($task_arr);
}
}
diff --git a/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e b/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
index 47391cb..525191d 100644
--- a/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
+++ b/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
Binary files differ
diff --git a/Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05 b/Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05
new file mode 100644
index 0000000..6eb8bf9
--- /dev/null
+++ b/Yfs/Model/.phpintel/cd550ac684a8053ff9489bafc6a2da05
Binary files differ
diff --git a/Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec b/Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec
new file mode 100644
index 0000000..777fe25
--- /dev/null
+++ b/Yfs/Model/.phpintel/e9c5c8acc7ec96e3d2bea72829d643ec
Binary files differ
diff --git a/Yfs/Model/.phpintel/index b/Yfs/Model/.phpintel/index
index 486935d..bdbf6d2 100644
--- a/Yfs/Model/.phpintel/index
+++ b/Yfs/Model/.phpintel/index
Binary files differ
diff --git a/Yfs/Model/Base.php b/Yfs/Model/Base.php
index 2b904a2..5758efe 100644
--- a/Yfs/Model/Base.php
+++ b/Yfs/Model/Base.php
@@ -53,7 +53,7 @@
return $this->db->insert($this->table, $data);
}
- public function update($data, $query){
+ public function update($data, $query = null){
return $this->db->update($this->table, $data, $query);
}
diff --git a/Yfs/Model/DataOriginal.php b/Yfs/Model/DataOriginal.php
index dc21ba7..4869497 100644
--- a/Yfs/Model/DataOriginal.php
+++ b/Yfs/Model/DataOriginal.php
@@ -1,6 +1,6 @@
<?php
-class Model_DataOriginal extends System_Model_Base{
+class Model_DataOriginal extends Model_Base{
public $table = "data_original";
diff --git a/Yfs/Model/Task.php b/Yfs/Model/Task.php
new file mode 100644
index 0000000..4d03b27
--- /dev/null
+++ b/Yfs/Model/Task.php
@@ -0,0 +1,7 @@
+<?php
+
+class Model_Task extends Model_Base{
+
+ public $table = 'user';
+
+}
--
Gitblit v1.8.0