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

catch/email/EmailService.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\email;
+
+use catcher\ModuleService;
+
+class EmailService extends ModuleService
+{
+    public function loadRouteFrom()
+    {
+        // TODO: Implement loadRouteFrom() method.
+        return __DIR__ . DIRECTORY_SEPARATOR . 'route.php';
+    }
+}

catch/email/controller/Email.php

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

catch/email/database/migrations/20220607101623_email.php

@@ -0,0 +1,42 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Email 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('email', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('email', 'string', ['limit' => 20,'null' => false,'default' => '','signed' => true,'comment' => '邮箱',])
+			->addColumn('status', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => 1,'signed' => true,'comment' => '1 有效  -1 报废',])
+			->addColumn('info', 'string', ['limit' => 50,'null' => false,'default' => '','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/email/model/Email.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace catchAdmin\email\model;
+
+use catcher\base\CatchModel as Model;
+
+class Email extends Model
+{
+    // 表名
+    public $name = 'email';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 邮箱
+        'email',
+        // 1 有效  -1 报废
+        'status',
+        // 详情
+        'info',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+}

catch/email/module.json

@@ -0,0 +1,15 @@
+{
+    "name": "邮箱管理",
+    "alias": "email",
+    "description": "对邮箱管理",
+    "version": "1.0.0",
+    "keywords": [""],
+    "order": 0,
+    "services": [
+        "\\catchAdmin\\email\\EmailService"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": [],
+    "enable": true
+}

catch/email/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){
+	// email路由
+	$router->resource('email', '\catchAdmin\email\controller\email');
+})->middleware('auth');

catch/hydraulic/database/migrations/20220606012605_maintenancemapper_add_feild.php

@@ -0,0 +1,48 @@
+<?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 ]
+// +----------------------------------------------------------------------
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+
+class MaintenancemapperAddFeild 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()
+    {
+        if ($this->hasTable('maintenance_mapper')) {
+            $table = $this->table('maintenance_mapper');
+
+            $table  ->addColumn('fan_model', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => 'imei号',])
+                    ->update();
+        }
+
+    }
+}

catch/hydraulic/model/MaintenanceMapper.php

@@ -20,6 +20,7 @@ class maintenancemapper extends Model
         'value',
         // 名称
         'name',
+        'fan_model',
         // 创建人ID
         'creator_id',
         // 创建时间
@@ -36,7 +37,7 @@ class maintenancemapper extends Model
     {
         $res =  $this->dataRange()
             ->catchSearch()
-            ->append(['device_type_name','creator_name'])
+            ->append(['device_type_name','creator_name','fan_model_name'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
@@ -69,7 +70,22 @@ class maintenancemapper extends Model
        
         return (new SysDictData())->getValueByCode('Maintenance', $value) ?: '';
     }
-  
+    public function getFanModelAttr()
+    {
+        $value = $this->getData('fan_model');
+        return $value?intval($value):null;
+    }
+    public function getFanModelNameAttr()
+    {
+        $value = $this->getData('fan_model');
+        $where[] = ['device_type','=',4];
+        $where[] = ['id','=',$value];
+        $name = Db::name('device_mold')->where($where)->value('name');
+        return $name;
+    }
+
+
+
     
 
 }

composer.json

@@ -34,7 +34,8 @@
         "topthink/think-trace": "^1.4",
         "workerman/phpsocket.io": "^1.1",
         "aliyun/aliyun-tablestore-sdk-php": "~5.0",
-        "alibabacloud/sts-20150401": "1.0.1"
+        "alibabacloud/sts-20150401": "1.0.1",
+        "phpmailer/phpmailer": "^6.6"
     },
     "require-dev": {
         "symfony/var-dumper": "^5.1",