likang

catch/hydraulic/controller/HydEquipment.php

@@ -107,10 +107,13 @@ class HydEquipment extends CatchController
                     // 所属部门
                     'department_id' => $data['department_id'],
                     'remark' => $data['remark'] ? $data['remark'] : '',
-                    'pressure' => $data['pressure'],
+                    'min_pressure' => $data['min_pressure'],
+                    'max_pressure' => $data['max_pressure'],
+                    'min_torque' => $data['min_torque'],
+                    'max_torque' => $data['max_torque'],
                     'angle_sensor' => $data['angle_sensor'],
-                    // 扭矩
-                    'torque' => $data['torque'],
+                    'angular_resolution' => $data['angular_resolution']
+
                 ];
                 Wrench::create($wrench);
             }
@@ -204,11 +207,13 @@ class HydEquipment extends CatchController
                 // 所属部门
                 'department_id' => $data['department_id'],
                 'remark' => $data['remark'],
-
-                'pressure' => $data['pressure'],
+                'min_pressure' => $data['min_pressure'],
+                'max_pressure' => $data['max_pressure'],
+                'min_torque' => $data['min_torque'],
+                'max_torque' => $data['max_torque'],
+                'angular_resolution' => $data['angular_resolution'],
                 'angle_sensor' => $data['angle_sensor'],
                 // 扭矩
-                'torque' => $data['torque'],
             ];
             Wrench::where('id', $data['list']['id'])->update($wrench);
         }

catch/hydraulic/database/migrations/20220506141132_wrench.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-05-27 13:34:31
  * @LastEditors: likang
- * @LastEditTime: 2022-06-21 16:46:12
+ * @LastEditTime: 2022-07-04 09:34:10
  */
 
 use think\migration\Migrator;
@@ -37,25 +37,28 @@ class Wrench extends Migrator
      */
     public function change()
     {
-        $table = $this->table('wrench', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '液压扳手' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('number', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '编号',])
-			->addColumn('department_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '所属部门',])
-			->addColumn('eq_id', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '设备id',])
-			->addColumn('remark', 'string', ['limit' => 256,'null' => true,'signed' => true,'comment' => '备注',])
-			->addColumn('alarm_state', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '告警状态',])
-			->addColumn('net_state', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '网络状态',])
-			->addColumn('online_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '在线时间',])
-			->addColumn('pressure', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '压力',])
-            ->addColumn('angle_sensor', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '角度传感器',])
-			->addColumn('checked_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '校验时间',])
-			->addColumn('checked_no', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '校验台编号',])
-			->addColumn('checked_res', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '校验结果',])
-			->addColumn('checked_user_id', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '操作员',])
-			->addColumn('torque', 'string', ['limit' => 32,'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' => '软删除',])
+        $table = $this->table('wrench', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '液压扳手', 'id' => 'id', 'signed' => true, 'primary_key' => ['id']]);
+        $table->addColumn('number', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '编号',])
+            ->addColumn('department_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '所属部门',])
+            ->addColumn('eq_id', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '设备id',])
+            ->addColumn('remark', 'string', ['limit' => 256, 'null' => true, 'signed' => true, 'comment' => '备注',])
+            ->addColumn('alarm_state', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '告警状态',])
+            ->addColumn('net_state', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '网络状态',])
+            ->addColumn('online_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '在线时间',])
+            ->addColumn('angle_sensor', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '角度传感器',])
+            ->addColumn('checked_at', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '校验时间',])
+            ->addColumn('checked_no', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '校验台编号',])
+            ->addColumn('checked_res', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '校验结果',])
+            ->addColumn('checked_user_id', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '操作员',])
+            ->addColumn('min_pressure', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '最大压力',])
+            ->addColumn('max_pressure', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '最小压力',])
+            ->addColumn('max_torque', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '最大扭矩',])
+            ->addColumn('min_torque', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '最小扭矩',])
+            ->addColumn('angular_resolution', 'string', ['limit' => 32, '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/hydraulic/model/Wrench.php

@@ -6,6 +6,7 @@ use catcher\base\CatchModel as Model;
 use \think\facade\Db;
 use catchAdmin\system\model\SysDictData;
 use catchAdmin\permissions\model\DataRangScopeTrait;
+
 class Wrench extends Model
 {
     use DataRangScopeTrait;
@@ -31,19 +32,26 @@ class Wrench extends Model
         // 供应商
         //'supplier',
         // 出厂日期
-       // 'out_date',
+        // 'out_date',
         // 备注
         'remark',
         // 告警状态
         'alarm_state',
         // 网络状态
         'net_state',
+        //角度分辨率
+        'angular_resolution',
         // 在线时间
         //'online_time',
+        //最小压力
+        'min_pressure',
         //最大压力
-        'pressure',
-        // 最小压力
-       // 'min_pressure',
+        'max_pressure',
+        //最小扭矩
+        'min_torque',
+        //最大扭矩
+        'min_torque',
+        //角度传感器
         'angle_sensor',
         // 校验台编号
         'checked_no',
@@ -51,8 +59,6 @@ class Wrench extends Model
         'checked_res',
         // 操作员
         'checked_user_id',
-        // 扭矩
-        'torque',
         // 创建人ID
         'creator_id',
         // 创建时间
@@ -66,7 +72,7 @@ class Wrench extends Model
     {
         $res =  $this->dataRange()
             ->catchSearch()
-            ->append(['depart_name', 'creator_user','model_name'])
+            ->append(['depart_name', 'creator_user', 'model_name'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
@@ -106,14 +112,14 @@ class Wrench extends Model
     //     $id = $this->getData('model');
     //     return Db::table('device_mold')->where('id', $id)->value('name');
     // }
-     /**
+    /**
      * 获取角度传感器
      */
     public function getAngleSensorAttr($value)
     {
-        if($value==1){
+        if ($value == 1) {
             return true;
-        }else{
+        } else {
             return false;
         }
     }
@@ -122,12 +128,10 @@ class Wrench extends Model
      */
     public function getOnlineTimeAttr($value)
     {
-       if($value){
-            return date('Y-m-d H:i:s',$value);
-       }else{
-           return '-';
-       }
+        if ($value) {
+            return date('Y-m-d H:i:s', $value);
+        } else {
+            return '-';
+        }
     }
-
-  
-}
+}