|
|
|
@ -11,8 +11,6 @@ use think\Db; |
|
|
|
class Passcc extends Controller |
|
|
|
{ |
|
|
|
|
|
|
|
protected $libUrl = 'http://balib.cn:8999/CustCount/baoan/stat.json?key=baoan'; |
|
|
|
|
|
|
|
public function test() { |
|
|
|
echo 1111; |
|
|
|
} |
|
|
|
@ -175,6 +173,15 @@ class Passcc extends Controller |
|
|
|
} |
|
|
|
$returnData['sumYear']['noRepeatInNum'] = $yearSum; |
|
|
|
|
|
|
|
$libData = Pass::getBaoAnLibData(true); |
|
|
|
foreach ($libData as $libRow) { |
|
|
|
$returnData['day']['noRepeatInNum'] += $libRow['today']['incount']; |
|
|
|
$returnData['week']['noRepeatInNum'] += $libRow['today']['incount']; |
|
|
|
$returnData['month']['noRepeatInNum'] += $libRow['month']['incount']; |
|
|
|
$returnData['year']['noRepeatInNum'] += $libRow['year']['incount']; |
|
|
|
$returnData['sumYear']['noRepeatInNum'] += $libRow['year']['incount']; |
|
|
|
} |
|
|
|
|
|
|
|
foreach ($returnData as &$val) { |
|
|
|
$val['noRepeatInNum'] = formatNumber($val['noRepeatInNum']); |
|
|
|
} |
|
|
|
@ -216,17 +223,19 @@ class Passcc extends Controller |
|
|
|
$returnData[] = $val; |
|
|
|
} |
|
|
|
|
|
|
|
$result = curlPost($this->libUrl); |
|
|
|
$libData = json_decode($result,true); |
|
|
|
$libData = Pass::getBaoAnLibData(true); |
|
|
|
|
|
|
|
$libProportion = $libData['today']['incount'] > 0 ? round($libData['today']['incount']/$threshold,2) : 0; |
|
|
|
$returnData[] = [ |
|
|
|
'allEnter' => $libData['today']['incount'], |
|
|
|
'proportion' => ($libProportion * 100) . "%", |
|
|
|
'congestion' => Pass::getPassType($libProportion), |
|
|
|
'groupId' => '', |
|
|
|
'groupName' => '图书馆' |
|
|
|
]; |
|
|
|
foreach ($libData as $libRow) { |
|
|
|
|
|
|
|
$libProportion = $libRow['today']['incount'] > 0 ? round($libRow['today']['incount']/$threshold,2) : 0; |
|
|
|
$returnData[] = [ |
|
|
|
'allEnter' => $libRow['today']['incount'], |
|
|
|
'proportion' => ($libProportion * 100) . "%", |
|
|
|
'congestion' => Pass::getPassType($libProportion), |
|
|
|
'groupId' => $libRow['groupId'], |
|
|
|
'groupName' => $libRow['name'] |
|
|
|
]; |
|
|
|
} |
|
|
|
|
|
|
|
return $this->renderSuccess(compact('returnData')); |
|
|
|
} |
|
|
|
|