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

catch/equipment/controller/EquipmentType.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-06-17 15:45:05
  * @LastEditors: likang
- * @LastEditTime: 2022-06-21 14:19:07
+ * @LastEditTime: 2022-06-21 19:13:45
  */
 
 namespace catchAdmin\equipment\controller;
@@ -104,4 +104,16 @@ class EquipmentType extends CatchController
         $pch = $this->equipmentTypeModel->where('pid',0)->order('order asc')->select();
         return CatchResponse::success($pch);
     }
+    /** 根据pid 获取所有的种类
+     * @Descripttion: 
+     * @name: likang
+     * @return {*}
+     */    
+    public function findAllBypid(Request $request)
+    {
+        $data =$request->get();
+        $pid =$data['id'];
+        $ls = $this->equipmentTypeModel->where('pid',$pid)->select();
+        return CatchResponse::success($ls);
+    }
 }

catch/equipment/route.php

@@ -14,4 +14,6 @@ $router->group(function () use ($router){
 	// equipmentType路由
 	$router->resource('equipmentType', '\catchAdmin\equipment\controller\EquipmentType');
 	$router->get('findParentEquipmentTyp','\catchAdmin\equipment\controller\EquipmentType@findParentEquipmentType');
+	$router->get('findAllByPid','\catchAdmin\equipment\controller\EquipmentType@findAllBypid');
+
 })->middleware('auth');

catch/hydraulic/controller/HydEquipment.php

@@ -1,11 +1,13 @@
 <?php
-
 namespace catchAdmin\hydraulic\controller;
-
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
 use catchAdmin\hydraulic\model\HydEquipment as hydEquipmentModel;
