likang

catch/api/controller/Api.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-08-12 10:33:24
  * @LastEditors: likang 1186820806@qq.com
- * @LastEditTime: 2023-04-18 14:14:22
+ * @LastEditTime: 2023-04-18 17:06:51
  */
 
 
@@ -60,6 +60,27 @@ class Api extends CatchController
         $tage->saveAll($data);
         json_success('上传成功');
     }
+    //储存数据到mysql
+    // public function redis_to_mysql(){
+    //     Cache::store('redis')->
+
+    // }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 删除前1天的数据
      *

catch/tag_history/controller/Access.php

@@ -12,7 +12,7 @@ class Access extends CatchController
 {
     protected $accessModel;
     private $label=['44010201','44010202'];
-    
+    private $mac=[];
     public function __construct(AccessModel $accessModel)
     {
         $this->accessModel = $accessModel;
@@ -40,19 +40,15 @@ class Access extends CatchController
         }
 
         if (!empty($tage)) {
-            $where[] = ['lable', 'in',  implode(",", $tage)];   
+            $where[] = ['label', 'in',  implode(",", $tage)];   
         }
         $list=[];
-      
-        if (!empty($tage)) {
-            $otherlabel=implode(",",$this->label);
-        }
         
-        $labelArray=explode(',',$otherlabel);
+        $labelArray=empty($tage) ? $this->label:$tage;
         foreach($labelArray as $item){
             $otherWhere=[];
            // $otherWhere[]=["mac","=",$othermac];
-            $otherWhere[]=["lable","=",trim($item)];
+            $otherWhere[]=["label","=",trim($item)];
             
             $t1 = $this->accessModel->where($otherWhere)->order("id","desc")->find();
             
@@ -136,7 +132,7 @@ class Access extends CatchController
             $where[]= ["time","<=",strtotime($times[1])];
         }
       
-        $where[] =  ['lable', '=', $lable];
+        $where[] =  ['label', '=', $lable];
      
         
         $list = $this->accessModel->where($where)->order('id desc')->page($page)->limit($limit)->select();
@@ -154,5 +150,10 @@ class Access extends CatchController
             'data'    => $list,
         ]);
     }
+    public function getStations(Request $request)
+    {
+        
+        return CatchResponse::success($this->mac);
+    }
 
 }

catch/tag_history/route.php

@@ -4,8 +4,8 @@
  * @version: 1.0.0
  * @Author: likang
  * @Date: 2022-08-12 11:31:01
- * @LastEditors: likang
- * @LastEditTime: 2022-10-08 15:41:38
+ * @LastEditors: likang 1186820806@qq.com
+ * @LastEditTime: 2023-04-18 15:54:18
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -32,4 +32,11 @@ $router->group(function () use ($router) {
 	$router->get('lineChart', '\catchAdmin\tag_history\controller\TagHistory@lineChart');
 	// access路由
 	$router->resource('access', '\catchAdmin\tag_history\controller\access');
+	$router->get('getAccessRecordByTag', '\catchAdmin\tag_history\controller\access@getRecordByTag');
+	$router->get('getAccessTages', '\catchAdmin\tag_history\controller\access@getTages');
+	$router->get('getAccessStations', '\catchAdmin\tag_history\controller\access@getStations');
+
+
+
+
 })->middleware('auth');