XW-AIOT/iot-test-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 经纬度修改
All checks were successful
iot-test-platform CI/CD / build-and-deploy (push) Successful in 16s
Details

Browse Source
This commit is contained in:
lzh
2025-12-15 15:04:02 +08:00
parent 40d560115b
commit 3456fc65b9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/iot/transport/jt808/service/codec/DataDecoder.java
View File

@@ -239,9 +239,9 @@ public class DataDecoder {
// 2. byte[4-7] 状态(DWORD(32)) // 2. byte[4-7] 状态(DWORD(32))
ret.setStatusField(this.parseIntFromBytes(data, 4, 4)); ret.setStatusField(this.parseIntFromBytes(data, 4, 4));
// 3. byte[8-11] 纬度(DWORD(32)) 以度为单位的纬度值乘以10^6，精确到百万分之一度 // 3. byte[8-11] 纬度(DWORD(32)) 以度为单位的纬度值乘以10^6，精确到百万分之一度
ret.setLatitude(this.parseFloatFromBytes(data, 8, 4)); ret.setLatitude(this.parseIntFromBytes(data, 8, 4) / 1000000.0f);
// 4. byte[12-15] 经度(DWORD(32)) 以度为单位的经度值乘以10^6，精确到百万分之一度 // 4. byte[12-15] 经度(DWORD(32)) 以度为单位的经度值乘以10^6，精确到百万分之一度
ret.setLongitude(this.parseFloatFromBytes(data, 12, 4)); ret.setLongitude(this.parseIntFromBytes(data, 12, 4) / 1000000.0f);
// 5. byte[16-17] 高程(WORD(16)) 海拔高度，单位为米（ m） // 5. byte[16-17] 高程(WORD(16)) 海拔高度，单位为米（ m）
ret.setElevation(this.parseIntFromBytes(data, 16, 2)); ret.setElevation(this.parseIntFromBytes(data, 16, 2));
// byte[18-19] 速度(WORD) 1/10km/h // byte[18-19] 速度(WORD) 1/10km/h

10
src/main/resources/static/index.html
View File

@@ -278,7 +278,7 @@
</div> </div>
<div class="col-6"> <div class="col-6">
<div v-if="badge.location" class="text-dark fw-bold mb-1" title="点击查看详情"> <div v-if="badge.location" class="text-dark fw-bold mb-1" title="点击查看详情">
{{ badge.location.lat.toFixed(4) }}, {{ badge.location.lon.toFixed(4) }} {{ badge.location.lat.toFixed(6) }}, {{ badge.location.lon.toFixed(6) }}
</div> </div>
<div v-else class="text-muted mb-1">-</div> <div v-else class="text-muted mb-1">-</div>
<div class="text-muted" style="font-size: 0.7rem;">GPS坐标</div> <div class="text-muted" style="font-size: 0.7rem;">GPS坐标</div>
@@ -288,12 +288,12 @@
<!-- 详细蓝牙列表 (折叠展示) --> <!-- 详细蓝牙列表 (折叠展示) -->
<div v-if="badge.bluetooth && badge.bluetooth.length > 0" class="mt-2 bg-light rounded p-2" style="font-size: 0.75rem;"> <div v-if="badge.bluetooth && badge.bluetooth.length > 0" class="mt-2 bg-light rounded p-2" style="font-size: 0.75rem;">
<div v-for="(ble, idx) in badge.bluetooth.slice(0, 2)" :key="idx" class="d-flex justify-content-between text-muted"> <div v-for="(ble, idx) in badge.bluetooth.slice(0, 4)" :key="idx" class="d-flex justify-content-between text-muted">
<span>MAC: {{ ble.mac }}</span> <span>MAC: {{ ble.mac }}</span>
<span>RSSI: {{ ble.rssi }}</span> <span>RSSI: {{ ble.rssi }} dBm</span>
</div> </div>
<div v-if="badge.bluetooth.length > 2" class="text-center text-primary" style="font-size: 0.7rem;"> <div v-if="badge.bluetooth.length > 4" class="text-center text-primary" style="font-size: 0.7rem;">
+{{ badge.bluetooth.length - 2 }} 更多... +{{ badge.bluetooth.length - 4 }} 更多...
</div> </div>
</div> </div>