修改

catch/alarm/controller/ControlAalrm.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace catchAdmin\alarm\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\alarm\model\ControlAalrm as controlAalrmModel;
+
+class ControlAalrm extends CatchController
+{
+    protected $controlAalrmModel;
+    
+    public function __construct(ControlAalrmModel $controlAalrmModel)
+    {
+        $this->controlAalrmModel = $controlAalrmModel;
+    }
+    
+    /**
+     * 列表
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     */
+    public function index(Request $request) : \think\Response
+    {
+        return CatchResponse::paginate($this->controlAalrmModel->getList());
+    }
+    
+    /**
+     * 保存信息
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     */
+    public function save(Request $request) : \think\Response
+    {
+        return CatchResponse::success($this->controlAalrmModel->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     * @time 2022年10月27日 15:33
+     * @param $id 
+     */
+    public function read($id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAalrmModel->findBy($id));
+    }
+    
+    /**
+     * 更新
+     * @time 2022年10月27日 15:33
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAalrmModel->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     * @time 2022年10月27日 15:33
+     * @param $id
+     */
+    public function delete($id) : \think\Response
+    {
+        return CatchResponse::success($this->controlAalrmModel->deleteBy($id));
+    }
+}

catch/alarm/database/migrations/20221027153309_control_alarm.php

@@ -0,0 +1,45 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class ControlAlarm 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('control_alarm', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '布控预警' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('plate_no', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '车牌',])
+			->addColumn('rfid_sn', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '车辆标签',])
+			->addColumn('address', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '报警地点',])
+			->addColumn('alarm_type', 'string', ['limit' => 16,'null' => true,'signed' => true,'comment' => '报警类型',])
+			->addColumn('state', 'string', ['limit' => 8,'null' => true,'signed' => true,'comment' => '状态',])
+			->addColumn('remark', 'string', ['limit' => 255,'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' => '软删除',])
+            ->create();
+    }
+}

catch/alarm/model/ControlAalrm.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace catchAdmin\alarm\model;
+
+use catcher\base\CatchModel as Model;
+use catchAdmin\permissions\model\DataRangScopeTrait;
+use catchAdmin\system\model\SysDictData;
+class ControlAalrm extends Model
+{
+    use DataRangScopeTrait;
+    // 表名
+    public $name = 'control_alarm';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 车牌
+        'plate_no',
+        // 车辆标签
+        'rfid_sn',
+        // 报警地点
+        'address',
+        // 报警类型
+        'alarm_type',
+        // 状态
+        'state',
+        // 备注
+        'remark',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+    /**
+     * 列表
+     */
+    public function getList()
+    {
+        $res=$this->dataRange()
+            ->catchSearch()
+
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+        return $res;
+    }
+    // //根据姓名搜索
+    // public function searchNameAttr($query, $value, $data)
+    // {
+    //     return $query->where('name', 'like', '%' . $value . '%');
+    // }
+
+    
+    public function getStateAttr($value){
+        // $state = $this->getData('state');
+        return (new SysDictData())->getValueByCode('AlarmHandleState', $value) ?: '';
+    }
+    public function getAlarmTypeAttr($value){
+        
+        return (new SysDictData())->getValueByCode('AlarmType', $value) ?: '';
+    }
+}

catch/alarm/route.php

@@ -28,10 +28,13 @@ $router->group(function () use ($router){
 	$router->resource('bwList', '\catchAdmin\alarm\controller\BwList');
 	// rfidWithBw路由
 	$router->resource('rfidWithBw', '\catchAdmin\alarm\controller\RfidWithBw');
+	// controlAalrm路由
+	$router->resource('controlAalrm', '\catchAdmin\alarm\controller\ControlAalrm');
 })->middleware('auth');
 
 $router->group('alarmReport', function () use ($router){
 	$router->get('getDetail/:id', '\catchAdmin\alarm\controller\AlarmReport@detail');
 	$router->get('totalGrowth', '\catchAdmin\alarm\controller\AlarmReport@totalGrowth');
 	
+	
 })->middleware('auth');

catch/device/controller/Station.php

@@ -89,7 +89,7 @@ class Station extends CatchController
             
 
         $cond['page']=1;
-        $cond['limit']=2000;
+        $cond['limit']=1000;
 
            
         $conn = null;