first commit

connect/device_storage.go

@@ -9,13 +9,11 @@ import (
 	"strings"
 )
 
-// Modified device data storage path
 var (
 	devicesBaseDir = "/data/devices"
 	deviceDataList []DeviceData
 )
 
-// InitializeDevicesFromServiceConfig Initialize device data from service configuration
 func InitializeDevicesFromServiceConfig() ([]DeviceData, error) {
 	deviceDataMutex.Lock()
 	defer deviceDataMutex.Unlock()
@@ -38,15 +36,12 @@ func InitializeDevicesFromServiceConfig() ([]DeviceData, error) {
 
 	logger.Logger.Printf("Loaded %d devices from service configuration", len(configs))
 
-	// Clear existing device data
 	deviceDataList = []DeviceData{}
 
-	// Process each device and save to individual files
 	for i, config := range configs {
 		processedData := ProcessDeviceDataForInference(config)
 		deviceDataList = append(deviceDataList, processedData)
 
-		// Save to individual device file
 		if err := saveDeviceToFile(processedData); err != nil {
 			logger.Logger.Printf("Failed to save the device file [%s]: %v", processedData.DeviceUUID, err)
 			continue
@@ -58,11 +53,9 @@ func InitializeDevicesFromServiceConfig() ([]DeviceData, error) {
 	return deviceDataList, nil
 }
 
-// saveDeviceToFile Save individual device data to separate file
 func saveDeviceToFile(deviceData DeviceData) error {
 	filePath := filepath.Join(devicesBaseDir, fmt.Sprintf("device_%s.json", deviceData.DeviceUUID))
 
-	// Clean device data to ensure no invalid characters
 	cleanedData := cleanDeviceData(deviceData)
 
 	data, err := json.MarshalIndent(cleanedData, "", "  ")
@@ -71,7 +64,6 @@ func saveDeviceToFile(deviceData DeviceData) error {
 		return fmt.Errorf("Device data serialization failed: %v", err)
 	}
 
-	// Write directly to file
 	if err := os.WriteFile(filePath, data, 0644); err != nil {
 		return fmt.Errorf("Failed to write device file: %v", err)
 	}
@@ -80,11 +72,9 @@ func saveDeviceToFile(deviceData DeviceData) error {
 	return nil
 }
 
-// cleanDeviceData Clean device data, remove possible invalid characters
 func cleanDeviceData(data DeviceData) DeviceData {
 	cleaned := data
 
-	// Clean string fields
 	cleaned.DeviceUUID = cleanString(data.DeviceUUID)
 	cleaned.TaskID = cleanString(data.TaskID)
 	cleaned.CameraRTSP = cleanString(data.CameraRTSP)
@@ -92,9 +82,8 @@ func cleanDeviceData(data DeviceData) DeviceData {
 	cleaned.UploadURL = cleanString(data.UploadURL)
 	cleaned.DetectAreaStr = cleanString(data.DetectAreaStr)
 
-	// Ensure numeric fields are valid
 	if cleaned.Confidence < 0 || cleaned.Confidence > 100 {
-		cleaned.Confidence = 70 // Default value
+		cleaned.Confidence = 70
 	}
 	if cleaned.CameraChannel < 0 {
 		cleaned.CameraChannel = 0
@@ -106,14 +95,14 @@ func cleanDeviceData(data DeviceData) DeviceData {
 		cleaned.Temperature = 0
 	}
 	if cleaned.TemperatureThreshold <= 0 {
-		cleaned.TemperatureThreshold = 45.0 // Default value
+		cleaned.TemperatureThreshold = 45.0
 	}
 
 	return cleaned
 }
 
 func cleanString(s string) string {
-	// Remove control characters and invalid Unicode characters
+
 	return strings.Map(func(r rune) rune {
 		if r == 0xFFFD { // Unicode replacement character
 			return -1
@@ -125,12 +114,10 @@ func cleanString(s string) string {
 	}, s)
 }
 
-// GetDeviceDataList Get device data list
 func GetDeviceDataList() []DeviceData {
 	deviceDataMutex.Lock()
 	defer deviceDataMutex.Unlock()
 
-	// If no data in memory, try to load from device files
 	if len(deviceDataList) == 0 {
 		logger.Logger.Printf("No device data in memory, loading from device files...")
 		if err := loadDevicesFromFiles(); err != nil {
@@ -139,18 +126,15 @@ func GetDeviceDataList() []DeviceData {
 		}
 	}
 
-	// Return copy
 	result := make([]DeviceData, len(deviceDataList))
 	copy(result, deviceDataList)
 	return result
 }
 
-// loadDevicesFromFiles Load data from device files
 func loadDevicesFromFiles() error {
 	// Clear existing data
 	deviceDataList = []DeviceData{}
 
-	// Read all files in device directory
 	files, err := filepath.Glob(filepath.Join(devicesBaseDir, "device_*.json"))
 	if err != nil {
 		return fmt.Errorf("Failed to find device files: %v", err)
@@ -179,7 +163,6 @@ func loadDevicesFromFiles() error {
 	return nil
 }
 
-// UpdateDeviceData Update device data
 func UpdateDeviceData(data DeviceData) error {
 	deviceDataMutex.Lock()
 	defer deviceDataMutex.Unlock()
@@ -189,7 +172,6 @@ func UpdateDeviceData(data DeviceData) error {
 	// Clean input data
 	cleanedData := cleanDeviceData(data)
 
-	// Find if device with same DeviceUUID already exists
 	found := false
 	for i, existing := range deviceDataList {
 		if existing.DeviceUUID == cleanedData.DeviceUUID {
@@ -200,13 +182,11 @@ func UpdateDeviceData(data DeviceData) error {
 		}
 	}
 
-	// If not exists, add to list
 	if !found {
 		logger.Logger.Printf("Adding new device to list: DeviceUUID=%s", cleanedData.DeviceUUID)
 		deviceDataList = append(deviceDataList, cleanedData)
 	}
 
-	// Save to individual file
 	if err := saveDeviceToFile(cleanedData); err != nil {
 		logger.Logger.Printf("Failed to save device file: %v", err)
 		return err