Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/station-test-api

.env

@@ -7,12 +7,13 @@ DEFAULT_TIMEZONE = Asia/Shanghai
 DOMAIN = http://app
 [DATABASE]
 TYPE = mysql
-HOSTNAME = 127.0.0.1
+HOSTNAME = localhost
 DATABASE = station
 USERNAME = root
-PASSWORD = 123456
+PASSWORD = root
 HOSTPORT = 3306
 CHARSET = utf8mb4
+
 DEBUG = true
 
 [REDIS]

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

@@ -0,0 +1,159 @@
+<?php
+
+namespace catchAdmin\tag_history\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\tag_history\model\Access as accessModel;
+use catcher\Code;
+
+class Access extends CatchController
+{
+    protected $accessModel;
+    private $label=['44010201','44010202'];
+    private $mac=[];
+    public function __construct(AccessModel $accessModel)
+    {
+        $this->accessModel = $accessModel;
+    }
+    
+    /**
+     * 列表
+     * @time 2023年04月18日 11:50
+     * @param Request $request 
+     */
+    public function index(Request $request) : \think\Response
+    {
+        $data = $request->get();
+        $time =  isset($data['time']) ? $data['time'] : '';
+        $mac = isset($data['mac']) ? $data['mac'] : '';
+        $tage = isset($data['tage']) ? $data['tage'] : '';
+        $endtime = isset($data['endtime']) ? $data['endtime'] : "";
+        $meter = isset($data['meter']) ? $data['meter'] : "";
+        $where = [];
+         $onewhere=[];
+         if (!empty($time)) {
+            $onewhere[] = ['addTime', '>=', $time];
+        } else {
+            $onewhere[] = ['addTime', '>=', time()];
+        }
+
+        if (!empty($tage)) {
+            $where[] = ['label', 'in',  implode(",", $tage)];   
+        }
+        $list=[];
+        
+        $labelArray=empty($tage) ? $this->label:$tage;
+        foreach($labelArray as $item){
+            $otherWhere=[];
+           // $otherWhere[]=["mac","=",$othermac];
+            $otherWhere[]=["label","=",trim($item)];
+            
+            $t1 = $this->accessModel->where($otherWhere)->order("id","desc")->find();
+            
+            if(empty($t1)){
+              
+                continue;
+            }
+            $t1['report_time'] = date('Y-m-d H:i:s', $t1['report_time']);
+            array_push($list,$t1);
+        }
+        return CatchResponse::success($list);
+    }
+    
+    /**
+     * 保存信息
+     * @time 2023年04月18日 11:50
+     * @param Request $request 
+     */
+    public function save(Request $request) : \think\Response
+    {
+        return CatchResponse::success($this->accessModel->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     * @time 2023年04月18日 11:50
+     * @param $id 
+     */
+    public function read($id) : \think\Response
+    {
+        return CatchResponse::success($this->accessModel->findBy($id));
+    }
+    
+    /**
+     * 更新
+     * @time 2023年04月18日 11:50
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id) : \think\Response
+    {
+        return CatchResponse::success($this->accessModel->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     * @time 2023年04月18日 11:50
+     * @param $id
+     */
+    public function delete($id) : \think\Response
+    {
+        return CatchResponse::success($this->accessModel->deleteBy($id));
+    }
+    /**
+     * 获取标签
+     */
+    public function getTages(Request $request)
+    {
+       
+       
+
+        return CatchResponse::success($this->label);
+    }
+
+    public function getRecordByTag(Request $request)
+    {
+        $lable = $request->get('lable');
+        $mac = $request->get('mac');
+        $where=[];
+        $limit = 10;
+        $page = 1;
+        if ($request->get('page')) {
+            $page = $request->get('page');
+        }
+        if ($request->get('limit')) {
+            $limit = $request->get('limit');
+        }
+        $times=  $request->get("filter_time");
+        if(!empty($request->get("filter_time"))){
+            $where[]= ["time",">=",strtotime($times[0])];
+            $where[]= ["time","<=",strtotime($times[1])];
+        }
+      
+        $where[] =  ['label', '=', $lable];
+     
+        
+        $list = $this->accessModel->where($where)->order('id desc')->page($page)->limit($limit)->select();
+        foreach ($list as $key => $value) {
+           
+            $list[$key]['report_time'] = date('Y-m-d H:i:s', $value['report_time']);
+         
+        }
+        return json([
+            'code'    => Code::SUCCESS,
+            'message' => 'success',
+            'count'   => $this->accessModel->where($where)->count(),
+            'current' => $page,
+            'limit'   => $limit,
+            'data'    => $list,
+        ]);
+    }
+    public function getStations(Request $request)
+    {
+        
+        return CatchResponse::success($this->mac);
+    }
+
+}

catch/tag_history/database/migrations/20230418115046_access.php

@@ -0,0 +1,47 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Access extends Migrator
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $table = $this->table('access', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '进出测试' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('mac', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '',])
+			->addColumn('label', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '',])
+			->addColumn('report_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '上报时间',])
+			->addColumn('rssi1', 'float', ['precision' => 10,'scale' => 4,'null' => true,'signed' => true,'comment' => '前方向信号',])
+			->addColumn('rssi2', 'float', ['precision' => 10,'scale' => 4,'null' => true,'signed' => true,'comment' => '后方向信号',])
+			->addColumn('rssi3', 'float', ['precision' => 10,'scale' => 4,'null' => true,'signed' => true,'comment' => '左方向信号',])
+			->addColumn('rssi4', 'float', ['precision' => 10,'scale' => 4,'null' => true,'signed' => true,'comment' => '右方向信号',])
+			->addColumn('creator_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建人ID',])
+			->addColumn('created_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '创建时间',])
+			->addColumn('updated_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '更新时间',])
+			->addColumn('deleted_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => false,'comment' => '软删除',])
+			->addIndex(['mac'], ['name' => 'mac'])
+            ->create();
+    }
+}

catch/tag_history/model/Access.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace catchAdmin\tag_history\model;
+
+use catcher\base\CatchModel as Model;
+
+class Access extends Model
+{
+    // 表名
+    public $name = 'access';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        'mac',
+        'label',
+        // 上报时间
+        'report_time',
+        // 前方向信号
+        'rssi1',
+        // 后方向信号
+        'rssi2',
+        // 左方向信号
+        'rssi3',
+        // 右方向信号
+        'rssi4',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+}

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 ～ ]
@@ -30,4 +30,13 @@ $router->group(function () use ($router) {
 	$router->get('getTime', '\catchAdmin\tag_history\controller\TagHistory@getTime');
 	//获取折线图lineChart
 	$router->get('lineChart', '\catchAdmin\tag_history\controller\TagHistory@lineChart');
-})->middleware('auth');
+	// 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');