likang

catch/api/controller/Api.php

@@ -1,5 +1,6 @@
 <?php
 
+
 namespace catchAdmin\api\controller;
 
 use catchAdmin\tag_history\model\TagHistory;
@@ -34,7 +35,8 @@ class Api extends CatchController
                 'lable' => $item['label'],
                 'rssi' => $item['rssi'],
                 'time' => $item['time'],
-                'addTime' => time()
+                'addTime' => time(),
+                'move' => $item['move']
             ];
         }
         $tage = new TagHistory();

catch/tag_history/controller/TagHistory.php

@@ -38,7 +38,7 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
 
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
-
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
 
 
 
@@ -80,11 +80,16 @@ class TagHistory extends CatchController
         if ($bool) {
             $where[] = ['mac', 'in', '30B5F1013899'];
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+        } elseif ($shifouRole) {
+            $where[] = ['mac', 'in', '30B5F10138EB'];
+            $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008"];
         } else {
             $where[] = ['mac', 'not in', '30B5F1013899'];
             $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
         }
 
+
+
         $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();
 
@@ -98,7 +103,7 @@ class TagHistory extends CatchController
             $list[$key]['rssi'] = $da['rssi'];
             $list[$key]['addTime'] = date('Y-m-d H:i:s', $value['addTime']);
             $list[$key]['time'] = date('Y-m-d H:i:s', $da['time']);
-            $list[$key]['id'] = $da['id'];
+            $list[$key]['id'] = $da['move'];
         }
         return CatchResponse::success($list);
     }
@@ -154,10 +159,14 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
         $where = [];
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+
         if ($bool) {
             $where[] = ['mac', 'in', '30B5F1013899'];
+        } else if ($shifouRole) {
+            $where[] = ['mac', 'in', '30B5F10138EB'];
         } else {
-            $where[] = ['mac', 'not in', '30B5F1013899'];
+            $where[] = ['mac', 'not in', ['30B5F1013899', '30B5F10138EB']];
         }
         $list = $this->tagHistoryModel->group('mac')->where($where)->column('mac');
         return CatchResponse::success($list);
@@ -172,10 +181,14 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
         $where = [];
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+
         if ($bool) {
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+        } elseif ($shifouRole) {
+            $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008"];
         } else {
-            $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+            $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306,30b5f6000006,30b5f6000007,30b5f6000008"];
         }
         $list = $this->tagHistoryModel->group('lable')->where($where)->column('lable');
         return CatchResponse::success($list);

catch/tag_history/model/TagHistory.php

@@ -21,6 +21,7 @@ class TagHistory extends Model
         'addTime',
         // 心跳
         'rssi',
+        'move',
         // 创建人ID
         'creator_id',
         // 创建时间