@@ -1650,6 +1723,75 @@
}
// ==================== DEVICES ====================
+ let _devItems = [];
+ let _devLocModes = {};
+ const _devSort = { field: 'name', dir: 'asc' };
+
+ function _renderDeviceRows() {
+ const tbody = document.getElementById('devicesTableBody');
+ if (!_devItems.length) {
+ tbody.innerHTML = '
| 没有找到设备 |
';
+ return;
+ }
+ const sorted = [..._devItems].sort((a, b) => {
+ const f = _devSort.field;
+ let va = a[f], vb = b[f];
+ if (va == null) va = '';
+ if (vb == null) vb = '';
+ if (typeof va === 'number' && typeof vb === 'number') return _devSort.dir === 'asc' ? va - vb : vb - va;
+ va = String(va); vb = String(vb);
+ const cmp = va.localeCompare(vb, 'zh-CN', { numeric: true });
+ return _devSort.dir === 'asc' ? cmp : -cmp;
+ });
+ tbody.innerHTML = sorted.map(d => {
+ const did = d.id || d.device_id || '';
+ const on = d.status === 'online';
+ const dis = on ? '' : 'disabled style="opacity:0.35;cursor:not-allowed"';
+ return `
+
+ | ${escapeHtml(d.imei)} |
+ ${escapeHtml(d.name || '-')} |
+ ${escapeHtml(d.device_type || '-')} |
+ ${statusBadge(d.status)} |
+ ${_locTypeBadge(_devLocModes[d.id] || null)} |
+ ${d.battery_level !== undefined && d.battery_level !== null ? `${d.battery_level}%` : '-'} |
+ ${d.gsm_signal !== undefined && d.gsm_signal !== null ? d.gsm_signal : '-'} |
+ ${formatTime(d.last_login)} |
+ ${formatTime(d.last_heartbeat)} |
+
+
+
+
+
+
+ |
+
`;
+ }).join('');
+ }
+
+ function _updateSortArrows() {
+ document.querySelectorAll('.dev-sort .sort-arrow').forEach(el => {
+ el.className = 'sort-arrow';
+ if (el.parentElement.dataset.sort === _devSort.field) {
+ el.classList.add(_devSort.dir);
+ }
+ });
+ }
+
+ document.addEventListener('click', e => {
+ const th = e.target.closest('.dev-sort');
+ if (!th) return;
+ const field = th.dataset.sort;
+ if (_devSort.field === field) {
+ _devSort.dir = _devSort.dir === 'asc' ? 'desc' : 'asc';
+ } else {
+ _devSort.field = field;
+ _devSort.dir = 'asc';
+ }
+ _updateSortArrows();
+ _renderDeviceRows();
+ });
+
async function loadDevices(page) {
if (page) pageState.devices.page = page;
const p = pageState.devices.page;
@@ -1664,29 +1806,18 @@
showLoading('devicesLoading');
try {
const data = await apiCall(url);
- const items = data.items || [];
- const tbody = document.getElementById('devicesTableBody');
-
- if (items.length === 0) {
- tbody.innerHTML = '
| 没有找到设备 |
';
- } else {
- tbody.innerHTML = items.map(d => `
-
- | ${escapeHtml(d.imei)} |
- ${escapeHtml(d.name || '-')} |
- ${escapeHtml(d.device_type || '-')} |
- ${statusBadge(d.status)} |
- ${d.battery_level !== undefined && d.battery_level !== null ? `${d.battery_level}%` : '-'} |
- ${d.gsm_signal !== undefined && d.gsm_signal !== null ? d.gsm_signal : '-'} |
- ${formatTime(d.last_login)} |
- ${formatTime(d.last_heartbeat)} |
-
- `).join('');
- }
+ _devItems = data.items || [];
+ _devLocModes = {};
+ _renderDeviceRows();
+ _updateSortArrows();
renderPagination('devicesPagination', data.total || 0, data.page || p, data.page_size || ps, 'loadDevices');
+ // Fetch latest location types asynchronously
+ if (_devItems.length) {
+ _fillDeviceLocModes(_devItems.map(d => d.id));
+ }
} catch (err) {
showToast('加载设备列表失败: ' + err.message, 'error');
- document.getElementById('devicesTableBody').innerHTML = '
| 加载失败 |
';
+ document.getElementById('devicesTableBody').innerHTML = '
| 加载失败 |
';
} finally {
hideLoading('devicesLoading');
}
@@ -1736,6 +1867,25 @@
const map = { gps: 'GPS', gps_4g: 'GPS 4G', lbs: 'LBS 基站', lbs_4g: 'LBS 4G', wifi: 'WiFi', wifi_4g: 'WiFi 4G', bluetooth: '蓝牙' };
return map[t] || t || '-';
}
+ function _locTypeBadge(t) {
+ if (!t) return '
-';
+ const colors = { gps: '#3b82f6', gps_4g: '#3b82f6', wifi: '#06b6d4', wifi_4g: '#06b6d4', lbs: '#f59e0b', lbs_4g: '#f59e0b', bluetooth: '#a855f7' };
+ const color = colors[t] || '#6b7280';
+ const label = _locTypeLabel(t);
+ return `
${label}`;
+ }
+ async function _fillDeviceLocModes(deviceIds) {
+ if (!deviceIds.length) return;
+ try {
+ const data = await apiCall(`${API_BASE}/locations/batch-latest`, {
+ method: 'POST',
+ body: JSON.stringify({ device_ids: deviceIds })
+ });
+ const locs = Array.isArray(data) ? data : [];
+ locs.forEach(l => { if (l) _devLocModes[l.device_id] = l.location_type; });
+ _renderDeviceRows();
+ } catch (e) { /* silent - non-critical */ }
+ }
function _locModeBadges(locType) {
const modes = [
{ label: 'GPS', match: ['gps','gps_4g'] },
@@ -1872,6 +2022,8 @@
const content = _buildInfoContent('位置记录', loc, lat, lng);
_focusInfoWindow = new AMap.InfoWindow({ content, offset: new AMap.Pixel(0, -30) });
_focusInfoWindow.open(locationMap, [mLng, mLat]);
+ _focusMarker.on('mouseover', () => _focusInfoWindow.open(locationMap, [mLng, mLat]));
+ _focusMarker.on('mouseout', () => _focusInfoWindow.close());
_focusMarker.on('click', () => _focusInfoWindow.open(locationMap, [mLng, mLat]));
locationMap.setCenter([mLng, mLat]);
@@ -1977,6 +2129,86 @@
}
// --- Quick command sender for device detail panel ---
+ async function _devQuickCmd(deviceId, cmd, btnEl) {
+ if (btnEl) { btnEl.disabled = true; btnEl.classList.add('sent'); }
+ try {
+ const res = await apiCall(`${API_BASE}/commands/send`, {
+ method: 'POST',
+ body: JSON.stringify({ device_id: parseInt(deviceId), command_type: 'online_cmd', command_content: cmd }),
+ });
+ showToast(`${cmd} → 已发送`);
+ // Poll for response
+ const cmdId = res && res.id;
+ if (cmdId) {
+ for (let i = 0; i < 6; i++) {
+ await new Promise(r => setTimeout(r, 1500));
+ try {
+ const c = await apiCall(`${API_BASE}/commands/${cmdId}`);
+ if (c.response_content) { showToast(`${cmd} → ${c.response_content}`); break; }
+ } catch (_) {}
+ }
+ }
+ } catch (err) {
+ showToast(`${cmd} 发送失败: ${err.message}`, 'error');
+ } finally {
+ if (btnEl) { btnEl.disabled = false; btnEl.classList.remove('sent'); }
+ }
+ }
+
+ async function _broadcastCmd(cmd, label) {
+ if (!confirm(`确定向所有设备发送 ${cmd} ？`)) return;
+ try {
+ const data = await apiCall(`${API_BASE}/commands/broadcast`, {
+ method: 'POST',
+ body: JSON.stringify({ command_type: 'online_cmd', command_content: cmd }),
+ });
+ showToast(`${label}: ${data.sent} 台已发送, ${data.failed} 台未连接`);
+ } catch (err) {
+ showToast(`${label} 失败: ${err.message}`, 'error');
+ }
+ }
+
+ function _showBroadcastModal() {
+ showModal(`
+
广播指令 — 发送给所有在线设备
+
+
+
常用指令快捷选择：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `);
+ }
+
+ async function _doBroadcast() {
+ const cmd = document.getElementById('broadcastCmdInput').value.trim();
+ if (!cmd) { showToast('请输入指令内容', 'error'); return; }
+ if (!confirm('确定向所有设备发送 ' + cmd + ' ？')) return;
+ closeModal();
+ await _broadcastCmd(cmd, '广播 ' + cmd);
+ }
+
async function _quickCmd(deviceId, cmd, btnEl) {
if (btnEl) { btnEl.disabled = true; btnEl.style.opacity = '0.5'; }
try {
@@ -2260,6 +2492,381 @@
return wgs84ToGcj02(lat, lng);
}
+ // ==================== LOCATION TAB SWITCH ====================
+ let _ovInited = false;
+ async function _switchLocTab(tab) {
+ document.getElementById('locTabTrack').classList.toggle('active', tab === 'track');
+ document.getElementById('locTabOverview').classList.toggle('active', tab === 'overview');
+ document.getElementById('locTabTrackContent').style.display = tab === 'track' ? '' : 'none';
+ document.getElementById('locTabOverviewContent').style.display = tab === 'overview' ? '' : 'none';
+ if (tab === 'overview') {
+ if (!_overviewMap) _initOverviewMap();
+ if (!cachedDevices || !cachedDevices.length) await loadDeviceSelectors();
+ if (!_ovInited) {
+ _ovInited = true;
+ cachedDevices.forEach(d => _ovSelectedDevices.add(d.id));
+ }
+ _ovBuildDeviceList();
+ loadAllDevicePositions();
+ }
+ }
+
+ // ==================== OVERVIEW MAP ====================
+ let _overviewMap = null;
+ let _ovMarkerMap = {}; // {device_id: marker}
+ let _ovSelectedDevices = new Set(); // selected device IDs
+
+ function _initOverviewMap() {
+ if (_overviewMap) return;
+ setTimeout(() => {
+ const [mLat, mLng] = toMapCoord(30.605, 103.936);
+ _overviewMap = new AMap.Map('overviewMap', {
+ viewMode: '3D', pitch: 45, rotation: -15, rotateEnable: true,
+ zoom: 14, center: [mLng, mLat],
+ mapStyle: 'amap://styles/normal',
+ });
+ }, 100);
+ }
+
+ function _clearOverviewMarkers() {
+ Object.values(_ovMarkerMap).forEach(m => m.setMap(null));
+ _ovMarkerMap = {};
+ }
+
+ let _ovPinnedIW = null; // pinned (click) info window
+
+ function _ovLocateDevice(did) {
+ // Highlight in list
+ document.querySelectorAll('.ov-dev-item').forEach(el => {
+ el.style.background = Number(el.dataset.did) === did ? '#1e3a5f' : '';
+ });
+ // Move map to device marker (show even if unchecked)
+ const marker = _ovMarkerMap[did];
+ if (marker) {
+ if (!marker.getMap()) marker.setMap(_overviewMap);
+ const pos = marker.getPosition();
+ _overviewMap.setCenter(pos);
+ _overviewMap.setZoom(16);
+ if (_ovPinnedIW) _ovPinnedIW.close();
+ marker.emit('click', { lnglat: pos });
+ } else {
+ showToast('该设备暂无位置数据', 'info');
+ }
+ // Highlight this device's track if exists
+ _ovHighlightByDevice(did);
+ }
+
+ function _ovSyncMarkerVisibility() {
+ let visibleCount = 0;
+ const visible = [];
+ for (const [did, marker] of Object.entries(_ovMarkerMap)) {
+ if (_ovSelectedDevices.has(Number(did))) {
+ marker.setMap(_overviewMap);
+ visible.push(marker);
+ visibleCount++;
+ } else {
+ marker.setMap(null);
+ }
+ }
+ document.getElementById('overviewDeviceCount').textContent =
+ `已选 ${_ovSelectedDevices.size} 台，${visibleCount} 台有位置`;
+ }
+
+ function _ovBuildDeviceList() {
+ const list = document.getElementById('ovDeviceList');
+ if (!cachedDevices || !cachedDevices.length) {
+ list.innerHTML = '
无设备
';
+ return;
+ }
+ list.innerHTML = cachedDevices.map(d => {
+ const checked = _ovSelectedDevices.has(d.id) ? 'checked' : '';
+ const statusDot = d.status === 'online' ? '🟢' : '⚫';
+ return `
+
+ ${statusDot}
+
+ ${escapeHtml(d.name || '-')}
+ ${escapeHtml(d.imei)}
+
+
`;
+ }).join('');
+ _ovUpdateCount();
+ document.getElementById('ovSelectAll').checked = _ovSelectedDevices.size === cachedDevices.length;
+ }
+
+ function _ovToggleDevice(id, checked) {
+ if (checked) _ovSelectedDevices.add(id); else _ovSelectedDevices.delete(id);
+ _ovUpdateCount();
+ document.getElementById('ovSelectAll').checked = _ovSelectedDevices.size === (cachedDevices || []).length;
+ _ovSyncMarkerVisibility();
+ }
+
+ function _ovFilterDevices() {
+ const q = (document.getElementById('ovDeviceSearch').value || '').toLowerCase();
+ document.querySelectorAll('.ov-dev-item').forEach(el => {
+ const text = el.textContent.toLowerCase();
+ el.style.display = !q || text.includes(q) ? '' : 'none';
+ });
+ }
+
+ function _ovToggleAll(checked) {
+ (cachedDevices || []).forEach(d => {
+ if (checked) _ovSelectedDevices.add(d.id); else _ovSelectedDevices.delete(d.id);
+ });
+ _ovBuildDeviceList();
+ _ovSyncMarkerVisibility();
+ }
+
+ function _ovUpdateCount() {
+ const el = document.getElementById('ovSelectedCount');
+ if (el) el.textContent = `${_ovSelectedDevices.size}/${(cachedDevices||[]).length}`;
+ }
+
+ async function loadAllDevicePositions() {
+ if (!_overviewMap) { _initOverviewMap(); await new Promise(r => setTimeout(r, 200)); }
+ if (!cachedDevices || !cachedDevices.length) await loadDeviceSelectors();
+ _clearOverviewMarkers();
+
+ const allIds = cachedDevices.map(d => d.id);
+ if (!allIds.length) return;
+
+ try {
+ const data = await apiCall(`${API_BASE}/locations/batch-latest`, {
+ method: 'POST',
+ body: JSON.stringify({ device_ids: allIds }),
+ });
+ const locs = Array.isArray(data) ? data : [];
+ const _devColors = ['#3b82f6','#ef4444','#22c55e','#f59e0b','#a855f7','#06b6d4','#ec4899','#84cc16','#f97316','#6366f1','#14b8a6','#e879f9','#facc15','#fb923c'];
+ const _devColorMap = {};
+ allIds.forEach((id, idx) => { _devColorMap[id] = _devColors[idx % _devColors.length]; });
+ let plotted = 0;
+ locs.forEach((loc, i) => {
+ if (!loc) return;
+ const lat = loc.latitude, lng = loc.longitude;
+ if (!lat || !lng) return;
+ const did = allIds[i];
+ const [mLat, mLng] = toMapCoord(lat, lng);
+ const dev = cachedDevices.find(d => d.id === did);
+ const devName = dev ? (dev.name || '') : '';
+ const devImei = dev ? dev.imei : _imei(did);
+ const isOnline = dev && dev.status === 'online';
+ const color = _devColorMap[did] || '#3b82f6';
+ const borderColor = isOnline ? '#22c55e' : '#6b7280';
+ const labelText = devName ? `${devName} (${devImei.slice(-4)})` : devImei;
+
+ const marker = new AMap.Marker({
+ position: [mLng, mLat],
+ label: { content: `
${escapeHtml(labelText)}`, direction: 'top', offset: new AMap.Pixel(0, -5) },
+ });
+ // Don't add to map yet — visibility controlled by _ovSyncMarkerVisibility
+
+ const statusText = isOnline ? '
● 在线' : '
● 离线';
+ const title = `${escapeHtml(devName || devImei)} ${statusText}
${escapeHtml(devImei)}`;
+ const content = _buildInfoContent(title, loc, lat, lng);
+ // Hover: lightweight preview
+ const hoverIW = new AMap.InfoWindow({ content, offset: new AMap.Pixel(0, -30) });
+ let _pinned = false;
+ marker.on('mouseover', () => { if (!_pinned) hoverIW.open(_overviewMap, [mLng, mLat]); });
+ marker.on('mouseout', () => { if (!_pinned) hoverIW.close(); });
+ // Click: pin the info window + highlight track
+ const _clickDid = did;
+ marker.on('click', () => {
+ if (_ovPinnedIW) _ovPinnedIW.close();
+ _pinned = true;
+ const pinnedIW = new AMap.InfoWindow({ content, offset: new AMap.Pixel(0, -30) });
+ pinnedIW.open(_overviewMap, [mLng, mLat]);
+ pinnedIW.on('close', () => { _pinned = false; });
+ _ovPinnedIW = pinnedIW;
+ _ovHighlightByDevice(_clickDid);
+ });
+ _ovMarkerMap[did] = marker;
+ plotted++;
+ });
+
+ // Show only selected devices
+ _ovSyncMarkerVisibility();
+
+ // Fit view to visible markers
+ const visible = Object.entries(_ovMarkerMap)
+ .filter(([did]) => _ovSelectedDevices.has(Number(did)))
+ .map(([, m]) => m);
+ if (visible.length > 1) {
+ _overviewMap.setFitView(visible, false, [80,80,80,80]);
+ } else if (visible.length === 1) {
+ _overviewMap.setCenter(visible[0].getPosition());
+ _overviewMap.setZoom(15);
+ }
+ showToast(`已加载 ${plotted} 台设备位置`);
+ } catch (err) {
+ showToast('加载设备位置失败: ' + err.message, 'error');
+ }
+ }
+
+ async function _ovRequestAllPositions() {
+ if (!confirm('向所有设备发送定位指令？')) return;
+ try {
+ const data = await apiCall(`${API_BASE}/commands/broadcast`, {
+ method: 'POST',
+ body: JSON.stringify({ command_type: 'online_cmd', command_content: 'WHERE#' }),
+ });
+ showToast(`已发送定位指令: ${data.sent} 台已发送, ${data.failed} 台未连接，等待回传后点"刷新位置"`);
+ } catch (err) {
+ showToast('发送失败: ' + err.message, 'error');
+ }
+ }
+
+ // ==================== OVERVIEW TRACK + LP FILTER ====================
+ let _ovTrackMarkers = [];
+ let _ovHideLP = false;
+ let _ovHighlightedPL = null;
+ let _ovDidToPL = {}; // {device_id: polyline} for highlight lookup
+
+ function _ovHighlightByDevice(did) {
+ const pl = _ovDidToPL[did];
+ if (pl) _ovHighlightTrack(pl);
+ }
+
+ function _ovHighlightTrack(pl) {
+ // Reset previous highlight
+ _ovTrackMarkers.forEach(m => {
+ if (m._ovColor) {
+ m.setOptions({ strokeWeight: 3, strokeOpacity: 0.6, zIndex: 50 });
+ }
+ // Dim track points of other devices
+ if (m.setRadius && m._ovOwnerPL && m._ovOwnerPL !== pl) {
+ m.setMap(null); m._ovDimmed = true;
+ }
+ });
+
+ if (_ovHighlightedPL === pl) {
+ // Toggle off: restore all
+ _ovHighlightedPL = null;
+ _ovTrackMarkers.forEach(m => {
+ if (m._ovColor) m.setOptions({ strokeOpacity: 0.6 });
+ if (m._ovDimmed) { m.setMap(_overviewMap); m._ovDimmed = false; }
+ });
+ showToast('已取消高亮');
+ return;
+ }
+
+ // Highlight clicked polyline
+ pl.setOptions({ strokeWeight: 6, strokeOpacity: 1, zIndex: 200 });
+ _ovHighlightedPL = pl;
+ // Show only this device's track points
+ _ovTrackMarkers.forEach(m => {
+ if (m._ovDimmed) { m.setMap(_overviewMap); m._ovDimmed = false; }
+ });
+ showToast(`已高亮: ${pl._ovDevName}`);
+ }
+
+ async function _ovShowTrack() {
+ const ids = [..._ovSelectedDevices];
+ if (!ids.length) { showToast('请勾选至少一台设备', 'error'); return; }
+
+ const today = new Date().toISOString().split('T')[0];
+ _ovClearTrack();
+ let totalPoints = 0;
+
+ // Distinct track colors per device
+ const trackColors = ['#3b82f6','#ef4444','#22c55e','#f59e0b','#a855f7','#06b6d4','#ec4899','#84cc16','#f97316','#6366f1','#14b8a6'];
+
+ for (let idx = 0; idx < ids.length; idx++) {
+ const did = ids[idx];
+ const dev = cachedDevices.find(d => d.id === did);
+ const devName = dev ? (dev.name || dev.imei) : did;
+ const color = trackColors[idx % trackColors.length];
+
+ try {
+ const data = await apiCall(`${API_BASE}/locations/track/${did}?start_time=${today}T00:00:00&end_time=${today}T23:59:59`);
+ const locs = Array.isArray(data) ? data : (data.items || []);
+ if (!locs.length) continue;
+
+ const path = [];
+ const deviceMarkers = [];
+ locs.forEach((loc, i) => {
+ const lat = loc.latitude, lng = loc.longitude;
+ if (!lat || !lng) return;
+ const lt = (loc.location_type || '').toLowerCase();
+ if (_ovHideLP && lt.startsWith('lbs')) return;
+
+ const [mLat, mLng] = toMapCoord(lat, lng);
+ path.push([mLng, mLat]);
+
+ const isFirst = i === 0, isLast = i === locs.length - 1;
+ const marker = new AMap.CircleMarker({
+ center: [mLng, mLat],
+ radius: isFirst || isLast ? 10 : 5,
+ fillColor: isFirst ? '#22c55e' : isLast ? '#ef4444' : color,
+ strokeColor: '#fff', strokeWeight: 1,
+ fillOpacity: 0.9, zIndex: 130, cursor: 'pointer',
+ });
+ marker.setMap(_overviewMap);
+
+ const label = `${devName} ${isFirst ? '起点' : isLast ? '终点' : `第${i+1}/${locs.length}点`}`;
+ const content = _buildInfoContent(label, loc, lat, lng);
+ const iw = new AMap.InfoWindow({ content, offset: new AMap.Pixel(0, -5) });
+ let pinned = false;
+ marker.on('mouseover', () => { if (!pinned) iw.open(_overviewMap, [mLng, mLat]); });
+ marker.on('mouseout', () => { if (!pinned) iw.close(); });
+ marker.on('click', () => { pinned = !pinned; iw.open(_overviewMap, [mLng, mLat]); });
+ iw.on('close', () => { pinned = false; });
+ deviceMarkers.push(marker);
+ _ovTrackMarkers.push(marker);
+ });
+
+ if (path.length > 1) {
+ const pl = new AMap.Polyline({ path, strokeColor: color, strokeWeight: 3, strokeOpacity: 0.6, lineJoin: 'round', cursor: 'pointer', zIndex: 50 });
+ pl.setMap(_overviewMap);
+ pl._ovColor = color;
+ pl._ovDevName = devName;
+ pl._ovDid = did;
+ _ovDidToPL[did] = pl;
+ pl.on('click', () => _ovHighlightTrack(pl));
+ pl.on('mouseover', () => { if (pl !== _ovHighlightedPL) pl.setOptions({ strokeWeight: 5 }); });
+ pl.on('mouseout', () => { if (pl !== _ovHighlightedPL) pl.setOptions({ strokeWeight: 3 }); });
+ _ovTrackMarkers.push(pl);
+ // Tag markers with their polyline for highlight grouping
+ deviceMarkers.forEach(m => { m._ovOwnerPL = pl; });
+ }
+ totalPoints += locs.length;
+ } catch (err) {
+ console.error(`Track load failed for ${devName}:`, err);
+ }
+ }
+
+ if (totalPoints === 0) { showToast('今天没有轨迹数据', 'info'); return; }
+
+ if (_ovTrackMarkers.length > 1) {
+ _overviewMap.setFitView(_ovTrackMarkers.filter(m => m.getPosition), false, [80,80,80,80]);
+ }
+ document.getElementById('ovBtnClearTrack').style.display = '';
+ document.getElementById('ovBtnTrack').innerHTML = `
轨迹 ${ids.length}台 (${totalPoints}点)`;
+ showToast(`已加载 ${ids.length} 台设备共 ${totalPoints} 个轨迹点`);
+ }
+
+ function _ovClearTrack() {
+ _ovTrackMarkers.forEach(m => m.setMap(null));
+ _ovTrackMarkers = [];
+ _ovHighlightedPL = null;
+ _ovDidToPL = {};
+ document.getElementById('ovBtnClearTrack').style.display = 'none';
+ document.getElementById('ovBtnTrack').innerHTML = '
显示轨迹';
+ }
+
+ function _ovToggleLP() {
+ _ovHideLP = !_ovHideLP;
+ const btn = document.getElementById('ovBtnHideLP');
+ if (_ovHideLP) {
+ btn.style.background = '#b91c1c'; btn.style.color = '#fff';
+ btn.innerHTML = '
低精度';
+ } else {
+ btn.style.background = ''; btn.style.color = '';
+ btn.innerHTML = '
低精度';
+ }
+ // Re-render track if active
+ if (_ovTrackMarkers.length) _ovShowTrack();
+ }
+
// ==================== LOCATIONS ====================
function initLocationMap() {
if (locationMap) return;
@@ -2308,12 +2915,14 @@
btn.style.color = '';
btn.innerHTML = '
低精度';
}
- // Re-apply to existing track markers
+ // Re-apply to existing track markers + polyline
_applyLowPrecisionFilter();
+ // Reload table with correct pagination
+ loadLocationRecords(1);
}
function _isLowPrecision(locationType) {
const t = (locationType || '').toLowerCase();
- return t.startsWith('lbs') || t.startsWith('wifi');
+ return t.startsWith('lbs');
}
function _applyLowPrecisionFilter() {
// Toggle visibility of low-precision markers stored with _lpFlag
@@ -2413,14 +3022,18 @@
fillOpacity: isLbs ? 0.6 : 0.9,
zIndex: 120, cursor: 'pointer',
});
- const isLP = (isLbs || isWifi) && !isFirst && !isLast;
+ const isLP = isLbs && !isFirst && !isLast;
marker._lpFlag = isLP;
if (_hideLowPrecision && isLP) marker._lpHidden = true;
else marker.setMap(locationMap);
const label = isFirst ? `起点 (1/${total})` : isLast ? `终点 (${i+1}/${total})` : `第 ${i+1}/${total} 点`;
const content = _buildInfoContent(label, loc, lat, lng);
const infoWindow = new AMap.InfoWindow({ content, offset: new AMap.Pixel(0, -5) });
- marker.on('click', () => infoWindow.open(locationMap, [mLng, mLat]));
+ let _trackPinned = false;
+ marker.on('mouseover', () => { if (!_trackPinned) infoWindow.open(locationMap, [mLng, mLat]); });
+ marker.on('mouseout', () => { if (!_trackPinned) infoWindow.close(); });
+ marker.on('click', () => { _trackPinned = !_trackPinned; infoWindow.open(locationMap, [mLng, mLat]); });
+ infoWindow.on('close', () => { _trackPinned = false; });
mapMarkers.push(marker);
mapInfoWindows.push({ infoWindow, position: [mLng, mLat], locId: loc.id });
}
@@ -2433,8 +3046,7 @@
const filteredPath = _hideLowPrecision
? path.filter((_, i) => {
const lt = (locations[i]?.location_type || '').toLowerCase();
- const isFirst = i === 0, isLast = i === locations.length - 1;
- return isFirst || isLast || !(lt.startsWith('lbs') || lt.startsWith('wifi'));
+ return !lt.startsWith('lbs');
})
: path;
@@ -2521,7 +3133,11 @@
const infoContent = _buildInfoContent('实时定位', loc, lat, lng);
const infoWindow = new AMap.InfoWindow({ content: infoContent, offset: new AMap.Pixel(0, -30) });
infoWindow.open(locationMap, [mLng, mLat]);
- marker.on('click', () => infoWindow.open(locationMap, [mLng, mLat]));
+ let _latestPinned = true; // pinned by default for latest position
+ marker.on('mouseover', () => { if (!_latestPinned) infoWindow.open(locationMap, [mLng, mLat]); });
+ marker.on('mouseout', () => { if (!_latestPinned) infoWindow.close(); });
+ marker.on('click', () => { _latestPinned = !_latestPinned; infoWindow.open(locationMap, [mLng, mLat]); });
+ infoWindow.on('close', () => { _latestPinned = false; });
mapMarkers.push(marker);
locationMap.setCenter([mLng, mLat]);
locationMap.setZoom(15);
@@ -2547,6 +3163,7 @@
let url = `${API_BASE}/locations?page=${p}&page_size=${ps}`;
if (deviceId) url += `&device_id=${deviceId}`;
if (locType) url += `&location_type=${locType}`;
+ if (_hideLowPrecision && !locType) url += `&exclude_type=lbs`;
if (startTime) url += `&start_time=${startTime}T00:00:00`;
if (endTime) url += `&end_time=${endTime}T23:59:59`;
@@ -2563,10 +3180,9 @@
tbody.innerHTML = items.map(l => {
const q = _locQuality(l);
const hasCoord = l.latitude != null && l.longitude != null;
- const lpHide = _hideLowPrecision && _isLowPrecision(l.location_type);
- return `
+ return `
|
- ${escapeHtml(l.device_id || '-')} |
+ ${escapeHtml(_imei(l.device_id))} |
${_locTypeLabel(l.location_type)} |
${l.latitude != null ? Number(l.latitude).toFixed(6) : '-'} |
${l.longitude != null ? Number(l.longitude).toFixed(6) : '-'} |
@@ -2634,7 +3250,7 @@
tbody.innerHTML = items.map(a => `
|
- ${escapeHtml(a.device_id || '-')} |
+ ${escapeHtml(_imei(a.device_id))} |
${alarmTypeName(a.alarm_type)} |
${({'single_fence':'单围栏','multi_fence':'多围栏','lbs':'基站','wifi':'WiFi'})[a.alarm_source] || escapeHtml(a.alarm_source || '-')} |
${a.address ? escapeHtml(a.address) : (a.latitude != null ? Number(a.latitude).toFixed(6) + ', ' + Number(a.longitude).toFixed(6) : '-')} |
@@ -2743,7 +3359,7 @@
const srcColor = {'device':'#9ca3af','bluetooth':'#818cf8','fence':'#34d399'}[a.attendance_source] || '#9ca3af';
return `
|
- ${escapeHtml(a.device_id || '-')} |
+ ${escapeHtml(_imei(a.device_id))} |
${attendanceTypeName(a.attendance_type)} |
${srcLabel} |
${locMethod} ${escapeHtml(posStr)} |
@@ -2813,7 +3429,7 @@
const attStr = b.attendance_type ? `${attendanceTypeName(b.attendance_type)}` : '-';
return `
|
- ${escapeHtml(b.device_id || '-')} |
+ ${escapeHtml(_imei(b.device_id))} |
${typeIcon} ${typeName} |
${escapeHtml(mac)} |
${uuidLine} |
@@ -2970,8 +3586,7 @@
|
${r.id} |
${typeBadge} |
- ${r.device_id || '-'} |
- ${escapeHtml(r.imei || (logDeviceMap[r.device_id] || {}).imei || '-')} |
+ ${escapeHtml(r.imei || _imei(r.device_id))} |
${escapeHtml(detail)} |
${coord} |
${escapeHtml(addr)} |
@@ -4089,7 +4704,7 @@
tbody.innerHTML = items.map(c => `
| ${escapeHtml(c.id || '-')} |
- ${escapeHtml(c.device_id || c.imei || '-')} |
+ ${escapeHtml(_imei(c.device_id))} |
${escapeHtml(c.command_type || '-')} |
${escapeHtml(truncate(c.command_content || '-', 40))} |
${commandStatusBadge(c.status)} |
diff --git a/app/tcp_server.py b/app/tcp_server.py
index cee6a02..eedb59f 100644
--- a/app/tcp_server.py
+++ b/app/tcp_server.py
@@ -235,10 +235,11 @@ class PacketBuilder:
class ConnectionInfo:
"""Metadata about a single device TCP connection."""
- __slots__ = ("imei", "addr", "connected_at", "last_activity", "serial_counter")
+ __slots__ = ("imei", "device_id", "addr", "connected_at", "last_activity", "serial_counter")
def __init__(self, addr: Tuple[str, int]) -> None:
self.imei: Optional[str] = None
+ self.device_id: Optional[int] = None
self.addr = addr
self.connected_at = datetime.now(timezone(timedelta(hours=8))).replace(tzinfo=None)
self.last_activity = self.connected_at
@@ -254,12 +255,16 @@ class ConnectionInfo:
# Helper: look up device_id from IMEI
# ---------------------------------------------------------------------------
-async def _get_device_id(session, imei: str) -> Optional[int]:
- """Query the Device table and return the integer id for the given IMEI."""
+async def _get_device_id(session, imei: str, conn_info: Optional["ConnectionInfo"] = None) -> Optional[int]:
+ """Return the device id for the given IMEI, using ConnectionInfo cache if available."""
+ if conn_info is not None and conn_info.device_id is not None:
+ return conn_info.device_id
result = await session.execute(
select(Device.id).where(Device.imei == imei)
)
row = result.scalar_one_or_none()
+ if row is not None and conn_info is not None:
+ conn_info.device_id = row
return row
@@ -273,6 +278,7 @@ class TCPManager:
def __init__(self) -> None:
# {imei: (reader, writer, connection_info)}
self.connections: Dict[str, Tuple[asyncio.StreamReader, asyncio.StreamWriter, ConnectionInfo]] = {}
+ self._conn_lock = asyncio.Lock()
self._server: Optional[asyncio.AbstractServer] = None
# Protocol number -> handler coroutine mapping
@@ -316,11 +322,22 @@ class TCPManager:
conn_info = ConnectionInfo(addr)
logger.info("New TCP connection from %s:%d", addr[0], addr[1])
- recv_buffer = b""
+ recv_buffer = bytearray()
try:
+ idle_timeout = settings.TCP_IDLE_TIMEOUT or None
while True:
- data = await reader.read(4096)
+ try:
+ if idle_timeout:
+ data = await asyncio.wait_for(reader.read(4096), timeout=idle_timeout)
+ else:
+ data = await reader.read(4096)
+ except asyncio.TimeoutError:
+ logger.info(
+ "Idle timeout (%ds) for %s:%d (IMEI=%s), closing",
+ idle_timeout, addr[0], addr[1], conn_info.imei,
+ )
+ break
if not data:
logger.info(
"Connection closed by remote %s:%d (IMEI=%s)",
@@ -371,7 +388,7 @@ class TCPManager:
"Receive buffer overflow for IMEI=%s, discarding",
conn_info.imei,
)
- recv_buffer = b""
+ recv_buffer = bytearray()
except asyncio.CancelledError:
logger.info(
@@ -402,14 +419,15 @@ class TCPManager:
) -> None:
"""Remove connection from tracking and update the device status."""
imei = conn_info.imei
- if imei and imei in self.connections:
- # Only remove if this is still the active connection (not replaced by reconnect)
- _, stored_writer, _ = self.connections[imei]
- if stored_writer is writer:
- del self.connections[imei]
- logger.info("Device IMEI=%s removed from active connections", imei)
- else:
- logger.info("Device IMEI=%s has reconnected, keeping new connection", imei)
+ async with self._conn_lock:
+ if imei and imei in self.connections:
+ # Only remove if this is still the active connection (not replaced by reconnect)
+ _, stored_writer, _ = self.connections[imei]
+ if stored_writer is writer:
+ del self.connections[imei]
+ logger.info("Device IMEI=%s removed from active connections", imei)
+ else:
+ logger.info("Device IMEI=%s has reconnected, keeping new connection", imei)
# Don't mark offline since device reconnected
try:
writer.close()
@@ -599,16 +617,16 @@ class TCPManager:
conn_info.imei = imei
# Close existing connection if device reconnects
- old_conn = self.connections.get(imei)
- if old_conn is not None:
- _, old_writer, old_info = old_conn
- logger.info("Closing stale connection for IMEI=%s (old %s:%d)", imei, old_info.addr[0], old_info.addr[1])
- try:
- old_writer.close()
- except Exception:
- pass
-
- self.connections[imei] = (reader, writer, conn_info)
+ async with self._conn_lock:
+ old_conn = self.connections.get(imei)
+ if old_conn is not None:
+ _, old_writer, old_info = old_conn
+ logger.info("Closing stale connection for IMEI=%s (old %s:%d)", imei, old_info.addr[0], old_info.addr[1])
+ try:
+ old_writer.close()
+ except Exception:
+ pass
+ self.connections[imei] = (reader, writer, conn_info)
logger.info(
"Device login: IMEI=%s from %s:%d", imei, conn_info.addr[0], conn_info.addr[1]
)
@@ -739,7 +757,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("Heartbeat for unknown IMEI=%s", imei)
return
@@ -1046,22 +1064,29 @@ class TCPManager:
except Exception:
logger.exception("Geocoding failed for %s IMEI=%s", location_type, imei)
- # --- Reverse geocoding: coordinates -> address ---
- address: Optional[str] = None
+ # --- Reverse geocoding (run concurrently with DB store below) ---
+ address_task = None
if latitude is not None and longitude is not None:
- try:
- address = await reverse_geocode(latitude, longitude)
- except Exception:
- logger.exception("Reverse geocoding failed for IMEI=%s", imei)
+ address_task = asyncio.ensure_future(reverse_geocode(latitude, longitude))
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("Location for unknown IMEI=%s", imei)
+ if address_task:
+ address_task.cancel()
return
+ # Await reverse geocode result if running
+ address: Optional[str] = None
+ if address_task:
+ try:
+ address = await address_task
+ except Exception:
+ logger.exception("Reverse geocoding failed for IMEI=%s", imei)
+
record = LocationRecord(
device_id=device_id,
imei=conn_info.imei,
@@ -1086,41 +1111,35 @@ class TCPManager:
recorded_at=recorded_at,
)
session.add(record)
- # Broadcast to WebSocket subscribers
+
+ # --- Fence auto-attendance check (same session) ---
+ fence_events = []
+ if settings.FENCE_CHECK_ENABLED and latitude is not None and longitude is not None:
+ try:
+ from app.services.fence_checker import check_device_fences
+ fence_events = await check_device_fences(
+ session, device_id, imei,
+ latitude, longitude, location_type,
+ address, recorded_at,
+ mcc=mcc, mnc=mnc, lac=lac, cell_id=cell_id,
+ )
+ except Exception:
+ logger.exception("Fence check failed for IMEI=%s", imei)
+
+ # Broadcast to WebSocket subscribers (after commit)
ws_manager.broadcast_nonblocking("location", {
"imei": imei, "device_id": device_id, "location_type": location_type,
"latitude": latitude, "longitude": longitude, "speed": speed,
"address": address, "recorded_at": str(recorded_at),
})
+ for evt in fence_events:
+ ws_manager.broadcast_nonblocking("fence_attendance", evt)
+ ws_manager.broadcast_nonblocking("attendance", evt)
except Exception:
logger.exception(
"DB error storing %s location for IMEI=%s", location_type, imei
)
- # --- Fence auto-attendance check ---
- if settings.FENCE_CHECK_ENABLED and latitude is not None and longitude is not None:
- try:
- from app.services.fence_checker import check_device_fences
-
- async with async_session() as fence_session:
- async with fence_session.begin():
- device_id_for_fence = device_id
- if device_id_for_fence is None:
- # Resolve device_id if not available from above
- device_id_for_fence = await _get_device_id(fence_session, imei)
- if device_id_for_fence is not None:
- fence_events = await check_device_fences(
- fence_session, device_id_for_fence, imei,
- latitude, longitude, location_type,
- address, recorded_at,
- mcc=mcc, mnc=mnc, lac=lac, cell_id=cell_id,
- )
- for evt in fence_events:
- ws_manager.broadcast_nonblocking("fence_attendance", evt)
- ws_manager.broadcast_nonblocking("attendance", evt)
- except Exception:
- logger.exception("Fence check failed for IMEI=%s", imei)
-
return address
@staticmethod
@@ -1564,7 +1583,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("Alarm for unknown IMEI=%s", imei)
return
@@ -1865,7 +1884,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("Attendance for unknown IMEI=%s", imei)
return attendance_type, reserved_bytes, datetime_bytes
@@ -2001,7 +2020,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is not None:
# Look up beacon location from beacon_configs
beacon_lat = None
@@ -2206,7 +2225,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("BT location for unknown IMEI=%s", imei)
return
@@ -2390,7 +2409,7 @@ class TCPManager:
try:
async with async_session() as session:
async with session.begin():
- device_id = await _get_device_id(session, imei)
+ device_id = await _get_device_id(session, imei, conn_info)
if device_id is None:
logger.warning("Command reply for unknown IMEI=%s", imei)
return
@@ -2439,20 +2458,17 @@ class TCPManager:
bool
``True`` if the command was successfully written to the socket.
"""
- conn = self.connections.get(imei)
- if conn is None:
- logger.warning("Cannot send command to IMEI=%s: not connected", imei)
- return False
-
- _reader, writer, conn_info = conn
-
- # Check if the writer is still alive
- if writer.is_closing():
- logger.warning("IMEI=%s writer is closing, removing stale connection", imei)
- del self.connections[imei]
- return False
-
- serial = conn_info.next_serial()
+ async with self._conn_lock:
+ conn = self.connections.get(imei)
+ if conn is None:
+ logger.warning("Cannot send command to IMEI=%s: not connected", imei)
+ return False
+ _reader, writer, conn_info = conn
+ if writer.is_closing():
+ logger.warning("IMEI=%s writer is closing, removing stale connection", imei)
+ del self.connections[imei]
+ return False
+ serial = conn_info.next_serial()
# Build 0x80 online-command packet
# Payload: length(1) + server_flag(4) + content_bytes + language(2)
@@ -2497,19 +2513,17 @@ class TCPManager:
bool
``True`` if the message was successfully written to the socket.
"""
- conn = self.connections.get(imei)
- if conn is None:
- logger.warning("Cannot send message to IMEI=%s: not connected", imei)
- return False
-
- _reader, writer, conn_info = conn
-
- if writer.is_closing():
- logger.warning("IMEI=%s writer is closing, removing stale connection", imei)
- del self.connections[imei]
- return False
-
- serial = conn_info.next_serial()
+ async with self._conn_lock:
+ conn = self.connections.get(imei)
+ if conn is None:
+ logger.warning("Cannot send message to IMEI=%s: not connected", imei)
+ return False
+ _reader, writer, conn_info = conn
+ if writer.is_closing():
+ logger.warning("IMEI=%s writer is closing, removing stale connection", imei)
+ del self.connections[imei]
+ return False
+ serial = conn_info.next_serial()
msg_bytes = message.encode("utf-16-be")
server_flag = b"\x00\x00\x00\x00"
diff --git a/app/websocket_manager.py b/app/websocket_manager.py
index 95ba191..01dd05c 100644
--- a/app/websocket_manager.py
+++ b/app/websocket_manager.py
@@ -62,17 +62,22 @@ class WebSocketManager:
ensure_ascii=False,
)
- disconnected = []
- # Snapshot dict to avoid RuntimeError from concurrent modification
- for ws, topics in list(self.active_connections.items()):
- if topic in topics:
- try:
- await ws.send_text(message)
- except Exception:
- disconnected.append(ws)
+ # Send to all subscribers concurrently with timeout
+ subscribers = [(ws, topics) for ws, topics in list(self.active_connections.items()) if topic in topics]
+ if not subscribers:
+ return
- for ws in disconnected:
- self.active_connections.pop(ws, None)
+ async def _safe_send(ws):
+ try:
+ await asyncio.wait_for(ws.send_text(message), timeout=3.0)
+ return None
+ except Exception:
+ return ws
+
+ results = await asyncio.gather(*[_safe_send(ws) for ws, _ in subscribers])
+ for ws in results:
+ if ws is not None:
+ self.active_connections.pop(ws, None)
def broadcast_nonblocking(self, topic: str, data: dict):
"""Fire-and-forget broadcast (used from TCP handler context)."""