+use catchAdmin\hydraulic\model\Hydraulic;
+use catchAdmin\hydraulic\model\Wrench;
+use catchAdmin\system\model\SysDictData;
+use PhpParser\Node\Stmt\Catch_;
 
 class HydEquipment extends CatchController
 {
@@ -33,7 +35,83 @@ class HydEquipment extends CatchController
      */
     public function save(Request $request) : \think\Response
     {
-        return CatchResponse::success($this->hydEquipmentModel->storeBy($request->post()));
+        $data = $request->post();
+        $hydraulic = null;
+        $wrench = null;
+        $hydequ=[
+        // 物料号
+        'material_number'=>$data['material_number'],
+        // 设备类别
+        'equipment_type'=>$data['equipment_type'],
+        // 工具名称
+        'name'=>$data['name'],
+        // 设备型号
+        'equipment_model'=>$data['equipment_model'],
+        // 发放单位
+        'issue_unit'=>$data['issue_unit'],
+        // 固定资产编号
+        'fixed_asset_number'=>$data['fixed_asset_number'],
+        // 类固定资产编号
+        'fixed_asset_number2'=>$data['fixed_asset_number2'],
+        // 序列号
+        'serial_number'=>$data['serial_number'],
+        // 出厂编号
+        'factory_number'=>$data['factory_number'],
+        // 上次校验时间
+        'check_last_time'=>$data['check_last_time'],
+        // 下次校验时间
+        'check_next_time'=>$data['check_next_time'],
+        // 校验状态
+        'check_status'=>$data['check_status'],
+        // 状态
+        'status'=>$data['status'],
+        ];
+
+        $id = $this->hydEquipmentModel->storeBy($hydequ);
+        if(!$id)
+        {
+            return CatchResponse::fail('提交失败');
+        }
+
+        if($data['equipment_type']==2)
+        {
+            $hydraulic=[
+                 // 编号
+                'number'=>$data['number'],
+                // 所属部门
+                'department_id'=>$data['department_id'],
+                'remark'=>$data['remark']?$data['remark']:'',
+                'max_pressure'=>$data['max_pressure'],
+                'min_pressure'=>$data['min_pressure'],
+                'imei'=>$data['imei'],
+                'effective_period'=>$data['effective_period'],
+                //设备的id
+                'eq_id'=>$id
+            ];
+
+            Hydraulic::create($hydraulic);
+        }
+        //保存扳手
+        if($data['equipment_type']==3||$data['equipment_type']==4)
+        {
+            
+            $wrench = [
+                // 编号
+                'number'=>$data['number'],
+                //设备id
+                'eq_id'=>$id,
+                // 所属部门
+                'department_id'=>$data['department_id'],
+                'remark'=>$data['remark']?$data['remark']:'',
+                'pressure'=>$data['pressure'],
+                'angle_sensor'=>$data['angle_sensor'],
+                // 扭矩
+                'torque'=>$data['torque'],
+            ];
+            Wrench::create($wrench);
+        }
+        
+        return CatchResponse::success();
     }
     
     /**
@@ -54,7 +132,76 @@ class HydEquipment extends CatchController
      */
     public function update(Request $request, $id) : \think\Response
     {
-        return CatchResponse::success($this->hydEquipmentModel->updateBy($id, $request->post()));
+        $data = $request->post();
+        $hydraulic = null;
+        $wrench = null;
+        $hydequ=[
+        // 物料号
+        'material_number'=>$data['material_number'],
+        // 设备类别
+        'equipment_type'=>$data['equipment_type'],
+        // 工具名称
+        'name'=>$data['name'],
+        // 设备型号
+        'equipment_model'=>$data['equipment_model'],
+        // 发放单位
+        'issue_unit'=>$data['issue_unit'],
+        // 固定资产编号
+        'fixed_asset_number'=>$data['fixed_asset_number'],
+        // 类固定资产编号
+        'fixed_asset_number2'=>$data['fixed_asset_number2'],
+        // 序列号
+        'serial_number'=>$data['serial_number'],
+        // 出厂编号
+        'factory_number'=>$data['factory_number'],
+        // 上次校验时间
+        'check_last_time'=>$data['check_last_time']?strstr($data['check_last_time'],'-')?strtotime($data['check_last_time']):$data['check_last_time']:'',
+        // 下次校验时间
+        'check_next_time'=>$data['check_next_time']?strstr($data['check_next_time'],'-')?strtotime($data['check_next_time']):$data['check_next_time']:'',
+        // 校验状态
+        'check_status'=>$data['check_status'],
+        // 状态
+        'status'=>$data['status'],
+        ];
+        if($data['equipment_type']==2)
+        {
+            $hydraulic=[
+                 // 编号
+                'number'=>$data['number'],
+                // 所属部门
+                'department_id'=>$data['department_id'],
+                //备注
+                'remark'=>$data['remark'],
+                'max_pressure'=>$data['max_pressure'],
+                'min_pressure'=>$data['min_pressure'],
+                'imei'=>$data['imei'],
+                'effective_period'=>$data['effective_period'],
+                //设备的id
+                'eq_id'=>$id
+            ];
+            Hydraulic::where('id',$data['list']['id'])->update($hydraulic);
+        }
+        //保存扳手
+        if($data['equipment_type']==3||$data['equipment_type']==4)
+        {
+            
+            $wrench = [
+                // 编号
+                'number'=>$data['number'],
+                //设备id
+                'eq_id'=>$id,
+                // 所属部门
+                'department_id'=>$data['department_id'],
+                'remark'=>$data['remark'],
+            
+                'pressure'=>$data['pressure'],
+                'angle_sensor'=>$data['angle_sensor'],
+                // 扭矩
+                'torque'=>$data['torque'],
+            ];
+            Wrench::where('id',$data['list']['id'])->update($wrench);
+        }
+        return CatchResponse::success($this->hydEquipmentModel->updateBy($id, $hydequ));
     }
     
     /**
@@ -66,4 +213,18 @@ class HydEquipment extends CatchController
     {
         return CatchResponse::success($this->hydEquipmentModel->deleteBy($id));
     }
+    /**
+     * @Descripttion: 获取设备状态和校验状态
+     * @name: likang
+     * @return {*}
+     */    
+    public function getHydEquipmentType(Request $request)
+    {
+       $data=$request->get();
+       $code =  $data['code'];
+        $sysDict = new SysDictData();
+        $list =  $sysDict->getTypesByCodeWithRemark($code,'');
+        return CatchResponse::success($list);
+        
+    }
 }

catch/hydraulic/model/HydEquipment.php

