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

app/common.php

@@ -318,9 +318,9 @@ function get_sms_config($type)
  * data： 额外数据
  * @time 2022年06月09日 14:22
  */
-function json_success($message, $data = '')
+function json_success($message, $data = '', $imei = '')
 {
-    echo json_encode(array('success' => true, 'message' => $message, 'data' => $data), JSON_UNESCAPED_UNICODE);
+    echo json_encode(array('success' => true, 'message' => $message, 'data' => $data, 'imei' => $imei), JSON_UNESCAPED_UNICODE);
     exit;
 }
 
@@ -330,9 +330,9 @@ function json_success($message, $data = '')
  * data： 额外数据
  * @time 2022年06月09日 14:22
  */
-function json_fail($message, $data = '')
+function json_fail($message, $data = '', $imei = '')
 {
-    echo json_encode(array('success' => false, 'message' => $message, 'data' => $data), JSON_UNESCAPED_UNICODE);
+    echo json_encode(array('success' => false, 'message' => $message, 'data' => $data, 'imei' => $imei), JSON_UNESCAPED_UNICODE);
     exit;
 }
 /**

catch/api/Listen.php

@@ -25,6 +25,9 @@ trait Listen
             }
         }
         $time = msectime();
+        //塞入版本号
+        //类型
+        //操作方式
         $content = [
             'Type' => 'add',
             'ContentType' => $data['type'],
@@ -90,12 +93,12 @@ trait Listen
         $where = [];
         $where[] = ['ContentType', '=', $data['type']];
         $where[] = ['ContentId', '=', $data['data']['id']];
+
         $content = [
             'Type' => 'delete',
             'Imei' => $obj->imei ? '' : $obj->imei,
             'Version' => $time,
             'Status' => 1,
-            'Content' => json_encode($data['data'])
         ];
         Db::name('publish')->where($where)->update($content);
     }

catch/api/controller/Tool.php

@@ -1,12 +1,4 @@
 <?php
-/*
- * @Descripttion: 下发工具等相关信息
- * @version: 1.0.0
- * @Author: likang
- * @Date: 2022-06-09 14:58:24
- * @LastEditors: likang
- * @LastEditTime: 2022-06-10 09:28:54
- */
 
 namespace catchAdmin\api\controller;
 
@@ -16,43 +8,109 @@ use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
 use PhpParser\Node\Expr\FuncCall;
+use think\facade\Db;
 use Wrench;
 
 class Tool extends Base
 {
     /**
-     * @Descripttion: 获取扳手列表
+     * @Descripttion: 下发设备   携带的参数 imei号  版本号
      * @name: likang
      * @return {*}
-     */    
-    public function getWrenchList()
+     */
+    public function Issued()
     {
-       $list =  ModelWrench::select();
-       return json_success('获取成功',$list);
+        //校验imei是否存在
+        if (!isset($_GET['imei']) ||  $_GET['imei'] == '') {
+            json_fail('缺少设备IMEI号参数');
+        }
+        $Imei = $_GET['imei'];
+        if (!isset($_GET['version']) ||  $_GET['version'] == '') {
+            json_fail('缺少版本号参数', '', $Imei);
+        }
+        $version = $_GET['version'];
+        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: 获取工作位置列表
+     * @Descripttion: 数据处理
      * @name: likang
      * @return {*}
-     */    
-    public function getWorkLocal()
+     */
+    private function DataIssued($Imei, $version)
     {
-        $list =  maintenancemapper::where('device_type',2)->select();
-        return json_success('获取成功',$list);
-    }
-     
+        $where1 = [
+            // ['Imei', '<>', $Imei],
+            ['Version', '>', $version]
+        ];
+        $where2 = [
+            ['Imei', '=', $Imei],
+            ['ContentType', '=', 'File'],
+            ['Version', '>', $version]
+        ];
 
-    public function getUserList(){
-     
-        if (!isset($_GET['imei']) ||  $_GET['imei']=='') {
-            json_fail('缺少设备IMEI号参数');
-        }
-        //检测imei号是否在数据库中
+        $list = Db::name('publish')
+            ->whereOr([$where1, $where2])
+            //->where($where1)
+            ->order('Version asc')->limit(5)->select();
 
 
-        //请求成功返回数据
-       json_success('获取成功','');
-    }
+        foreach ($list as $key => $value) {
 
-}
+            $da = json_decode($value['Content'], true);
+            $da['id'] = strval($da['id']);
+            $content[] = [
+                'OpType' => $value['Type'],
+                'CntType' => $value['ContentType'],
+                'CntVersion' => strval($value['Version']),
+                'id' => strval($value['ContentId']),
+                'Content' => $da
+            ];
+            $CntVersion = strval($value['Version']);
+        }
+        //保存下发的记录
+        $ack = [
+            'PublishVersion' => $CntVersion,
+            'PublishContent' => json_encode($content),
+            'Imei' => $Imei,
+            'AddTime' => msectime()
+        ];
+        Db::name('publish_ack')->save($ack);
+        return json_success('获取成功', $content, $Imei);
+    }
+}

