From 066fffc3e2d8107df55dd41d4d50dbe5b69886b1 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Sat, 28 Apr 2018 10:22:40 +0800
Subject: [PATCH] 解决上传原始数据接口ｂｕｇ
---
Yfs/Domain/Data.php | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index 0a76dd5..e1b51c4 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -9,6 +9,8 @@
$this->model = new Model_Data();
$this->hourly_model = new Model_DataHourly();
$this->warn_model = new Model_DataWarn();
+ $this->task_model = new Model_Task();
+ $this->data_original_model = new Model_DataOriginal();
}
/**
@@ -22,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){
@@ -32,7 +35,26 @@
}
}
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();
+ $task_date = $this->task_model->get(array('date' => $arr['date']));
+ if(!$task_date){
+ $task_arr['date'] = $arr['date'];
+ $this->task_model->add($task_arr);
+ }
+
}
if(isset($arr['_id']))
unset($arr['_id']);
@@ -43,6 +65,30 @@
}
+ /**
+ * ������������������������
+ * @return [type] [description]
+ */
+ public function originalUpload($param){
+ $arr = array();
+ 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');
+ if($this->data_original_model->add($arr))
+ return true;
+ else
+ return false;
+ }
+
+
public function getList(){
return $this->model->getList();
}
--
Gitblit v1.8.0