likang

catch/tag_history/controller/TagHistory.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-08-12 11:31:01
  * @LastEditors: likang
- * @LastEditTime: 2022-08-13 10:10:33
+ * @LastEditTime: 2022-08-13 14:23:39
  */
 
 namespace catchAdmin\tag_history\controller;
@@ -36,12 +36,16 @@ class TagHistory extends CatchController
         $data = $request->get();
         $time =  isset($data['time']) ? $data['time'] : '';
         $mac = isset($data['mac']) ? $data['mac'] : '';
-        $tage = isset($data['tage']) ? $data['tage'] : '';;
+        $tage = isset($data['tage']) ? $data['tage'] : '';
+        $endtime = isset($data['endtime']) ? $data['endtime'] : "";
 
         $where = [];
-        // if (!empty($time)) {
-        //     $where[] = ['time', '>', $time];
-        // }
+        if (!empty($time)) {
+            $where[] = ['addTime', '>=', $time];
+        } else {
+            $where[] = ['addTime', '>=', $time];
+        }
+
         if (!empty($mac)) {
 
             $where[] = ['mac', 'in',  implode(",", $mac)];
@@ -49,9 +53,21 @@ class TagHistory extends CatchController
         if (!empty($tage)) {
             $where[] = ['lable', 'in',  implode(",", $tage)];
         }
+
         $list = $this->tagHistoryModel->group('mac,lable')->where($where)
-            ->field('mac,lable,any_value(rssi) as rssi,max(time) as time,any_value(addTime) as addTime,AVG(rssi) as ave_rssi,count(*) as num')->select();
+            ->field('mac,lable,max(addTime) as addTime,AVG(rssi) as ave_rssi,count(*) as num')->select()->toArray();
 
+        foreach ($list as $key => $value) {
+            $wheres = [];
+            $da = null;
+            $wheres[] = ['mac', '=', $value['mac']];
+            $wheres[] = ['lable', '=', $value['lable']];
+            $wheres[] = ['addTime', '=', $value['addTime']];
+            $da = $this->tagHistoryModel->where($wheres)->find();
+            $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']);
+        }
         return CatchResponse::success($list);
     }
 
@@ -117,4 +133,11 @@ class TagHistory extends CatchController
         $list = $this->tagHistoryModel->group('lable')->column('lable');
         return CatchResponse::success($list);
     }
+
+    public function getTime()
+    {
+
+        $time = time();
+        return CatchResponse::success($time);
+    }
 }

catch/tag_history/route.php

@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Descripttion: 
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-08-12 11:31:01
+ * @LastEditors: likang
+ * @LastEditTime: 2022-08-13 14:00:58
+ */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------
@@ -17,4 +25,5 @@ $router->group(function () use ($router) {
 	$router->get('getStations', '\catchAdmin\tag_history\controller\TagHistory@getStations');
 	//获取标签
 	$router->get('getTages', '\catchAdmin\tag_history\controller\TagHistory@getTages');
+	$router->get('getTime', '\catchAdmin\tag_history\controller\TagHistory@getTime');
 })->middleware('auth');