From 6e986f878ae7b82b1291a2d368485c30a2e02e86 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 26 Apr 2018 14:57:07 +0800
Subject: [PATCH] 新增原始数据上传接口
---
Yfs/Domain/Data.php | 22 ++++++++++++++++++++++
Yfs/Api/Data.php | 26 ++++++++++++++++++++++++++
Yfs/Model/DataOriginal.php | 7 +++++++
Yfs/Model/.phpintel/index | 0
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e | 0
5 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 4293e22..97cce4e 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -11,6 +11,10 @@
'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' => '������������'),
+ ),
'getUserDataList' => array(
'user_id' => array(
'name' => 'user_id', 'type' => 'string', 'require' => true, 'desc' => '������id'
@@ -60,6 +64,28 @@
}
/**
+ * ������������������
+ * @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'] = "������������������������";
+ }
+ }
+
+ /**
* ������������
* @desc ������������
* @return string user_id ������id
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index 0a76dd5..b70b495 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();
}
/**
@@ -33,6 +35,12 @@
}
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']);
@@ -43,6 +51,20 @@
}
+ /**
+ * ������������������������
+ * @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();
}
diff --git a/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e b/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
new file mode 100644
index 0000000..47391cb
--- /dev/null
+++ b/Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
Binary files differ
diff --git a/Yfs/Model/.phpintel/index b/Yfs/Model/.phpintel/index
new file mode 100644
index 0000000..486935d
--- /dev/null
+++ b/Yfs/Model/.phpintel/index
Binary files differ
diff --git a/Yfs/Model/DataOriginal.php b/Yfs/Model/DataOriginal.php
new file mode 100644
index 0000000..dc21ba7
--- /dev/null
+++ b/Yfs/Model/DataOriginal.php
@@ -0,0 +1,7 @@
+<?php
+
+class Model_DataOriginal extends System_Model_Base{
+
+ public $table = "data_original";
+
+}
\ No newline at end of file
--
Gitblit v1.8.0