first time

app/Console/Commands/ReadCommand.php

@@ -1,351 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Jobs\SendDataJob;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
-
-class ReadCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'command:readTXT';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '读取文件';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->tcpServer();
-        $this->info('Your command executed!');
-    }
-
-    //读取数据
-    public function readTxtForData()
-    {
-        $directory = env('PROCESS_DIR',null);
-        if(! $directory) {
-            echo '未找到日志文件位置,请确认工具运行位置,再进行配置！';die;
-        }
-
-        $newLogFile = storage_path().'/app/public/record_device.txt';
-//        $positionFile = storage_path().'/app/public/position_device.txt';
-
-        date_default_timezone_set("PRC");
-        $key = date("Y-m-d",time());
-        $position = Cache::get($key);
-
-        // 读取上次记录的位置
-        $lastPosition = 0;
-        if ($position) $lastPosition = $position;
-//        if (file_exists($positionFile)) {
-//            $lastPosition = intval(file_get_contents($positionFile));
-//        }
-
-        // 持续监视日志文件的变化
-        while (true) {
-            $key = date("Y-m-d",time());
-
-            //日志源 文件位置
-            $logFile = $directory . "/TesttoolLog" . $key . '.log';
-
-            // 检查文件是否有更新
-            clearstatcache(true, $logFile);
-            $currentFileSize = filesize($logFile);
-
-            echo "当前指针位置：$currentFileSize 上一次指针位置：$lastPosition \n";
-
-            if ($currentFileSize > $lastPosition) {
-                // 打开原始日志文件和新的日志文件
-                $fileHandle = fopen($logFile, 'r');
-                $newFileHandle = fopen($newLogFile, 'a'); // 使用追加模式打开新的日志文件
-
-                // 移动文件指针到上次记录的位置
-                fseek($fileHandle, $lastPosition);
-
-                // 逐行读取并处理新增内容
-                $read_data = [];
-                while (($line = fgets($fileHandle)) !== false) {
-                    // 提取Tag数字
-                    $pattern = '/Tag:(\d+)/';
-                    preg_match($pattern, $line, $matches);
-
-                    if (isset($matches[1])) {
-                        $tagNumber = $matches[1];
-                        echo "接收到的数据:" . $tagNumber . "\n";
-
-                        $read_data[] = $tagNumber;
-                        // 将Tag数字写入新的日志文件
-                        fwrite($newFileHandle, $tagNumber . PHP_EOL);
-                    }
-                }
-
-                if(! empty($read_data)) {
-                    $this->sendData($read_data);
-                    echo '发送成功---！' . "\n";
-                }
-
-                // 获取新的位置并更新位置文件
-                $lastPosition = ftell($fileHandle);
-                Cache::put($key,$lastPosition,86400);
-//                file_put_contents($positionFile, $lastPosition);
-
-                // 关闭文件句柄
-                fclose($fileHandle);
-                fclose($newFileHandle);
-            } else {
-                echo '暂无新数据...' . "\n";
-                // 在下一次检查之前休眠一段时间
-                sleep(2);
-            }
-        }
-    }
-
-    public function sendData($data){
-        $url = env('CLOUD_ADDRESS',null);
-
-        if(empty($url)) return;
-
-        $curl = curl_init();
-        curl_setopt_array($curl, array(
-            CURLOPT_URL => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING => '',
-            CURLOPT_MAXREDIRS => 10,
-            CURLOPT_TIMEOUT => 0,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
-            CURLOPT_CUSTOMREQUEST => 'POST',
-            CURLOPT_POSTFIELDS => $data,
-        ));
-        $response = curl_exec($curl);
-        curl_close($curl);
-    }
-
-    public function tcpServer(){
-        //本地ipv4地址
-        $ipv4 = $this->getMyIpV4();
-
-        $host = env('HOST_TCP');  // 主机局域网地址
-        $port = env('HOST_PORT'); // 端口号
-        if(empty($host)) $host = $ipv4;
-        if(empty($port)) $port = 9501;
-
-        // 创建一个TCP socket
-        $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-        // 绑定到指定的主机和端口  第二个参数不写 默认局域网ipv4地址
-        socket_bind($socket, '', $port);
-        // 监听连接
-        socket_listen($socket);
-
-        // 初始内存使用量
-        $initialMemoryUsage = memory_get_usage();
-
-        echo date("Y-m-d H:i:s") . " 服务器" . $host . ":" . $port . "已启动监听\n";
-        file_put_contents('C:\Users\Administrator\Desktop\record.txt',date("Y-m-d H:i:s") . "服务器已启动".PHP_EOL,8);
-
-        while (true) {
-            // 接受连接请求并创建新的套接字
-            $clientSocket = socket_accept($socket);
-
-            if ($clientSocket === false) {
-                // 错误处理
-                $error = socket_strerror(socket_last_error($socket));
-                echo "接受连接请求失败：{$error}\n";
-                continue; // 继续下一次循环
-            }
-
-            // 读取客户端发送的数据
-            $data = socket_read($clientSocket, 1024);
-//            file_put_contents('C:\Users\Administrator\Desktop\record2.txt',$data .PHP_EOL,8);
-
-            $this->byteParsing3($data);
-
-            // 发送响应给客户端
-//            $response = "服务器已接收到您的消息：" . $data;
-//            socket_write($clientSocket, $response, strlen($response));
-
-            $currentMemoryUsage = memory_get_usage();
-            $memoryDiff = $currentMemoryUsage - $initialMemoryUsage;
-
-            echo "内存使用量变化：" . $memoryDiff . " 字节\n";
-
-            $initialMemoryUsage = $currentMemoryUsage;
-
-            // 关闭当前连接的套接字
-            socket_close($clientSocket);
-
-            gc_collect_cycles();
-
-            sleep(5);
-        }
-
-        // 关闭服务器套接字
-        socket_close($socket);
-    }
-
-    public function byteParsing2($data){
-        $frame = $data;
-        // 提取字段值
-        $frameHeader = bin2hex(substr($frame, 0, 2));
-        $frameLength = unpack('v', substr($frame, 2, 2))[1];
-        $frameSequence = unpack('v', substr($frame, 4, 2))[1];
-        $port = ord(substr($frame, 6, 1));
-        $communicationType = unpack('v', substr($frame, 7, 2))[1];
-        $payload = substr($frame, 9, $frameLength - 8);
-        $checksum = ord(substr($frame, -3, 1));
-        $frameTail = bin2hex(substr($frame, -2));
-
-        $payloadBytes = substr($frame, 9, 4); // 假设帧载荷在通信帧中的偏移量为9，并且长度为4个字节
-
-// 将4个字节转换为无符号整数（根据您的数据编码方式确定是否需要使用符号整数）
-        $payloadValue = unpack('N', $payloadBytes)[1];
-            echo "zhen" . $payloadValue . "\n";
-        $payloadHex = sprintf('%08X', $payloadValue);
-
-        echo "帧载荷值: $payloadHex\n";
-
-        // 打印字段值
-        echo "帧头: $frameHeader\n";
-        echo "帧长度: $frameLength\n";
-        echo "帧序号: $frameSequence\n";
-        echo "端口: $port\n";
-        echo "通信类型: $communicationType\n";
-        echo "帧载荷: $payload\n";
-        echo "校验和: $checksum\n";
-        echo "帧尾: $frameTail\n";
-    }
-
-    public function byteParsing($data){
-        // 接收到的TCP数据（以字节形式表示）
-        $tcpData = $data;
-        // 解析源端口和目标端口
-        $sourcePort = unpack('n', substr($tcpData, 0, 2))[1];
-        $destinationPort = unpack('n', substr($tcpData, 2, 2))[1];
-        // 解析其他TCP头部字段，解析序列号
-        $sequenceNumber = unpack('N', substr($tcpData, 4, 4))[1];
-
-        // 获取TCP头部长度（通过读取数据偏移计算得出）
-        $dataOffset = ord(substr($tcpData, 12, 1)) >> 4;
-        $headerLength = $dataOffset * 4;
-
-        // 提取数据部分
-        $data = substr($tcpData, $headerLength);
-
-        // 处理数据部分中的控制字符
-        $data = $this->removeControlCharacters($data);
-
-        // 打印解析结果
-        echo "源端口: $sourcePort\n";
-        echo "目标端口: $destinationPort\n";
-        echo "序列号: $sequenceNumber\n";
-        if(! empty($data)){
-            echo "数据: $data\n";
-        }
-    }
-
-    // 去除控制字符的函数
-    function removeControlCharacters($string) {
-        $controlChars = array(
-            '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/u', // 去除 ASCII 控制字符
-//            '/\xEF\xBF\xBD/u' // 去除 UTF-8 中的替代字符
-        );
-        return preg_replace($controlChars, '', $string);
-    }
-
-    public function readTxt(){
-        $directory = env('PROCESS_DIR',null);
-        $directory = 'C:\Users\Administrator\Desktop\\';  // 替换为你的文件所在目录路径
-        $currentDate = date('Y-m-d');  // 当前日期
-        $file = $directory . "TesttoolLog" . $currentDate . '.log';  // 拼接文件路径和文件名
-
-        $lastModified = filemtime($file);  // 获取文件最后修改时间
-
-        while (true) {
-            clearstatcache();  // 清除文件状态缓存
-            $currentDate = date('Y-m-d');  // 获取当前日期
-            $currentFile = $directory . "TesttoolLog" . $currentDate . '.log';  // 当前日期对应的文件路径和文件名
-
-            if ($file !== $currentFile) {
-                // 文件已切换，更新文件路径和最后修改时间
-                $file = $currentFile;
-                $lastModified = filemtime($file);
-            }
-
-            $currentModified = filemtime($file);  // 获取当前文件最后修改时间
-
-            if ($currentModified > $lastModified) {
-                // 文件已被修改，读取新增内容
-                $handle = fopen($file, 'r');
-                fseek($handle, -1, SEEK_END);  // 定位到文件末尾前两个字节
-                $data = fread($handle, 2);  // 读取新增内容
-                fclose($handle);
-
-                // 处理新增内容
-                // ...
-
-                // 示例：打印新增内容
-                echo $data;
-
-                $lastModified = $currentModified;  // 更新最后修改时间
-            }
-
-            sleep(1);  // 睡眠一段时间后再次检查文件是否被修改
-        }
-    }
-
-    public function byteParsing3($data){
-        $hexData = bin2hex($data);
-        $hexData = str_replace(' ', '', $hexData);
-        $toReplace = array("a6a8001300000a00010101001708120012000103b5a5a7", "a6a8000c00000a0003120001037da5a7");
-        $result = str_replace($toReplace, "", $hexData);
-//        echo "原数据：" . $hexData . PHP_EOL;
-//        $memoryUsage = memory_get_usage();
-//        echo "当前脚本占用的内存量：".$memoryUsage." 字节" . "\n";
-//
-//        $memoryUsage = memory_get_peak_usage();
-//        echo "PHP程序总内存使用量：" . $memoryUsage . " 字节" . "\n";
-
-        if($result){
-            $last38Chars = substr($result, -38, 32);
-            echo "替换后：" . $last38Chars . PHP_EOL;
-
-            file_put_contents('C:\Users\Administrator\Desktop\record.txt',$last38Chars.PHP_EOL,8);
-            if(! empty($last38Chars)) {
-                $this->sendData([$last38Chars]);
-                echo '发送成功---！' . "\n";
-            }
-        }
-    }
-
-    public function getMyIpV4(){
-        $ip = exec("ipconfig | findstr /i \"IPv4\"");
-        $parts = explode(": ", $ip);
-        $ipAddress = $parts[1];
-        return $ipAddress;
-    }
-}

