likang

catch/api/Listen.php

@@ -62,7 +62,6 @@ trait Listen
         $where = [];
         $where[] = ['ContentType', '=', $data['type']];
         $where[] = ['ContentId', '=', $data['data']['id']];
-
         $content = [
             'Type' => 'update',
             'Imei' => $obj->imei ? '' : $obj->imei,

catch/api/controller/Tool.php

@@ -29,12 +29,51 @@ class Tool extends Base
             json_fail('缺少版本号参数', '', $Imei);
         }
         $version = $_GET['version'];
-        $where1 = [];
-        $where2 = [];
-        $content = [];
-        $CntVersion = '';
-        //判断版本号是否存在，不存在则下发全部，存在则下发部分
+        return $this->DataIssued($Imei, $version);
+    }
+    //收到的数据
+    public function receive()
+    {
+        //校验imei是否存在
+        $where = [];
+        if (!isset($_POST['imei']) ||  $_POST['imei'] == '') {
+            json_fail('缺少设备IMEI号参数');
+        }
+        $Imei = $_POST['imei'];
+        if (!isset($_POST['version']) ||  $_POST['version'] == '') {
+            json_fail('缺少版本号参数', '', $Imei);
+        }
+        $version = $_POST['version'];
 
+        if (!isset($_POST['Succ']) ||  $_POST['Succ'] == '') {
+            json_fail('缺少返回结果', '', $Imei);
+        }
+        $Succ = $_POST['Succ'];
+        if (!isset($_POST['Extra'])) {
+            json_fail('缺少回复内容参数', '', $Imei);
+        }
+        $Extra = $_POST['Extra'];
+        $where[] = ['PublishVersion', '=', $version];
+        $where[] = ['Imei', '=', $Imei];
+        $ack =   Db::name("publish_ack")->where($where)->find();
+        if (!$ack) {
+            json_fail('没有找到下发记录', '', $Imei);
+        }
+        $data = [
+            'Succ' => $Succ,
+            'AckTime' => msectime(),
+            'Extra' => $Extra
+        ];
+        Db::name("publish_ack")->where($where)->update($data);
+        return $this->DataIssued($Imei, $version);
+    }
+    /**
+     * @Descripttion: 数据处理
+     * @name: likang
+     * @return {*}
+     */
+    private function DataIssued($Imei, $version)
+    {
         $where1 = [
             // ['Imei', '<>', $Imei],
             ['Version', '>', $version]
@@ -46,14 +85,15 @@ class Tool extends Base
         ];
 
         $list = Db::name('publish')
-            //->whereOr([$where1, $where2])
-            ->where($where1)
+            ->whereOr([$where1, $where2])
+            //->where($where1)
             ->order('Version asc')->limit(5)->select();
 
 
         foreach ($list as $key => $value) {
 
             $da = json_decode($value['Content'], true);
+            $da['id'] = strval($da['id']);
             $content[] = [
                 'OpType' => $value['Type'],
                 'CntType' => $value['ContentType'],
@@ -73,41 +113,4 @@ class Tool extends Base
         Db::name('publish_ack')->save($ack);
         return json_success('获取成功', $content, $Imei);
     }
-    //接收上传的日志
-
-
-    /**
-     * @Descripttion: 获取扳手列表
-     * @name: likang
-     * @return {*}
-     */
-    public function getWrenchList()
-    {
-        $list =  ModelWrench::select();
-        return json_success('获取成功', $list);
-    }
-    /**
-     * @Descripttion: 获取工作位置列表
-     * @name: likang
-     * @return {*}
-     */
-    public function getWorkLocal()
-    {
-        $list =  maintenancemapper::where('device_type', 2)->select();
-        return json_success('获取成功', $list);
-    }
-
-
-    public function getUserList()
-    {
-
-        if (!isset($_GET['imei']) ||  $_GET['imei'] == '') {
-            json_fail('缺少设备IMEI号参数');
-        }
-        //检测imei号是否在数据库中
-
-
-        //请求成功返回数据
-        json_success('获取成功', '');
-    }
 }

catch/api/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-06-09 10:11:32
  * @LastEditors: likang
- * @LastEditTime: 2022-07-11 14:21:55
+ * @LastEditTime: 2022-07-11 17:23:27
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -25,3 +25,5 @@ $router->group(function () use ($router) {
 $router->get('api/getUsers', '\catchAdmin\api\controller\Api@getUserList');
 //下发数据
 $router->get('tool/Issued', '\catchAdmin\api\controller\Tool@Issued');
+//下发之后上传的信息
+$router->get('tool/receive', '\catchAdmin\api\controller\Tool@receive');

catch/permissions/model/Users.php

@@ -275,7 +275,6 @@ class Users extends CatchModel
             ];
             //判断下发的数据库中是否存在
             if ($pubulish) {
-
                 $content = [
                     'Type' => 'update',
                     'ContentType' => 'Users',

catch/worklocation/controller/WorkLocation.php

@@ -1,97 +0,0 @@
-<?php
-
-namespace catchAdmin\worklocation\controller;
-
-use catcher\base\CatchRequest as Request;
-use catcher\CatchResponse;
-use catcher\base\CatchController;
-use catchAdmin\worklocation\model\WorkLocation as workLocationModel;
-use think\facade\Db;
-
-class WorkLocation extends CatchController
-{
-    protected $workLocationModel;
-    
-    public function __construct(WorkLocationModel $workLocationModel)
-    {
-        $this->workLocationModel = $workLocationModel;
-    }
-    
-    /**
-     * 列表
-     * @time 2022年05月19日 13:36
-     * @param Request $request 
-     */
-    public function index(Request $request) : \think\Response
-    {
-        return CatchResponse::paginate($this->workLocationModel->getList());
-    }
-    
-    /**
-     * 保存信息
-     * @time 2022年05月19日 13:36
-     * @param Request $request 
-     */
-    public function save(Request $request) : \think\Response
-    {
-        return CatchResponse::success($this->workLocationModel->storeBy($request->post()));
-    }
-    
-    /**
-     * 读取
-     * @time 2022年05月19日 13:36
-     * @param $id 
-     */
-    public function read($id) : \think\Response
-    {
-        return CatchResponse::success($this->workLocationModel->findBy($id));
-    }
-    
-    /**
-     * 更新
-     * @time 2022年05月19日 13:36
-     * @param Request $request 
-     * @param $id
-     */
-    public function update(Request $request, $id) : \think\Response
-    {
-        return CatchResponse::success($this->workLocationModel->updateBy($id, $request->post()));
-    }
-    
-    /**
-     * 删除
-     * @time 2022年05月19日 13:36
-     * @param $id
-     */
-    public function delete($id) : \think\Response
-    {
-        return CatchResponse::success($this->workLocationModel->deleteBy($id,true));
-    }
-
-    //统计列表
-    public function getTotal(Request $request)
-    {
-       $device_model_list =Db::name('device_mold')->where('device_type',4)->select();
-       $array = [];
-     
-    //    fan_id 风机 id  风机编号
-       foreach($device_model_list as $item)
-       {   $worklist =[];
-           $where=[];
-           $ids =  Db::name('fan')->where('fan_model',$item["id"])->column('id');
-           $where[] =['fan_id','in',implode(",",$ids)];
-         
-           //创建时间 扭矩
-           //排序 从小到大
-            $list = $this->workLocationModel->where($where)->order('created_at','asc')->select();
-          
-            foreach($list as $it)
-            {
-                $worklist[] = [$it['created_at']=>$it['torque']];
-            }
-            $array[] =["name"=>$item['name'],'data'=>$worklist];
-       }
-       return CatchResponse::success($array,10000);
-
-    }
-}

catch/worklocation/controller/WorkRecord.php

@@ -0,0 +1,107 @@
+<?php
+/*
+ * @Descripttion: 
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-07-12 10:11:04
+ * @LastEditors: likang
+ * @LastEditTime: 2022-07-12 10:39:34
+ */
+
+namespace catchAdmin\worklocation\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\worklocation\model\WorkRecord as workRecordModel;
+
+class WorkRecord extends CatchController
+{
+    protected $workRecordModel;
+
+    public function __construct(WorkRecordModel $workRecordModel)
+    {
+        $this->workRecordModel = $workRecordModel;
+    }
+
+    /**
+     * 列表
+     * @time 2022年07月12日 10:11
+     * @param Request $request 
+     */
+    public function index(Request $request): \think\Response
+    {
+        return CatchResponse::paginate($this->workRecordModel->getList());
+    }
+
+    /**
+     * 保存信息
+     * @time 2022年07月12日 10:11
+     * @param Request $request 
+     */
+    public function save(Request $request): \think\Response
+    {
+        return CatchResponse::success($this->workRecordModel->storeBy($request->post()));
+    }
+
+    /**
+     * 读取
+     * @time 2022年07月12日 10:11
+     * @param $id 
+     */
+    public function read($id): \think\Response
+    {
+        return CatchResponse::success($this->workRecordModel->findBy($id));
+    }
+
+    /**
+     * 更新
+     * @time 2022年07月12日 10:11
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id): \think\Response
+    {
+        return CatchResponse::success($this->workRecordModel->updateBy($id, $request->post()));
+    }
+
+    /**
+     * 删除
+     * @time 2022年07月12日 10:11
+     * @param $id
+     */
+    public function delete($id): \think\Response
+    {
+        return CatchResponse::success($this->workRecordModel->deleteBy($id));
+    }
+
+    /**
+     * @Descripttion: 统计
+     * @name: likang
+     * @param {Request} $request
+     * @return {*}
+     */
+    public function getTotal(Request $request)
+    {
+        $device_model_list = Db::name('device_mold')->where('device_type', 4)->select();
+        $array = [];
+
+        //    fan_id 风机 id  风机编号
+        foreach ($device_model_list as $item) {
+            $worklist = [];
+            $where = [];
+            $ids =  Db::name('fan')->where('fan_model', $item["id"])->column('id');
+            $where[] = ['fan_id', 'in', implode(",", $ids)];
+
+            //创建时间 扭矩
+            //排序 从小到大
+            $list = $this->workLocationModel->where($where)->order('created_at', 'asc')->select();
+
+            foreach ($list as $it) {
+                $worklist[] = [$it['created_at'] => $it['torque']];
+            }
+            $array[] = ["name" => $item['name'], 'data' => $worklist];
+        }
+        return CatchResponse::success($array, 10000);
+    }
+}

catch/worklocation/database/migrations/20220519133643_worklocation.php

@@ -1,47 +0,0 @@
-<?php
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class Worklocation 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()
-    {
-        $table = $this->table('work_location', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '工作位置' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('wind_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '风场编号',])
-			->addColumn('fan_id', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '风机编号',])
-			->addColumn('work_local', 'string', ['limit' => 250,'null' => true,'signed' => true,'comment' => '工作位置',])
-			->addColumn('parts', 'string', ['limit' => 250,'null' => true,'signed' => true,'comment' => '所属部件',])
-			->addColumn('bolt_style', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '螺栓样式',])
-			->addColumn('boit_type', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '螺栓型号',])
-			->addColumn('number', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '编号',])
-			->addColumn('info', 'string', ['limit' => 100,'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/worklocation/database/migrations/20220712101110_work_record.php

@@ -0,0 +1,57 @@
+<?php
+
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class WorkRecord 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()
+    {
+        $table = $this->table('work_record', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '', 'id' => 'id', 'signed' => true, 'primary_key' => ['id']]);
+        $table->addColumn('wind_number', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '风场编号',])
+            ->addColumn('fan_number', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '风机编号',])
+            ->addColumn('fan_model', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '风机模型',])
+            ->addColumn('parts', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '部件',])
+            ->addColumn('boit_type', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '螺栓型号',])
+            ->addColumn('bolt_number', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '螺栓编号',])
+            ->addColumn('boit_total', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '螺栓总数',])
+            ->addColumn('wrench_number', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '扳手编号',])
+            ->addColumn('set_torque', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '设定的扭矩1',])
+            ->addColumn('fastening_torque', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '紧固扭矩1',])
+            ->addColumn('set_torque1', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '设定的扭矩2',])
+            ->addColumn('fastening_torque1', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '紧固扭矩2',])
+            ->addColumn('fastening_status', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '1 紧固正常，2紧固异常',])
+            ->addColumn('fastening_time', 'string', ['limit' => 20, 'null' => true, 'signed' => true, 'comment' => '紧固时间',])
+            ->addColumn('move_angle', 'string', ['limit' => 10, 'null' => true, 'signed' => true, 'comment' => '搬动角度',])
+            ->addColumn('imei', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '网关imei',])
+            ->addColumn('tyep', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '1 紧固模式，2维护模式',])
+            ->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/worklocation/model/WorkLocation.php

