Sumuxi/fastbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:细节补充

Browse Source
This commit is contained in:
zhugongping 2026-04-08 11:38:56 +08:00
parent e7ae333a11
commit 4048df2cca
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-admin/src/main/resources/application-test.yml
View File

@ -62,7 +62,7 @@ spring:
# mqtt 配置 # mqtt 配置
mqtt: mqtt:
username: fastbee # 账号（仅用于后端自认证） username: fastbee # 账号（仅用于后端自认证）
password: Yan@ancekong-mqtt # 密码（仅用于后端自认证） password: Yan@ancekong2026 # 密码（仅用于后端自认证）
host-url: tcp://47.121.180.229:1883 # 连接 Emqx 消息服务器地址 host-url: tcp://47.121.180.229:1883 # 连接 Emqx 消息服务器地址
#host-url: tcp://47.121.180.229:1883 # 内置netty mqtt broker地址 #host-url: tcp://47.121.180.229:1883 # 内置netty mqtt broker地址
client-id: ${random.int} # 客户端Id，不能相同，采用随机数 ${random.value} client-id: ${random.int} # 客户端Id，不能相同，采用随机数 ${random.value}
@ -78,7 +78,7 @@ emqx:
ApiSecret: tMbf5EEZFb08sut88i4tZscxTc9CE3gaRQewSOTRNvWL ApiSecret: tMbf5EEZFb08sut88i4tZscxTc9CE3gaRQewSOTRNvWL
# sip 配置 # sip 配置
sip: sip:
enabled: true # 是否启用视频监控SIP，true为启用 enabled: false # 是否启用视频监控SIP，true为启用
## 本地调试时，绑定网卡局域网IP，设备在同一局域网，设备接入IP填写绑定IP ## 本地调试时，绑定网卡局域网IP，设备在同一局域网，设备接入IP填写绑定IP
## 部署服务端时，默认绑定容器IP，设备接入IP填写服务器公网IP ## 部署服务端时，默认绑定容器IP，设备接入IP填写服务器公网IP
ip: 47.121.180.229 # 容器部署容器IP：47.121.180.229；云服务器部署写公网IP；本地部署127.0.0.1；总原则：能被摄像机访问的地址 ip: 47.121.180.229 # 容器部署容器IP：47.121.180.229；云服务器部署写公网IP；本地部署127.0.0.1；总原则：能被摄像机访问的地址

9
fastbee-common/src/main/java/com/fastbee/common/enums/TopicType.java
View File

@ -55,10 +55,11 @@ public enum TopicType {
FETCH_UPGRADE_REPLY(0, 9, "/fetch/upgrade/reply", "分包拉取方式OTA升级回调"), FETCH_UPGRADE_REPLY(0, 9, "/fetch/upgrade/reply", "分包拉取方式OTA升级回调"),
HTTP_UPGRADE_REPLY(0, 9, "/http/upgrade/reply", "http推送方式OTA升级回调"); HTTP_UPGRADE_REPLY(0, 9, "/http/upgrade/reply", "http推送方式OTA升级回调");
Integer type; // 定义成final更加安全，这样运行期间无法修改值
Integer order; final Integer type;
String topicSuffix; final Integer order;
String msg; final String topicSuffix;
final String msg;
public static TopicType getType(String topicSuffix) { public static TopicType getType(String topicSuffix) {
for (TopicType value : TopicType.values()) { for (TopicType value : TopicType.values()) {

6
yack-web/src/views/dataCenter/history.vue
View File

@ -47,7 +47,7 @@
<el-card v-loading="loading" shadow="never"> <el-card v-loading="loading" shadow="never">
<div slot="header" style="display: flex; align-items: center; justify-content: space-between;"> <div slot="header" style="display: flex; align-items: center; justify-content: space-between;">
<span>{{ $t('dataCenter.history.384934-10') }}</span> <span>{{ $t('dataCenter.history.384934-10') }}</span>
<el-switch v-model="independentYAxis" active-text="比例Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" /> <el-switch v-model="independentYAxis" active-text="独立Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" />
</div> </div>
<div class="el-table--enable-row-hover el-table--medium"> <div class="el-table--enable-row-hover el-table--medium">
<div v-show="devDatas.length !== 0" ref="devLineChart" :style="{ width: '100%', height: devChartHeight + 'px', background: '#fff' }"></div> <div v-show="devDatas.length !== 0" ref="devLineChart" :style="{ width: '100%', height: devChartHeight + 'px', background: '#fff' }"></div>
@ -128,7 +128,7 @@
<el-card v-loading="loading" shadow="never"> <el-card v-loading="loading" shadow="never">
<div slot="header" style="display: flex; align-items: center; justify-content: space-between;"> <div slot="header" style="display: flex; align-items: center; justify-content: space-between;">
<span>{{ gwResultTitle }}</span> <span>{{ gwResultTitle }}</span>
<el-switch v-model="independentYAxis" active-text="比例Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" /> <el-switch v-model="independentYAxis" active-text="独立Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" />
</div> </div>
<!-- 计算量结果 --> <!-- 计算量结果 -->
<template v-if="gwResultMode === 'calc'"> <template v-if="gwResultMode === 'calc'">
@ -215,7 +215,7 @@
<el-card v-loading="loading" shadow="never"> <el-card v-loading="loading" shadow="never">
<div slot="header" style="display: flex; align-items: center; justify-content: space-between;"> <div slot="header" style="display: flex; align-items: center; justify-content: space-between;">
<span>{{ $t('dataCenter.history.384934-10') }}</span> <span>{{ $t('dataCenter.history.384934-10') }}</span>
<el-switch v-model="independentYAxis" active-text="比例Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" /> <el-switch v-model="independentYAxis" active-text="独立Y轴" inactive-text="共享Y轴" @change="handleYAxisModeChange" />
</div> </div>
<div class="el-table--enable-row-hover el-table--medium"> <div class="el-table--enable-row-hover el-table--medium">
<div v-show="sceneDatas.length !== 0" ref="sceneLineChart" :style="{ width: '100%', height: sceneChartHeight + 'px', background: '#fff' }"></div> <div v-show="sceneDatas.length !== 0" ref="sceneLineChart" :style="{ width: '100%', height: sceneChartHeight + 'px', background: '#fff' }"></div>