likang

catch/api/controller/Api.php

@@ -2,10 +2,13 @@
 
 namespace catchAdmin\api\controller;
 
+use catchAdmin\alarm\model\AlarmRecords;
 use catchAdmin\hydraulic\model\DeviceMold;
 use catchAdmin\hydraulic\model\Hydraulic as ModelHydraulic;
 use catchAdmin\hydraulic\model\maintenancemapper;
 use catchAdmin\permissions\model\Users;
+use catchAdmin\wind\model\Fan;
+use catchAdmin\wind\model\Wind;
 use catchAdmin\worklocation\model\WorkRecord as ModelWorkRecord;
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
@@ -15,8 +18,34 @@ use \think\facade\Db;
 use Workerman\Worker;
 use WorkRecord;
 
+error_reporting(0);
 class Api extends CatchController
 {
+    //设备告警
+    public function alarm()
+    {
+        $param = json_decode(file_get_contents("php://input"), true);
+
+        //校验imei是否存在
+        if (!isset($param['IMEI']) ||  $param['IMEI'] == '') {
+            json_fail('缺少设备IMEI号参数');
+        }
+        $Imei = $param['IMEI'];
+        if (!$this->IsImei($Imei)) {
+            json_fail('该Imei号不存在');
+        }
+        $aram = new AlarmRecords();
+        $content = [
+            'device_number' => $Imei,
+            'alarm_type' => $param['Type'],
+            'alarm_reason' => $param['Reason'],
+            'comment' => json_encode($param['Data']),
+            'start_time' => $param['Time'],
+        ];
+        $aram->save($content);
+        return json_success('获取成功', '', $Imei);
+    }
+
     /**
      * @Descripttion: 上传紧固模式
      * @name: likang
@@ -25,6 +54,7 @@ class Api extends CatchController
     public function UploadWorkRecordFA()
     {
         $param = json_decode(file_get_contents("php://input"), true);
+
         //校验imei是否存在
         if (!isset($param['IMEI']) ||  $param['IMEI'] == '') {
             json_fail('缺少设备IMEI号参数');
@@ -35,12 +65,14 @@ class Api extends CatchController
         if (!$this->IsImei($Imei)) {
             json_fail('该Imei号不存在');
         }
-        if (!($param['SoftVersion']) ||  $param['SoftVersion'] == '') {
+        if (!($param['PublishVersion']) ||  $param['PublishVersion'] == '') {
 
-            $param['SoftVersion'] = 0;
+            $param['PublishVersion'] = 0;
         }
-        $version = $param['SoftVersion'];
-        $this->Conversion($param, 1);
+        $version = $param['PublishVersion'];
+        $content = $this->Conversion($param, 1);
+
+        $this->IssuedWorkRecord($content, $Imei);
         return json_success('获取成功', '', $Imei);
     }
     /**
@@ -51,22 +83,22 @@ class Api extends CatchController
     public function UploadWorkRecordMA()
     {
         $param = json_decode(file_get_contents("php://input"), true);
+
         //校验imei是否存在
         if (!isset($param['IMEI']) ||  $param['IMEI'] == '') {
             json_fail('缺少设备IMEI号参数');
         }
         $Imei = $param['IMEI'];
-
-
         if (!$this->IsImei($Imei)) {
             json_fail('该Imei号不存在');
         }
-        if (!($param['SoftVersion']) ||  $param['SoftVersion'] == '') {
+        if (!($param['PublishVersion']) ||  $param['PublishVersion'] == '') {
 
-            $param['SoftVersion'] = 0;
+            $param['PublishVersion'] = 0;
         }
-        $version = $param['SoftVersion'];
-        $this->Conversion($param, 2);
+        $version = $param['PublishVersion'];
+        $content = $this->Conversion($param, 2);
+        $this->IssuedWorkRecord($content, $Imei);
         return json_success('获取成功', '', $Imei);
     }
 
@@ -101,26 +133,26 @@ class Api extends CatchController
     {
         $content = [];
         $content['creator_id'] =  Users::where('username', $data['Username'])->value('id');
-        $content['wrench_number'] = $data['WrenchNumber'];
-        $content['fan_number'] = $data['TurbineNumber'];
-        $content['fan_model'] = $data['Model'];
-        $content['parts'] = $data['PartNumber'];
-        $content['work_sign'] = $data['WorkPos'];
-        $content['boit_type'] = $data['BoltModel'];
-        $content['bolt_number'] = $data['BoltNumber'];
-        $content['boit_total'] = $data['BoltTotal'];
-        $content['set_torque'] = $data['SetTorque'];
-        $content['fastening_torque'] = $data['FasteningTorque'];
-        $content['set_stress'] = $data['SetStress'];
-        $content['fastening_stress'] = $data['FasteningStress'];
-        $content['fastening_status'] = $data['FasteningStatus'];
-        $content['fastening_time'] = $data['Time'];
-        $content['move_angle'] = $data['WrenchAngle'];
-        $content['imei'] = $data['IMEI'];
-        $content['FasteningStatus'] = $data['FasteningStatus'];
-
+        $content['wrench_number'] = trim($data['WrenchNumber']);
+        $content['wind_number'] = trim($data['WindFieldNumber']);
+        $content['fan_number'] = trim($data['TurbineNumber']);
+        $content['fan_model'] = trim($data['Model']);
+        $content['parts'] = trim($data['PartNumber']);
+        $content['work_sign'] = trim($data['WorkPos']);
+        $content['boit_type'] = trim($data['BoltModel']);
+        $content['bolt_number'] = trim($data['BoltNumber']);
+        $content['boit_total'] = trim($data['BoltTotal']);
+        $content['set_torque'] = trim($data['SetTorque']);
+        $content['fastening_torque'] = trim($data['FasteningTorque']);
+        $content['set_stress'] = trim($data['SetStress']);
+        $content['fastening_stress'] = trim($data['FasteningStress']);
+        $content['fastening_status'] = trim($data['FasteningStatus']);
+        $content['fastening_time'] = trim($data['Time']);
+        $content['move_angle'] = trim($data['WrenchAngle']);
+        $content['imei'] = trim($data['IMEI']);
+        $content['FasteningStatus'] = trim($data['FasteningStatus']);
         if ($type == 2) {
-            $content['wrench_type'] = $data['FasteningStatus'];
+            $content['wrench_type'] = trim($data['FasteningStatus']);
             if ($data['FasteningStatus'] == 3) {
                 if ($content['move_angle'] > 2) {
                     $content['FasteningStatus'] = 2;
@@ -133,5 +165,140 @@ class Api extends CatchController
         }
         $workRecod = new ModelWorkRecord();
         $bool = $workRecod->save($content);
+
+        //校验风机编号
+        $this->CheckFanNumber($content['wind_number'], $content['fan_number'], $content['fan_model'], $content['creator_id']);
+        //校验部件
+
+        $this->CheckParts($content['parts'], $content['creator_id']);
+
+        //校验工作位置
+        $this->CheckWork($content['fan_model'], $content['parts'], $content['work_sign'], $content['creator_id']);
+
+        return $content;
+        //下发上传的记录
+    }
+    /**
+     * @Descripttion: 下发工作记录
+     * @name: likang
+     * @return {*}
+     */
+    private function IssuedWorkRecord($content, $IMEI)
+    {
+        $where = [];
+        $data = [
+            'id' => $content['wind_number'] . '_' . $content['fan_number'] . '_' . $content['fan_model'] . '_' . $content['parts'] . '_' . $content['work_sign'],
+            'wnum' => $content['wind_number'],
+            'fnum' => $content['fan_number'],
+            'fmodel'  => $content['fan_model'],
+            'parts' => $content['parts'],
+            'work' =>  $content['work_sign'],
+            'bnum' =>  $content['boit_total'],
+            'torque' => $content['fastening_torque']
+        ];
+        $time = msectime();
+        $where[] = ['ContentId', '=', $data['id']];
+        $where[] = ['ContentType', '=', 'WorkRecord'];
+
+        $bool =  Db::name('publish')->where($where)->find();
+        if ($bool) {
+            $addContent = [
+                'Imei' => $IMEI,
+                'Type' => 'update',
+                'Version' => $time,
+                'Content' => json_encode($data)
+            ];
+
+            Db::name('publish')->where($where)->update($addContent);
+        } else {
+            $addContent = [
+                'Imei' => $IMEI,
+                'Type' => 'add',
+                'Version' => $time,
+                'Content' => json_encode($data),
+                'ContentId' => $data['id'],
+                'AddTime' => $time,
+                'Status' => 1,
+                'ContentType' => 'WorkRecord'
+            ];
+            Db::name('publish')->save($addContent);
+        }
+    }
+    /**
+     * @Descripttion: 校验该风机机位号是否存在  不存在则创建并下发
+     * @name: likang
+     * @param {*} $wind_number  风场编号  
+     * @param {*} $number
+     * @param {*} $fan_model
+     * @return {*}
+     */
+    public function CheckFanNumber($wind_number, $number, $fan_model, $creator_id)
+    {
+        $wind_id = Wind::where('number', $wind_number)->value('id');
+        $fan_model_id = DeviceMold::where('device_type', 4)->where('name', $fan_model)->value('id');
+        $where = [];
+        $where[] = ['wind_id', '=', $wind_id];
+        $where[] = ['number', '=', $number];
+        $where[] = ['fan_model', '=', $fan_model_id];
+        $bool = Fan::where($where)->find();
+        if (!$bool) {
+            $content = [
+                'wind_id' => $wind_id,
+                'number' => $number,
+                'fan_model' => $fan_model_id,
+                'creator_id' => $creator_id
+            ];
+
+            $fan = new Fan();
+            $fan->save($content);
+        }
+    }
+    /**
+     * @Descripttion: 校验部件是否存在  不存在则添加上
+     * @name: likang
+     * @param {*} $parts_name
+     * @param {*} $creator_id
+     * @return {*}
+     */
+    public function CheckParts($parts_name, $creator_id)
+    {
+        $bool =   maintenancemapper::where('device_type', 1)->where('name', $parts_name)->find();
+        if (!$bool) {
+            $Mainten = new maintenancemapper();
+            $content = [
+                'device_type' => 1,
+                'value' => msectime(),
+                'name' => $parts_name,
+                'creator_id' => $creator_id
+            ];
+            $Mainten->save($content);
+        }
+    }
+    /**
+     * @Descripttion: 
+     * @name: likang
+     * @return {*}
+     */
+    public function CheckWork($Fan_model, $parts, $work_name, $creator_id)
+    {
+        $where = [];
+        $model_id =   DeviceMold::where('device_type', 4)->where('name', $Fan_model)->value('id');
+        $parts = maintenancemapper::where('device_type', 1)->where('name', $parts)->value('value');
+        $where[] = ['fan_model', '=', $model_id];
+        $where[] = ['parts', '=', $parts];
+        $where[] = ['device_type', '=', 2];
+        $bool = maintenancemapper::where($where)->where('name', $work_name)->find();
+        if (!$bool) {
+            $Mainten = new maintenancemapper();
+            $content = [
+                'device_type' => 2,
+                'fan_model' => $model_id,
+                'parts' => $parts,
+                'value' => msectime(),
+                'name' => $work_name,
+                'creator_id' => $creator_id
+            ];
+            $Mainten->save($content);
+        }
     }
 }

