feat: 新的解析函数

This commit is contained in:
fengyarnom 2025-05-24 13:13:57 +08:00
parent 07b5cb9843
commit a2d0bc8226
4 changed files with 335 additions and 271 deletions

40
db.go
View File

@ -48,20 +48,22 @@ func CloseDB() {
} }
} }
// 保存传感器数据 - 将浮点值转换为整数存储 // 保存传感器数据 - 将浮点值转换为整数存储,添加温度支持
func SaveSensorData(sensorID int, x, y, z float64) error { func SaveSensorData(sensorID int, x, y, z, temperature float64) error {
xInt := int(x * SCALING_FACTOR) xInt := int(x * SCALING_FACTOR)
yInt := int(y * SCALING_FACTOR) yInt := int(y * SCALING_FACTOR)
zInt := int(z * SCALING_FACTOR) zInt := int(z * SCALING_FACTOR)
tempInt := int(temperature * SCALING_FACTOR)
query := `INSERT INTO sensor_data (sensor_id, x_value, y_value, z_value) VALUES (?, ?, ?, ?)` query := `INSERT INTO sensor_data (sensor_id, x_value, y_value, z_value, temperature) VALUES (?, ?, ?, ?, ?)`
_, err := db.Exec(query, sensorID, xInt, yInt, zInt) _, err := db.Exec(query, sensorID, xInt, yInt, zInt, tempInt)
return err return err
} }
// 获取传感器数据 - 添加时间范围 // 获取传感器数据 - 添加时间范围,包含温度字段
func GetSensorData(sensorID int, limit int, startDate time.Time, endDate time.Time) ([]SensorData, error) { func GetSensorData(sensorID int, limit int, startDate time.Time, endDate time.Time) ([]SensorData, error) {
query := `SELECT id, sensor_id, x_value, y_value, z_value, query := `SELECT id, sensor_id, x_value, y_value, z_value,
COALESCE(temperature, 0) as temperature,
timestamp as timestamp timestamp as timestamp
FROM sensor_data FROM sensor_data
WHERE sensor_id = ?` WHERE sensor_id = ?`
@ -97,9 +99,9 @@ func GetSensorData(sensorID int, limit int, startDate time.Time, endDate time.Ti
for rows.Next() { for rows.Next() {
var data SensorData var data SensorData
var xInt, yInt, zInt int var xInt, yInt, zInt, tempInt int
err := rows.Scan(&data.ID, &data.SensorID, &xInt, &yInt, &zInt, &data.Timestamp) err := rows.Scan(&data.ID, &data.SensorID, &xInt, &yInt, &zInt, &tempInt, &data.Timestamp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -107,6 +109,7 @@ func GetSensorData(sensorID int, limit int, startDate time.Time, endDate time.Ti
data.X = float64(xInt) / SCALING_FACTOR data.X = float64(xInt) / SCALING_FACTOR
data.Y = float64(yInt) / SCALING_FACTOR data.Y = float64(yInt) / SCALING_FACTOR
data.Z = float64(zInt) / SCALING_FACTOR data.Z = float64(zInt) / SCALING_FACTOR
data.Temperature = float64(tempInt) / SCALING_FACTOR
result = append(result, data) result = append(result, data)
} }
@ -114,9 +117,10 @@ func GetSensorData(sensorID int, limit int, startDate time.Time, endDate time.Ti
return result, nil return result, nil
} }
// 获取所有传感器数据 // 获取所有传感器数据,包含温度字段
func GetAllSensorData(limit int, startDate time.Time, endDate time.Time) ([]SensorData, error) { func GetAllSensorData(limit int, startDate time.Time, endDate time.Time) ([]SensorData, error) {
query := `SELECT id, sensor_id, x_value, y_value, z_value, query := `SELECT id, sensor_id, x_value, y_value, z_value,
COALESCE(temperature, 0) as temperature,
timestamp as timestamp timestamp as timestamp
FROM sensor_data FROM sensor_data
WHERE 1=1` WHERE 1=1`
@ -151,9 +155,9 @@ func GetAllSensorData(limit int, startDate time.Time, endDate time.Time) ([]Sens
for rows.Next() { for rows.Next() {
var data SensorData var data SensorData
var xInt, yInt, zInt int var xInt, yInt, zInt, tempInt int
err := rows.Scan(&data.ID, &data.SensorID, &xInt, &yInt, &zInt, &data.Timestamp) err := rows.Scan(&data.ID, &data.SensorID, &xInt, &yInt, &zInt, &tempInt, &data.Timestamp)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -161,6 +165,7 @@ func GetAllSensorData(limit int, startDate time.Time, endDate time.Time) ([]Sens
data.X = float64(xInt) / SCALING_FACTOR data.X = float64(xInt) / SCALING_FACTOR
data.Y = float64(yInt) / SCALING_FACTOR data.Y = float64(yInt) / SCALING_FACTOR
data.Z = float64(zInt) / SCALING_FACTOR data.Z = float64(zInt) / SCALING_FACTOR
data.Temperature = float64(tempInt) / SCALING_FACTOR
result = append(result, data) result = append(result, data)
} }
@ -190,12 +195,13 @@ func GetAllSensorIDs() ([]int, error) {
return ids, nil return ids, nil
} }
// SensorData 结构用于存储传感器数据 // SensorData 结构用于存储传感器数据,添加温度字段
type SensorData struct { type SensorData struct {
ID int `json:"id"` ID int `json:"id"`
SensorID int `json:"sensor_id"` SensorID int `json:"sensor_id"`
X float64 `json:"x"` X float64 `json:"x"`
Y float64 `json:"y"` Y float64 `json:"y"`
Z float64 `json:"z"` Z float64 `json:"z"`
Timestamp time.Time `json:"timestamp"` Temperature float64 `json:"temperature"`
Timestamp time.Time `json:"timestamp"`
} }

View File

@ -1,236 +1,292 @@
package main package main
import ( import (
"fmt" "fmt"
"io" "io"
"net" "net"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
) )
// 客户端信息结构 // 客户端信息结构
type ClientInfo struct { type ClientInfo struct {
IP string // IP地址 IP string // IP地址
Port string // 端口 Port string // 端口
LastSeen time.Time // 最后活跃时间 LastSeen time.Time // 最后活跃时间
} }
// 客户端列表(使用互斥锁保护的映射) // 客户端列表(使用互斥锁保护的映射)
var ( var (
clientsMutex sync.Mutex clientsMutex sync.Mutex
clients = make(map[string]*ClientInfo) clients = make(map[string]*ClientInfo)
) )
// StartTCPServer 启动TCP服务器 // StartTCPServer 启动TCP服务器
func StartTCPServer(address string) error { func StartTCPServer(address string) error {
listener, err := net.Listen("tcp", address) listener, err := net.Listen("tcp", address)
if err != nil { if err != nil {
return err return err
} }
startClientCleanup() startClientCleanup()
Logger.Printf("TCP服务器已启动正在监听 %s\n", address) Logger.Printf("TCP服务器已启动正在监听 %s\n", address)
for { for {
conn, err := listener.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {
Logger.Printf("接受连接失败: %v", err) Logger.Printf("接受连接失败: %v", err)
continue continue
} }
go handleConnection(conn) go handleConnection(conn)
} }
} }
// handleConnection 处理客户端连接 // handleConnection 处理客户端连接
func handleConnection(conn net.Conn) { func handleConnection(conn net.Conn) {
defer conn.Close() defer conn.Close()
remoteAddr := conn.RemoteAddr().String() remoteAddr := conn.RemoteAddr().String()
Logger.Printf("新的客户端连接: %s", remoteAddr) Logger.Printf("新的客户端连接: %s", remoteAddr)
addClient(remoteAddr) addClient(remoteAddr)
buffer := make([]byte, 1024) // 启动定时发送指令的goroutine
go sendPeriodicCommand(conn, remoteAddr)
for {
n, err := conn.Read(buffer) buffer := make([]byte, 1024)
if err != nil {
if err != io.EOF { for {
Logger.Printf("从客户端读取失败 %s: %v", remoteAddr, err) n, err := conn.Read(buffer)
} else { if err != nil {
Logger.Printf("客户端断开连接 %s", remoteAddr) if err != io.EOF {
} Logger.Printf("从客户端读取失败 %s: %v", remoteAddr, err)
removeClient(remoteAddr) } else {
break Logger.Printf("客户端断开连接 %s", remoteAddr)
} }
removeClient(remoteAddr)
rawData := string(buffer[:n]) break
TCPDataLogger.Printf("从客户端 %s 接收到原始数据: %s", remoteAddr, rawData) }
sensorID, x, y, z, err := parseData(rawData) rawData := string(buffer[:n])
TCPDataLogger.Printf("从客户端 %s 接收到原始数据: %s", remoteAddr, rawData)
if err == nil {
TCPDataLogger.Printf("解析成功 - 客户端: %s, 传感器ID: %d, 值: X=%.3f, Y=%.3f, Z=%.3f", sensorID, x, y, z, temperature, err := parseData(rawData)
remoteAddr, sensorID, x, y, z)
if err == nil {
if err := SaveSensorData(sensorID, x, y, z); err != nil { TCPDataLogger.Printf("解析成功 - 客户端: %s, 传感器ID: %d, 值: X=%.3f, Y=%.3f, Z=%.3f, 温度=%.1f°C",
Logger.Printf("保存传感器数据失败: %v", err) remoteAddr, sensorID, x, y, z, temperature)
}
} else { if err := SaveSensorData(sensorID, x, y, z, temperature); err != nil {
TCPDataLogger.Printf("无法解析从客户端 %s 接收到的数据: %s, 错误: %v", remoteAddr, rawData, err) Logger.Printf("保存传感器数据失败: %v", err)
} }
} else {
resp := "OK\n" TCPDataLogger.Printf("无法解析从客户端 %s 接收到的数据: %s, 错误: %v", remoteAddr, rawData, err)
if _, err := conn.Write([]byte(resp)); err != nil { }
Logger.Printf("发送响应到客户端 %s 失败: %v", remoteAddr, err)
removeClient(remoteAddr) resp := "OK\n"
break if _, err := conn.Write([]byte(resp)); err != nil {
} Logger.Printf("发送响应到客户端 %s 失败: %v", remoteAddr, err)
removeClient(remoteAddr)
updateClientLastSeen(remoteAddr) break
} }
}
updateClientLastSeen(remoteAddr)
// parseData 使用正则表达式解析传感器数据 }
func parseData(data string) (int, float64, float64, float64, error) { }
pattern := regexp.MustCompile(`(\d+):([-]?\d+\.\d+),\s*([-]?\d+\.\d+),\s*([-]?\d+\.\d+)`)
matches := pattern.FindStringSubmatch(data) // sendPeriodicCommand 每10秒发送一次查询指令
func sendPeriodicCommand(conn net.Conn, remoteAddr string) {
if len(matches) != 5 { ticker := time.NewTicker(10 * time.Second)
return 0, 0, 0, 0, fmt.Errorf("数据格式不正确: %s", data) defer ticker.Stop()
}
for {
sensorID, err := strconv.Atoi(matches[1]) select {
if err != nil { case <-ticker.C:
return 0, 0, 0, 0, fmt.Errorf("解析传感器ID失败: %v", err) command := "@1602301014A*0!\n"
} if _, err := conn.Write([]byte(command)); err != nil {
Logger.Printf("发送定时指令到客户端 %s 失败: %v", remoteAddr, err)
x, err := strconv.ParseFloat(strings.TrimSpace(matches[2]), 64) return // 连接断开退出goroutine
if err != nil { }
return 0, 0, 0, 0, fmt.Errorf("解析X值失败: %v", err) TCPDataLogger.Printf("发送定时指令到客户端 %s: %s", remoteAddr, strings.TrimSpace(command))
} }
}
y, err := strconv.ParseFloat(strings.TrimSpace(matches[3]), 64) }
if err != nil {
return 0, 0, 0, 0, fmt.Errorf("解析Y值失败: %v", err) // parseData 使用正则表达式解析传感器数据,支持新格式 #{1602301014-01,1,1,28.4,-6.884,1.540}!
} func parseData(data string) (int, float64, float64, float64, float64, error) {
// 尝试解析新格式: #{1602301014-01,1,1,28.4,-6.884,1.540}!
z, err := strconv.ParseFloat(strings.TrimSpace(matches[4]), 64) newPattern := regexp.MustCompile(`#\{[^,]+-(\d+),\d+,(\d+),([-]?\d+\.\d+),([-]?\d+\.\d+),([-]?\d+\.\d+)\}!`)
if err != nil { matches := newPattern.FindStringSubmatch(data)
return 0, 0, 0, 0, fmt.Errorf("解析Z值失败: %v", err)
} if len(matches) == 6 {
// 新格式解析
return sensorID, x, y, z, nil sensorID, err := strconv.Atoi(matches[2]) // 使用传感器地址编号
} if err != nil {
return 0, 0, 0, 0, 0, fmt.Errorf("解析传感器ID失败: %v", err)
// addClient 添加客户端 }
func addClient(addr string) {
clientsMutex.Lock() temperature, err := strconv.ParseFloat(strings.TrimSpace(matches[3]), 64)
defer clientsMutex.Unlock() if err != nil {
return 0, 0, 0, 0, 0, fmt.Errorf("解析温度值失败: %v", err)
host, port, err := net.SplitHostPort(addr) }
if err != nil {
Logger.Printf("解析客户端地址失败 %s: %v", addr, err) x, err := strconv.ParseFloat(strings.TrimSpace(matches[4]), 64)
host = addr if err != nil {
port = "unknown" return 0, 0, 0, 0, 0, fmt.Errorf("解析X值失败: %v", err)
} }
clients[addr] = &ClientInfo{ y, err := strconv.ParseFloat(strings.TrimSpace(matches[5]), 64)
IP: host, if err != nil {
Port: port, return 0, 0, 0, 0, 0, fmt.Errorf("解析Y值失败: %v", err)
LastSeen: time.Now(), }
}
z := 0.0 // 新格式没有Z值设为0
Logger.Printf("添加新客户端: %s", addr)
} return sensorID, x, y, z, temperature, nil
}
// updateClientLastSeen 更新客户端最后活跃时间
func updateClientLastSeen(addr string) { // 尝试解析旧格式: 1:1.000, 2.000, 3.000
clientsMutex.Lock() oldPattern := regexp.MustCompile(`(\d+):([-]?\d+\.\d+),\s*([-]?\d+\.\d+),\s*([-]?\d+\.\d+)`)
defer clientsMutex.Unlock() matches = oldPattern.FindStringSubmatch(data)
if client, exists := clients[addr]; exists { if len(matches) == 5 {
client.LastSeen = time.Now() // 旧格式解析
} sensorID, err := strconv.Atoi(matches[1])
} if err != nil {
return 0, 0, 0, 0, 0, fmt.Errorf("解析传感器ID失败: %v", err)
// removeClient 移除客户端 }
func removeClient(addr string) {
clientsMutex.Lock() x, err := strconv.ParseFloat(strings.TrimSpace(matches[2]), 64)
defer clientsMutex.Unlock() if err != nil {
return 0, 0, 0, 0, 0, fmt.Errorf("解析X值失败: %v", err)
if client, exists := clients[addr]; exists { }
client.LastSeen = time.Now()
Logger.Printf("客户端标记为断开连接: %s", addr) y, err := strconv.ParseFloat(strings.TrimSpace(matches[3]), 64)
} if err != nil {
} return 0, 0, 0, 0, 0, fmt.Errorf("解析Y值失败: %v", err)
}
// getAllClients 获取所有客户端信息
func getAllClients() []map[string]interface{} { z, err := strconv.ParseFloat(strings.TrimSpace(matches[4]), 64)
clientsMutex.Lock() if err != nil {
defer clientsMutex.Unlock() return 0, 0, 0, 0, 0, fmt.Errorf("解析Z值失败: %v", err)
}
now := time.Now()
result := make([]map[string]interface{}, 0, len(clients)) temperature := 0.0 // 旧格式没有温度值设为0
for addr, client := range clients { return sensorID, x, y, z, temperature, nil
lastSeenDuration := now.Sub(client.LastSeen) }
if lastSeenDuration > 24*time.Hour { return 0, 0, 0, 0, 0, fmt.Errorf("数据格式不正确: %s", data)
delete(clients, addr) }
continue
} // addClient 添加客户端
func addClient(addr string) {
isOnline := lastSeenDuration < 10*time.Minute clientsMutex.Lock()
defer clientsMutex.Unlock()
result = append(result, map[string]interface{}{
"address": addr, host, port, err := net.SplitHostPort(addr)
"ip": client.IP, if err != nil {
"port": client.Port, Logger.Printf("解析客户端地址失败 %s: %v", addr, err)
"lastSeen": client.LastSeen, host = addr
"isOnline": isOnline, port = "unknown"
"lastSeenFormatted": formatDuration(lastSeenDuration), }
})
} clients[addr] = &ClientInfo{
IP: host,
return result Port: port,
} LastSeen: time.Now(),
}
// formatDuration 格式化持续时间为友好的字符串
func formatDuration(d time.Duration) string { Logger.Printf("添加新客户端: %s", addr)
if d < time.Minute { }
return "刚刚"
} else if d < time.Hour { // updateClientLastSeen 更新客户端最后活跃时间
return fmt.Sprintf("%d分钟前", int(d.Minutes())) func updateClientLastSeen(addr string) {
} else if d < 24*time.Hour { clientsMutex.Lock()
return fmt.Sprintf("%d小时前", int(d.Hours())) defer clientsMutex.Unlock()
} else {
return fmt.Sprintf("%d天前", int(d.Hours()/24)) if client, exists := clients[addr]; exists {
} client.LastSeen = time.Now()
} }
}
// startClientCleanup 启动清理过期客户端的goroutine
func startClientCleanup() { // removeClient 移除客户端
go func() { func removeClient(addr string) {
for { clientsMutex.Lock()
time.Sleep(1 * time.Hour) // 每小时检查一次 defer clientsMutex.Unlock()
clientsMutex.Lock() if client, exists := clients[addr]; exists {
now := time.Now() client.LastSeen = time.Now()
Logger.Printf("客户端标记为断开连接: %s", addr)
for addr, client := range clients { }
if now.Sub(client.LastSeen) > 24*time.Hour { }
delete(clients, addr)
Logger.Printf("移除过期客户端: %s", addr) // getAllClients 获取所有客户端信息
} func getAllClients() []map[string]interface{} {
} clientsMutex.Lock()
defer clientsMutex.Unlock()
clientsMutex.Unlock()
} now := time.Now()
}() result := make([]map[string]interface{}, 0, len(clients))
}
for addr, client := range clients {
lastSeenDuration := now.Sub(client.LastSeen)
if lastSeenDuration > 24*time.Hour {
delete(clients, addr)
continue
}
isOnline := lastSeenDuration < 10*time.Minute
result = append(result, map[string]interface{}{
"address": addr,
"ip": client.IP,
"port": client.Port,
"lastSeen": client.LastSeen,
"isOnline": isOnline,
"lastSeenFormatted": formatDuration(lastSeenDuration),
})
}
return result
}
// formatDuration 格式化持续时间为友好的字符串
func formatDuration(d time.Duration) string {
if d < time.Minute {
return "刚刚"
} else if d < time.Hour {
return fmt.Sprintf("%d分钟前", int(d.Minutes()))
} else if d < 24*time.Hour {
return fmt.Sprintf("%d小时前", int(d.Hours()))
} else {
return fmt.Sprintf("%d天前", int(d.Hours()/24))
}
}
// startClientCleanup 启动清理过期客户端的goroutine
func startClientCleanup() {
go func() {
for {
time.Sleep(1 * time.Hour) // 每小时检查一次
clientsMutex.Lock()
now := time.Now()
for addr, client := range clients {
if now.Sub(client.LastSeen) > 24*time.Hour {
delete(clients, addr)
Logger.Printf("移除过期客户端: %s", addr)
}
}
clientsMutex.Unlock()
}
}()
}

View File

@ -201,11 +201,12 @@
<thead> <thead>
<tr> <tr>
<th>数据编号</th> <th>数据编号</th>
<th>探头地址</th> <th>探头地址</th>
<th>时间</th> <th>时间</th>
<th>X</th> <th>X</th>
<th>Y</th> <th>Y</th>
<th>Z</th> <th>Z</th>
<th>温度(°C)</th>
</tr> </tr>
</thead> </thead>
<tbody id="tableBody"> <tbody id="tableBody">
@ -439,7 +440,7 @@
if (data.length === 0) { if (data.length === 0) {
const row = document.createElement('tr'); const row = document.createElement('tr');
row.innerHTML = '<td colspan="6" style="text-align: center;">没有数据</td>'; row.innerHTML = '<td colspan="7" style="text-align: center;">没有数据</td>';
tableBody.appendChild(row); tableBody.appendChild(row);
return; return;
} }
@ -467,7 +468,8 @@
'<td>' + formattedDate + '</td>' + '<td>' + formattedDate + '</td>' +
'<td>' + item.x.toFixed(3) + '</td>' + '<td>' + item.x.toFixed(3) + '</td>' +
'<td>' + item.y.toFixed(3) + '</td>' + '<td>' + item.y.toFixed(3) + '</td>' +
'<td>' + item.z.toFixed(3) + '</td>' ; '<td>' + item.z.toFixed(3) + '</td>' +
'<td>' + item.temperature.toFixed(1) + '</td>';
tableBody.appendChild(row); tableBody.appendChild(row);
}); });
@ -579,11 +581,12 @@
'rgb(255, 159, 64)' 'rgb(255, 159, 64)'
]; ];
// 为X, Y, Z创建不同的数据集 // 为X, Y, Z, 温度创建不同的数据集
const dataTypes = [ const dataTypes = [
{ key: 'x', label: 'X' }, { key: 'x', label: 'X' },
{ key: 'y', label: 'Y' }, { key: 'y', label: 'Y' },
{ key: 'z', label: 'Z' } { key: 'z', label: 'Z' },
{ key: 'temperature', label: '温度(°C)' }
]; ];
sensorIDs.forEach((sensorID, sensorIndex) => { sensorIDs.forEach((sensorID, sensorIndex) => {
@ -616,7 +619,7 @@
} }
// 准备CSV内容 // 准备CSV内容
let csvContent = "数据编号,探头地址编号,X,Y,Z,时间\n"; let csvContent = "数据编号,探头地址编号,X,Y,Z,温度,时间\n";
currentSensorData.forEach(item => { currentSensorData.forEach(item => {
// 解析时间并调整为中国时间 // 解析时间并调整为中国时间
@ -632,14 +635,13 @@
date.getMinutes().toString().padStart(2, '0') + ':' + date.getMinutes().toString().padStart(2, '0') + ':' +
date.getSeconds().toString().padStart(2, '0'); date.getSeconds().toString().padStart(2, '0');
// 添加一行数据 csvContent += item.id + "," +
csvContent += item.sensor_id + "," +
item.id + "," + item.x.toFixed(3) + "," +
item.sensor_id + "," + item.y.toFixed(3) + "," +
item.x.toFixed(3) + "," + item.z.toFixed(3) + "," +
item.y.toFixed(3) + "," + item.temperature.toFixed(1) + "," +
item.z.toFixed(3) + "," + formattedDate + "\n";
formattedDate + "\n";
}); });
// 创建Blob对象 // 创建Blob对象

View File

@ -44,13 +44,13 @@ func handleUDPPacket(conn *net.UDPConn, addr *net.UDPAddr, data []byte) {
rawData := string(data) rawData := string(data)
TCPDataLogger.Printf("从UDP客户端 %s 接收到原始数据: %s", remoteAddr, rawData) TCPDataLogger.Printf("从UDP客户端 %s 接收到原始数据: %s", remoteAddr, rawData)
sensorID, x, y, z, err := parseData(rawData) sensorID, x, y, z, temperature, err := parseData(rawData)
if err == nil { if err == nil {
TCPDataLogger.Printf("解析成功 - UDP客户端: %s, 传感器ID: %d, 值: X=%.3f, Y=%.3f, Z=%.3f", TCPDataLogger.Printf("解析成功 - UDP客户端: %s, 传感器ID: %d, 值: X=%.3f, Y=%.3f, Z=%.3f, 温度=%.1f°C",
remoteAddr, sensorID, x, y, z) remoteAddr, sensorID, x, y, z, temperature)
if err := SaveSensorData(sensorID, x, y, z); err != nil { if err := SaveSensorData(sensorID, x, y, z, temperature); err != nil {
Logger.Printf("保存传感器数据失败: %v", err) Logger.Printf("保存传感器数据失败: %v", err)
} }
} else { } else {