catch/api/database/migrations/20220706114453_publish.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-07-06 11:44:53
  * @LastEditors: likang
- * @LastEditTime: 2022-07-07 15:30:20
+ * @LastEditTime: 2022-07-11 11:18:04
  */
 
 use think\migration\Migrator;
@@ -43,8 +43,8 @@ class Publish extends Migrator
             ->addColumn('Content', 'text', ['limit' => MysqlAdapter::TEXT_LONG, 'null' => true, 'signed' => true, 'comment' => '内容 json',])
             ->addColumn('Imei', 'string', ['limit' => 255, 'null' => true, 'signed' => true, 'comment' => '网关imei',])
             ->addColumn('ContentId', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '内容id',])
-            ->addColumn('AddTime', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '添加时间',])
-            ->addColumn('Version', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '毫秒时间戳',])
+            ->addColumn('AddTime', 'integer', ['limit' => MysqlAdapter::INT_BIG, 'null' => true, 'signed' => true, 'comment' => '添加时间',])
+            ->addColumn('Version', 'integer', ['limit' => MysqlAdapter::INT_BIG, 'null' => true, 'signed' => true, 'comment' => '毫秒时间戳',])
             ->addColumn('Status', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '1 更新 2 只读',])
             ->create();
     }

catch/api/database/migrations/20220706135109_publish_ack.php

@@ -1,42 +0,0 @@
-<?php
-
-use think\migration\Migrator;
-use think\migration\db\Column;
-use Phinx\Db\Adapter\MysqlAdapter;
-
-class PublishAck 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('publish_ack', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '已发记录表' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
-        $table->addColumn('PublishVersion', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '下发表版本号',])
-			->addColumn('PublishContent', 'text', ['limit' => MysqlAdapter::TEXT_LONG,'null' => true,'signed' => true,'comment' => '内容',])
-			->addColumn('AddTime', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '添加时间',])
-			->addColumn('Succ', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'signed' => true,'comment' => '1 成功  -1 失败',])
-			->addColumn('ErrStr', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '失败原因',])
-			->addColumn('AckTime', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '回复时间',])
-			->addColumn('Imei', 'string', ['limit' => 50,'null' => true,'signed' => true,'comment' => '网关',])
-            ->create();
-    }
-}

catch/api/database/migrations/20220709165747_publish_ack.php

@@ -0,0 +1,42 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class PublishAck 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('publish_ack', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '回复的信息', 'id' => 'id', 'signed' => true, 'primary_key' => ['id']]);
+        $table->addColumn('PublishVersion', 'integer', ['limit' => MysqlAdapter::INT_BIG, 'null' => true, 'signed' => true, 'comment' => '版本',])
+            ->addColumn('PublishContent', 'text', ['limit' => MysqlAdapter::TEXT_LONG, 'null' => true, 'signed' => true, 'comment' => '下发的内容',])
+            ->addColumn('AddTime', 'integer', ['limit' => MysqlAdapter::INT_BIG, 'null' => true, 'signed' => true, 'comment' => '创建时间',])
+            ->addColumn('Succ', 'integer', ['limit' => MysqlAdapter::INT_REGULAR, 'null' => true, 'signed' => true, 'comment' => '1 成功  -1 失败',])
+            ->addColumn('Imei', 'string', ['limit' => 50, 'null' => true, 'signed' => true, 'comment' => '网关imei',])
+            ->addColumn('AckTime', 'integer', ['limit' => MysqlAdapter::INT_BIG, 'null' => true, 'signed' => true, 'comment' => '回复时间',])
+            ->addColumn('Extra', 'text', ['limit' => MysqlAdapter::TEXT_LONG, 'null' => true, 'signed' => true, 'comment' => '回复的内容',])
+            ->create();
+    }
+}

catch/api/model/Publishack.php

@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Descripttion: 
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-07-09 16:57:43
+ * @LastEditors: likang
+ * @LastEditTime: 2022-07-11 14:16:02
+ */
 
 namespace catchAdmin\api\model;
 
@@ -6,7 +14,7 @@ use catcher\base\CatchModel as Model;
 use catcher\traits\db\BaseOptionsTrait;
 use catcher\traits\db\ScopeTrait;
 
-class Publishack extends Model
+class PublishAck extends Model
 {
     use BaseOptionsTrait, ScopeTrait;
     // 表名
@@ -14,19 +22,19 @@ class Publishack extends Model
     // 数据库字段映射
     public $field = array(
         'id',
-        // 下发表版本号
+        // 版本
         'PublishVersion',
-        // 内容
+        // 下发的内容
         'PublishContent',
-        // 添加时间
+        // 创建时间
         'AddTime',
         // 1 成功  -1 失败
         'Succ',
-        // 失败原因
-        'ErrStr',
         // 回复时间
         'AckTime',
-        // 网关
-        'Imei',
+        // 回复的内容
+        'Extra',
+        //网关Imei号
+        'Imei'
     );
-}
+}

catch/api/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-06-09 10:11:32
  * @LastEditors: likang
- * @LastEditTime: 2022-06-10 09:41:04
+ * @LastEditTime: 2022-07-11 17:23:27
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -18,9 +18,12 @@
 // +----------------------------------------------------------------------
 
 // you should use `$router`
