修改

catch/fan/controller/Fan.php

@@ -63,8 +63,17 @@ class Fan extends CatchController
      * @param $id
      */
     public function update(Request $request, $id) : \think\Response
-    {
-        return CatchResponse::success($this->fanModel->updateBy($id, $request->post()));
+    {   $data = $request->post();
+        if($data['production_date']){
+            $date = date('Y-m-d',$data['production_date']);
+            $data['production_date'] = $date?$date:$data['production_date'];
+        }
+        if($data['install_date']){
+            $date = date('Y-m-d',$data['install_date']);
+            $data['install_date'] = $date?$date:$data['install_date'];
+           
+        }
+        return CatchResponse::success($this->fanModel->updateBy($id, $data));
     }
     
     /**

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

catch/flange/controller/Flange.php

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

catch/flange/database/migrations/20220506145038_flange.php

@@ -0,0 +1,56 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Flange 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('flange', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '法兰' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('number', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => true,'comment' => '编号',])
+			->addColumn('model', 'string', ['limit' => 50,'null' => false,'default' => '','signed' => true,'comment' => '型号',])
+			->addColumn('department_id', 'string', ['limit' => 11,'null' => true,'signed' => true,'comment' => '所属部门',])
+			->addColumn('name', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '名称',])
+			->addColumn('is_used', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => false,'default' => -1,'signed' => true,'comment' => '使用状态 1已使用 -1未使用 -2废弃',])
+			->addColumn('brand', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '品牌',])
+			->addColumn('supplier', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '供应商',])
+			->addColumn('out_date', 'date', ['null' => true,'signed' => true,'comment' => '出厂日期',])
+			->addColumn('remark', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '注释',])
+			->addColumn('torque', 'string', ['limit' => 10,'null' => true,'signed' => true,'comment' => '扭矩',])
+			->addColumn('stress', 'string', ['limit' => 10,'null' => true,'signed' => true,'comment' => '压力',])
+			->addColumn('fastening_scheme', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '紧固方案',])
+			->addColumn('fan_id', 'string', ['limit' => 11,'null' => true,'signed' => true,'comment' => '风机id',])
+			->addColumn('install_position', 'string', ['limit' => 20,'null' => true,'signed' => true,'comment' => '安装位置',])
+			->addColumn('fastening_information', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '紧固信息',])
+			->addColumn('maintenance_information', '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' => '软删除',])
+			->addIndex(['torque'], ['name' => 'fulltext_torque','type' => 'fulltext'])
+            ->create();
+    }
+}

catch/flange/model/Flange.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace catchAdmin\flange\model;
+
+use catcher\base\CatchModel as Model;
+
+class Flange extends Model
+{
+    // 表名
+    public $name = 'flange';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 编号
+        'number',
+        // 型号
+        'model',
+        // 所属部门
+        'department_id',
+        // 名称
+        'name',
+        // 使用状态 1已使用 -1未使用 -2废弃
+        'is_used',
+        // 品牌
+        'brand',
+        // 供应商
+        'supplier',
+        // 出厂日期
+        'out_date',
+        // 注释
+        'remark',
+        // 扭矩
+        'torque',
+        // 压力
+        'stress',
+        // 紧固方案
+        'fastening_scheme',
+        // 风机id
+        'fan_id',
+        // 安装位置
+        'install_position',
+        // 紧固信息
+        'fastening_information',
+        // 维护信息
+        'maintenance_information',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+}

catch/flange/module.json

@@ -0,0 +1,15 @@
+{
+    "name": "flange",
+    "alias": "flange",
+    "description": "法兰",
+    "version": "1.0.0",
+    "keywords": [""],
+    "order": 0,
+    "services": [
+        "\\catchAdmin\\flange\\FlangeService"
+    ],
+    "aliases": {},
+    "files": [],
+    "requires": [],
+    "enable": true
+}

catch/flange/route.php

@@ -0,0 +1,18 @@
+<?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){
+	// flange路由
+	$router->resource('flange', '\catchAdmin\flange\controller\flange');
+	// flange路由
+	$router->resource('flange', '\catchAdmin\flange\controller\flange');
+})->middleware('auth');

catch/hydraulic/controller/Hydraulic.php

@@ -37,6 +37,7 @@ class Hydraulic extends CatchController
         if(isset($data['out_date']) && is_int($data['out_date'])){
             $data['out_date'] = date('Y-m-d',$data['out_date']);
         }
+
         return CatchResponse::success($this->hydraulicModel->storeBy($data));
     }
     

catch/hydraulic/database/migrations/20220505112140_hydraulic_add_fields.php

@@ -0,0 +1,49 @@
+<?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 HydraulicAddFields 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('hydraulic')) {
+            $table = $this->table('hydraulic');
+
+            $table  ->addColumn('torque', 'string', ['limit' => 10,'null' => true,'signed' => true,'comment' => '扭矩',])
+                    ->addColumn('stress', 'string', ['limit' => 10,'null' => true,'signed' => true,'comment' => '压力',])
+                    ->update();
+        }
+      
+    }
+}

catch/hydraulic/model/Hydraulic.php

@@ -36,6 +36,14 @@ class Hydraulic extends Model
         'net_state',
         // 在线时间
         'online_time',
+        //扭矩
+        'torque',
+        //压力
+        'stress',
+        //螺栓尺寸
+        'bolts_size',
+        //螺栓数量
+        'bolts_num',
         //备注
         'remark',
         // 创建人ID