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

catch/fan/FanService.php

@@ -0,0 +1,23 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+namespace catchAdmin\fan;
+
+use catcher\ModuleService;
+
+class FanService extends ModuleService
+{
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+}

catch/fan/controller/Fan.php

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

catch/fan/database/migrations/20220428195332_fan.php

@@ -0,0 +1,47 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Fan 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('fan', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '风机表' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('wind_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 0,'signed' => true,'comment' => '风厂的id',])
+			->addColumn('number', 'string', ['limit' => 32,'null' => false,'default' => 0,'signed' => true,'comment' => '编号',])
+			->addColumn('supplier', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '供应商',])
+			->addColumn('production_date', 'date', ['null' => true,'signed' => true,'comment' => '出厂日期',])
+			->addColumn('install_date', 'date', ['null' => true,'signed' => true,'comment' => '安装日期',])
+			->addColumn('location', 'string', ['limit' => 100,'null' => true,'signed' => true,'comment' => '位置',])
+			->addColumn('lng_lat', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '经纬度（json）',])
+			->addColumn('info', 'string', ['limit' => 100,'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/fan/model/Fan.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace catchAdmin\fan\model;
+
+use catcher\base\CatchModel as Model;
+
+class Fan extends Model
+{
+    // 表名
+    public $name = 'fan';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 风厂的id
+        'wind_id',
+        // 编号
+        'number',
+        // 供应商
+        'supplier',
+        // 出厂日期
+        'production_date',
+        // 安装日期
+        'install_date',
+        // 位置
+        'location',
+        // 经纬度（json）
+        'lng_lat',
+        // 备注
+        'info',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+}

catch/fan/module.json

@@ -0,0 +1,15 @@
+{
+    "name": "fan",
+    "alias": "fan",
+    "description": "风机管理",
+    "version": "1.0.0",
+    "keywords": ["fan"],
+    "order": 0,
+    "services": [
+        "\\catchAdmin\\fan\\FanService"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": [],
+    "enable": true
+}

catch/fan/route.php

@@ -0,0 +1,16 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+// you should use `$router`
+$router->group(function () use ($router){
+    $router->resource('fan', '\catchAdmin\fan\controller\Fan');
+})->middleware('auth');
+