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

catch/hydraulic/controller/Maintenance.php

@@ -5,7 +5,9 @@ namespace catchAdmin\hydraulic\controller;
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
-use catchAdmin\hydraulic\model\Maintenance as maintenanceModel;
+use catchAdmin\hydraulic\model\maintenanceMapper as maintenanceModel;
+use catcher\base\CatchRequest;
+use think\facade\Db;
 
 class Maintenance extends CatchController
 {
@@ -33,6 +35,15 @@ class Maintenance extends CatchController
      */
     public function save(Request $request) : \think\Response
     {
+        //校验是否重复 value 是否重复
+        $data =  $request->post();
+        $where[] = ["device_type",'=',$data['device_type']];
+        $where[] = ['value','=',$data["value"]];
+        $bool =  Db::name("maintenancemapper")->where($where)->find();
+        if(!empty($bool))
+        {
+            return CatchResponse::fail('唯一标识重复');
+        };
         return CatchResponse::success($this->maintenanceModel->storeBy($request->post()));
     }
     
@@ -53,7 +64,17 @@ class Maintenance extends CatchController
      * @param $id
      */
     public function update(Request $request, $id) : \think\Response
-    {
+    {   
+        $data =  $request->post();
+        $where[] = ["device_type",'=',$data['device_type']];
+        $where[] = ['value','=',$data["value"]];
+        $where[] =['id','<>',$id];
+        $bool =  Db::name("maintenancemapper")->where($where)->find();
+        if(!empty($bool))
+        {
+            return CatchResponse::fail('唯一标识重复');
+        };
+
         return CatchResponse::success($this->maintenanceModel->updateBy($id, $request->post()));
     }
     
@@ -64,6 +85,6 @@ class Maintenance extends CatchController
      */
     public function delete($id) : \think\Response
     {
-        return CatchResponse::success($this->maintenanceModel->deleteBy($id));
+        return CatchResponse::success($this->maintenanceModel->deleteBy($id,true));
     }
 }

catch/hydraulic/model/Maintenance.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace catchAdmin\hydraulic\model;
-
-use catcher\base\CatchModel as Model;
-
-class Maintenance extends Model
-{
-    // 表名
-    public $name = 'maintenancemapper';
-    // 数据库字段映射
-    public $field = array(
-        'id',
-        // 设备类型
-        'device_type',
-        // 唯一值
-        'value',
-        // 名称
-        'name',
-        // 创建人ID
-        'creator_id',
-        // 创建时间
-        'created_at',
-        // 更新时间
-        'updated_at',
-        // 软删除
-        'deleted_at',
-    );
-}

catch/hydraulic/model/MaintenanceMapper.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace catchAdmin\hydraulic\model;
+use catcher\base\CatchModel as Model;
+use catchAdmin\system\model\SysDictData;
+use catchAdmin\permissions\model\DataRangScopeTrait;
+use \think\facade\Db;
+
+class maintenancemapper extends Model
+{
+    use DataRangScopeTrait;
+    // 表名
+    public $name = 'maintenancemapper';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 设备类型
+        'device_type',
+        // 唯一值
+        'value',
+        // 名称
+        'name',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+     /**
+     * 获取列表
+     */
+    public function getList()
+    {
+        $res =  $this->dataRange()
+            ->catchSearch()
+            ->append(['device_type_name','creator_name'])
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+        return $res;
+    }
+
+    
+    /**
+     * 名称搜索
+     */
+    public function searchNameAttr($query, $value, $data)
+    {
+        return $query->where('name', 'like', '%'.$value.'%');
+    }
+    /**
+     * 设备类型搜索
+    */
+    public function searchDeviceTypeAttr($query, $value, $data)
+    {
+
+        return $query->where('device_type', '=', $value);
+        
+    } 
+
+    /**
+     * 设备类型名称
+    */
+    public function getDeviceTypeNameAttr(){
+        $value=$this->getData('device_type');
+       
+        return (new SysDictData())->getValueByCode('Maintenance', $value) ?: '';
+    }
+
+}

catch/hydraulic/route.php

@@ -18,6 +18,6 @@ $router->group(function () use ($router){
 	$router->get('get_device_mold', '\catchAdmin\hydraulic\controller\DeviceMold@getDeviceMold');
 	// wrench路由
 	$router->resource('wrench', '\catchAdmin\hydraulic\controller\Wrench');
-	// maintenance路由
-	$router->resource('maintenance', '\catchAdmin\hydraulic\controller\Maintenance');
+	// 
+	$router->resource('maintenance_mapper', '\catchAdmin\hydraulic\controller\Maintenance');
 })->middleware('auth');

catch/worklocation/database/migrations/20220520034314_work_local_add_field.php

@@ -0,0 +1,51 @@
+<?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 WorkLocalAddField 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('worklocation')) {
+            $table = $this->table('worklocation');
+
+            $table ->addColumn('torque', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '扭矩',])
+                    ->addColumn('pressure', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '压力',])
+                    ->addColumn('external_diameter', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '外径',])
+                    ->update();
+        }
+
+
+    }
+}