likang

catch/tag_history/controller/TagHistory.php

@@ -50,11 +50,15 @@ class TagHistory extends CatchController
 
 
         if (!empty($time)) {
-            $where[] = ['addTime', '>=', $time];
+            $onewhere[] = ['addTime', '>=', $time];
         } else {
-            $where[] = ['addTime', '>=', time()];
+            $onewhere[] = ['addTime', '>=', time()];
         }
 
+
+
+
+
         if (!empty($mac)) {
             $where[] = ['mac', 'in',  implode(",", $mac)];
         }
@@ -109,9 +113,16 @@ 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();
+            ->field('mac,lable')->select()->toArray();
 
         foreach ($list as $key => $value) {
+             
+            $value['addTime'] = $this->tagHistoryModel->
+                where($where)->where($onewhere)->max('addTime');
+            $value['ave_rssi']= $this->tagHistoryModel->where($where)->where($onewhere)->avg('rssi');
+            $value['num']=$this->tagHistoryModel->where($where)->where($onewhere)->count();
+            
+
             $wheres = [];
             $wh = [];
             $da = null;
@@ -130,7 +141,7 @@ class TagHistory extends CatchController
             //1 在线 0 离线
             if($shifouRole)
             {
-                $time = $this->tagHistoryModel->where($wh)->order('addTime','desc')->value('addTime');
+                $time = $this->tagHistoryModel->where($wh)->max('addTime');
                
                 if(($value['addTime']-$time)<=90)
                 {
@@ -147,6 +158,7 @@ class TagHistory extends CatchController
             $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']);
+
             if ($da['temperWarn'] == '00') {
                 $list[$key]['temperWarn'] = '正常';
             } elseif ($da['temperWarn'] == '01') {