-$router->group(function () use ($router){
+$router->group(function () use ($router) {
 	// api路由
 	$router->get('api/getUserList', '\catchAdmin\api\controller\Api@getUserList');
 });
 $router->get('api/getUsers', '\catchAdmin\api\controller\Api@getUserList');
-$router->get('tool/getwrenchlist','\catchAdmin\api\controller\Tool@getWrenchList');
+//下发数据
+$router->get('tool/Issued', '\catchAdmin\api\controller\Tool@Issued');
+//下发之后上传的信息
+$router->get('tool/receive', '\catchAdmin\api\controller\Tool@receive');

catch/hydraulic/controller/HydEquipment.php

@@ -115,6 +115,7 @@ class HydEquipment extends CatchController
                     'angular_resolution' => $data['angular_resolution']
 
                 ];
+
                 Wrench::create($wrench);
             }
         } catch (\Exception $e) {
@@ -200,6 +201,7 @@ class HydEquipment extends CatchController
         if ($data['equipment_type'] == 3 || $data['equipment_type'] == 4) {
 
             $wrench = [
+                'id' => $data['list']['id'],
                 // 编号
                 'number' => $data['number'],
                 //设备id
@@ -215,7 +217,8 @@ class HydEquipment extends CatchController
                 'angle_sensor' => $data['angle_sensor'],
                 // 扭矩
             ];
-            Wrench::where('id', $data['list']['id'])->update($wrench);
+
+            Wrench::update($wrench, ['id' => $data['list']['id']]);
         }
         return CatchResponse::success($this->hydEquipmentModel->updateBy($id, $hydequ));
     }
@@ -243,10 +246,10 @@ class HydEquipment extends CatchController
                     Hydraulic::where('eq_id', '=', $item['id'])->delete();
                 }
                 if ($item['equipment_type'] == 3 || $item['equipment_type'] == 4) {
-                    Wrench::where('eq_id', '=', $item['id'])->delete();
+                    $wrench =  Wrench::where('eq_id', '=', $item['id'])->find();
+                    $wrench->delete();
                 }
             }
-
             $this->hydEquipmentModel->deleteBy($id, true);
         } catch (\Exception $e) {
             Db::rollback();

catch/hydraulic/model/Hydraulic.php

@@ -2,6 +2,7 @@
 
 namespace catchAdmin\hydraulic\model;
 
+use catchAdmin\api\Listen;
 use catcher\base\CatchModel as Model;
 use \think\facade\Db;
 use catchAdmin\system\model\SysDictData;
@@ -10,6 +11,7 @@ use catchAdmin\permissions\model\DataRangScopeTrait;
 class Hydraulic extends Model
 {
     use DataRangScopeTrait;
+
     // 表名
     public $name = 'hydraulic';
     // 数据库字段映射

catch/hydraulic/model/MaintenanceMapper.php

@@ -105,7 +105,7 @@ class maintenancemapper extends Model
         } else if ($obj->device_type == 2) {
             $data = [
                 'id' => $obj->id,
-                'fan_model' => Db::name('device_mold')->where('id', $obj->fan_model)->value('name'),
+                'fmodel' => Db::name('device_mold')->where('id', $obj->fan_model)->value('name'),
                 'name' => $obj['name'],
                 'parts' => $this->where('device_type', 1)->where('value', $obj->parts)->value('name')
             ];

catch/hydraulic/model/Wrench.php

@@ -2,6 +2,7 @@
 
 namespace catchAdmin\hydraulic\model;
 
+use catchAdmin\api\Listen;
 use catcher\base\CatchModel as Model;
 use \think\facade\Db;
 use catchAdmin\system\model\SysDictData;
@@ -10,6 +11,7 @@ use catchAdmin\permissions\model\DataRangScopeTrait;
 class Wrench extends Model
 {
     use DataRangScopeTrait;
+    use Listen;
     // 表名
     public $name = 'wrench';
     // 数据库字段映射
@@ -134,4 +136,32 @@ class Wrench extends Model
             return '-';
         }
     }
+    /**
+     * 风机下发内容
+     */
+    public function addContent(&$obj)
+    {
+
+        $data = null;
+        $content = null;
+        $Hyd = Hydraulic::where('id', $obj->eq_id)->find();
+
+        $data = [
+            'id' => intval($obj->eq_id),
+            'number' => $obj->number,
+            'qualified' => intval($obj->checked_res),
+            'type' => intval($obj->angle_sensor) ? 2 : 1,
+            'minp' => intval($obj->min_pressure),
+            'maxp' => intval($obj->max_pressure),
+            'maxt' => intval($obj->max_torque),
+            'mint' => intval($obj->min_torque),
+            'angres' => intval($obj->angular_resolution),
+            'clt' => date('Y-m-d', $Hyd['check_last_time']),
+            'model' => strval($Hyd['equipment_model']),
+            'fixed' => strval($Hyd['fixed_asset_number'])
+        ];
+        $content['data'] = $data;
+        $content['type'] = 'Wrench';
+        return  $content;
+    }
 }

