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

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

@@ -40,9 +40,9 @@ class MaintenancemapperAddFeild extends Migrator
         if ($this->hasTable('maintenance_mapper')) {
             $table = $this->table('maintenance_mapper');
 
-            $table  ->addColumn('fan_model', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => 'imei号',])
-                    ->update();
+            $table->addColumn('fan_model', 'string', ['limit' => 32, 'null' => true, 'signed' => true, 'comment' => '风机型号',])
+                ->addColumn('parts', 'string', ['limit' => 255, 'null' => true, 'signed' => true, 'comment' => '部件',])
+                ->update();
         }
-
     }
 }

catch/hydraulic/model/Hydraulic.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 Hydraulic extends Model
 {
     use DataRangScopeTrait;
@@ -30,7 +31,7 @@ class Hydraulic extends Model
         // 'bolts_size',
         // //螺栓数量
         // 'bolts_num',
-         //备注
+        //备注
         'remark',
         // 创建人ID
         'creator_id',
@@ -50,32 +51,32 @@ class Hydraulic extends Model
         'effective_period',
         //设备的id
         'eq_id'
-        
+
     );
-     /**
+    /**
      * 获取列表
      */
     public function getList()
     {
         $res =  $this->dataRange()
             ->catchSearch()
-            ->append(['depart_name', 'alarm_state_text','creator_user','model_name'])
+            ->append(['depart_name', 'alarm_state_text', 'creator_user', 'model_name'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
     }
-     /**
+    /**
      * 获取轨迹地图列表定位不分页 只查询有定位时间的
      */
     public function queryLocationList()
     {
         $res = $this->dataRange()
-                    ->catchSearch()
-                   
-                    ->select();
+            ->catchSearch()
+
+            ->select();
         return $res;
     }
-     /**
+    /**
      * 获取导入用户（文本）
      */
     public function getCreatorUserAttr($value)
@@ -88,12 +89,11 @@ class Hydraulic extends Model
      */
     public function getIsUsedAttr($value)
     {
-       if($value!=0){
+        if ($value != 0) {
             return true;
-       }else{
-           return false;
-       }
-       
+        } else {
+            return false;
+        }
     }
     /**
      * 获取部门名称（文本）
@@ -104,65 +104,46 @@ class Hydraulic extends Model
         return Db::table('departments')->where('id', $id)->value('department_name');
     }
 
-     /**
+    /**
      * 获取类型名称
      */
     public function getModelAttr($value)
     {
-       
+
         return (int)$value;
     }
-    // /**
-    //  * 获取类型名称
-    //  */
-    // public function getModelNameAttr()
-    // {
-    //     $id = $this->getData('model');
-    //     return Db::table('device_mold')->where('id', $id)->value('name');
-    // }
-    // /**
-    //  * 获取部门名称（文本）
-    //  */
-    // public function getOnlineTimeAttr($value)
-    // {
-    //    if($value){
-    //         return date('Y-m-d H:i:s',$value);
-    //    }else{
-    //        return '-';
-    //    }
-    // }
 
     /**
      * 校验日期
      */
     public function getEffectiveTimeAttr($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 '-';
+        }
     }
-        /**
+    /**
      * 校验日期
      */
     public function getCheckTimeAttr($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 '-';
+        }
     }
     /**
      * 获取告警状态文本
      */
     public function getAlarmStateTextAttr($value)
     {
-      $alarm_state = $this->getData('alarm_state');
-      return  $alarm_state ? '告警' : '正常';
+        $alarm_state = $this->getData('alarm_state');
+        return  $alarm_state ? '告警' : '正常';
     }
-     /**
+    /**
      * 根据部门搜索
      */
     public function searchDepartmentIdAttr($query, $value, $data)
@@ -172,32 +153,32 @@ class Hydraulic extends Model
             return $query->where('department_id', '=', $id);
         }
     }
-     /**
+    /**
      * 根据number搜索
      */
     public function searchNumberAttr($query, $value, $data)
     {
-            return $query->where('number', 'like', '%'.$value.'%');
+        return $query->where('number', 'like', '%' . $value . '%');
     }
-     /**
+    /**
      * 根据name搜索
      */
     public function searchNameAttr($query, $value, $data)
     {
-            return $query->where('name', 'like', '%'.$value.'%');
+        return $query->where('name', 'like', '%' . $value . '%');
     }
-     /**
+    /**
      * 根据model搜索
      */
     public function searchModelAttr($query, $value, $data)
     {
-            return $query->where('model', 'like', '%'.$value.'%');
+        return $query->where('model', 'like', '%' . $value . '%');
     }
-     /**
+    /**
      * 根据name搜索
      */
     public function searchIsUsedAttr($query, $value, $data)
     {
-            return $query->where('is_used', $value);
+        return $query->where('is_used', $value);
     }
-}
+}

catch/hydraulic/model/MaintenanceMapper.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace catchAdmin\hydraulic\model;
+
 use catcher\base\CatchModel as Model;
 use catchAdmin\system\model\SysDictData;
 use catchAdmin\permissions\model\DataRangScopeTrait;
@@ -20,6 +21,9 @@ class maintenancemapper extends Model
         'value',
         // 名称
         'name',
+        //部件
+        'parts',
+        //风机型号
         'fan_model',
         // 创建人ID
         'creator_id',
@@ -30,62 +34,57 @@ class maintenancemapper extends Model
         // 软删除
         'deleted_at',
     );
-     /**
+    /**
      * 获取列表
      */
     public function getList()
     {
         $res =  $this->dataRange()
             ->catchSearch()
-            ->append(['device_type_name','creator_name','fan_model_name'])
+            ->append(['device_type_name', 'creator_name', 'fan_model_name'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
     }
 
-    
+
     /**
      * 名称搜索
      */
     public function searchNameAttr($query, $value, $data)
     {
-        return $query->where('name', 'like', '%'.$value.'%');
+        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');
-       
+     */
+    public function getDeviceTypeNameAttr()
+    {
+        $value = $this->getData('device_type');
+
         return (new SysDictData())->getValueByCode('Maintenance', $value) ?: '';
     }
     public function getFanModelAttr()
     {
         $value = $this->getData('fan_model');
-        return $value?intval($value):null;
+        return $value ? intval($value) : null;
     }
     public function getFanModelNameAttr()
     {
         $value = $this->getData('fan_model');
-        $where[] = ['device_type','=',4];
-        $where[] = ['id','=',$value];
+        $where[] = ['device_type', '=', 4];
+        $where[] = ['id', '=', $value];
         $name = Db::name('device_mold')->where($where)->value('name');
         return $name;
     }
-
-
-
-    
-
-}
+}