@@ -54,11 +54,27 @@ class HydEquipment extends Model
     {
         $res =  $this->dataRange()
             ->catchSearch()
-            ->append(['classification','equ_type_name', 'list'])
+            ->append(['classification','equ_type_name', 'list','status1','check_status1'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
         return $res;
     }
+    public function getEquipmentTypeAttr()
+    {
+        $id = $this->getData('equipment_type');
+        return intval($id);
+    }
+    public function getStatusAttr()
+    {
+        $id = $this->getData('status');
+        return intval($id);
+    }
+    public function getCheckStatusAttr()
+    {
+        $id = $this->getData('check_status');
+        return intval($id);
+    }
+
     public function getClassificationAttr()
     {
         $id = $this->getData('equipment_type');
@@ -72,14 +88,14 @@ class HydEquipment extends Model
         $name =  EquipmentType::where('id',$id)->value('name');
         return $name;
     }
-    public function getCheckStatusAttr()
+    public function getCheckStatus1Attr()
     {
         $id = $this->getData('check_status');
         $Dict =  new SysDictData();
         $value = $Dict->getValueByCode('Check',$id);
         return $value;
     }
-    public function getStatusAttr()
+    public function getStatus1Attr()
     {
         $id = $this->getData('status');
         $Dict =  new SysDictData();
@@ -89,12 +105,31 @@ class HydEquipment extends Model
     public function getCheckLastTimeAttr()
     {
         $time = $this->getData('check_last_time');
-        return date('Y-m-d',$time);
+        
+        return $time?date('Y-m-d',$time):'';
     }
     public function getCheckNextTimeAttr()
     {
         $time = $this->getData('check_next_time');
-        return date('Y-m-d',$time);
+        return $time?date('Y-m-d',$time):'';
+    }
+    public function getListAttr()
+    {
+        $id = $this->getData('id');
+        $type_id = $this->getData('equipment_type');
+        if($type_id==2)
+        {
+          return  Hydraulic::where('eq_id',$id)->find();
+
+        }
+        if($type_id==3||$type_id==4)
+        {
+            return Wrench::where('eq_id',$id)->find();
+        }
+        else
+        {
+            return null;
+        }
     }
     
     

catch/hydraulic/model/Hydraulic.php

@@ -16,35 +16,21 @@ class Hydraulic extends Model
         'id',
         // 编号
         'number',
-        // 型号
-        'model',
         // 所属部门
         'department_id',
-        // 名称
-        //'name',
-        // 使用状态
-        //'is_used',
-        // 品牌
-       // 'brand',
-        // 供应商
-        //'supplier',
-        // 出厂日期
-        'out_date',
         // 告警状态
         'alarm_state',
         // 网络状态
         'net_state',
-        // 在线时间
-        //'online_time',
-        //扭矩
-        'torque',
-        //压力
-        'stress',
-        //螺栓尺寸
-        'bolts_size',
-        //螺栓数量
-        'bolts_num',
-        //备注
+        // //扭矩
+        // 'torque',
+        // //压力
+        // 'stress',
+        // //螺栓尺寸
+        // 'bolts_size',
+        // //螺栓数量
+        // 'bolts_num',
+         //备注
         'remark',
         // 创建人ID
         'creator_id',
@@ -126,25 +112,25 @@ class Hydraulic extends Model
        
         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 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 '-';
+    //    }
+    // }
 
     /**
      * 校验日期

catch/hydraulic/model/Wrench.php

@@ -91,21 +91,21 @@ class Wrench 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 getModelAttr($value)
+    // {
+    //     return (int)$value;
+    // }
+    // /**
+    //  * 获取类型名称
+    //  */
+    // public function getModelNameAttr()
+    // {
+    //     $id = $this->getData('model');
+    //     return Db::table('device_mold')->where('id', $id)->value('name');
+    // }
      /**
      * 获取角度传感器
      */

catch/hydraulic/route.php

@@ -26,4 +26,6 @@ $router->group(function () use ($router){
 	$router->get('wrenchCheckRecordData', '\catchAdmin\hydraulic\controller\WrenchCheckRecord@decordDataList');
 	// 液压设备路由
 	$router->resource('hydEquipment', '\catchAdmin\hydraulic\controller\HydEquipment');
+	//获取所有设备状态字典
+	$router->get('getHydEquipmentType', '\catchAdmin\hydraulic\controller\HydEquipment@getHydEquipmentType');
 })->middleware('auth');