likang

app/common.php

@@ -346,3 +346,13 @@ function msectime()
     $msectime = (float)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
     return $msectime;
 }
+
+/**
+ * @Descripttion:  优化json字符串
+ * @name: likang
+ * @return {*}
+ */
+function optimize_json($tempResult)
+{
+    return  preg_replace('/[\x00-\x1F\x80-\x9F]/u', '', trim($tempResult));
+}

catch/api/Directive.php

@@ -0,0 +1,62 @@
+<?php
+/*
+ * @Descripttion: 定制下发指令
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-07-28 14:39:11
+ * @LastEditors: likang
+ * @LastEditTime: 2022-07-28 16:28:16
+ */
+
+namespace catchAdmin\api;
+
+use catcher\Utils;
+use think\facade\Db;
+
+class Directive
+{
+    /**
+     * @Descripttion: 下发指令
+     * @name: likang
+     * @param {*} $type 1 全部 2 部分
+     * @param {*} $data  下发内容
+     * @param {*} $order 指令类型
+     * @param {*} $imei  数组 或者字符串
+     * @return {*}
+     */
+    public static function Issued($type, $data, $order, $imei = '')
+    {
+
+
+        if ($type == 1) {
+            $msetime = msectime();
+            $cont = [
+                'Type' => 'directive',
+                'ContentType' => $order,
+                'Content' => json_encode($data),
+                'ContentId' => md5(time() . mt_rand(1, 1000000)),
+                'AddTime' => $msetime,
+                'Version' => $msetime,
+                'Status' => 2
+            ];
+            Db::name('publish')->save($cont);
+        } else {
+
+            $imei =  is_array($imei) ? $imei : Utils::stringToArrayBy($imei);
+            foreach ($imei as $item) {
+                $msetime = msectime();
+                $cont = [
+                    'Type' => 'directive',
+                    'ContentType' => $order,
+                    'Content' => json_encode($data),
+                    'ContentId' => md5(time() . mt_rand(1, 1000000)),
+                    'AddTime' => $msetime,
+                    'Version' => $msetime,
+                    'Imei' => $item,
+                    'Status' => 2
+                ];
+                Db::name('publish')->save($cont);
+            }
+        }
+    }
+}

catch/hydraulic/controller/HydEquipment.php

@@ -13,6 +13,7 @@ use catchAdmin\hydraulic\model\Hydraulic;
 use catchAdmin\hydraulic\model\Wrench;
 use catchAdmin\system\model\SysDictData;
 use catcher\base\CatchRequest;
+use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpParser\Node\Stmt\Catch_;
 use think\facade\Db;
 
@@ -300,4 +301,113 @@ class HydEquipment extends CatchController
         }
         return CatchResponse::success($list);
     }
