From be438fe3dc69c55e2479411bcfa3920bdcaa6ac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 29 Jan 2026 10:14:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=85=E6=94=BE?= =?UTF-8?q?=E7=94=B5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java index aee5382..fd174e3 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java @@ -82,4 +82,8 @@ public class DockWithGPSVO implements Serializable { @Schema(description = "经度") private Double longitude; + /** 电量 */ + @Schema(description = "电量百分比") + private Integer batteryLevel; + } From c9148fad9f789f665457abfc5563f2f25bf66ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 29 Jan 2026 10:18:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=85=E6=94=BE?= =?UTF-8?q?=E7=94=B5=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java index fd174e3..b52bc13 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockWithGPSVO.java @@ -84,6 +84,6 @@ public class DockWithGPSVO implements Serializable { /** 电量 */ @Schema(description = "电量百分比") - private Integer batteryLevel; + private Integer capacity_percent; } From a207ceaa06dbd637fc0e4c793a77784b703bcd8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 29 Jan 2026 11:17:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20hyf-backend=20?= =?UTF-8?q?=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 hyf-backend 作为 Git 子模块,用于后端服务扩展。 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .gitmodules | 3 +++ docker/hyf-backend/dockerfile | 0 hyf-backend | 1 + 3 files changed, 4 insertions(+) create mode 100644 docker/hyf-backend/dockerfile create mode 160000 hyf-backend diff --git a/.gitmodules b/.gitmodules index 6d137be..8087e23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,3 +56,6 @@ [submodule "thingsboard"] path = thingsboard url = http://221.226.114.142:13000/THENG/thingsboard.git +[submodule "hyf-backend"] + path = hyf-backend + url = http://221.226.114.142:13000/THENG/hyf-backend.git diff --git a/docker/hyf-backend/dockerfile b/docker/hyf-backend/dockerfile new file mode 100644 index 0000000..e69de29 diff --git a/hyf-backend b/hyf-backend new file mode 160000 index 0000000..e308e9d --- /dev/null +++ b/hyf-backend @@ -0,0 +1 @@ +Subproject commit e308e9d2f2eb35feac799ebc2aed9cf0983c01f6 From 24cf92c0b804714fa3039e9cded322300d8fde32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 29 Jan 2026 11:49:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?remove:=20=E7=A7=BB=E9=99=A4=20hyf-backend?= =?UTF-8?q?=20=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 从项目中移除 hyf-backend 子模块 - 更新 .gitmodules 配置 - 删除相关 docker 配置文件 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .gitmodules | 3 --- docker/hyf-backend/dockerfile | 0 hyf-backend | 1 - 3 files changed, 4 deletions(-) delete mode 100644 docker/hyf-backend/dockerfile delete mode 160000 hyf-backend diff --git a/.gitmodules b/.gitmodules index 8087e23..6d137be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,6 +56,3 @@ [submodule "thingsboard"] path = thingsboard url = http://221.226.114.142:13000/THENG/thingsboard.git -[submodule "hyf-backend"] - path = hyf-backend - url = http://221.226.114.142:13000/THENG/hyf-backend.git diff --git a/docker/hyf-backend/dockerfile b/docker/hyf-backend/dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/hyf-backend b/hyf-backend deleted file mode 160000 index e308e9d..0000000 --- a/hyf-backend +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e308e9d2f2eb35feac799ebc2aed9cf0983c01f6 From be476f39e798343f6b4d3f57151f543c13878349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 29 Jan 2026 11:55:07 +0800 Subject: [PATCH 5/5] xx --- .devops/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index 6ed9c96..70d28a3 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -12,7 +12,7 @@ main_repository: monitor: poll_interval: 10 # 轮询间隔(秒) enabled_repos: [] # 空数组表示监听所有仓库,或指定具体仓库名称列表 - watch_tags: true # 是否监听 tag 变化(打 tag 时触发部署) + watch_tags: false # 是否监听 tag 变化(打 tag 时触发部署) tag_pattern: "v*" # 监听的 tag 模式,支持通配符(如 v*、release-*) # 部署配置