|
|
@@ -42,8 +42,6 @@ class TagHistory extends CatchController
|
|
|
$shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where($wheress)->find();
|
|
|
$ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 5)->find();
|
|
|
|
|
|
-
|
|
|
-
|
|
|
if (!empty($time)) {
|
|
|
$where[] = ['addTime', '>=', $time];
|
|
|
} else {
|
|
|
@@ -85,6 +83,9 @@ class TagHistory extends CatchController
|
|
|
} elseif ($shifouRole) {
|
|
|
$where[] = ['mac', 'in', '30B5F10138EB'];
|
|
|
$where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
|
|
|
+ } elseif ($ccccRole) {
|
|
|
+ $where[] = ['mac', 'in', '30B5F1013800'];
|
|
|
+ $where[] = ['lable', 'in', "0000f6000006,0000f6000007"];
|
|
|
} else {
|
|
|
$where[] = ['mac', 'not in', '30B5F1013899'];
|
|
|
$where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
|
|
|
@@ -92,6 +93,7 @@ class TagHistory extends CatchController
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
$list = $this->tagHistoryModel->group('mac,lable')->where($where)
|
|
|
->field('mac,lable,max(addTime) as addTime,format(AVG(rssi),2) as ave_rssi,count(*) as num')->select()->toArray();
|
|
|
|
|
|
@@ -119,7 +121,6 @@ class TagHistory extends CatchController
|
|
|
$list[$key]['step'] = $das['value'];
|
|
|
Db::name('config')->where('key', 'upload')->update(['value' => $das['value'] + 1]);
|
|
|
}
|
|
|
- $list[$key]['lable'] = str_replace('30b5', '0000', $value['lable']);
|
|
|
}
|
|
|
|
|
|
$list[$key]['addTime'] = date('Y-m-d H:i:s', $value['addTime']);
|
likang