|
|
|
@ -1,9 +1,10 @@ |
|
|
|
<?php |
|
|
|
namespace app\api\controller\PassengerFlow; |
|
|
|
|
|
|
|
use app\api\controller\Controller; |
|
|
|
use think\Db; |
|
|
|
|
|
|
|
class PassengerFlow |
|
|
|
class PassengerFlow extends Controller |
|
|
|
{ |
|
|
|
|
|
|
|
/** |
|
|
|
@ -15,9 +16,8 @@ class PassengerFlow |
|
|
|
*/ |
|
|
|
public function allGroupTimeNum($granularity) { |
|
|
|
|
|
|
|
if (empty($granularity)) return json_encode(['code' => 403, 'date参数不能为空'],JSON_UNESCAPED_UNICODE); |
|
|
|
if (empty($granularity)) $this->renderError('date参数不能为空'); |
|
|
|
|
|
|
|
$dateData = getTargetDate(); |
|
|
|
$allTimeData = []; |
|
|
|
$groupsData = []; |
|
|
|
if ($granularity == 'daily') { |
|
|
|
@ -37,10 +37,7 @@ class PassengerFlow |
|
|
|
$groupsData = $data['groupsData']; |
|
|
|
} |
|
|
|
|
|
|
|
return json_encode(['code' => 0, 'msg' => '成功', 'data' => [ |
|
|
|
'allTimeData' => $allTimeData, |
|
|
|
'groupsData' => $groupsData |
|
|
|
]],JSON_UNESCAPED_UNICODE); |
|
|
|
$this->renderSuccess(['allTimeData' => $allTimeData, 'groupsData' => $groupsData]); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -124,12 +121,7 @@ class PassengerFlow |
|
|
|
$val['noRepeatInNum'] = formatNumber($val['noRepeatInNum']); |
|
|
|
} |
|
|
|
|
|
|
|
$returnArr = [ |
|
|
|
'code' => 0, |
|
|
|
'msg' => '成功', |
|
|
|
'data' => $returnData |
|
|
|
]; |
|
|
|
return json_encode($returnArr,JSON_UNESCAPED_UNICODE); |
|
|
|
$this->renderSuccess($returnData); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -155,11 +147,7 @@ class PassengerFlow |
|
|
|
$val['proportion'] = (round($val['allEnter']/$sumAllEnter,2) * 100) ."%"; |
|
|
|
} |
|
|
|
|
|
|
|
return json_encode([ |
|
|
|
'code' => 0, |
|
|
|
'msg' => '成功', |
|
|
|
'data' => $returnData |
|
|
|
],JSON_UNESCAPED_UNICODE); |
|
|
|
$this->renderSuccess($returnData); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -184,11 +172,6 @@ class PassengerFlow |
|
|
|
if (!isset($returnData[$value['groupName']][$allTimeData[$date]])) $returnData[$value['groupName']][$date] = 0; |
|
|
|
$returnData[$value['groupName']][$date] += $value['flowInNum']; |
|
|
|
} |
|
|
|
return json_encode([ |
|
|
|
'code' => 0, |
|
|
|
'msg' => '成功', |
|
|
|
'data' => $returnData], |
|
|
|
JSON_UNESCAPED_UNICODE |
|
|
|
); |
|
|
|
$this->renderSuccess($returnData); |
|
|
|
} |
|
|
|
} |