likang

.env

@@ -7,7 +7,7 @@ DEFAULT_TIMEZONE = Asia/Shanghai
 DOMAIN = http://app
 [DATABASE]
 TYPE = mysql
-HOSTNAME = localhost
+HOSTNAME = 127.0.0.1
 DATABASE = station
 USERNAME = root
 PASSWORD = root
@@ -19,8 +19,8 @@ DEBUG = true
 [REDIS]
 HOST = 127.0.0.1
 PORT = 6379
-PASSWORD = password
-SELECT = 0
+PASSWORD = '123456'
+SELECT = 3
 
 [LANG]
 default_lang = zh-cn

.gitignore

@@ -10,4 +10,5 @@ composer.lock
 node_modules/
 package-lock.json
 yarn.lock
-.env
+/.env
+.env

catch/api/controller/Api.php

@@ -1,23 +1,16 @@
 <?php
-/*
- * @Descripttion: 
- * @version: 1.0.0
- * @Author: likang
- * @Date: 2022-08-12 10:33:24
- * @LastEditors: likang 1186820806@qq.com
- * @LastEditTime: 2023-04-18 17:06:51
- */
-
-
-
-
 namespace catchAdmin\api\controller;
 
+use catchAdmin\api\service\dispose;
+use catchAdmin\tag_history\model\Access;
+use catchAdmin\tag_history\model\Dormitory;
 use catchAdmin\tag_history\model\TagHistory;
 use catchAdmin\worklocation\model\WorkRecord as ModelWorkRecord;
 use catcher\base\CatchRequest as Request;
 use catcher\CatchResponse;
 use catcher\base\CatchController;
+use Exception;
+use think\facade\Cache;
 use \think\facade\Db;
 
 
@@ -60,11 +53,104 @@ class Api extends CatchController
         $tage->saveAll($data);
         json_success('上传成功');
     }
-    //储存数据到mysql
-    // public function redis_to_mysql(){
-    //     Cache::store('redis')->
+    //储存数据到redis
+    public function redis_to_mysql(){
+       
+        $ues_redis=Cache::store('redis')->handler();
+        $text=null;
+      
+        while(1){
+            $jsonData= $ues_redis->rpop("mqtt_data");
+            debug_log("InAndOUT",'数据redis'.$jsonData);
+            
+            if(empty($jsonData)){
+                debug_log("InAndOUT",'没有数据');
+                sleep(1);
+                continue;
+                
+            }
+            // debug_log("InAndOUT",$jsonData);
+            $data=json_decode($jsonData,true);
+            // debug_log("InAndOUT",$data['cnt']);
+            $time=$data['time'];
+            $mac=$data['imei'];
+            $list=[];
+            $text=$text.$data['cnt'];
+            
+            if(strlen($text)<24){
+                continue;
+            }
+            while(strlen($text)>=24){
+     
+                $da=substr($text,0,24);
+
+                $t1 = substr($da,8,2)=='00'||substr($da,8,2)=='10'||substr($da,8,2)=='01' ? true:false;
+                $t2 =substr($da,10,6)=="FFFFFF"||substr($da,10,6)=="000000" ?true:false;
+               
+                if($t1&&$t2){
+                    
+                     $label= substr($da,0,8);
+                     $rssi1= substr($da,16,2);
+                     $rssi2= substr($da,18,2);
+                     $rssi3= substr($da,20,2);
+                     $rssi4= substr($da,22,2);
+                     $DA=[
+                        'mac' => $mac,
+                        'label' =>$label,
+                        'rssi1' => hexdec($rssi1),
+                        'rssi2' => hexdec($rssi2),
+                        'rssi3' => hexdec($rssi3),
+                        'rssi4' => hexdec($rssi4),
+                        'report_time'=>$time
+                    ];
+
+                    debug_log("InAndOUT","数据：".json_encode($DA,true));
+                    //保存计算中
+                    //分为8个桶
+                    // $num=Hexdec($label);
+                    // $Identification=$num%8;
+                    // $key="buckets".$Identification;
+                    // $ues_redis->rPush($key,json_encode($DA,true));
+                    
+                    try{
+                        $dispose = new dispose($ues_redis);
+                        $computedata=$dispose->computeData($DA);
+                         debug_log("InAndOUT","计算完成的数据：".json_encode($DA,true));
+                         $dispose->computeResout($computedata);
+                        
+                    }catch(Exception $e){
+                        debug_log("InAndOUT","抛出异常".json_encode($DA,true));
+                    }
+                    
+                     $text=substr($text,24);
+                }else{
+                  $text=substr($text,1);
+                }
+         
+             }
+         
+            // $tage = new Access();
+           //  $tage->saveAll($list);
+        }
 
-    // }
+
+    }
+
+
+
+
+   
+    public function test(){
+        
+        try{
+            $ues_redis=Cache::store('redis')->handler();
+            $jsonData= $ues_redis->rpop("mqtt_data");
+            debug_log("InAndOUT","1212");
+        }catch(Exception $e){
+            var_dump($e->getMessage());
+        }
+    
+    }
 
 
 
@@ -114,6 +200,7 @@ class Api extends CatchController
         $data["version"]="1.1.1";
         json_success("查询版本成功",$data);
     }
+    
 
 
 

catch/api/route.php

@@ -5,7 +5,7 @@
  * @Author: likang
  * @Date: 2022-06-09 10:11:32
  * @LastEditors: likang 1186820806@qq.com
