修正ｂｕｇ

colly_wyx

2018-04-27 78cff841433fce51ade16e5fba124becebf26512

 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,17 +24,37 @@
        $arr['lat'] = $data['lat'];
        $arr['address'] = $data['address'];
        foreach ($data['data'] as $value) {

            $arr['value'] = $value['value'];
            $arr['create_time'] = $value['time'];
            $arr['date'] = date('Y-m-d', strtotime($value['time']));
            if($data['type'] == 0){
            if($value['type'] == 0){
                $this->model->add($arr);
                if($arr['is_warn'] == 1){
                if($value['is_warn'] == 1){
                    $this->warn_model->add($arr);
                }
            }
            elseif($data['type'] == 1){
                $this->hourly_model->add($arr);
            elseif($value['type'] == 1){

                $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,20 @@

    }

    /**
     * 原始数据获取上传
     * @return [type] [description]
     */
    public function originalUpload($data){
        $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();
    }