优化了平均值

colly_wyx

2018-04-28 4b9bdbdab8d33a9197e12cac65477018e8bdc20e

 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;
@@ -46,10 +56,22 @@
     */
    public function getUserDataAvg($user_id, $start_time, $end_time){
       
        // if($start_time == $end_time){
        //     $result = $this->model->get(array('date' => $start_time));
        // }
        // else{
         if($start_time == $end_time){
             $result = $this->data_three_hourly_model->get(array('date' => $start_time));
             if($result){
                $sum = 0;
                for($i = 1; $i <= 8; $i++){
                    $sum += $result['time_slot_'.$i];
                }
                
                $result[0]['day_avg'] = $sum/8;
             }
             else{
                $result[0]['day_avg'] = 0;
             }
             
         }
         else{
            $result = $this->model->aggregate(
                array(
                    array(
@@ -63,7 +85,7 @@
                    )
                )   
            );
        //}
        }

        return isset($result[0]['day_avg'])?$result[0]['day_avg']:0;
    }