catch/permissions/controller/User.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace catchAdmin\permissions\controller;
 
 use catchAdmin\permissions\excel\UserExport;
@@ -24,7 +25,7 @@ class User extends CatchController
 
     public function __construct(Users $user)
     {
-       $this->user = $user;
+        $this->user = $user;
     }
 
     /**
@@ -38,16 +39,16 @@ class User extends CatchController
         return CatchResponse::paginate($this->user->getList());
     }
 
-  /**
-   * 获取用户信息
-   *
-   * @time 2020年01月07日
-   * @param CatchAuth $auth
-   * @throws \think\db\exception\DataNotFoundException
-   * @throws \think\db\exception\DbException
-   * @throws \think\db\exception\ModelNotFoundException
-   * @return \think\response\Json
-   */
+    /**
+     * 获取用户信息
+     *
+     * @time 2020年01月07日
+     * @param CatchAuth $auth
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @return \think\response\Json
+     */
     public function info(CatchAuth $auth)
     {
         $user = $auth->user();
@@ -77,21 +78,21 @@ class User extends CatchController
     public function save(CreateRequest $request)
     {
         // $area_id=json_encode($request->param('area_id'));
-       $params=$request->param();
-      
+        $params = $request->param();
 
 
-    //    $params['area_id']=json_encode($params['area_id']);
-       $params['realname']=$params['username'];
-     
-        $this->user->storeBy($params);
 
+        //    $params['area_id']=json_encode($params['area_id']);
+        $params['realname'] = $params['username'];
+        $params['equ_password'] = strtoupper(substr(md5($params['password']), 8, 16));
+        $this->user->storeBy($params);
         $this->user->attachRoles($request->param('roles'));
 
         if ($request->param('jobs')) {
             $this->user->attachJobs($request->param('jobs'));
         }
 
+        $this->user->equUserUpdate($this->user);
         return CatchResponse::success('', '添加成功');
     }
 
@@ -118,13 +119,15 @@ class User extends CatchController
      */
     public function update($id, UpdateRequest $request)
     {
-        $params=$request->param();
+        $params = $request->param();
         // $params['area_id']=json_encode($params['area_id']);
 
-        if($params['password']==""){
+        if ($params['password'] == "") {
             unset($params['password']);
+        } else {
+            $params['equ_password'] = strtoupper(substr(md5($params['password']), 8, 16));
         }
-        $params['realname']=$params['username'];
+        $params['realname'] = $params['username'];
         $this->user->updateBy($id, $params);
 
         $user = $this->user->findBy($id);
@@ -138,6 +141,8 @@ class User extends CatchController
         if (!empty($request->param('jobs'))) {
             $user->attachJobs($request->param('jobs'));
         }
+
+        $this->user->equUserUpdate($this->user->where('id', $id)->find());
         return CatchResponse::success();
     }
 
@@ -151,14 +156,17 @@ class User extends CatchController
     {
         $ids = Utils::stringToArrayBy($id);
 
-        foreach ($ids as $_id) {
-          $user = $this->user->findBy($_id);
-          // 删除角色
-          $user->detachRoles();
-          // 删除岗位
-          $user->detachJobs();
 
-          $this->user->deleteBy($_id,true);
+        foreach ($ids as $_id) {
+            $user = $this->user->findBy($_id);
+            $array = $user;
+            // 删除角色
+            $user->detachRoles();
+            // 删除岗位
+            $user->detachJobs();
+
+            $this->user->deleteBy($_id, true);
+            $this->user->equUserUpdate($array);
         }
 
         return CatchResponse::success();
@@ -176,11 +184,11 @@ class User extends CatchController
 
         foreach ($ids as $_id) {
 
-          $user = $this->user->findBy($_id);
+            $user = $this->user->findBy($_id);
 
-          $this->user->updateBy($_id, [
-            'status' => $user->status == Users::ENABLE ? Users::DISABLE : Users::ENABLE,
-          ]);
+            $this->user->updateBy($_id, [
+                'status' => $user->status == Users::ENABLE ? Users::DISABLE : Users::ENABLE,
+            ]);
         }
 
         return CatchResponse::success([], '操作成功');
@@ -197,13 +205,13 @@ class User extends CatchController
      */
     public function recover($id): \think\response\Json
     {
-       $trashedUser = $this->user->findBy($id, ['*'], true);
+        $trashedUser = $this->user->findBy($id, ['*'], true);
 
-       if ($this->user->where('email', $trashedUser->email)->find()) {
-           return CatchResponse::fail(sprintf('该恢复用户的邮箱 [%s] 已被占用', $trashedUser->email));
-       }
+        if ($this->user->where('email', $trashedUser->email)->find()) {
+            return CatchResponse::fail(sprintf('该恢复用户的邮箱 [%s] 已被占用', $trashedUser->email));
+        }
 
-       return CatchResponse::success($this->user->recover($id));
+        return CatchResponse::success($this->user->recover($id));
     }
 
     /**
@@ -254,7 +262,7 @@ class User extends CatchController
      */
     public function profile(ProfileRequest $request)
     {
-       return CatchResponse::success($this->user->updateBy($request->user()->id, $request->param()));
+        return CatchResponse::success($this->user->updateBy($request->user()->id, $request->param()));
     }
 
     /**
@@ -265,7 +273,7 @@ class User extends CatchController
         return CatchResponse::success($this->user->getAreaIdBy());
     }
 
-    
+
     /**
      *
      * @time 2019年12月07日
@@ -274,10 +282,10 @@ class User extends CatchController
      */
     public function getUserByDepart($depart_id): \think\response\Json
     {
-        
+
         return CatchResponse::success($this->user->getUserByDepart($depart_id));
     }
-    
+
     /**
      * 获取推送用户
      */

catch/permissions/database/migrations/20191128114204_users.php

@@ -28,28 +28,29 @@ class Users extends Migrator
      */
     public function change()
     {
-        $table  =  $this->table('users',array('engine'=>'Innodb', 'comment' => '用户表', 'signed' => false));
-        $table->addColumn('username', 'string',array('null'=>true,'limit'  =>  20,'default'=>'','comment'=>'用户名'))
-            ->addColumn('password', 'string',array('null' => true,'limit'  =>  255,'comment'=>'用户密码'))
-            ->addColumn('sex', 'integer',['null'=>true,'default' => 0, 'comment'=>'性别'])
-            ->addColumn('email', 'string',array('null'=>true,'limit'  =>  100, 'comment'=>'邮箱 登录'))
-            ->addColumn('idcard', 'string',array('null'=>true,'limit'  =>  20, 'comment'=>'身份证'))
-            ->addColumn('user_no', 'string',array('null'=>true,'limit'  =>  20, 'comment'=>'用户编号'))
-            ->addColumn('department_id', 'integer',['null'=>true,'default' => 0, 'comment'=>'部门ID'])
-            ->addColumn('status', 'boolean',array('null'=>true,'limit'  =>  1,'default'=> 1,'comment'=>'用户状态 1 正常 2 禁用'))
-            ->addColumn('last_login_ip', 'string',array('null'=>true,'limit' => 50,'default'=>0,'comment'=>'最后登录IP'))
-            ->addColumn('last_login_time', 'integer',array('null'=>true,'default'=>0,'comment'=>'最后登录时间', 'signed' => false))
-            ->addColumn('wxmp_open_id', 'string', ['limit' => '30','null' => true,'signed' => true,'comment' => '微信小程序openid',])
-            ->addColumn('wx_open_id', 'string', ['limit' => '30','null' => true,'signed' => true,'comment' => '微信公众号openid',])
-            ->addColumn('wx_union_id', 'string', ['limit' => '50','null' => true,'signed' => true,'comment' => '微信unionid',])
-            ->addColumn('phone', 'string', ['null'=>true,'limit' => '20','null' => true,'signed' => true,'comment' => '手机号',])
-            ->addColumn('remember_token', 'string', ['limit' => 512,'default' => '','null'=>true,'comment' => '用户token'])
-            ->addColumn('realname', 'string', ['null'=>true,'default' => '', 'comment' => '姓名', 'limit' => 20])
-            ->addColumn('avatar', 'string', ['limit' => 255,'null'=>true,'default' => '','comment' => '用户头像','after' => 'email'])
-            ->addColumn('creator_id', 'integer',['null'=>true,'default' => 0, 'comment'=>'创建人ID'])
-            ->addColumn('created_at', 'integer', array('null'=>true,'default'=>0,'comment'=>'创建时间', 'signed' => false ))
-            ->addColumn('updated_at', 'integer', array('null'=>true,'default'=>0,'comment'=>'更新时间', 'signed' => false))
-            ->addColumn('deleted_at', 'integer', array('null'=>true,'default'=>0,'comment'=>'删除状态，0未删除 >0 已删除', 'signed' => false))
+        $table  =  $this->table('users', array('engine' => 'Innodb', 'comment' => '用户表', 'signed' => false));
+        $table->addColumn('username', 'string', array('null' => true, 'limit'  =>  20, 'default' => '', 'comment' => '用户名'))
+            ->addColumn('password', 'string', array('null' => true, 'limit'  =>  255, 'comment' => '用户密码'))
+            ->addColumn('sex', 'integer', ['null' => true, 'default' => 0, 'comment' => '性别'])
+            ->addColumn('email', 'string', array('null' => true, 'limit'  =>  100, 'comment' => '邮箱 登录'))
+            ->addColumn('idcard', 'string', array('null' => true, 'limit'  =>  20, 'comment' => '身份证'))
+            ->addColumn('user_no', 'string', array('null' => true, 'limit'  =>  20, 'comment' => '用户编号'))
+            ->addColumn('department_id', 'integer', ['null' => true, 'default' => 0, 'comment' => '部门ID'])
+            ->addColumn('status', 'boolean', array('null' => true, 'limit'  =>  1, 'default' => 1, 'comment' => '用户状态 1 正常 2 禁用'))
+            ->addColumn('last_login_ip', 'string', array('null' => true, 'limit' => 50, 'default' => 0, 'comment' => '最后登录IP'))
+            ->addColumn('last_login_time', 'integer', array('null' => true, 'default' => 0, 'comment' => '最后登录时间', 'signed' => false))
+            ->addColumn('wxmp_open_id', 'string', ['limit' => '30', 'null' => true, 'signed' => true, 'comment' => '微信小程序openid',])
+            ->addColumn('wx_open_id', 'string', ['limit' => '30', 'null' => true, 'signed' => true, 'comment' => '微信公众号openid',])
+            ->addColumn('wx_union_id', 'string', ['limit' => '50', 'null' => true, 'signed' => true, 'comment' => '微信unionid',])
+            ->addColumn('phone', 'string', ['null' => true, 'limit' => '20', 'null' => true, 'signed' => true, 'comment' => '手机号',])
+            ->addColumn('remember_token', 'string', ['limit' => 512, 'default' => '', 'null' => true, 'comment' => '用户token'])
+            ->addColumn('realname', 'string', ['null' => true, 'default' => '', 'comment' => '姓名', 'limit' => 20])
+            ->addColumn('equ_password', 'string', array('null' => true, 'limit'  =>  255, 'comment' => '设备密码'))
+            ->addColumn('avatar', 'string', ['limit' => 255, 'null' => true, 'default' => '', 'comment' => '用户头像', 'after' => 'email'])
+            ->addColumn('creator_id', 'integer', ['null' => true, 'default' => 0, 'comment' => '创建人ID'])
+            ->addColumn('created_at', 'integer', array('null' => true, 'default' => 0, 'comment' => '创建时间', 'signed' => false))
+            ->addColumn('updated_at', 'integer', array('null' => true, 'default' => 0, 'comment' => '更新时间', 'signed' => false))
+            ->addColumn('deleted_at', 'integer', array('null' => true, 'default' => 0, 'comment' => '删除状态，0未删除 >0 已删除', 'signed' => false))
             ->create();
     }
 }

catch/permissions/model/Users.php

@@ -1,79 +1,84 @@
 <?php
+
 namespace catchAdmin\permissions\model;
 
+use catchAdmin\api\Listen;
 use catchAdmin\permissions\model\search\UserSearch;
 use catcher\base\CatchModel;
 use catcher\exceptions\FailedException;
 use catcher\Utils;
 use catchAdmin\permissions\model\DataRangScopeTrait;
 use think\facade\Db;
+
 class Users extends CatchModel
 {
     use HasRolesTrait;
     use HasJobsTrait;
     use UserSearch;
-     //权限过滤
-     use DataRangScopeTrait;
+    //权限过滤
+    use DataRangScopeTrait;
     protected $name = 'users';
 
     protected $field = [
-            'id', // 
-			'username', // 用户名
-			'password', // 用户密码
-			'email', // 邮箱 登录
-            'avatar', // 头像
-            'remember_token',
-            'creator_id', // 创建者ID
-            'department_id', // 部门ID
-			'status', // 用户状态 1 正常 2 禁用
-			'last_login_ip', // 最后登录IP
-			'last_login_time', // 最后登录时间
-			'created_at', // 创建时间
-			'updated_at', // 更新时间
-			'deleted_at', // 删除状态，0未删除 >0 已删除
-            'area_id', // 区域ID
-            'phone', // 手机号
-            'wxmp_open_id',
-            'wx_open_id',
-            'wx_union_id',
-            'school_id',
-            'grade_id',
-            'class_id',
-            'passive_rfid',
-            'realname',
-            'idcard',
-            'active_rfid',
-            'active_rfid_code',
-            'rfid_expire_date',
-            'student_no',
-            'card_status',
-            'rules_id',
-            'parents_id',
-            'sex',
-            'age',
-            'online_time',
-            'alarm_status',
-            'last_station_mac',
-            'birthday',
-            'addr',
-            'classes',
-            'manage_classes',
-            'subjects',
-            'card_type',
-            'student_type',
-            'student_status',
-            'voice',
-            'voice_size',
-            'voice_time',
-            'imei',
-            'battery_level',
-            'accesskey',
-            'secretkey',
-            'remark',
-            'dept_name',
-            'asset_admin',
-            'wifi_macs',
-            'user_no'
+        'id', // 
+        'username', // 用户名
+        'password', // 用户密码
+        'email', // 邮箱 登录
+        'avatar', // 头像
+        'remember_token',
+        'creator_id', // 创建者ID
+        'department_id', // 部门ID
+        'status', // 用户状态 1 正常 2 禁用
+        'last_login_ip', // 最后登录IP
+        'last_login_time', // 最后登录时间
+        'created_at', // 创建时间
+        'updated_at', // 更新时间
+        'deleted_at', // 删除状态，0未删除 >0 已删除
+        'area_id', // 区域ID
+        'phone', // 手机号
+        'wxmp_open_id',
+        'wx_open_id',
+        'wx_union_id',
+        'school_id',
+        'grade_id',
+        'class_id',
+        'passive_rfid',
+        'realname',
+        'idcard',
+        'active_rfid',
+        'active_rfid_code',
+        'rfid_expire_date',
+        'student_no',
+        'card_status',
+        'rules_id',
+        'parents_id',
+        'sex',
+        'age',
+        'online_time',
+        'alarm_status',
+        'last_station_mac',
+        'birthday',
+        'addr',
+        'classes',
+        'manage_classes',
+        'subjects',
+        'card_type',
+        'student_type',
+        'student_status',
+        'voice',
+        'voice_size',
+        'voice_time',
+        'imei',
+        'battery_level',
+        'accesskey',
+        'secretkey',
+        'remark',
+        'dept_name',
+        'asset_admin',
+        'wifi_macs',
+        'user_no',
+        //设备密码
+        'equ_password'
     ];
 
     /**
@@ -97,23 +102,23 @@ class Users extends CatchModel
      */
     public function getList(): \think\Paginator
     {
-        $no_display_roles = Db::table('roles')->whereIn('identify','personal,group_card_user,group_badge_user')->column('id');
+        $no_display_roles = Db::table('roles')->whereIn('identify', 'personal,group_card_user,group_badge_user')->column('id');
         $user = request()->user();
         $res = $this->dataRange()
-                    ->withoutField(['updated_at'], true)
-                    ->catchSearch()
-                    ->alias('u')
-                    ->join('user_has_roles r','u.id=r.uid')
-                    // ->distinct(true)
-                    ->group('u.id')
-                    ->where('u.id','<>',1) //超级管理员账号不显示
-                    ->where('u.id','<>',$user->id) //不显示自己
-                    ->whereNotIn('r.role_id',$no_display_roles)
-                    ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
-                    ->order($this->aliasField('id'), 'desc')
-                    ->paginate();
-                    // var_dump($this->getLastSql());
-                    return $res;
+            ->withoutField(['updated_at'], true)
+            ->catchSearch()
+            ->alias('u')
+            ->join('user_has_roles r', 'u.id=r.uid')
+            // ->distinct(true)
+            ->group('u.id')
+            ->where('u.id', '<>', 1) //超级管理员账号不显示
+            ->where('u.id', '<>', $user->id) //不显示自己
+            ->whereNotIn('r.role_id', $no_display_roles)
+            ->catchLeftJoin(Department::class, 'id', 'department_id', ['department_name'])
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+        // var_dump($this->getLastSql());
+        return $res;
     }
 
     /**
@@ -142,8 +147,8 @@ class Users extends CatchModel
 
         return array_unique($permissionIds);
     }
-	
-	 /**
+
+    /**
      * 后台根据权限标识判断用户是否拥有某个权限
      * @param string $permission_mark
      * @return bool
@@ -156,12 +161,12 @@ class Users extends CatchModel
     public function can($permission_mark)
     {
         // 超级管理员直接返回true
-        if (Utils::isSuperAdmin()){
+        if (Utils::isSuperAdmin()) {
             return true;
         }
         // 查询当前用户的权限
         return in_array(
-            Permissions::where('permission_mark',$permission_mark)->value('id') ? : 0,
+            Permissions::where('permission_mark', $permission_mark)->value('id') ?: 0,
             $this->getPermissionsBy()
         );
     }
@@ -179,23 +184,22 @@ class Users extends CatchModel
      */
     public function getUserByDepart($value)
     {
-        
+
         return $this
-                ->where('department_id', $value)
-                ->field('id as value,username as text')
-                ->select();
+            ->where('department_id', $value)
+            ->field('id as value,username as text')
+            ->select();
     }
-    
+
     /**
      * 根据多个部门ID获取用户Ids
      */
     public function getUserByDepartIds($value)
     {
-        
+
         return $this
-                ->whereIn('department_id', $value)
-                ->column('id');
-               
+            ->whereIn('department_id', $value)
+            ->column('id');
     }
 
     /**
@@ -204,21 +208,21 @@ class Users extends CatchModel
     public function getPushUserList()
     {
         // 查出非家长、学生角色id
-        $allowed_roles = Db::table('roles')->whereNotIn('identify',['personal','group_card_user','group_badge_user'])->column('id');
+        $allowed_roles = Db::table('roles')->whereNotIn('identify', ['personal', 'group_card_user', 'group_badge_user'])->column('id');
         $allowed_roles_text = join(',', $allowed_roles);
         // 查出有这些角色的用户信息
         $res = $this->dataRange()
-                    ->catchSearch()
-                    ->alias('u')
-                    ->field('u.*')
-                    ->where('u.id','<>',1) //超级管理员账号不显示
-                    ->distinct(true)
-                    ->join('user_has_roles uhr', "uhr.role_id in ({$allowed_roles_text}) and uhr.uid = u.id")
-                    ->select()
-                    ->toArray();
+            ->catchSearch()
+            ->alias('u')
+            ->field('u.*')
+            ->where('u.id', '<>', 1) //超级管理员账号不显示
+            ->distinct(true)
+            ->join('user_has_roles uhr', "uhr.role_id in ({$allowed_roles_text}) and uhr.uid = u.id")
+            ->select()
+            ->toArray();
         // 非管理员，可能存在是管理员添加的账号，查不到自己，追加自己
         // var_dump($this->getLastSql());
-        if (!Utils::isSuperAdmin()){
+        if (!Utils::isSuperAdmin()) {
             $has_self = false;
             foreach ($res as $user) {
                 if ($user['id'] == request()->user()->id) {
@@ -231,4 +235,81 @@ class Users extends CatchModel
         }
         return $res;
     }
+    //下发设备
+    /**
+     * @Descripttion: 将用户下发给设备
+     * @name: likang
+     * @param {*} $user 用户数组
+     * @return {*}
+     */
+    public function equUserUpdate($user)
+    {
+        $roleid = [7, 9, 10];
+        $content = null;
+        $equ_user = [];
+        $where = [];
+        $wheres = [];
+        $permissions = null;
+        $where[] = ['uid', '=', $user['id']];
+        $where[] = ['role_id', 'in', $roleid];
+        $wheres[] = ['ContentType', '=', 'Users'];
+        $wheres[] = ['ContentId', '=', $user['id']];
+        $data = Db::name('user_has_roles')->where($where)->find();
+        $pubulish =  Db::name('publish')->where($wheres)->find();
+        $time = msectime();
+        //是否存在该设备
+        if ($data) {
+            if ($data['role_id'] == 7) {
+                $permissions = 10;
+            } else if ($data['role_id'] == 9) {
+                $permissions = 11;
+            } else if ($data['role_id'] == 10) {
+                $permissions = 12;
+            }
+
+            $equ_user = [
+                'id' => intval($user['id']),
+                'name' => strval($user['username']),
+                'pwd' => strval($user['equ_password']),
+                'perm' => intval($permissions)
+            ];
+            //判断下发的数据库中是否存在
+            if ($pubulish) {
+                $content = [
+                    'Type' => 'update',
+                    'ContentType' => 'Users',
+                    'ContentId' => $user['id'],
+                    'Version' => $time,
+                    'Status' => 1,
+                    'Content' => json_encode($equ_user)
+                ];
+                Db::name('publish')->where($wheres)->update($content);
+            } else {
+
+                $content = [
+                    'Type' => 'add',
+                    'ContentType' => 'Users',
+                    'ContentId' => $user['id'],
+                    'Version' => $time,
+                    'AddTime' => $time,
+                    'Status' => 1,
+                    'Content' => json_encode($equ_user)
+                ];
+                Db::name('publish')->save($content);
+            }
+        } else {
+            if ($pubulish) {
+
+                $content = [
+                    'Type' => 'delete',
+                    'Version' => $time,
+                    'Status' => 1,
+                    'Content' => json_encode($data)
+                ];
+                Db::name('publish')->where($wheres)->update($content);
+            }
+        }
+
+        return;
+    }
 }

catch/wind/model/Fan.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-05-27 13:34:31
  * @LastEditors: likang
- * @LastEditTime: 2022-07-07 11:00:49
+ * @LastEditTime: 2022-07-09 14:43:53
  */
 
 namespace catchAdmin\wind\model;
@@ -83,9 +83,9 @@ class Fan extends Model
         $data = null;
         $content = null;
         $data = [
-            'id' => $obj->id,
-            'wind_number' => Wind::where('id', $obj->wind_id)->value('number'),
-            'number' => $this->number,
+            'id' => intval($obj->id),
+            'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
+            'number' => intval($this->number),
         ];
         $content['data'] = $data;
         $content['type'] = 'Fan';

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,13 +151,13 @@ class Worklocation extends Model
         $data = null;
         $content = null;
         $data = [
-            'id' => $obj->wind_id . $obj->fan_id . $obj->fan_model . $obj->parts . $obj->work_local,
-            'wind_number' => $obj->id,
-            'fan_number' => Wind::where('id', $obj->wind_id)->value('number'),
-            'fan_model'  => ModelDeviceMold::where('device_type', 4)->where('id', $this->fan_model)->value('name'),
+            '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),
-            'fan_number' => Fan::where('id', $obj->fan_id)->value('number'),
-            'bolt_num' => $this->bolt_num,
+            'work' => $this->get_dict_data(2, $obj->work_local),
+            'bnum' => $this->bolt_num,
             'torque' => $this->torque
         ];
         $content['data'] = $data;

catch/worklocation/model/Workplan.php

@@ -55,10 +55,19 @@ class Workplan extends Model
         $content = null;
         $data = [
             'id' => $obj->id,
-            'plan_number' => $obj->id,
-            'wind_number' => Wind::where('id', $obj->wind_id)->value('number'),
-            'wind_name' => Wind::where('id', $obj->wind_id)->value('name'),
-            'fan_number' => Fan::where('id', $obj->wind_id)->value('number'),
+            'pnum' => $obj->id,
+            'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
+            'wname' => Wind::where('id', $obj->wind_id)->value('name'),
+            'fnum' => Fan::where('id', $obj->wind_id)->value('number'),
+            'fmode' => $obj->id,
+            'work' => $obj->work_sign,
+            'bm' => $obj->id,
+            'bn' => $obj->id,
+            'tm' => $obj->id,
+            'bias' => $obj->id,
+            'lt' => $obj->id,
+            'torque' => $obj->id
+
         ];
         $content['data'] = $data;
         $content['type'] = 'WorkPlan';

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');