likang

catch/tag_history/controller/TagHistory.php

@@ -150,7 +150,9 @@ class TagHistory extends CatchController
             "];
         }
 
+        if(false){
 
+        
         $list = $this->tagHistoryModel->group('mac,lable')->where('addTime','>',strtotime("-10 minutes"))->where($where)
             ->field('mac,lable')->select()->toArray();
        
@@ -214,6 +216,47 @@ class TagHistory extends CatchController
                 $list[$key]['temperWarn'] = '高温告警';
             }
         }
+    }else{
+        $list=[];
+        $othermac= "301054541054";
+        $otherlabel= "00000098C145,00000098C15D,00000098C163,00000098C15C,00000098C151,00000098C164,00000098C166,00000098C15E
+        ,00000098C168,00000098C165,00000098C154,00000098C161,00000098C167,00000098C162,00000098C15A,00000098C158,00000098C152
+        ,00000098C157,00000098C160,00000098C15F ,00000098C156,00000098C15B,00000098C148,00000098C155,00000098C147,00000098C153
+        ,00000098BDAB ,00000098BDA5,00000098BD93,00000098BDA9 ,00000098BDA7";
+        if (!empty($mac)) {
+            $othermac=$mac;
+        }
+        if (!empty($tage)) {
+            $otherlabel=$tage;
+        }
+        
+        $labelArray=explode(',',$otherlabel);
+        foreach($labelArray as $item){
+            $otherWhere[]=["mac","=",$othermac];
+            $otherWhere[]=["lable","=",$item];
+            
+            $t1 = $this->tagHistoryModel->where($otherWhere)->order("id,desc")->field('id,mac,lable,step,addTime,time,rssi,move')->find();
+            if(empty($t1)){
+                continue;
+            }
+
+            $t1['addTime'] = date('Y-m-d H:i:s', $t1['addTime']);
+            $t1['time'] = date('Y-m-d H:i:s', $t1['time']);
+            $t1['status']=1;
+            if ($t1['temperWarn'] == '00') {
+                $t1['temperWarn'] = '正常';
+            } elseif ($t1['temperWarn'] == '01') {
+                $t1['temperWarn'] = '低温告警';
+            } elseif ($t1['temperWarn'] == '10') {
+                $t1['temperWarn'] = '高温告警';
+            }
+            $list[]=$t1;
+        }
+
+        // $list = $this->tagHistoryModel->where($where)
+        // ->field('mac,lable,step,addTime,time')->select()->toArray();
+    }
+
         return CatchResponse::success($list);
     }