Merge remote-tracking branch 'origin/main'

docker/thingsboard/dji.conf

@@ -1,107 +1,369 @@
 {
-  "thingsboard": {
+  "broker": {
-    "host": "220.154.136.137",
+    "host": "mqtt.t-aaron.com",
-    "port": 1883,
+    "port": 10883,
-    "remoteShell": false,
+    "version": 5,
-    "remoteConfiguration": true,
+    "clientId": "ThingsBoard_gateway",
-    "checkConnectorsConfigurationInSeconds": 60,
-    "statistics": {
-      "enable": true,
-      "enableCustom": true,
-      "statsSendPeriodInSeconds": 60,
-      "customStatsSendPeriodInSeconds": 3600,
-      "commands": []
-    },
-    "maxPayloadSizeBytes": 8196,
-    "minPackSendDelayMS": 50,
-    "minPackSizeToSend": 500,
-    "handleDeviceRenaming": true,
-    "checkingDeviceActivity": {
-      "checkDeviceInactivity": false,
-      "inactivityTimeoutSeconds": 300,
-      "inactivityCheckPeriodSeconds": 10
-    },
     "security": {
-      "type": "accessToken",
+      "type": "basic",
-      "accessToken": "J3ZlDINlAoUhjBIE0CIr"
+      "username": "admin",
+      "password": "admin"
     },
-    "qos": 1,
+    "maxNumberOfWorkers": 100,
-    "reportStrategy": {
+    "maxMessageNumberPerWorker": 10
-      "type": "ON_RECEIVED"
-    }
   },
-  "storage": {
+  "mapping": [
-    "type": "memory",
+    {
-    "read_records_count": 100,
+      "topicFilter": "thing/product/7C+/osd",
-    "max_records_count": 100000,
+      "subscriptionQos": 0,
-    "data_folder_path": "./data/",
-    "max_file_count": 10,
-    "max_read_records_count": 10,
-    "max_records_per_file": 10000,
-    "data_file_path": "./data/",
-    "messages_ttl_check_in_hours": 1,
-    "messages_ttl_in_days": 7,
-    "ts": 1769419043112
-  },
-  "grpc": {
-    "enabled": false,
-    "serverPort": 9595,
-    "keepAliveTimeMs": 10001,
-    "keepAliveTimeoutMs": 5000,
-    "keepAlivePermitWithoutCalls": true,
-    "maxPingsWithoutData": 0,
-    "minTimeBetweenPingsMs": 10000,
-    "minPingIntervalWithoutDataMs": 5000,
-    "ts": 1769419043112
-  },
-  "connectors": [],
-  "logs": {
-    "local": {
-      "service": {
-        "logLevel": "INFO",
-        "filePath": "./logs",
-        "backupCount": 7,
-        "savingTime": 3,
-        "savingPeriod": "D"
-      },
-      "connector": {
-        "logLevel": "INFO",
-        "filePath": "./logs",
-        "backupCount": 7,
-        "savingTime": 3,
-        "savingPeriod": "D"
-      },
       "converter": {
-        "logLevel": "INFO",
+        "type": "json",
-        "filePath": "./logs",
+        "deviceInfo": {
-        "backupCount": 7,
+          "deviceNameExpression": "(?<=thing/product/)[^/]+(?=/osd)",
-        "savingTime": 3,
+          "deviceNameExpressionSource": "topic",
-        "savingPeriod": "D"
+          "deviceProfileExpressionSource": "message",
-      },
+          "deviceProfileExpression": "default"
-      "tb_connection": {
+        },
-        "logLevel": "INFO",
+        "attributes": [
-        "filePath": "./logs",
+          {
-        "backupCount": 7,
+            "key": "dock_sn",
-        "savingTime": 3,
+            "type": "string",
-        "savingPeriod": "D"
+            "value": "${gateway}"
-      },
+          },
-      "storage": {
+          {
-        "logLevel": "INFO",
+            "key": "sub_device.device_sn",
-        "filePath": "./logs",
+            "type": "string",
-        "backupCount": 7,
+            "value": "${data.sub_device.device_sn}"
-        "savingTime": 3,
+          },
-        "savingPeriod": "D"
+          {
-      },
+            "key": "mode_code",
-      "extension": {
+            "type": "integer",
-        "logLevel": "INFO",
+            "value": "${data.mode_code}"
-        "filePath": "./logs",
+          },
-        "backupCount": 7,
+          {
-        "savingTime": 3,
+            "key": "firmware_version",
-        "savingPeriod": "D"
+            "type": "string",
+            "value": "${data.firmware_version}"
+          },
+          {
+            "key": "latitude",
+            "type": "double",
+            "value": "${data.latitude}"
+          },
+          {
+            "key": "longitude",
+            "type": "double",
+            "value": "${data.longitude}"
+          }
+        ],
+        "timeseries": [
+          {
+            "key": "air_conditioner.air_conditioner_state",
+            "type": "string",
+            "value": "${data.air_conditioner.air_conditioner_state}"
+          },
+          {
+            "key": "flighttask_step_code",
+            "type": "integer",
+            "value": "${data.flighttask_step_code}"
+          },
+          {
+            "key": "drone_in_dock",
+            "type": "string",
+            "value": "${data.drone_in_dock}"
+          },
+          {
+            "key": "sub_device.device_online_status",
+            "type": "integer",
+            "value": "${data.sub_device.device_online_status}"
+          },
+          {
+            "key": "drone_charge_state.state",
+            "type": "integer",
+            "value": "${data.drone_charge_state.state}"
+          },
+          {
+            "key": "air_conditioner.air_conditioner_state",
+            "type": "integer",
+            "value": "${data.air_conditioner.air_conditioner_state}"
+          },
+          {
+            "key": "humidity",
+            "type": "double",
+            "value": "${data.humidity}"
+          },
+          {
+            "key": "temperature",
+            "type": "double",
+            "value": "${data.temperature}"
+          },
+          {
+            "key": "acc_time",
+            "type": "integer",
+            "value": "${data.acc_time}"
+          },
+          {
+            "key": "network_state.type",
+            "type": "integer",
+            "value": "${data.network_state.type}"
+          },
+          {
+            "key": "wind_speed",
+            "type": "double",
+            "value": "${data.wind_speed}"
+          },
+          {
+            "key": "rainfall",
+            "type": "integer",
+            "value": "${data.rainfall}"
+          },
+          {
+            "key": "position_state.rtk_number",
+            "type": "integer",
+            "value": "${data.position_state.rtk_number}"
+          },
+          {
+            "key": "alternate_land_point.longitude",
+            "type": "double",
+            "value": "${data.alternate_land_point.longitude}"
+          },
+          {
+            "key": "alternate_land_point.latitude",
+            "type": "double",
+            "value": "${data.alternate_land_point.latitude}"
+          },
+          {
+            "key": "environment_temperature",
+            "type": "double",
+            "value": "${data.environment_temperature}"
+          },
+          {
+            "key": "network_state.rate",
+            "type": "double",
+            "value": "${data.network_state.rate}"
+          },
+          {
+            "key": "cover_state",
+            "type": "integer",
+            "value": "${data.cover_state}"
+          },
+          {
+            "key": "drone_charge_state.capacity_percent",
+            "type": "integer",
+            "value": "${data.drone_charge_state.capacity_percent}"
+          }
+        ]
       }
     },
-    "logFormat": "%(asctime)s.%(msecs)03d - |%(levelname)s| - [%(filename)s] - %(module)s - %(funcName)s - %(lineno)d - %(message)s",
+    {
-    "dateFormat": "%Y-%m-%d %H:%M:%S",
+      "topicFilter": "thing/product/158+/osd",
-    "logLevel": "NONE"
+      "subscriptionQos": 0,
-  }
+      "converter": {
+        "type": "json",
+        "deviceInfo": {
+          "deviceNameExpression": "(?<=thing/product/)[^/]+(?=/osd)",
+          "deviceNameExpressionSource": "topic",
+          "deviceProfileExpressionSource": "message",
+          "deviceProfileExpression": "default"
+        },
+        "attributes": [
+          {
+            "key": "mode_code",
+            "type": "integer",
+            "value": "${data.mode_code}"
+          },
+          {
+            "key": "dock_sn",
+            "type": "string",
+            "value": "${gateway}"
+          }
+        ],
+        "timeseries": [
+          {
+            "key": "total_flight_sorties",
+            "type": "string",
+            "value": "${data.total_flight_sorties}"
+          },
+          {
+            "key": "height_limit",
+            "type": "integer",
+            "value": "${data.height_limit}"
+          },
+          {
+            "key": "distance_limit_status.distance_limit",
+            "type": "integer",
+            "value": "${data.distance_limit_status.distance_limit}"
+          },
+          {
+            "key": "battery",
+            "type": "string",
+            "value": "${data.battery}"
+          },
+          {
+            "key": "position_state.rtk_number",
+            "type": "integer",
+            "value": "${data.position_state.rtk_number}"
+          },
+          {
+            "key": "total_flight_time",
+            "type": "integer",
+            "value": "${data.total_flight_time}"
+          },
+          {
+            "key": "position_state.gps_number",
+            "type": "integer",
+            "value": "${data.position_state.gps_number}"
+          }
+        ]
+      }
+    },
+    {
+      "topicFilter": "thing/product/7C+/state",
+      "subscriptionQos": 0,
+      "converter": {
+        "type": "json",
+        "deviceInfo": {
+          "deviceNameExpression": "(?<=thing/product/)[^/]+(?=/state)",
+          "deviceNameExpressionSource": "topic",
+          "deviceProfileExpressionSource": "constant",
+          "deviceProfileExpression": "default"
+        },
+        "attributes": [
+          {
+            "key": "firmware_version",
+            "type": "string",
+            "value": "${data.firmware_version}"
+          }
+        ],
+        "timeseries": []
+      }
+    },
+    {
+      "topicFilter": "thing/product/158+/state",
+      "subscriptionQos": 0,
+      "converter": {
+        "type": "json",
+        "deviceInfo": {
+          "deviceNameExpression": "(?<=thing/product/)[^/]+(?=/state)",
+          "deviceNameExpressionSource": "topic",
+          "deviceProfileExpressionSource": "constant",
+          "deviceProfileExpression": "default"
+        },
+        "attributes": [
+          {
+            "key": "firmware_version",
+            "type": "string",
+            "value": "${data.firmware_version}"
+          }
+        ],
+        "timeseries": [
+          {
+            "key": "psdk_widget_values",
+            "type": "string",
+            "value": "${data.psdk_widget_values}"
+          },
+          {
+            "key": "home_latitude",
+            "type": "double",
+            "value": "${data.home_latitude}"
+          },
+          {
+            "key": "home_longitude",
+            "type": "double",
+            "value": "${data.home_longitude}"
+          },
+          {
+            "key": "total_flight_time",
+            "type": "integer",
+            "value": "${data.total_flight_time}"
+          }
+        ]
+      }
+    }
+  ],
+  "requestsMapping": {
+    "connectRequests": [
+      {
+        "topicFilter": "sensor/connect",
+        "deviceInfo": {
+          "deviceNameExpressionSource": "message",
+          "deviceNameExpression": "${serialNumber}",
+          "deviceProfileExpressionSource": "constant",
+          "deviceProfileExpression": "Thermometer"
+        }
+      },
+      {
+        "topicFilter": "sensor/+/connect",
+        "deviceInfo": {
+          "deviceNameExpressionSource": "topic",
+          "deviceNameExpression": "(?<=sensor/)(.*?)(?=/connect)",
+          "deviceProfileExpressionSource": "constant",
+          "deviceProfileExpression": "Thermometer"
+        }
+      }
+    ],
+    "disconnectRequests": [
+      {
+        "topicFilter": "sensor/disconnect",
+        "deviceInfo": {
+          "deviceNameExpressionSource": "message",
+          "deviceNameExpression": "${serialNumber}"
+        }
+      },
+      {
+        "topicFilter": "sensor/+/disconnect",
+        "deviceInfo": {
+          "deviceNameExpressionSource": "topic",
+          "deviceNameExpression": "(?<=sensor/)(.*?)(?=/connect)"
+        }
+      }
+    ],
+    "attributeRequests": [
+      {
+        "retain": false,
+        "topicFilter": "v1/devices/me/attributes/request",
+        "deviceInfo": {
+          "deviceNameExpressionSource": "message",
+          "deviceNameExpression": "${serialNumber}"
+        },
+        "attributeNameExpressionSource": "message",
+        "attributeNameExpression": "${versionAttribute}, ${pduAttribute}",
+        "topicExpression": "devices/${deviceName}/attrs",
+        "valueExpression": "${attributeKey}: ${attributeValue}"
+      }
+    ],
+    "attributeUpdates": [
+      {
+        "retain": true,
+        "deviceNameFilter": ".*",
+        "attributeFilter": "firmwareVersion",
+        "topicExpression": "sensor/${deviceName}/${attributeKey}",
+        "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
+      }
+    ],
+    "serverSideRpc": [
+      {
+        "type": "twoWay",
+        "deviceNameFilter": ".*",
+        "methodFilter": "echo",
+        "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+        "responseTopicExpression": "sensor/${deviceName}/response/${methodName}/${requestId}",
+        "responseTopicQoS": 1,
+        "responseTimeout": 10000,
+        "valueExpression": "${params}"
+      },
+      {
+        "type": "oneWay",
+        "deviceNameFilter": ".*",
+        "methodFilter": "no-reply",
+        "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
+        "valueExpression": "${params}"
+      }
+    ]
+  },
+  "name": "dajiang",
+  "id": "28239240-5e44-4fb8-9f66-c29c638903ae",
+  "logLevel": "INFO",
+  "enableRemoteLogging": false,
+  "configVersion": "3.7.8"
 }

ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/AircraftDetailVO.java

@@ -71,6 +71,10 @@ public class AircraftDetailVO extends AircraftVO {
     @Excel(name = "RTK信号")
     private Integer rtkSignal;
 
+    @Schema(description = "GPS信号")
+    @Excel(name = "GPS信号")
+    private Integer gpsSignal;
+
     /** 限高 */
     @Schema(description = "限高")
     @Excel(name = "限高")

ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java

@@ -169,10 +169,18 @@ public class DockDetailVO extends DockVO {
     /**
      * 充放电状态
      */
-    @Schema(description = "充放电状态")
+    @Schema(description = "充放电状态 空闲: FREE 充电中: CHARGING")
     @Excel(name = "充放电状态")
     private String chargingStatus;
 
+
+    /**
+     * 电量百分比
+     */
+    @Schema(description = "电量百分比")
+    @Excel(name = "电量百分比")
+    private Integer capacity_percent;
+
     /**
      * 舱内温度
      */

ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockVO.java

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -91,4 +92,9 @@ public class DockVO implements Serializable {
     @Schema(description = "挂载列表")
     private List<PayloadVO> payloadList;
 
+    /** 最后活跃时间 */
+    @Schema(description = "最后活跃时间")
+    @Excel(name = "最后活跃时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lastActiveTime;
+
 }