+    /**
+     * @Descripttion: 获取不同类型的设备
+     * @name: likang
+     * @return {*}
+     */
+    public function getAllHydEqu(Request $request)
+    {
+        $data = $request->get();
+        $type = $data['type'];
+
+        $list =  $this->hydEquipmentModel->where('equipment_type', $type)->field('id as value,name as text')->select();
+        return CatchResponse::success($list);
+    }
+
+
+
+    public function importStores(Request $request)
+    {
+        $url = $request->post('url');
+        if (!$url) {
+            return CatchResponse::fail('请上传文件');
+        }
+        $brand_id = $request->post('brand_id');
+        if (!$brand_id) {
+            return CatchResponse::fail('请选择品牌');
+        }
+        $creator_id = $request->post('creator_id');
+        //解析地址
+        $parse_url = parse_url($url)['path'];
+        //载入excel表格 
+        $objPHPExcel = IOFactory::load(public_path() . $parse_url);
+        // var_dump($objPHPExcel);
+        //获取表名，一维数组，值是表名。如：array('sheet1', 'sheet2', 'sheet3')
+        // $nameArr = $objPHPExcel->getSheetNames();
+        // var_dump($nameArr);
+        //获取表的数量
+        $sheetCount = $objPHPExcel->getSheetCount();
+        $fail = 0; //失败条数
+        $success = 0; //成功条数
+        $total = 0; //总导入数
+        $excel_data = [];
+        //循环读取每一张表
+        for ($index = 0; $index < $sheetCount; $index++) {
+            //设置当前要读取的表
+            $sheet = $objPHPExcel->getSheet($index);   //excel中的第一张sheet
+            // var_dump($sheet);exit;
+            $highestRow  = $sheet->getHighestRow();       // 取得总行数
+            // var_dump($highestRow);
+            if ($highestRow <= 2) {
+                continue;
+            }
+            $total += $highestRow - 3;
+            for ($j = 4; $j <= $highestRow - 1; $j++) {
+                $data = array(); //每条门店信息
+                $name = trim($sheet->getCell("B" . $j)->getFormattedValue());  //门店名称
+                $city_name = trim($sheet->getCell("C" . $j)->getFormattedValue());  //市区
+                $area_name = trim($sheet->getCell("D" . $j)->getFormattedValue());  //县区
+                $street = trim($sheet->getCell("E" . $j)->getFormattedValue());  //街道办
+                $address = trim($sheet->getCell("F" . $j)->getFormattedValue());  //详细地址
+                $longitude = trim($sheet->getCell("G" . $j)->getFormattedValue());  //经度
+                $latitude = trim($sheet->getCell("H" . $j)->getFormattedValue());  //维度
+                $category = trim($sheet->getCell("I" . $j)->getFormattedValue());  //门店类别
+                if ($category == '直营店') {
+                    $mendian = '1';
+                }
+                if ($category == '经销商') {
+                    $mendian = '2';
+                }
+                if ($category == '加盟店') {
+                    $mendian = '3';
+                }
+                $principal = trim($sheet->getCell("J" . $j)->getFormattedValue());  //店长
+                $mobile = trim($sheet->getCell("K" . $j)->getFormattedValue());  //电话
+                if (!$name) {
+                    $fail++;
+                    $msg = '导入第' . $j . '行门店失败：门店名称不存在';
+                    $this->importFailLog($msg);
+                    continue;
+                }
+                $data = array(
+                    'department_name' => $name,
+                    'brand_id' => $brand_id,
+                    'area_id' => Db::table('area')->whereLike('area_name', $area_name)->value('id'),
+                    'street' => $street,
+                    'address' => $address,
+                    'status' => 1, //正常
+                    'longitude' => $longitude,
+                    'latitude' => $latitude,
+                    'category' => $mendian,
+                    'principal' => $principal,
+                    'mobile' => $mobile,
+                    'reserve_num' => 999, //预约剩余数
+                    'creator_id'      => $creator_id,
+                    'created_at' => time(),
+                    'updated_at' => time()
+                );
+                array_push($excel_data, $data);
+            }
+        }
+        // var_dump($excel_data);
+        // return CatchResponse::success();
+        //防止Excel有重复，去重
+        array_unique($excel_data, SORT_REGULAR);
+        if ($count = $this->department->limit(100)->insertAll($excel_data)) {
+            return CatchResponse::success('共' . $total . '条数据,成功' . $count . '条，失败' . $fail . '条');
+        }
+        return CatchResponse::success(['error' => true, 'msg' => '导入失败']);
+        // return CatchResponse::success('共' . $total . '条数据,成功' . $success . '条，失败' . $fail . '条');
+    }
 }

catch/hydraulic/model/HydEquipment.php

@@ -187,4 +187,18 @@ class HydEquipment extends Model
             return null;
         }
     }
+
+
+
+    /**
+     * @Descripttion: 上传excel 信息
+     * @name: likang
+     * @return {*}
+     */
+    public function  importExcel()
+    {
+    }
+    public function  exportExcel()
+    {
+    }
 }

catch/hydraulic/model/MaintenanceMapper.php