app/Console/SwooleServer.php

@@ -1,36 +0,0 @@
-<?php
-use Swoole\Server;
-
-$server = new Server('http://cloud_device.qingyaokeji.com/', 9501, SWOOLE_PROCESS, SWOOLE_SOCK_TCP);
-
-$server->set([
-    'worker_num'      => 1, //工作进程数
-    'task_worker_num' => 5, //任务工作进程数
-    'log_file' => '/www/server/file.log', //日志文件目录
-//    'task_use_object' => true, //用于设置是否使用面向对象风格的 Task 回调格式。
-    'max_connection' => 3, //最大连接数
-//    'upload_tmp_dir' => '/path/to/tmp/dir',  //上传文件的临时存储路径
-//    'daemonize' => true, //守护进程
-]);
-
-//注册一个回调函数，当有客户端连接到服务器时触发。回调函数内的代码会在客户端连接时执行。
-$server->on('connect', function ($server, $fd) {
-    echo "Client {$fd} connected.\n";
-});
-
-//注册一个回调函数，当服务器从已连接的客户端接收数据时触发。回调函数内的代码会在接收到客户端发送的数据时执行
-$server->on('receive', function ($server, $fd, $from_id, $data) {
-    echo "Received data from client {$fd}: {$data}\n";
-    $server->send($fd, "Server received: {$data}");
-});
-
-//注册一个回调函数，当服务器与客户端断开连接时触发。回调函数内的代码会在客户端断开连接时执行。
-$server->on('close', function ($server, $fd) {
-    echo "Client {$fd} closed.\n";
-});
-
-$server->on('Task', function ($task) {
-    // 处理任务回调逻辑
-    echo "Client222222222222";
-});
-$server->start();

