first commit
This commit is contained in:
gqc
+20
-13
@@ -1,12 +1,14 @@
|
||||
package httpreader
|
||||
|
||||
import (
|
||||
"FireLeave_tool/connect"
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@@ -113,20 +115,17 @@ func (is *InferenceServer) handleVideoPost(w http.ResponseWriter, r *http.Reques
|
||||
http.Error(w, `{"error":"Missing serial field"}`, http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
now := time.Now().Format("2006/01/02 15:04:05.000")
|
||||
logger.Logger.Printf("♥ 推理心跳收到 | 时间: %s | UUID: %s | Serial: %s | 人数量: %d",
|
||||
now, is.deviceUUID, result.Serial, getPersonCount(result))
|
||||
|
||||
// 只在人员数量变化或重要事件时记录详细日志
|
||||
if len(result.Params) > 0 {
|
||||
hasPerson := false
|
||||
for _, param := range result.Params {
|
||||
if param.ClassIdx == 1 && param.Number > 0 {
|
||||
hasPerson = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if hasPerson {
|
||||
logger.Logger.Printf("Inference data: Serial=%s, Person detected, ParamsCount=%d",
|
||||
result.Serial, len(result.Params))
|
||||
}
|
||||
// 这一行就是你缺失的救命稻草！
|
||||
connect.UpdateInferenceHeartbeat(is.deviceUUID)
|
||||
|
||||
// 额外写一份永不丢失的独立心跳日志
|
||||
if f, err := os.OpenFile("/data/heartbeat.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644); err == nil {
|
||||
defer f.Close()
|
||||
fmt.Fprintf(f, "[%s] HEARTBEAT OK | %s | person=%d\n", now, is.deviceUUID, getPersonCount(result))
|
||||
}
|
||||
|
||||
// 发送到处理通道
|
||||
@@ -179,3 +178,11 @@ func (s *InferenceServer) StopWithContext(ctx context.Context) {
|
||||
logger.Logger.Printf("The HTTP server has been shut down (DeviceUUID=%s)", s.deviceUUID)
|
||||
}
|
||||
}
|
||||
func getPersonCount(result InferenceResult) int {
|
||||
for _, p := range result.Params {
|
||||
if p.ClassIdx == 1 {
|
||||
return p.Number
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
package httpreader
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"FireLeave_tool/logger"
|
||||
)
|
||||
|
||||
// CheckHTTPService 检查HTTP服务是否可用
|
||||
func CheckHTTPService(port int, timeout time.Duration) bool {
|
||||
client := &http.Client{
|
||||
Timeout: timeout,
|
||||
}
|
||||
|
||||
url := fmt.Sprintf("http://127.0.0.1:%d/health", port)
|
||||
resp, err := client.Get(url)
|
||||
if err != nil {
|
||||
logger.Logger.Printf("HTTP服务健康检查失败 (Port=%d): %v", port, err)
|
||||
return false
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
return resp.StatusCode == http.StatusOK
|
||||
}
|
||||
|
||||
// CheckPortAvailable 检查端口是否可用
|
||||
func CheckPortAvailable(port int) bool {
|
||||
address := fmt.Sprintf(":%d", port)
|
||||
listener, err := net.Listen("tcp", address)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
listener.Close()
|
||||
return true
|
||||
}
|
||||
|
||||
// WaitForHTTPService 等待HTTP服务启动
|
||||
func WaitForHTTPService(port int, timeout time.Duration) bool {
|
||||
deadline := time.Now().Add(timeout)
|
||||
logger.Logger.Printf("等待HTTP服务启动 (Port=%d, Timeout=%v)", port, timeout)
|
||||
|
||||
attempt := 0
|
||||
for time.Now().Before(deadline) {
|
||||
attempt++
|
||||
|
||||
if CheckHTTPService(port, 2*time.Second) {
|
||||
logger.Logger.Printf("HTTP服务启动成功 (Port=%d, 尝试次数=%d)", port, attempt)
|
||||
return true
|
||||
}
|
||||
|
||||
if attempt == 1 || attempt%5 == 0 {
|
||||
logger.Logger.Printf("等待HTTP服务... (Port=%d, 尝试次数=%d)", port, attempt)
|
||||
}
|
||||
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
logger.Logger.Printf("HTTP服务启动超时 (Port=%d, 总尝试次数=%d)", port, attempt)
|
||||
return false
|
||||
}
|
||||
|
||||
// ValidateInferenceResult 验证推理结果数据
|
||||
func ValidateInferenceResult(result *InferenceResult) error {
|
||||
if result.Serial == "" {
|
||||
return fmt.Errorf("serial字段不能为空")
|
||||
}
|
||||
if result.At <= 0 {
|
||||
return fmt.Errorf("at时间戳无效")
|
||||
}
|
||||
|
||||
// 验证参数数据
|
||||
for i, param := range result.Params {
|
||||
if param.Number < 0 {
|
||||
return fmt.Errorf("参数[%d]的number不能为负数", i)
|
||||
}
|
||||
if param.ClassIdx < 0 {
|
||||
return fmt.Errorf("参数[%d]的class_idx不能为负数", i)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetPersonCountFromResult 从推理结果中获取人员数量
|
||||
func GetPersonCountFromResult(result *InferenceResult) int {
|
||||
if result == nil || len(result.Params) == 0 {
|
||||
return 0
|
||||
}
|
||||
|
||||
// 查找人员类别的参数（假设 class_idx=1 表示人员）
|
||||
for _, param := range result.Params {
|
||||
if param.ClassIdx == 1 { // 人员类别
|
||||
return param.Number
|
||||
}
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
// CreateTestInferenceResult 创建测试用的推理结果（用于调试）
|
||||
func CreateTestInferenceResult(deviceUUID string, personCount int) InferenceResult {
|
||||
return InferenceResult{
|
||||
Serial: deviceUUID,
|
||||
At: time.Now().Unix(),
|
||||
Type: 1,
|
||||
Params: []struct {
|
||||
ClassIdx int `json:"class_idx"`
|
||||
Name string `json:"name"`
|
||||
Number int `json:"number"`
|
||||
}{
|
||||
{
|
||||
ClassIdx: 1,
|
||||
Name: "person",
|
||||
Number: personCount,
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user