likang

catch/api/controller/Api.php

@@ -2,6 +2,7 @@
 
 
 
+
 namespace catchAdmin\api\controller;
 
 use catchAdmin\tag_history\model\TagHistory;
@@ -38,6 +39,8 @@ class Api extends CatchController
                 'time' => $item['time'],
                 'addTime' => time(),
                 'move' => $item['move'],
+                'step' => empty($item['step']) ? 0 : $item['step'],
+                'temperature' => empty($item['temperature']) ? 0 : $item['temperature'],
             ];
         }
         $tage = new TagHistory();

catch/tag_history/controller/TagHistory.php

@@ -38,9 +38,10 @@ class TagHistory extends CatchController
         $create_id = $request->user()->id;
 
         $bool = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 3)->find();
-        $wheress[] = ['role_id', 'in', [4, 5]];
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where($wheress)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
         $ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 5)->find();
+        //
+        $six = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 6)->find();
 
         if (!empty($time)) {
             $where[] = ['addTime', '>=', $time];
@@ -84,11 +85,22 @@ class TagHistory extends CatchController
             $where[] = ['mac', 'in', '30B5F10138EB'];
             $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
         } elseif ($ccccRole) {
-            $where[] = ['mac', 'in', '30B5F1013800'];
-            $where[] = ['lable', 'in', "0000f6000006,0000f6000007"];
+            $where[] = ['mac', 'in', '30B5F10138ED'];
+            $where[] = ['lable', 'in', "000000880002,000000880003"];
+        } elseif ($six) {
+
+            $where[] = ['mac', 'in', '30B5F1013801'];
+            $where[] = ['lable', 'in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
         } else {
+
             $where[] = ['mac', 'not in', '30B5F1013899'];
+            $where[] = ['mac', 'not in', '30B5F10138EB'];
+            $where[] = ['mac', 'not in', '30B5F10138ED'];
+            $where[] = ['mac', 'not in', '30B5F1013801'];
             $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+            $where[] = ['lable', 'not in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
+            $where[] = ['lable', 'not in', "000000880002,000000880003"];
+            $where[] = ['lable', 'not in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
         }
 
 
@@ -105,24 +117,8 @@ class TagHistory extends CatchController
             $wheres[] = ['addTime', '=', $value['addTime']];
             $da = $this->tagHistoryModel->where($wheres)->find();
             $list[$key]['rssi'] = $da['rssi'];
-            if ($ccccRole) {
-                if ($key == 0) {
-                    $list[$key]['move'] = 0;
-                    $list[$key]['temperature'] = 38.5;
-                    $list[$key]['step'] = 1502;
-                } else {
-                    $list[$key]['move'] = 1;
-                    $list[$key]['temperature'] = 39;
-                    $list[$key]['step'] = 2100;
-                    $das = Db::name('config')->where('key', 'upload')->find();
-                    if (empty($das['value'])) {
-                        $das['value'] = 2100;
-                    }
-                    $list[$key]['step'] = $das['value'];
-                    Db::name('config')->where('key', 'upload')->update(['value' => $das['value'] + 1]);
-                }
-            }
-
+            $list[$key]['move'] = $da['move'];
+            $list[$key]['temperature'] = $da['temperature'];
             $list[$key]['addTime'] = date('Y-m-d H:i:s', $value['addTime']);
             $list[$key]['time'] = date('Y-m-d H:i:s', $da['time']);
         }
@@ -179,15 +175,20 @@ 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();
-        $wheress[] = ['role_id', 'in', [4, 5]];
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 'in', $wheress)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+        $six = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 6)->find();
+        $ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 5)->find();
 
         if ($bool) {
             $where[] = ['mac', 'in', '30B5F1013899'];
         } else if ($shifouRole) {
             $where[] = ['mac', 'in', '30B5F10138EB'];
+        } elseif ($ccccRole) {
+            $where[] = ['mac', 'in', '30B5F10138ED'];
+        } elseif ($six) {
+            $where[] = ['mac', 'in', '30B5F1013801'];
         } else {
-            $where[] = ['mac', 'not in', ['30B5F1013899', '30B5F10138EB']];
+            $where[] = ['mac', 'not in', ['30B5F1013899', '30B5F10138EB', '30B5F1013801', '30B5F10138ED']];
         }
         $list = $this->tagHistoryModel->group('mac')->where($where)->column('mac');
         return CatchResponse::success($list);
@@ -202,15 +203,24 @@ 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();
-        $wheress[] = ['role_id', 'in', [4, 5]];
-        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where($wheress)->find();
+        $shifouRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 4)->find();
+        $six = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 6)->find();
+        //牛耳朵
+        $ccccRole = Db::name('user_has_roles')->where('uid', $create_id)->where('role_id', 5)->find();
 
         if ($bool) {
             $where[] = ['lable', 'in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
         } elseif ($shifouRole) {
             $where[] = ['lable', 'in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
+        } elseif ($ccccRole) {
+            $where[] = ['lable', 'in', "000000880002,000000880003"];
+        } elseif ($six) {
+            $where[] = ['lable', 'in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
         } else {
-            $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306,30b5f6000006,30b5f6000007,30b5f6000008"];
+            $where[] = ['lable', 'not in', "3543245626,3544976938,3544261098,1539178988,3544517098,3544959402,3542053498,3543226346,3544413306"];
+            $where[] = ['lable', 'not in', "30b5f6000006,30b5f6000007,30b5f6000008,0000f6000006,0000f6000007,0000f6000008"];
+            $where[] = ['lable', 'not in', "0000e2b7a905,0000e2b7a2c5,0000ea511abe,0000e2b6d355"];
+            $where[] = ['lable', 'not in', "000000880002,000000880003"];
         }
         $list = $this->tagHistoryModel->group('lable')->where($where)->column('lable');
         return CatchResponse::success($list);

catch/tag_history/model/TagHistory.php

@@ -22,6 +22,8 @@ class TagHistory extends Model
         // 心跳
         'rssi',
         'move',
+        'step',
+        'temperature',
         // 创建人ID
         'creator_id',
         // 创建时间