修改

catch/device/controller/Station.php

@@ -35,20 +35,9 @@ class Station extends CatchController
      */
     public function index(Request $request) 
     {
-        // $field = $request->get('field')?:'id';
-        // $order = $request->get('order')?:'desc';
-        // $where=[];
-        // $param=$request->param();
-        // if($param['shortcode']){
-        //     $where[]=['a.DEVICE_CODE','like','%'.$param['shortcode'].'%'];
-        // }
-        // if($param['name']){
-        //     $where[]=['a.DEVICE_NAME','like','%'.$param['name'].'%'];
-        // }
 
-        // return CatchResponse::paginate($this->stationModel->getStationList($field,$order,$where));
             $param=$request->param();
-            // var_dump($param);
+ 
             $cond=[];
             if($param['shortcode']){
                 $cond['a.DEVICE_CODE']=['like',$param['shortcode']];
@@ -62,20 +51,15 @@ class Station extends CatchController
             $cond['page']=isset($param['page'])?$param['page']:1;
             $cond['limit']=isset($param['limit'])?$param['limit']:10;
             $rows=queryOracleSelect('(SELECT * FROM DSSC2.ADM_DEV  ORDER BY ID DESC) a',$cond,'a.ID,a.IS_ONLINE,a.LOGIN_NAME,a.DEVICE_CODE,a.DEVICE_NAME,a.OWNER_CODE,a.DEVICE_IP,a.DEVICE_PORT,to_char(a.CREATE_DATE,\'yyyy-mm-dd hh24:mi:ss\') CREATE_DATE');
-            
-            
             foreach($rows as &$val){
-                // $val['DEVICE_NAME'] = mb_convert_encoding($val['DEVICE_NAME'], 'UTF-8', 'GBK');
                 $val['IS_ONLINE_TEXT']=$val['IS_ONLINE']?'在线':'离线';
-                // $val['UPDATE_DATE'] = mb_convert_encoding($val['UPDATE_DATE'], 'UTF-8', 'GBK');
-                // $val['CREATE_DATE'] = mb_convert_encoding($val['CREATE_DATE'], 'UTF-8', 'GBK');
                 $findCond=[
                     'DEVICE_CODE'=>['=',$val['DEVICE_CODE']]
                 ];
                 $info=queryOracleFind('DSSC2.ADM_DEV_RFID_CHN',$findCond);
                 $val['longitude']=$info['GPS_X'];
                 $val['latitude']=$info['GPS_Y'];
-               
+
             }
             
             $response=[

catch/yunying/controller/KeyPersonnel.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace catchAdmin\yunying\controller;
+
+use catcher\base\CatchRequest as Request;
+use catcher\CatchResponse;
+use catcher\base\CatchController;
+use catchAdmin\yunying\model\KeyPersonnel as keyPerSonnelModel;
+use catcher\Utils;
+use catcher\library\excel\Excel;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use think\facade\Env;
+use think\facade\Db;
+class KeyPersonnel extends CatchController
+{
+    protected $keyPerSonnelModel;
+    
+    public function __construct(KeyPerSonnelModel $keyPerSonnelModel)
+    {
+        $this->keyPerSonnelModel = $keyPerSonnelModel;
+    }
+    
+    /**
+     * 列表
+     * @time 2022年10月25日 11:27
+     * @param Request $request 
+     */
+    public function index(Request $request) : \think\Response
+    {
+        return CatchResponse::paginate($this->keyPerSonnelModel->getList());
+    }
+    
+    /**
+     * 保存信息
+     * @time 2022年10月25日 11:27
+     * @param Request $request 
+     */
+    public function save(Request $request) : \think\Response
+    {
+        // var_dump($request->post());
+        return CatchResponse::success($this->keyPerSonnelModel->storeBy($request->post()));
+    }
+    
+    /**
+     * 读取
+     * @time 2022年10月25日 11:27
+     * @param $id 
+     */
+    public function read($id) : \think\Response
+    {
+        return CatchResponse::success($this->keyPerSonnelModel->findBy($id));
+    }
+    
+    /**
+     * 更新
+     * @time 2022年10月25日 11:27
+     * @param Request $request 
+     * @param $id
+     */
+    public function update(Request $request, $id) : \think\Response
+    {
+        return CatchResponse::success($this->keyPerSonnelModel->updateBy($id, $request->post()));
+    }
+    
+    /**
+     * 删除
+     * @time 2022年10月25日 11:27
+     * @param $id
+     */
+    public function delete($id) : \think\Response
+    {
+        return CatchResponse::success($this->keyPerSonnelModel->deleteBy($id));
+    }
+
+    /**
+     * 导入车辆
+     *
+     * @time 2022年02月15日
+     * @param Excel $excel
+     * @param DeviceExport $deviceExport
+     * @throws \PhpOffice\PhpSpreadsheet\Exception
+     * @return \think\response\Json
+     */
+    public function importExcel(Request $request)
+    {
+        $url = $request->post('url');
+        if (!$url) {
+            return CatchResponse::fail('请上传文件');
+        }
+        $creator_id = $request->post('creator_id');
+        //解析地址
+        $parse_url = parse_url($url)['path'];
+        //载入excel表格 
+        $objPHPExcel = IOFactory::load(public_path() . $parse_url);
+        //获取表名，一维数组，值是表名。如：array('sheet1', 'sheet2', 'sheet3')
+        // $nameArr = $objPHPExcel->getSheetNames();
+        //获取表的数量
+        $sheetCount = $objPHPExcel->getSheetCount();
+        $fail = 0; //失败条数
+        $success = 0; //成功条数
+        $total = 0; //总共设备数
+        $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 <= 1) {
+                continue;
+            }
+            $card_type_id = Db::table("sys_dict_type")->where('code', 'CARD_TYPE_OPTION')->value('id');
+
+            $total += $highestRow - 1;
+            for ($j = 2; $j <= $highestRow; $j++) {
+                $arr = array(); //每条设备信息
+                $arr['name'] = strtoupper(trim($sheet->getCell("A" . $j)->getFormattedValue())); 
+                $arr['gender'] = strtoupper(trim($sheet->getCell("B" . $j)->getFormattedValue())); 
+                $card_type_text = strtoupper(trim($sheet->getCell("C" . $j)->getFormattedValue())); 
+                $arr['card_type'] = Db::table("sys_dict_data")->where('type_id', $card_type_id)->whereLike('value','%'.$card_type_text.'%')->cache(60)->value('code'); 
+                $arr['card_number'] = strtoupper(trim($sheet->getCell("D" . $j)->getFormattedValue())); 
+                $arr['rfid_sn'] = strtoupper(trim($sheet->getCell("E" . $j)->getFormattedValue())); 
+                $arr['address'] = strtoupper(trim($sheet->getCell("F" . $j)->getFormattedValue())); 
+                $arr['guardians_name'] = strtoupper(trim($sheet->getCell("G" . $j)->getFormattedValue())); 
+                $arr['guardians_gender'] = strtoupper(trim($sheet->getCell("H" . $j)->getFormattedValue())); 
+                $arr['guardians_phone'] = strtoupper(trim($sheet->getCell("I" . $j)->getFormattedValue())); 
+                $arr['guardians_address'] = strtoupper(trim($sheet->getCell("J" . $j)->getFormattedValue())); 
+                
+
+                array_push($data,$arr);
+            }
+        }
+        array_unique($data, SORT_REGULAR);
+        // // var_dump($data);return CatchResponse::success();
+        $success = $this->keyPerSonnelModel->limit(100)->insertAll($data);
+        if ($success) {
+
+            return CatchResponse::success('共' . $total . '条数据,成功' . $success . '条，失败' . ($total-$success) . '条');
+
+        }
+        return CatchResponse::success(['error' => true, 'msg' => '导入失败']);
+    }
+}

catch/yunying/database/migrations/20221025112752_key_personnel.php

@@ -0,0 +1,49 @@
+<?php
+
+use think\migration\Migrator;
+use think\migration\db\Column;
+use Phinx\Db\Adapter\MysqlAdapter;
+
+class KeyPersonnel 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('key_personnel', ['engine' => 'InnoDB', 'collation' => 'utf8mb4_general_ci', 'comment' => '重点人员档案' ,'id' => 'id','signed' => true ,'primary_key' => ['id']]);
+        $table->addColumn('name', 'string', ['limit' => 20,'null' => true,'signed' => true,'comment' => '姓名',])
+			->addColumn('gender', 'boolean', ['null' => true,'signed' => true,'comment' => '性别',])
+			->addColumn('card_type', 'string', ['limit' => 16,'null' => true,'signed' => true,'comment' => '证件类型',])
+			->addColumn('card_number', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '证件号码',])
+			->addColumn('address', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '地址',])
+			->addColumn('guardians_name', 'string', ['limit' => 20,'null' => true,'signed' => true,'comment' => '监护人姓名',])
+			->addColumn('guardians_gender', 'boolean', ['null' => true,'signed' => true,'comment' => '监护人性别',])
+			->addColumn('guardians_phone', 'string', ['limit' => 28,'null' => true,'signed' => true,'comment' => '监护人联系电话',])
+			->addColumn('guardians_address', 'string', ['limit' => 255,'null' => true,'signed' => true,'comment' => '监护人地址',])
+			->addColumn('rfid_sn', 'string', ['limit' => 32,'null' => false,'signed' => false,'comment' => '标签ID',])
+			->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/yunying/model/KeyPersonnel.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace catchAdmin\yunying\model;
+
+use catcher\base\CatchModel as Model;
+use catchAdmin\permissions\model\DataRangScopeTrait;
+use catchAdmin\system\model\SysDictData;
+class KeyPersonnel extends Model
+{
+    use DataRangScopeTrait;
+    // 表名
+    public $name = 'key_personnel';
+    // 数据库字段映射
+    public $field = array(
+        'id',
+        // 姓名
+        'name',
+        // 性别
+        'gender',
+        // 证件类型
+        'card_type',
+        // 证件号码
+        'card_number',
+        // 地址
+        'address',
+        
+        // 监护人姓名
+        'guardians_name',
+        // 监护人性别
+        'guardians_gender',
+        // 监护人联系电话
+        'guardians_phone',
+        // 监护人地址
+        'guardians_address',
+        'rfid_sn',
+        // 创建人ID
+        'creator_id',
+        // 创建时间
+        'created_at',
+        // 更新时间
+        'updated_at',
+        // 软删除
+        'deleted_at',
+    );
+
+    /**
+     * 列表
+     */
+    public function getList()
+    {
+        $res=$this->dataRange()
+            ->catchSearch()
+            ->append(['guardians_gender_text', 'gender_text','card_type_text'])
+            ->order($this->aliasField('id'), 'desc')
+            ->paginate();
+        return $res;
+    }
+
+    //根据姓名搜索
+    public function searchNameAttr($query, $value, $data)
+    {
+        return $query->where('name', 'like', '%' . $value . '%');
+    }
+
+    public function searchRfidSnAttr($query, $value, $data)
+    {
+        return $query->where('name', 'like', '%' . $value . '%');
+    }
+
+    public function getGuardiansGenderTextAttr($value){
+        $guardians_gender = $this->getData('guardians_gender');
+         return (new SysDictData())->getValueByCode('GENDER_OPTION', $guardians_gender) ?: '';
+    }
+
+    public function getGenderTextAttr($value){
+        $gender = $this->getData('gender');
+         return (new SysDictData())->getValueByCode('GENDER_OPTION', $gender) ?: '';
+    }
+    public function getCardTypeTextAttr($value){
+        $card_type = $this->getData('card_type');
+         return (new SysDictData())->getValueByCode('CARD_TYPE_OPTION', $card_type) ?: '';
+    }
+
+    public function getGenderAttr($value){
+        return (string)$value;
+    }
+    public function getGuardiansGenderAttr($value){
+        return (string)$value;
+    }
+}

