likang

catch/tag_history/controller/TagHistory.php

@@ -1,12 +1,4 @@
 <?php
-/*
- * @Descripttion: 
- * @version: 1.0.0
- * @Author: likang
- * @Date: 2022-08-12 11:31:01
- * @LastEditors: likang
- * @LastEditTime: 2022-08-13 17:00:52
- */
 
 namespace catchAdmin\tag_history\controller;
 
@@ -16,6 +8,7 @@ use catcher\CatchResponse;
 use catcher\base\CatchController;
 use catchAdmin\tag_history\model\TagHistory as tagHistoryModel;
 use catcher\CatchAdmin;
+use catcher\Code;
 use think\facade\Db;
 
 class TagHistory extends CatchController
@@ -34,6 +27,7 @@ class TagHistory extends CatchController
      */
     public function index(Request $request): \think\Response
     {
+
         $data = $request->get();
         $time =  isset($data['time']) ? $data['time'] : '';
         $mac = isset($data['mac']) ? $data['mac'] : '';
@@ -48,7 +42,6 @@ class TagHistory extends CatchController
         }
 
         if (!empty($mac)) {
-
             $where[] = ['mac', 'in',  implode(",", $mac)];
         }
         if (!empty($tage)) {
@@ -57,7 +50,12 @@ class TagHistory extends CatchController
         if ($endtime == 1) {
             //生成报告
             $end = time();
-
+            if (empty($mac)) {
+                $mac = $this->tagHistoryModel->group('mac')->column('mac');
+            }
+            if (empty($tage)) {
+                $tage = $this->tagHistoryModel->group('lable')->column('lable');
+            }
             $tagList =  $this->tagHistoryModel->where($where)->where('addTime', '<=', $end)->select();
             $content = [
                 'mac' => json_encode($mac),
@@ -69,10 +67,11 @@ class TagHistory extends CatchController
             ];
             $report = new Report();
             $report->save($content);
+            return CatchResponse::success('生成报告成功');
         }
 
         $list = $this->tagHistoryModel->group('mac,lable')->where($where)
-            ->field('mac,lable,max(addTime) as addTime,AVG(rssi) as ave_rssi,count(*) as num')->select()->toArray();
+            ->field('mac,lable,max(addTime) as addTime,format(AVG(rssi),2) as ave_rssi,count(*) as num')->select()->toArray();
 
         foreach ($list as $key => $value) {
             $wheres = [];
@@ -162,4 +161,40 @@ class TagHistory extends CatchController
         $time = time();
         return CatchResponse::success($time);
     }
+    /**
+     * @Descripttion: 根据标签和设备获取数据和心跳
+     * @name: likang
+     * @param {Request} $request
+     * @return {*}
+     */
+    public function getRecordByTag(Request $request)
+    {
+        $lable = $request->get('lable');
+        $mac = $request->get('mac');
+        $limit = 10;
+        $page = 1;
+        if ($request->get('page')) {
+            $page = $request->get('page');
+        }
+        if ($request->get('limit')) {
+            $limit = $request->get('limit');
+        }
+        $where = [
+            ['lable', '=', $lable],
+            ['mac', '=', $mac]
+        ];
+        $list = $this->tagHistoryModel->where($where)->order('addTime desc')->page($page)->limit($limit)->select();
+        foreach ($list as $key => $value) {
+            $list[$key]['time'] = date('Y-m-d H:i:s', $value['time']);
+            $list[$key]['addTime'] = date('Y-m-d H:i:s', $value['addTime']);
+        }
+        return json([
+            'code'    => Code::SUCCESS,
+            'message' => 'success',
+            'count'   => $this->tagHistoryModel->where($where)->count(),
+            'current' => $page,
+            'limit'   => $limit,
+            'data'    => $list,
+        ]);
+    }
 }

catch/tag_history/model/Report.php

@@ -1,5 +1,6 @@
 <?php
 
+
 namespace catchAdmin\tag_history\model;
 
 use catcher\base\CatchModel as Model;
@@ -32,4 +33,15 @@ class Report extends Model
         // 软删除
         'deleted_at',
     );
-}
+
+    public function getStartTimeAttr()
+    {
+        $data =  $this->getData('startTime');
+        return date('Y-m-d H:i:s', $data);
+    }
+    public function getEndTimeAttr()
+    {
+        $data =  $this->getData('endTime');
+        return date('Y-m-d H:i:s', $data);
+    }
+}

catch/tag_history/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-08-12 11:31:01
  * @LastEditors: likang
- * @LastEditTime: 2022-08-13 14:00:58
+ * @LastEditTime: 2022-08-18 14:22:56
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -23,6 +23,8 @@ $router->group(function () use ($router) {
 	$router->resource('report', '\catchAdmin\tag_history\controller\Report');
 	//获取mac
 	$router->get('getStations', '\catchAdmin\tag_history\controller\TagHistory@getStations');
+
+	$router->get('getRecordByTag', '\catchAdmin\tag_history\controller\TagHistory@getRecordByTag');
 	//获取标签
 	$router->get('getTages', '\catchAdmin\tag_history\controller\TagHistory@getTages');
 	$router->get('getTime', '\catchAdmin\tag_history\controller\TagHistory@getTime');