修改名称

colly_wyx

2018-05-18 8ef7650be0363908b675827e732ec52fbb996900

 Yfs/Api/Data.php

@@ -77,19 +77,11 @@
    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'] = "原始数据上报成功";
        }
        if($data_service->originalUpload($this))
          $rs['msg'] = "原始数据上报成功";
        else
          $rs['msg'] = "原始数据上报失败";
        return $rs;
    }

    /**
@@ -106,17 +98,18 @@
            $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);