From 3fffc1da75d49f832b9faf3467d91202e0220a3b Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 26 Apr 2018 15:02:06 +0800
Subject: [PATCH] 增加上传字段
---
Yfs/Domain/Data.php | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index c5851ec..b70b495 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -7,6 +7,10 @@
public function __construct(){
//DI()->redis = new Redis_Lite(DI()->config->get('app.redis.servers'));
$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();
}
/**
@@ -19,10 +23,25 @@
$arr['lon'] = $data['lon'];
$arr['lat'] = $data['lat'];
$arr['address'] = $data['address'];
- foreach ($data['data'] as $value) {
+ foreach ($data['data'] as $value) {
$arr['value'] = $value['value'];
$arr['create_time'] = $value['time'];
- $this->model->add($arr);
+ $arr['date'] = date('Y-m-d', strtotime($value['time']));
+ if($value['type'] == 0){
+ $this->model->add($arr);
+ if($value['is_warn'] == 1){
+ $this->warn_model->add($arr);
+ }
+ }
+ elseif($value['type'] == 1){
+ $this->hourly_model->add($arr);
+ $task_arr = array();
+ if(!in_arrar($task_arr)){
+ $task_arr['date'] = $arr['date'];
+ $this->task_model->add($arr);
+ }
+
+ }
if(isset($arr['_id']))
unset($arr['_id']);
}
@@ -32,6 +51,32 @@
}
+ /**
+ * ������������������������
+ * @return [type] [description]
+ */
+ public function originalUpload(){
+ $arr = array();
+ $arr['data'] = $data['data'];
+ $arr['time'] = $data['time'];
+ $arr['create_time'] = date('Y-m-d H:i:s');
+ $this->data_original_model->add($arr);
+ return true;
+ }
+
+
+ public function getList(){
+ return $this->model->getList();
+ }
+
+
+
+ //public function updateTime($data){
+ // $id = $data['_id'];
+ // unset($data['_id']);
+ // return $this->model->update($data, array('_id' => $id));
+ //}
+
}
--
Gitblit v1.8.0