colly_wyx
2018-04-26 6e986f878ae7b82b1291a2d368485c30a2e02e86
新增原始数据上传接口
3 files added
2 files modified
55 ■■■■■ changed files
Yfs/Api/Data.php 26 ●●●●● patch | view | raw | blame | history
Yfs/Domain/Data.php 22 ●●●●● patch | view | raw | blame | history
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e patch | view | raw | blame | history
Yfs/Model/.phpintel/index patch | view | raw | blame | history
Yfs/Model/DataOriginal.php 7 ●●●●● patch | view | raw | blame | history
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
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();
    }
Yfs/Model/.phpintel/0bedd5b0016fa5b46ab8d14a2d2a636e
Binary files differ
Yfs/Model/.phpintel/index
Binary files differ
Yfs/Model/DataOriginal.php
New file
@@ -0,0 +1,7 @@
<?php
class Model_DataOriginal extends System_Model_Base{
    public $table = "data_original";
}