- * @LastEditTime: 2023-04-18 14:15:30
+ * @LastEditTime: 2023-04-19 11:01:00
  */
 // +----------------------------------------------------------------------
 // | CatchAdmin [Just Like ～ ]
@@ -26,6 +26,9 @@ $router->group(function () use ($router) {
 //报警上传
 $router->post('api/report', '\catchAdmin\api\controller\Api@report');
 $router->get('api/deleteHistory', '\catchAdmin\api\controller\Api@deleteHistory');
+$router->get('api/test', '\catchAdmin\api\controller\Api@test');
+$router->get('api/redis', '\catchAdmin\api\controller\Api@redis_to_mysql');
+
 //更新软件版本测试
 //$router->get('api/detectionVersion', '\catchAdmin\api\controller\Api@detectionVersion');
 

catch/tag_history/route.php

@@ -39,4 +39,6 @@ $router->group(function () use ($router) {
 
 
 
+	// dormitory路由
+	$router->resource('dormitory', '\catchAdmin\tag_history\controller\dormitory');
 })->middleware('auth');

composer.json

@@ -36,9 +36,8 @@
         "aliyun/aliyun-tablestore-sdk-php": "~5.0",
         "alibabacloud/sts-20150401": "1.0.1",
         "phpmailer/phpmailer": "^6.6",
-        "php-mqtt/client": "^1.2",
-        "bluerhinos/phpmqtt": "@dev",
-        "simps/mqtt": "^1.4"
+        "php-mqtt/client": "^1.8"
+       
     },
     "require-dev": {
         "symfony/var-dumper": "^5.1",

task_script/RL4RSSI_MQTT_CLIENT.php

@@ -1,13 +1,58 @@
 <?php
-
-require('vendor/autoload.php');
-
+require('../vendor/autoload.php');
 use \PhpMqtt\Client\MqttClient;
 use \PhpMqtt\Client\ConnectionSettings;
-
+use think\facade\Cache;
 date_default_timezone_set("PRC");
+define('HOST', '127.0.0.1');
+define('PORT', '6379');
+define('PASSWORD', '123456');
+define('DATABASE', 3);
 
 
+function app_redis()
+{
+    static $redis = null;
+    static $conn = false;
+    if (!$conn) {
+        connect: //定义标签
+        $redis = new Redis();
+        try {
+            //建立的Redis短连接,在请求结束后不会自动关闭,相当于持久连接.
+            $conn = $redis->connect(HOST, PORT);
+            $conn = $redis->auth(PASSWORD);
+            $conn = $redis->select(DATABASE);
+            // 连接成功,返回$redis对象,连接失败,返回false.
+            return ($conn === true) ? $redis : false;
+        } catch (Exception $e) {
+            return false;
+        }
+    } else {
+        // 这里假设PHP-FPM在处理一个请求的时间内,Redis连接都是可用的.
+        // 所以只在PHP-CLI下检查Redis连接的状态,进行断线重连.
+        if (php_sapi_name() === 'cli') {
+            try {
+                // ping用于检查当前连接的状态,成功时返回+PONG,失败时抛出一个RedisException对象.
+                // ping失败时警告:
+                // Warning: Redis::ping(): connect() failed: Connection refused
+                // var_dump('AAAAAAAAA', $redis);
+                echo 'Redis 连接状态' . $redis->ping() . PHP_EOL;
+                @$redis->ping();
+                if (!$redis->ping()) {
+                    goto connect; //跳转到标签出继续执行连接操作
+                }
+            } catch (Exception  $e) {
+                // 信息如 Connection lost 或 Redis server went away
+                echo $e->getMessage();
+                echo 'Redis 连接失败 重新连接：' . PHP_EOL;
+                // 断线重连
+                goto connect;
+            }
+        }
+        return $redis;
+    }
+}
+
 function rlog(...$args)
 {
     if (empty($args[0])) {
@@ -26,6 +71,7 @@ function rlog(...$args)
     static $LOG_TIMES = 10; //调用这个函数最大次数 超过次数后判断下文件大小
     static $logCount = 0;
 
+
     $buf = '';
     if (count($args) == 1 && $args[0] == "\n") { //只有换行时 不写入时间戳了
         $buf = "\n";
@@ -256,7 +302,7 @@ function loop()
 {
     $server   = 'develop.rltest.cn';
     $port     = 1883;
-    $clientId = 'mqttx_f845f9b0';
+    $clientId = 'mqttx_test12312';
     $username = 'rl517';
     $password = "rlian2022";
     $clean_session = true;
@@ -300,11 +346,29 @@ function loop()
     //终端上报系统信息数据
     $mqtt->subscribe('RL4RSSI/rfidinfos', function ($topic, $message) {
         rlog("INFO", 'recv', $topic, $message);
-        var_dump($message);
+        if(!empty($message)){
+            mqttToRedis($message);
+        }
+      
+        //var_dump($message);
     }, 0);
     $mqtt->loop(true);
 }
 
+function mqttToRedis($text){
+    
+    try{
+        
+        
+         app_redis()->lpush("mqtt_data",$text);
+
+    }catch(Exception $e){
+        rlog("INFO", 'recv',"redis 异常".$e->getMessage());
+    }
+    
+} 
+
+
 while (1) {
     try {
         rlog('INFO', 'connect start');