xg

composer.json

@@ -1,76 +0,0 @@
-{
-    "name": "jaguarjack/catchadmin",
-    "description": "the api framework base on thinkphp, help you to create admin management soon",
-    "type": "project",
-    "keywords": [
-        "framework",
-        "catchadmin",
-        "api",
-        "ORM"
-    ],
-    "homepage": "http://doc.catchadmin.com",
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "jaguarjack",
-            "email": "njphper@gmail.com"
-        }
-    ],
-    "require": {
-        "php": ">=7.1.0",
-        "topthink/framework": "6.0.5",
-        "topthink/think-orm": "2.0.33",
-        "topthink/think-migration": "^3.0",
-        "thans/tp-jwt-auth": "1.1",
-        "jaguarjack/think-filesystem-cloud": "dev-master",
-        "overtrue/wechat": "^4.2",
-        "phpoffice/phpspreadsheet": "^1.12",
-        "dragonmantank/cron-expression": "^3.0",
-        "symfony/finder": "^4.4",
-        "ext-json": "*",
-        "overtrue/easy-sms": "^1.1",
-        "jaguarjack/migration-generator": "dev-master",
-        "lcobucci/jwt": "3.3",
-        "topthink/think-trace": "^1.4",
-        "workerman/phpsocket.io": "^1.1",
-        "aliyun/aliyun-tablestore-sdk-php": "~5.0",
-        "alibabacloud/sts-20150401": "1.0.1",
-        "phpmailer/phpmailer": "^6.6",
-        "php-mqtt/client": "^1.8"
-      
-   
-       
-       
-    },
-    "require-dev": {
-        "symfony/var-dumper": "^5.1",
-        "swoole/ide-helper": "^4.5",
-        "nikic/php-parser": "^4.10"
-    },
-    "autoload": {
-        "psr-4": {
-            "app\\": "app",
-            "catchAdmin\\": "catch"
-        },
-        "psr-0": {
-            "": "extend/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "catchAdmin\\tests\\": "tests"
-        }
-    },
-    "config": {
-        "preferred-install": "dist",
-        "allow-plugins": {
-            "easywechat-composer/easywechat-composer": true
-        }
-    },
-    "scripts": {
-        "post-autoload-dump": [
-            "@php think service:discover",
-            "@php think vendor:publish"
-        ]
-    }
-}

task_script/ESP32_MQTT_CLIENT.php

@@ -207,7 +207,7 @@ function loop()
 {
     $server   = '116.62.220.88';
     $port     = 1883;
-    $clientId = 'mqtt_esp32_elevator_client';
+    $clientId = 'mqtt_esp32_elevator_client_0120';
     $username = 'rl517';
     $password = "rlian2022";
     $clean_session = false;

task_script/ESP32_MQTT_SEND.php

@@ -62,7 +62,7 @@ function sendConfig($topic,$config)
 {
     $server   = '116.62.220.88';
     $port     = 1883;
-    $clientId = 'mqtt_esp32_elevator_send';
+    $clientId = 'mqtt_esp32_elevator_send_0120';
     $username = 'rl517';
     $password = "rlian2022";
     $clean_session = false;

task_script/LIVESTOCK_MQTT_CLIENT.php

@@ -214,7 +214,7 @@ function loop()
 
     $server   = '116.62.220.88';
     $port     = 1883;
-    $clientId = 'local_mqtt_livestock_cli_202410271';
+    $clientId = 'local_mqtt_livestock_cli_202502101';
     $username = 'rl517';
     $password = "rlian2022";
 
@@ -306,7 +306,8 @@ function mqttToRedis($text){
          app_redis()->lpush("mqtt_data_livestock",$text);
          //同时推入竹彩
          app_redis()->lpush("zhucai_mqtt_data_livestock",$text);
-
+         //同时推入竹彩
+         app_redis()->lpush("mqtt_data_livestock_cn",$text);
     }catch(Exception $e){
         rlog("INFO", 'recv',"redis 异常".$e->getMessage());
     }

task_script/LIVESTOCK_MQTT_REPEAT.php

@@ -167,11 +167,12 @@ function mqttRepeat($topic,$message){
     
 
 
-    $server   = '61.175.203.188';
-    $port     = 10002;
+
+    $server   = '47.114.189.154';
+    $port     = 1883;
     $clientId = 'repeat_mqtt_livestock_ningbo_paigou';
-    $username = 'rltest';
-    $password = "rlian@24329";
+    $username = 'rl241107';
+    $password = "rlian2024";
     $clean_session = false;
 
     $connectionSettings  = new ConnectionSettings();

task_script/PUMP_MQTT_PUBLISH.php

@@ -355,6 +355,10 @@ class MQTT_TYPE {/*对应从1开始*/
 
     public static $SET_DAMPING_TIME = 'r';//双向 设备->平台 平台->设备 设备收到是要设置它的值 服务端收到是对下发值的回复
     public static $GET_DAMPING_TIME = 's';//双向 设备->平台 平台->设备 设备收到是要获取它的值 服务端收到是对下发的回复
+
+    //双向
+    public static $SET_SAMPLE_PERIOD = 't';                          /*20*/
+    public static $GET_SAMPLE_PERIOD = 'u';
 }
 
 define("ALTER_SEP", ",");
@@ -446,6 +450,17 @@ function buildMqttData($mqttType, $msgId/*整数 0-4294967295*/, $data) {
         $bin = $bin . $buff . chr(0);//补零 设备解析是以为\0结尾
     } else if ($mqttType == MQTT_TYPE::$GET_DAMPING_TIME) {
     }else if ($mqttType == MQTT_TYPE::$PUB_CALIBRATION_ZERO) {
+    }else if ($mqttType == MQTT_TYPE::$SET_SAMPLE_PERIOD) {
+        $num = intval($data);
+        if ($num < 0 || $num > 100) {
+            rlog("err damping time " . $data);
+            return false;
+        }
+
+        $buff = $data;/*0.00-60.00*/
+        $bin = $bin . $buff . chr(0);//补零 设备解析是以为\0结尾
+    } else if ($mqttType == MQTT_TYPE::$GET_SAMPLE_PERIOD) {
+
     } else {
         rlog("warn unknown type " . ord($mqttType));
         return false;
@@ -482,6 +497,10 @@ while (1) {
         $sendData = buildMqttData(MQTT_TYPE::$SET_DAMPING_TIME, $config_json['msgId'], $config_json['damping_time']);
     }elseif($data['type']=='get_damping'){
         $sendData = buildMqttData(MQTT_TYPE::$GET_DAMPING_TIME, $config_json['msgId'], null);
+    }elseif($data['type']=='set_samplie'){
+        $sendData = buildMqttData(MQTT_TYPE::$SET_SAMPLE_PERIOD, $config_json['msgId'], $config_json['samplie_period']);
+    }elseif($data['type']=='get_samplie'){
+        $sendData = buildMqttData(MQTT_TYPE::$GET_SAMPLE_PERIOD, $config_json['msgId'], null);
     }else{
 
     }