@@ -103,11 +103,13 @@ class maintenancemapper extends Model
             $content['data'] = $data;
             $content['type'] = 'WorkingParts';
         } else if ($obj->device_type == 2) {
+            $fmodel = Db::name('device_mold')->where('id', $obj->fan_model)->value('name');
+            $parts = $this->where('device_type', 1)->where('value', $obj->parts)->value('name');
             $data = [
                 'id' => $obj->id,
-                'fmodel' => Db::name('device_mold')->where('id', $obj->fan_model)->value('name'),
+                'fmodel' =>  $fmodel ? $fmodel : '',
                 'name' => $obj['name'],
-                'Parts' => $this->where('device_type', 1)->where('value', $obj->parts)->value('name')
+                'Parts' => $parts ? $parts : ''
             ];
             $content['data'] = $data;
             $content['type'] = 'WorkingPosition';

catch/hydraulic/model/Wrench.php

@@ -151,11 +151,11 @@ class Wrench extends Model
             'number' => $obj->number,
             'qualified' => intval($obj->checked_res) ? 1 : 1,
             '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),
+            'minp' => (float)$obj->min_pressure,
+            'maxp' => (float)$obj->max_pressure,
+            'maxt' => (float)$obj->max_torque,
+            'mint' => (float)$obj->min_torque,
+            'angres' => (float)$obj->angular_resolution,
             'clt' => date('Y-m-d', $Hyd['check_last_time']),
             'model' => strval($Hyd['equipment_model']),
             'fixed' => strval($Hyd['fixed_asset_number'])

catch/hydraulic/route.php

@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Descripttion: 
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-05-27 13:34:31
+ * @LastEditors: likang
+ * @LastEditTime: 2022-07-26 17:13:59
+ */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
 // +----------------------------------------------------------------------
@@ -10,7 +18,7 @@
 // +----------------------------------------------------------------------
 
 // you should use `$router`
-$router->group(function () use ($router){
+$router->group(function () use ($router) {
 	// hydraulic路由
 	$router->resource('hydraulic', '\catchAdmin\hydraulic\controller\Hydraulic');
 	// deviceMold路由
@@ -19,16 +27,18 @@ $router->group(function () use ($router){
 	// wrench路由
 	$router->resource('wrench', '\catchAdmin\hydraulic\controller\Wrench');
 	//获取维保记录映射
-	 $router->get('get_mainten_option', '\catchAdmin\hydraulic\controller\Maintenance@getMaintenOption');
+	$router->get('get_mainten_option', '\catchAdmin\hydraulic\controller\Maintenance@getMaintenOption');
 	$router->resource('maintenance_mapper', '\catchAdmin\hydraulic\controller\Maintenance');
 	// 扳手校验路由
 	$router->resource('wrenchCheckRecord', '\catchAdmin\hydraulic\controller\WrenchCheckRecord');
 	$router->get('wrenchCheckRecordData', '\catchAdmin\hydraulic\controller\WrenchCheckRecord@decordDataList');
 	// 液压设备路由
 	$router->resource('hydEquipment', '\catchAdmin\hydraulic\controller\HydEquipment');
+	//获取类型获取设备
+	$router->get('getAllHydEqu', '\catchAdmin\hydraulic\controller\HydEquipment@getAllHydEqu');
 	//获取所有设备状态字典
 	$router->get('getHydEquipmentType', '\catchAdmin\hydraulic\controller\HydEquipment@getHydEquipmentType');
 	//智能仓储路由
 	$router->resource('storageEquipment', '\catchAdmin\hydraulic\controller\StorageEquipment');
 	$router->get('getTotalByEquipmentType', '\catchAdmin\hydraulic\controller\HydEquipment@getTotalByEquipmentType');
-})->middleware('auth');
+})->middleware('auth');

catch/system/controller/Lssue.php

@@ -0,0 +1,93 @@
+<?php
+/*
+ * @Descripttion: 
+ * @version: 1.0.0
+ * @Author: likang
+ * @Date: 2022-07-26 16:16:11
+ * @LastEditors: likang
+ * @LastEditTime: 2022-07-28 17:47:29
+ */
+
+namespace catchAdmin\system\controller;
+
+use catchAdmin\api\Directive;
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\system\model\Lssue as lssueModel;
+
+class Lssue extends CatchController
+{
+    protected $lssueModel;
+
+    public function __construct(LssueModel $lssueModel)
+    {
+        $this->lssueModel = $lssueModel;
+    }
+
+    /**
+     * 列表
+     * @time 2022年07月26日 16:16
+     * @param Request $request 
+     */
+    public function index(Request $request): \think\Response
+    {
+        return CatchResponse::paginate($this->lssueModel->getList());
+    }
+
+    /**
+     * 保存信息
+     * @time 2022年07月26日 16:16
+     * @param Request $request 
+     */
+    public function save(Request $request): \think\Response
+    {
+        $data = $request->post();
+        $this->lssueModel->storeBy($request->post());
+        $content = [
+            'type' => $data['type'],
+            'file_name' => $data['file_name'],
+            'equ_ids' => $data['equ_ids']
+        ];
+
+
+
+
+
+
+        // Directive::Issued($data['type'],);
+        $this->lssueModel->IssueAll($content);
+        return CatchResponse::success();
+    }
+
+    /**
+     * 读取
+     * @time 2022年07月26日 16:16
+     * @param $id 
+     */
+    public function read($id): \think\Response
+    {
+        return CatchResponse::success($this->lssueModel->findBy($id));
+    }
+
+    /**
+     * 更新
+     * @time 2022年07月26日 16:16
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id): \think\Response
+    {
+        return CatchResponse::success($this->lssueModel->updateBy($id, $request->post()));
+    }
+
+    /**
+     * 删除
+     * @time 2022年07月26日 16:16
+     * @param $id
+     */
+    public function delete($id): \think\Response
+    {
+        return CatchResponse::success($this->lssueModel->deleteBy($id, true));
+    }
+}

catch/system/database/migrations/20220726161632_lssue.php

@@ -0,0 +1,42 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class Lssue 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('lssue', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '自定义下发指令' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('file_name', 'text', ['limit' => MysqlAdapter::TEXT_REGULAR,'null' => true,'signed' => true,'comment' => '文件内容',])
+			->addColumn('equ_ids', 'text', ['limit' => MysqlAdapter::TEXT_REGULAR,'null' => true,'signed' => true,'comment' => '所有设备',])
+			->addColumn('type', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'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/system/model/Lssue.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace catchAdmin\system\model;
+
+use catchAdmin\hydraulic\model\HydEquipment;
+use catchAdmin\hydraulic\model\Hydraulic;
+use catcher\base\CatchModel as Model;
+use think\facade\Db;
+
+class Lssue extends Model
+{
+    // 表名
+    public $name = 'lssue';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 内容
+        'file_name',
+        // 所有设备
+        'equ_ids',
+        // 指令类型
+        'type',
+        //指令类型
+        'directive',
+        //详情
+        'info',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+    public function setEquIdsAttr($value)
+    {
+        $data = json_encode($value);
+        return $data;
+    }
+    public function getEquIdsAttr()
+    {
+        $data =  $this->getData('equ_ids');
+        return json_decode($data, true);
+    }
+    /**
+     * @Descripttion: 下发指令
+     * @name: likang
+     * @return {*}
+     */
+    public function IssueAll($data)
+    {
+        $type = $data['type'];
+
+        $content = [
+            'file_name' => $data['file_name']
+        ];
+
+
+        if ($type == 1) {
+            $msetime = msectime();
+            $cont = [
+                'Type' => 'directive',
+                'ContentType' => 'File',
+                'Content' => json_encode($content),
+                'ContentId' => md5(time() . mt_rand(1, 1000000)),
+                'AddTime' => $msetime,
+                'Version' => $msetime,
+                'Status' => 2
+            ];
+            Db::name('publish')->save($cont);
+        }
+        if ($type == 2) {
+            $list = HydEquipment::alias('e')->leftJoin('hydraulic h', 'e.id = h.eq_id')
+                ->where('e.id', 'in', $data['equ_ids'])->field('h.imei as imei')->select()->toArray();
+
+            foreach ($list as $item) {
+
+                if (!$item['imei']) {
+                    continue;
+                } else {
+                    $msetime = msectime();
+                    $cont = [
+                        'Type' => 'directive',
+                        'ContentType' => 'File',
+                        'Content' => json_encode($content),
+                        'ContentId' => md5(time() . mt_rand(1, 1000000)),
+                        'AddTime' => $msetime,
+                        'Version' => $msetime,
+                        'Imei' => $item['imei'],
+                        'Status' => 2
+                    ];
+                    Db::name('publish')->save($cont);
+                }
+            }
+        }
+    }
+}

catch/system/route.php

@@ -13,8 +13,9 @@ $router->group(function () use ($router) {
     $router->get('table/view/<table>', '\catchAdmin\system\controller\DataDictionary@view');
     $router->post('table/optimize', '\catchAdmin\system\controller\DataDictionary@optimize');
     $router->post('table/backup', '\catchAdmin\system\controller\DataDictionary@backup');
+    //下发设备
+    $router->resource('lssue', '\catchAdmin\system\controller\Lssue');
 
-    
     // 附件
     $router->resource('attachments', '\catchAdmin\system\controller\Attachments');
 
@@ -40,7 +41,6 @@ $router->group(function () use ($router) {
     $router->put('modules/<module>', '\catchAdmin\system\controller\Module@disOrEnable');
     $router->put('cache/modules', '\catchAdmin\system\controller\Module@cache');
     $router->delete('clear/modules', '\catchAdmin\system\controller\Module@clear');
-
 })->middleware('auth');
 
 // 上传
@@ -56,11 +56,12 @@ $router->group('upload', function () use ($router) {
 
 // sysDictType路由
 $router->group('sysDictType', function () use ($router) {
-	$router->resource('/', '\catchAdmin\system\controller\SysDictType');
-   
+    $router->resource('/', '\catchAdmin\system\controller\SysDictType');
 });
 // sysDictData路由
 $router->group('sysDictData', function () use ($router) {
     $router->resource('/', '\catchAdmin\system\controller\SysDictData');
     $router->post('getOptions', '\catchAdmin\system\controller\SysDictData@getOptionsByCode');
-});
+    // lssue路由
+
+});

catch/wind/model/Fan.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-05-27 13:34:31
  * @LastEditors: likang
- * @LastEditTime: 2022-07-23 18:21:02
+ * @LastEditTime: 2022-07-26 15:07:54
  */
 
 namespace catchAdmin\wind\model;
@@ -85,12 +85,13 @@ class Fan extends Model
 
         $data = null;
         $content = null;
-
+        $wind_number = Wind::where('id', $obj->wind_id)->value('number');
+        $model_name = ModelDeviceMold::where('device_type', 4)->where('id', $obj->fan_model)->value('name');
         $data = [
             'id' => intval($obj->id),
-            'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
+            'wnum' =>  $wind_number ? $wind_number : 0,
             'number' => strval($this->number),
-            'model' => ModelDeviceMold::where('device_type', 4)->where('id', $obj->fan_model)->value('name')
+            'model' =>  $model_name ? $model_name : ""
 
         ];
         $content['data'] = $data;

catch/worklocation/model/Workplan.php

@@ -67,21 +67,25 @@ class Workplan extends Model
         $content = null;
         $fan = Fan::where('id', $obj->fan_id)->find();
         $fan_model = DeviceMold::where('id', $fan['fan_model'])->value('name');
+        $wnum = Wind::where('id', $obj->wind_id)->value('number');
+        $wname = Wind::where('id', $obj->wind_id)->value('name');
+        $parts = ModelMaintenancemapper::where('device_type', 1)->where('value', $this->parts_sign)->value('name');
+        $work = ModelMaintenancemapper::where('device_type', 2)->where('value', $this->work_sign)->value('name');
+        $bm = ModelMaintenancemapper::where('device_type', 4)->where('value', $this->boit_type_sign)->value('name');
         $data = [
             'id' => $obj->id,
             'pnum' => $obj->plan_number,
-            'wnum' => Wind::where('id', $obj->wind_id)->value('number'),
-            'wname' => Wind::where('id', $obj->wind_id)->value('name'),
+            'wnum' => $wnum ? $wnum : '',
+            'wname' => $wname ? $wname : '',
             'fnum' => $fan['number'],
-            'fmodel' => $fan_model,
-            'parts' => ModelMaintenancemapper::where('device_type', 1)->where('value', $this->parts_sign)->value('name'),
-            'work' => ModelMaintenancemapper::where('device_type', 2)->where('value', $this->work_sign)->value('name'),
-            'bm' => ModelMaintenancemapper::where('device_type', 4)->where('value', $this->boit_type_sign)->value('name'),
+            'fmodel' => $fan_model ? $fan_model : '',
+            'parts' =>  $parts ? $parts : " ",
+            'work' =>  $work ? $work : '',
+            'bm' => $bm ? $bm : '',
             'bn' => intval($obj->bolt_num),
             'tm' => $obj->tighten_mode,
             'bias' => intval($obj->bias),
-
-            'lt' => 110,
+            'lt' => 0,
             'torque' => $obj->torque,
             'info' => $obj->info
         ];