@@ -11,31 +11,49 @@ use catchAdmin\wind\model\Wind;
 use DeviceMold;
 use think\facade\Db;
 
-class Worklocation extends Model
+class WorkRecord extends Model
 {
     use Listen;
     use DataRangScopeTrait;
     // 表名
-    public $name = 'work_location';
+    public $name = 'work_record';
     // 数据库字段映射
     public $field = array(
         'id',
         // 风场编号
-        'wind_id',
+        'wind_number',
         // 风机编号
-        'fan_id',
-        // 工作位置
-        'work_local',
-        // 所属部件
+        'fan_number',
+        //风机模型
+        'fan_model',
+        // 部件
         'parts',
-        // 螺栓样式
-        'bolt_style',
         // 螺栓型号
         'boit_type',
-        // 编号
-        'number',
-        // 备注说明
-        'info',
+        // 螺栓编号
+        'bolt_number',
+        // 螺栓总数
+        'boit_total',
+        // 扳手编号
+        'wrench_number',
+        // 设定的扭矩1
+        'set_torque',
+        // 紧固扭矩1
+        'fastening_torque',
+        // 设定的扭矩2
+        'set_torque1',
+        // 紧固扭矩2
+        'fastening_torque1',
+        // 1 紧固正常，2紧固异常
+        'fastening_status',
+        // 紧固时间
+        'fastening_time',
+        // 搬动角度
+        'move_angle',
+        // 网关imei
+        'imei',
+        // 1 紧固模式，2维护模式
+        'tyep',
         // 创建人ID
         'creator_id',
         // 创建时间
@@ -44,18 +62,12 @@ class Worklocation extends Model
         'updated_at',
         // 软删除
         'deleted_at',
-        // 扭矩
-        'torque',
-        // 压力
-        'pressure',
-        // 外径
-        'external_diameter',
     );
     public function getList()
     {
         return $this->dataRange()
             ->catchSearch()
-            ->append(['department_name', 'wind_name', 'fan_number', 'work_local_name', 'parts_name', 'bolt_style_name', 'boit_type_name', 'work_name'])
+            ->append(['department_name', 'wind_name', 'work_local_name', 'parts_name', 'boit_type_name', 'work_name'])
             ->field('*')
             ->catchOrder()
             ->creator()
@@ -64,7 +76,7 @@ class Worklocation extends Model
     //获取部门名称
     public function getDepartmentNameAttr()
     {
-        $dep_id = Db::name('wind')->where('id', $this->wind_id)->value('department_id');
+        $dep_id = Db::name('wind')->where('number', $this->wind_number)->value('department_id');
         $name = Db::name('departments')->where('id', $dep_id)->where('status', 1)->value('department_name');
         return $name;
     }
@@ -76,8 +88,8 @@ class Worklocation extends Model
      */
     public function getWindNameAttr()
     {
-        $wind_id = $this->wind_id;
-        $wind_name =  Db::name('wind')->where('id', $wind_id)->value('name');
+        $wind_number = $this->wind_number;
+        $wind_name =  Db::name('wind')->where('number', $wind_number)->value('name');
         return $wind_name;
     }
     //获取操作人员
@@ -89,16 +101,6 @@ class Worklocation extends Model
     }
 
     /**
-     * 获取风机机位号
-     * @return void
-     */
-    public function getFanNumberAttr()
-    {
-        $fan_id = $this->fan_id;
-        $fan_number =  Db::name('fan')->where('id', $fan_id)->value('number');
-        return $fan_number;
-    }
-    /**
      * 获取部件名称
      *
      * @return void
@@ -117,18 +119,6 @@ class Worklocation extends Model
         return $value;
     }
     /**
-     * 获取螺栓样式
-     *
-     * @return void
-     */
-    public function  getBoltStyleNameAttr()
-    {
-
-        $code = $this->bolt_style;
-        $value = $this->get_dict_data(3, $code);
-        return $value;
-    }
-    /**
      * 螺栓型号
      *
      * @return void
@@ -161,9 +151,9 @@ class Worklocation extends Model
         $data = null;
         $content = null;
         $data = [
-            'id' => $obj->wind_id . $obj->fan_id . $obj->fan_model . $obj->parts . $obj->work_local,
-            'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
-            'fnum' =>  Db::name('fan')->where('id', $obj->fan_id)->value('number'),
+            '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),

catch/worklocation/route.php

@@ -12,7 +12,8 @@
 // you should use `$router`
 $router->group(function () use ($router) {
 	// workLocation路由
-	$router->resource('worklocation', '\catchAdmin\worklocation\controller\WorkLocation');
+	//$router->resource('worklocation', '\catchAdmin\worklocation\controller\WorkLocation');
+	$router->resource('workRecord', '\catchAdmin\worklocation\controller\WorkRecord');
 	// workplan路由
 	$router->resource('workplan', '\catchAdmin\worklocation\controller\Workplan');
 	$router->get('queryFanByWindId', '\catchAdmin\worklocation\controller\Workplan@getFanIdByWindId');
@@ -21,4 +22,6 @@ $router->group(function () use ($router) {
 $router->group('WorkLocationChart', function () use ($router) {
 	//维保记录 
 	$router->get('total', '\catchAdmin\worklocation\controller\WorkLocation@getTotal');
+	// workRecord路由
+
 })->middleware('auth');