catch/api/controller/Tool.php

@@ -14,6 +14,7 @@ use think\facade\Db;
 use Workerman\Worker;
 use Wrench;
 
+error_reporting(0);
 class Tool extends Base
 {
     /**
@@ -37,6 +38,7 @@ class Tool extends Base
 
             $param['SoftVersion'] = 0;
         }
+        $param['SoftVersion'] = 1658387272908;
         $version = $param['SoftVersion'];
         return $this->DataIssued($Imei, $version);
     }
@@ -91,10 +93,17 @@ class Tool extends Base
     private function DataIssued($Imei, $version)
     {
         $where1 = [
-            // ['Imei', '<>', $Imei],
+            ['ContentType', '<>', 'WorkRecord'],
+            ['Imei', '=', NULL],
             ['Version', '>', $version]
         ];
         $where2 = [
+            ['Imei', '<>', $Imei],
+            ['ContentType', '=', 'WorkRecord'],
+            ['Version', '>', $version]
+
+        ];
+        $where4 = [
             ['Imei', '=', $Imei],
             ['ContentType', '=', 'File'],
             ['Version', '>', $version]
@@ -103,7 +112,7 @@ class Tool extends Base
         $CntVersion = $version;
         $content = null;
         $list = Db::name('publish')
-            ->whereOr([$where1, $where2])
+            ->whereOr([$where1, $where2, $where4])
             ->order('Version asc')->limit(5)->select();
         if ($list->isEmpty()) {
             return json_success('获取成功', $content, $Imei);

catch/api/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-06-09 10:11:32
  * @LastEditors: likang
- * @LastEditTime: 2022-07-13 14:35:14
+ * @LastEditTime: 2022-07-21 19:06:52
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -30,3 +30,5 @@ $router->post('api/UploadWorkRecordFA', '\catchAdmin\api\controller\Api@UploadWo
 $router->post('tool/Issued', '\catchAdmin\api\controller\Tool@Issued');
 //下发之后上传的信息
 $router->post('tool/receive', '\catchAdmin\api\controller\Tool@receive');
+//报警上传
+$router->post('api/alarm', '\catchAdmin\api\controller\Api@alarm');

catch/hydraulic/model/HydEquipment.php

@@ -42,10 +42,11 @@ class HydEquipment extends Model
         // 校验状态
         'check_status',
         // 状态
+        'status',
         'longitude',
         'latitude',
         'address',
-        'status',
+
         // 创建人ID
         'creator_id',
         // 创建时间
@@ -70,9 +71,9 @@ class HydEquipment extends Model
     public function queryLocationList()
     {
         $res = $this->dataRange()
-                    ->catchSearch()
-                   
-                    ->select();
+            ->catchSearch()
+
+            ->select();
         return $res;
     }
     //物料号搜索
@@ -148,7 +149,9 @@ class HydEquipment extends Model
     {
         $id = $this->getData('status');
         $Dict =  new SysDictData();
+
         $value = $Dict->getValueByCode('ToolStatus', $id);
+
         return $value;
     }
     public function getCheckLastTimeAttr()

catch/hydraulic/model/Wrench.php

@@ -52,7 +52,7 @@ class Wrench extends Model
         //最小扭矩
         'min_torque',
         //最大扭矩
-        'min_torque',
+        'max_torque',
         //角度传感器
         'angle_sensor',
         // 校验台编号
@@ -144,12 +144,12 @@ class Wrench extends Model
 
         $data = null;
         $content = null;
-        $Hyd = Hydraulic::where('id', $obj->eq_id)->find();
+        $Hyd = HydEquipment::where('id', $obj->eq_id)->find();
 
         $data = [
             'id' => intval($obj->eq_id),
             'number' => $obj->number,
-            'qualified' => intval($obj->checked_res),
+            'qualified' => intval($obj->checked_res) ? 1 : 1,
             'type' => intval($obj->angle_sensor) ? 2 : 1,
             'minp' => intval($obj->min_pressure),
             'maxp' => intval($obj->max_pressure),

catch/system/model/SysDictData.php

@@ -36,10 +36,10 @@ class SysDictData extends Model
         'deleted_at',
     );
     public function getList()
-	{
-		return $this->catchSearch()
-                    ->order('sort', 'asc')
-                    ->paginate();
+    {
+        return $this->catchSearch()
+            ->order('sort', 'asc')
+            ->paginate();
     }
 
     /**
@@ -61,10 +61,9 @@ class SysDictData extends Model
         $type_id = (new SysDictType)->getTypeIdByCode($type_code);
 
         return $this->where('type_id', $type_id)
-                    ->where('code', $code)
-                    ->cache("dict_data_{$type_code}_{$code}", 60) //缓存
-                    ->value('value');
-
+            ->where('code', $code)
+            ->cache("dict_data_{$type_code}_{$code}", 60) //缓存
+            ->value('value');
     }
     //根据类型中的唯一编码获取所有类型
     public function getTypesByCode($type_code)
@@ -77,32 +76,32 @@ class SysDictData extends Model
         $options = [];
         foreach ($type_data as $key => $value) {
             $option = array(
-                'value'=>$value['code'],
-                'text'=>$value['value'],
-                'remark'=>$value['remark']
+                'value' => $value['code'],
+                'text' => $value['value'],
+                'remark' => $value['remark']
             );
-            array_push($options,$option);
-         }
+            array_push($options, $option);
+        }
         return $options;
     }
     //根据类型中的唯一编码获取所有类型
-    public function getTypesByCodeWithRemark($type_code,$remark)
+    public function getTypesByCodeWithRemark($type_code, $remark)
     {
         //获取类型id
         // $type_id = Db::table("sys_dict_type")->where('code',$type_code)->value('id');
         $type_id = (new SysDictType)->getTypeIdByCode($type_code);
         // 获取该类型下的所有字典
         $type_data = $this->where('type_id', $type_id)->whereIn('remark', $remark)->order('sort', 'asc')->column('type_id,value,code,remark,sort');
-        
+
         $options = [];
         foreach ($type_data as $key => $value) {
             $option = array(
-                'value'=>(int)$value['code'],
-                'text'=>$value['value'],
-                'remark'=>$value['remark']
+                'value' => (int)$value['code'],
+                'text' => $value['value'],
+                'remark' => $value['remark']
             );
-            array_push($options,$option);
-         }
+            array_push($options, $option);
+        }
         return $options;
     }
     /**
@@ -117,9 +116,9 @@ class SysDictData extends Model
         }
         $type_id = Db::table("sys_dict_type")->where('code', $type_code)->value('id');
         return $this->where('type_id', $type_id)
-                    ->where('code', $value)
-                    ->cache(true, 60)
-                    ->value('remark');
+            ->where('code', $value)
+            ->cache(true, 60)
+            ->value('remark');
     }
     /**
      * 词汇查询
@@ -142,4 +141,4 @@ class SysDictData extends Model
     {
         return $query->whereLike('code', $value);
     }
-}
+}

catch/wind/model/Wind.php

@@ -104,7 +104,8 @@ class Wind extends Model
         //var_dump($obj);
         $data = null;
         $content = null;
-        $jsonInfo = json_decode($obj->wind_info, true);
+
+        $jsonInfo = $obj->wind_info;
         $data = [
             'id' => $obj->id,
             'number' => $obj->number,

catch/worklocation/model/WorkRecord.php

@@ -15,7 +15,7 @@ use think\facade\Db;
 
 class WorkRecord extends Model
 {
-    use Listen;
+
     use DataRangScopeTrait;
     // 表名
     public $name = 'work_record';
@@ -209,25 +209,4 @@ class WorkRecord extends Model
         $name = Db::name('maintenance_mapper')->where($where)->value('name');
         return $name;
     }
-    /**
-     * 监听转换
-     */
-    public function addContent(&$obj)
-    {
-        $data = null;
-        $content = null;
-        $data = [
-            'id' => $obj->wind_number . $obj->fan_number . $obj->fan_model . $obj->parts . $obj->work_local,
-            'wnum' => $obj->wind_number,
-            'fnum' => $obj->fan_number,
-            'fmodel'  => ModelDeviceMold::where('device_type', 4)->where('id', $this->fan_model)->value('name'),
-            'parts' => $this->get_dict_data(1, $obj->parts),
-            'work' => $this->get_dict_data(2, $obj->work_local),
-            'bnum' => $this->bolt_num,
-            'torque' => $this->torque
-        ];
-        $content['data'] = $data;
-        $content['type'] = 'WorkRecord';
-        return  $content;
-    }
 }