优化回报数据

colly_wyx

2018-04-28 d50ec1d43fd3b57305425d38ecc7c84f201e74cf

优化回报数据

 Yfs/Api/Data.php

@@ -98,17 +98,17 @@
            $result = $data_daily_service->getUserDataList($this->user_id, $this->start_time, $this->end_time);
            if($result){
                $res_avg = $data_daily_service->getUserDataAvg($this->user_id, $this->start_time, $this->end_time);
                if($res_avg < 0.25){
                    $res_status = '安全';
                if($res_avg < 0.16){
                    $res_status = '绝对安全';
                }
                elseif($res_avg >= 0.25 && $res_avg < 0.8){
                    $res_status = '轻微';
                elseif($res_avg >= 0.16 && $res_avg < 0.8){
                    $res_status = '建议回避';
                }
                elseif($res_avg >= 0.8 && $res_avg < 2){
                    $res_status = '中度';
                    $res_status = '及时闪躲';
                }
                else{
                    $res_status = '严重';
                    $res_status = '紧急撤离';
                }
                $rs['msg'] = '数据获取成功';
                $rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);

 Yfs/Domain/Data.php

@@ -49,9 +49,10 @@
                    $this->hourly_model->add($arr);
                }
                $task_arr = array();
                $task_date = $this->task_model->get(array('date' => $arr['date']));
                $task_date = $this->task_model->get(array('date' => $arr['date'], 'user_id' => $arr['user_id']));
                if(!$task_date){
                   $task_arr['date'] = $arr['date'];
                   $task_arr['user_id'] = $arr['user_id'];
                   $this->task_model->add($task_arr); 
                }
                

 Yfs/Domain/DataDaily.php

@@ -7,7 +7,7 @@
    public function __construct(){
        //DI()->redis = new Redis_Lite(DI()->config->get('app.redis.servers'));
       $this->model = new Model_DataDaily();
       $this->hourly_model = new Model_DataHourly();
       $this->data_three_hourly_model = new Model_DataThreeHourly();
    }

    /**
@@ -31,7 +31,17 @@
            $result = $this->model->getList(array('user_id' => $user_id, 'date' => array('$in' => $days_arr)));
        }
        else{
            $result = $this->hourly_model->getList(array('user_id' => $user_id, 'date' => date('Y-m-d', $start_time)), array(), array('time_level' => 1));
            $result = $this->data_three_hourly_model->get(array('user_id' => $user_id, 'date' => date('Y-m-d', $start_time)));
            $_result = array();
            if($result){
                for($i = 1; $i <=8 ; $i++){
                    array_push($_result, array('hour_avg' => $result['time_slot_'.$i], 'time_level' => $i));
                }         
            }
            else{
                $_result = null;
            }
            return $_result;
        }
        
        return $result;