From d3534714ed8f07f19e0a648ab2d07c73d0bed156 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Wed, 09 May 2018 16:03:12 +0800
Subject: [PATCH] 调整存入值类型
---
Yfs/Domain/Data.php | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index b70b495..9ed9c3c 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -24,7 +24,8 @@
$arr['lat'] = $data['lat'];
$arr['address'] = $data['address'];
foreach ($data['data'] as $value) {
- $arr['value'] = $value['value'];
+
+ $arr['value'] = (float)$value['value'];
$arr['create_time'] = $value['time'];
$arr['date'] = date('Y-m-d', strtotime($value['time']));
if($value['type'] == 0){
@@ -34,11 +35,25 @@
}
}
elseif($value['type'] == 1){
- $this->hourly_model->add($arr);
+
+ $arr['hour'] = (int)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->task_model->get(array('date' => $arr['date'], 'user_id' => $arr['user_id']));
+ if(!$task_date){
$task_arr['date'] = $arr['date'];
- $this->task_model->add($arr);
+ $task_arr['user_id'] = $arr['user_id'];
+ $this->task_model->add($task_arr);
}
}
@@ -55,13 +70,23 @@
* ������������������������
* @return [type] [description]
*/
- public function originalUpload(){
+ public function originalUpload($param){
$arr = array();
- $arr['data'] = $data['data'];
- $arr['time'] = $data['time'];
+ if(!empty($param->data)){
+ $data = $param->data;
+ }
+ else{
+ $data = $param->data_1;
+ }
+
+ $arr['data'] = $data;
+ $arr['time'] = $param->time;
+ $arr['user_id'] = $param->user_id;
$arr['create_time'] = date('Y-m-d H:i:s');
- $this->data_original_model->add($arr);
- return true;
+ if($this->data_original_model->add($arr))
+ return true;
+ else
+ return false;
}
--
Gitblit v1.8.0