app/Http/Controllers/Api/EmployeeController.php

@@ -10,15 +10,8 @@ use Illuminate\Http\Request;
 
 class EmployeeController extends BaseController
 {
-
-
-
-
-
     public function employeeEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
         $user = $request->userData->toArray();
         list($status,$data) = $service->employeeEdit($request->all(),$user);
@@ -30,12 +23,9 @@ class EmployeeController extends BaseController
         }
 
     }
-
-
+    
     public function employeeAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
         $user = $request->userData->toArray();
         list($status,$data) = $service->employeeAdd($request->all(),$user);
@@ -45,16 +35,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function employeeDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeDel($request->all());
 
         if($status){
@@ -62,16 +48,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function employeeList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+        
         list($status,$data) = $service->employeeList($request->all());
 
         if($status){
@@ -79,17 +62,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
-
+    
     public function roleEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+        
         list($status,$data) = $service->roleEdit($request->all());
 
         if($status){
@@ -97,16 +76,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function roleAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+
         list($status,$data) = $service->roleAdd($request->all(),$request->all());
 
         if($status){
@@ -114,16 +90,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function roleDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+
         list($status,$data) = $service->roleDel($request->all());
 
         if($status){
@@ -131,16 +104,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function roleList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+
         list($status,$data) = $service->roleList($request->all());
 
         if($status){
@@ -148,17 +118,13 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
-
     public function departEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
+        
         list($status,$data) = $service->departEdit($request->all());
 
         if($status){
@@ -166,16 +132,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
+    
     public function departAdd(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departAdd($request->all(),$request->all());
 
         if($status){
@@ -183,16 +145,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function departDel(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departDel($request->all());
 
         if($status){
@@ -200,16 +158,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function departList(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->departList($request->all());
 
         if($status){
@@ -217,16 +171,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function teamEdit(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->teamEdit($request->all());
 
         if($status){
@@ -234,103 +184,12 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
-    }
-
-
-    public function teamAdd(Request $request)
-    {
-
-
-        $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->teamAdd($request->all(),$request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-
-    public function teamDel(Request $request)
-    {
-
-
-        $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->teamDel($request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-
-    public function teamList(Request $request)
-    {
-
-
-        $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->teamList($request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
     }
 
-
-    public function employeeDepart(Request $request)
-    {
-
-
-        $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->employeeDepart($request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-
-
-    public function employeeTeam(Request $request)
-    {
-
-
-        $service = new EmployeeService();
-        $user = $request->get('auth');
-        list($status,$data) = $service->employeeTeam($request->all());
-
-        if($status){
-            return $this->json_return(200,'',$data);
-        }else{
-            return $this->json_return(201,$data);
-        }
-
-    }
-
-
-
     public function employeeRole(Request $request)
     {
-
-
         $service = new EmployeeService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->employeeRole($request->all());
 
         if($status){
@@ -338,10 +197,5 @@ class EmployeeController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
-
-
 }

app/Http/Controllers/Api/SysMenuController.php

@@ -9,17 +9,10 @@ use Illuminate\Http\Request;
 
 class SysMenuController extends BaseController
 {
-
-
-
-
-
     public function add(Request $request)
     {
-
-
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->add($request->all(),$request->all());
 
         if($status){
@@ -27,16 +20,12 @@ class SysMenuController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function edit(Request $request)
     {
-
-
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->edit($request->all());
 
         if($status){
@@ -44,16 +33,12 @@ class SysMenuController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function del(Request $request)
     {
-
-
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->del($request->all());
 
         if($status){
@@ -61,16 +46,12 @@ class SysMenuController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
 
-
     public function menuList(Request $request)
     {
-
-
         $service = new SysMenuService();
-        $user = $request->get('auth');
+        $user = $request->userData->toArray();
         list($status,$data) = $service->menuList($request->all());
 
         if($status){
@@ -78,10 +59,5 @@ class SysMenuController extends BaseController
         }else{
             return $this->json_return(201,$data);
         }
-
     }
-
-
-
-
 }