catch/yunying/route.php

@@ -1,32 +1,36 @@
-<?php
-// +----------------------------------------------------------------------
-// | CatchAdmin [Just Like ～ ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
-// +----------------------------------------------------------------------
-// | Author: JaguarJack [ njphper@gmail.com ]
-// +----------------------------------------------------------------------
-
-// you should use `$router`
-$router->group(function () use ($router){
-	// vehicle路由
-	$router->post('vehicle/importVehicle', '\catchAdmin\yunying\controller\Vehicle@importVehicle');
-	$router->resource('vehicle', '\catchAdmin\yunying\controller\Vehicle');
-	
-	// 导出车辆
-	$router->post('export_vehicle', '\catchAdmin\yunying\controller\Vehicle@export_vehicle');
-	// vehicle_photo路由
-	$router->resource('vehicle_photo', '\catchAdmin\yunying\controller\VehiclePhoto');
-	// stolen_vehicle路由
-	$router->resource('stolen_vehicle', '\catchAdmin\yunying\controller\StolenVehicle');
-	// vehicle_brand路由
-	$router->resource('vehicle_brand', '\catchAdmin\yunying\controller\VehicleBrand');
-	// vehicle_color路由
-	$router->resource('vehicle_color', '\catchAdmin\yunying\controller\VehicleColor');
-	// insurance路由
-	$router->resource('insurance', '\catchAdmin\yunying\controller\Insurance');
-	// insureRecords路由
-	$router->resource('insureRecords', '\catchAdmin\yunying\controller\InsureRecords');
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
+// you should use `$router`
+$router->group(function () use ($router){
+	// vehicle路由
+	$router->post('vehicle/importVehicle', '\catchAdmin\yunying\controller\Vehicle@importVehicle');
+	$router->resource('vehicle', '\catchAdmin\yunying\controller\Vehicle');
+	
+	// 导出车辆
+	$router->post('export_vehicle', '\catchAdmin\yunying\controller\Vehicle@export_vehicle');
+	// vehicle_photo路由
+	$router->resource('vehicle_photo', '\catchAdmin\yunying\controller\VehiclePhoto');
+	// stolen_vehicle路由
+	$router->resource('stolen_vehicle', '\catchAdmin\yunying\controller\StolenVehicle');
+	// vehicle_brand路由
+	$router->resource('vehicle_brand', '\catchAdmin\yunying\controller\VehicleBrand');
+	// vehicle_color路由
+	$router->resource('vehicle_color', '\catchAdmin\yunying\controller\VehicleColor');
+	// insurance路由
+	$router->resource('insurance', '\catchAdmin\yunying\controller\Insurance');
+	// insureRecords路由
+	$router->resource('insureRecords', '\catchAdmin\yunying\controller\InsureRecords');
+	// keyPerSonnel路由
+	$router->resource('keyPersonnel', '\catchAdmin\yunying\controller\KeyPersonnel');
+	$router->post('keyPersonnel/importExcel', '\catchAdmin\yunying\controller\KeyPersonnel@importExcel');
+	
 })->middleware('auth');