tcp监测，前段修改

server/dao/devices/dev_camera.go

@@ -20,7 +20,7 @@ type Camera struct {
 	ShuntDescribe string         `gorm:"type:varchar(60)" json:"shuntDescribe"` //分路描述
 	StreamId      string         `gorm:"type:varchar(80)" json:"streamId"`      //流地址
 	IsDeleted     gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`         //是否删除
-	Status        int            `gorm:"type:int;default:1" json:"status"`      //在线状态 0=在线,1=离线
+	Status        int            `gorm:"type:int;default:0" json:"status"`      //在线状态 0=离线,1=在线
 
 	GateWay GateWay `gorm:"foreignkey:GatewayId"`
 }
@@ -98,7 +98,7 @@ func QueryCameraToDetail(id int) (cameraList []Camera, err error) {
 
 func UpdateCameraStatus(code string, status int) error {
 	var camera Camera
-	err := global.GVA_DB.Model(&camera).
+	err := global.GVA_DB.Model(&camera).Debug().
 		Select("status").
 		Where("camera_code = ?", code).
 		Updates(map[string]interface{}{

server/dao/devices/dev_gateway.go

@@ -17,7 +17,7 @@ type GateWay struct {
 	InstallTime  time.Time      `gorm:"type:date" json:"installTime"`                   //安装时间
 	RecentOnline time.Time      `gorm:"type:datetime;default:null" json:"recentOnline"` //最近在线时间
 	IsDeleted    gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`                  //是否删除
-	Status       int            `gorm:"type:int;default:1" json:"status"`               //在线状态 0=在线,1=离线
+	Status       int            `gorm:"type:int;default:0" json:"status"`               //在线状态 0=离线,1=在线
 
 	Intersect Intersect `gorm:"foreignkey:IntersectId"`
 }

server/dao/devices/dev_intersect.go

@@ -13,7 +13,7 @@ type Intersect struct {
 	Address       string         `gorm:"type:varchar(64)"  json:"address"`      //地址
 	CreateTime    time.Time      `gorm:"type:datetime" json:"createTime"`       //创建时间
 	IsDeleted     gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`         //是否删除
-	Status        int            `gorm:"type:int;default:0" json:"status"`      //运行状态 0=正常,1=异常
+	Status        int            `gorm:"type:int" json:"status"`                //运行状态 0=正常,1=异常
 }
 
 func (Intersect) TableName() string {

server/dao/devices/dev_radar.go

@@ -19,7 +19,7 @@ type Radar struct {
 	Shunt          int            `gorm:"type:int" json:"shunt"`                  //所属分路 1主路，2支路
 	ShuntDescribe  string         `gorm:"type:varchar(60)" json:"shuntDescribe"`  //分路描述
 	IsDeleted      gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`          //是否删除
-	Status         int            `gorm:"type:int;default:1" json:"status"`       //在线状态 0=在线,1=离线
+	Status         int            `gorm:"type:int;default:0" json:"status"`       //在线状态 0=离线,1=在线
 
 	GateWay GateWay `gorm:"foreignkey:GatewayId"`
 }

server/dao/devices/dev_screens.go

@@ -3,24 +3,28 @@ package devices
 import (
 	"gorm.io/gorm"
 	"server/global"
+	"server/model/common/request"
 	"time"
 )
 
 type Screens struct {
-	ID            int            `gorm:"primarykey" json:"ID"`                  //主键ID
-	ScreensName   string         `gorm:"type:varchar(64)" json:"screensName"`   //设备名称
-	ScreensCode   string         `gorm:"type:varchar(64)" json:"screensCode"`   //设备编码
-	GatewayId     int            `gorm:"type:int" json:"gatewayId"`             //所属网关
-	ScreensBrand  string         `gorm:"type:varchar(60)" json:"screensBrand"`  //屏幕品牌
-	ScreensModel  string         `gorm:"type:varchar(60)" json:"screensModel"`  //屏幕型号
-	IPAddress     string         `gorm:"type:varchar(40)" json:"ipAddress"`     //IP地址
-	InstallTime   time.Time      `gorm:"type:date" json:"installTime"`          //安装时间
-	Shunt         int            `gorm:"type:int" json:"shunt"`                 //所属分路 1主路，2支路
-	ShuntDescribe string         `gorm:"type:varchar(60)" json:"shuntDescribe"` //分路描述
-	ResolutionId  int            `gorm:"type:int" json:"resolutionId"`          //分辨率
-	ScreensSizeId int            `gorm:"type:int" json:"screensSizeId"`         //信息屏尺寸
-	IsDeleted     gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`         //是否删除
-	Status        int            `gorm:"type:int;default:1" json:"status"`      //在线状态 0=在线,1=离线
+	ID            int            `gorm:"primarykey" json:"ID"`                    //主键ID
+	ScreensName   string         `gorm:"type:varchar(64)" json:"screensName"`     //设备名称
+	ScreensCode   string         `gorm:"type:varchar(64)" json:"screensCode"`     //设备编码
+	GatewayId     int            `gorm:"type:int" json:"gatewayId"`               //所属网关
+	ScreensBrand  string         `gorm:"type:varchar(60)" json:"screensBrand"`    //屏幕品牌
+	ScreensModel  string         `gorm:"type:varchar(60)" json:"screensModel"`    //屏幕型号
+	IPAddress     string         `gorm:"type:varchar(40)" json:"ipAddress"`       //IP地址
+	InstallTime   time.Time      `gorm:"type:date" json:"installTime"`            //安装时间
+	Shunt         int            `gorm:"type:int" json:"shunt"`                   //所属分路 1主路，2支路
+	ShuntDescribe string         `gorm:"type:varchar(60)" json:"shuntDescribe"`   //分路描述
+	ResolutionId  int            `gorm:"type:int" json:"resolutionId"`            //分辨率
+	ScreensSizeId int            `gorm:"type:int" json:"screensSizeId"`           //信息屏尺寸
+	IsDeleted     gorm.DeletedAt `gorm:"default:null" json:"isDeleted"`           //是否删除
+	Status        int            `gorm:"type:int;default:0" json:"status"`        //在线状态 0=离线,1=在线
+	PlayStatus    int            `gorm:"type:int;default:0" json:"playStatus"`    //播放状态
+	DisplayStatus int            `gorm:"type:int;default:0" json:"displayStatus"` //显示模板状态
+	SourceStatus  int            `gorm:"type:int;default:0" json:"sourceStatus"`  //素材状态
 
 	GateWay     GateWay     `gorm:"foreignkey:GatewayId"`
 	Resolution  Resolution  `gorm:"foreignkey:ResolutionId"`
@@ -89,21 +93,35 @@ func QueryScreensToDetail(id int) (screensList []Screens, err error) {
 func UpdateScreensStatusByGatewayId(id, status int) error {
 	var screens Screens
 	err := global.GVA_DB.Model(&screens).
-		Select("status").
+		Select("status", "play_status", "display_status", "source_status").
 		Where("gateway_id = ?", id).
 		Updates(map[string]interface{}{
-			"status": status,
+			"status":         status,
+			"play_status":    status,
+			"display_status": status,
+			"source_status":  status,
 		}).Error
 	return err
 }
 
-func UpdateScreensStatus(code string, status int) error {
+func UpdateScreensStatus(code string, sta request.DeviceStatus) error {
 	var screens Screens
-	err := global.GVA_DB.Model(&screens).
-		Select("status").
-		Where("screens_code = ?", code).
-		Updates(map[string]interface{}{
-			"status": status,
-		}).Error
-	return err
+	//err := global.GVA_DB.Model(&screens).
+	//	Select("status").
+	//	Where("screens_code = ?", code).
+	//	Updates(map[string]interface{}{
+	//		"status": status,
+	//	}).Error
+	//return err
+	return global.GVA_DB.Model(&screens).Where("screens_code = ?", code).Updates(Screens{
+		Status:        sta.Status,
+		PlayStatus:    sta.PlayStatus,
+		DisplayStatus: sta.DisplayStatus,
+		SourceStatus:  sta.SourceStatus,
+	}).Error
+}
+
+func QueryAllScreens() (screensList []Screens) {
+	_ = global.GVA_DB.Model(&Screens{}).Find(&screensList)
+	return screensList
 }

server/edge/camera/devicemgr.go

@@ -1,56 +0,0 @@
-package camera
-
-import (
-	goonvif "github.com/use-go/onvif"
-	"gopkg.in/yaml.v2"
-	"os"
-	"server/edge/util/mqtt"
-	"sync"
-)
-
-var CameraDevices map[string]*goonvif.Device
-var _once sync.Once
-var _single *CameraDeviceMgr
-
-type CameraDeviceMgr struct {
-	downQueue      mqtt.MlQueue
-	mapTopicHandle map[string]func(m mqtt.Message)
-	mapDevice      map[string]*CameraDev
-}
-
-// CameraDeviceMgr 单例
-func GetCameraDeviceMgr() *CameraDeviceMgr {
-	_once.Do(func() {
-		_single = &CameraDeviceMgr{
-			downQueue:      *mqtt.NewQueue(100),
-			mapTopicHandle: make(map[string]func(m mqtt.Message)),
-			mapDevice:      make(map[string]*CameraDev),
-		}
-	})
-	return _single
-}
-
-// 初始化
-func (c CameraDeviceMgr) InitAllCameraDevice() error {
-	var conf DeviceConfig
-	filePath := "./edge/dev/dev.yaml"
-	if f, err := os.Open(filePath); err != nil {
-		panic(err)
-	} else {
-		err := yaml.NewDecoder(f).Decode(&conf)
-		if err != nil {
-			panic(err)
-		}
-	}
-	CameraDevices = make(map[string]*goonvif.Device)
-	for _, v := range conf.CameraDevs {
-		newDevice, err := NewDevice(v)
-		if err != nil {
-			return err
-		}
-		if newDevice != nil {
-			CameraDevices[v.Code] = newDevice
-		}
-	}
-	return nil
-}

server/edge/camera/ipc_device.go

@@ -1,77 +0,0 @@
-package camera
-
-import (
-	"context"
-	"errors"
-	"github.com/sirupsen/logrus"
-	goonvif "github.com/use-go/onvif"
-	"github.com/use-go/onvif/device"
-	sdkdevice "github.com/use-go/onvif/sdk/device"
-	"net/http"
-	"runtime/debug"
-	"server/edge/util/logger"
-	"server/edge/util/mqtt"
-	"sync"
-)
-
-var mutex sync.Mutex
-
-func NewDevice(camera CameraDev) (*goonvif.Device, error) {
-	defer func() {
-		if err := recover(); err != nil {
-			logrus.Errorf("NewDevice.Handle发生异常:%v", err)
-			logrus.Errorf("NewDevice.Handle发生异常,堆栈信息:%s", string(debug.Stack()))
-			go NewDevice(camera)
-		}
-	}()
-	params := goonvif.DeviceParams{
-		Xaddr:      camera.IP,
-		Username:   camera.User,
-		Password:   camera.Password,
-		HttpClient: &http.Client{},
-	}
-	//初始化 ONVIF 客户端
-	dev, err := goonvif.NewDevice(params)
-	if err != nil {
-		logrus.Errorf("摄像机%s初始化失败,原因:%s", camera.Code, err.Error())
-		return nil, err
-	}
-	ctx := context.Background()
-	getDeviceInformation := device.GetDeviceInformation{}
-	getDeviceInformationResponse, err := sdkdevice.Call_GetDeviceInformation(ctx, dev, getDeviceInformation)
-	if err != nil {
-		logrus.Errorf("[%s]获取信息失败", camera.Code)
-		return nil, err
-	}
-	if getDeviceInformationResponse == (device.GetDeviceInformationResponse{}) {
-		logrus.Errorf("设备[%s]权限认证失败", camera.Code)
-		return nil, errors.New("权限认证失败")
-	}
-	return dev, nil
-}
-
-func TestCameraOnline(devices map[string]*goonvif.Device) error {
-	ctx := context.Background()
-	var online string
-	for code, dev := range devices {
-		//读取设备能力信息，判断是否在线
-		capabilities := device.GetCapabilities{Category: "All"}
-		_, state := sdkdevice.Call_GetCapabilities(ctx, dev, capabilities)
-		topic := GetTopic(code, TopicDeviceCamera)
-		if state != nil {
-			//1表示离线
-			online = "1"
-		} else {
-			//0表示在线
-			online = "0"
-		}
-		mutex.Lock()
-		err := mqtt.GetMQTTMgr().Publish(topic, online, mqtt.AtLeastOnce)
-		mutex.Unlock()
-		if err != nil {
-			logger.Logger.Errorf("Publish err = %s", err.Error())
-			return err
-		}
-	}
-	return nil
-}

server/edge/camera/model.go

@@ -1,15 +0,0 @@
-package camera
-
-// 摄象机和一键报警(带摄象机功能)的配置
-type CameraDev struct {
-	Code     string `json:"code"`
-	IP       string `json:"ip"`
-	Name     string `json:"name"`
-	Brand    string `json:"brand"`
-	Model    string `json:"model"`
-	User     string `json:"user"`
-	Password string `json:"password"`
-}
-type DeviceConfig struct {
-	CameraDevs []CameraDev `yaml:"cameraDevs"`
-}

server/edge/camera/topic.go

@@ -1,11 +0,0 @@
-package camera
-
-import "fmt"
-
-const (
-	TopicDeviceCamera = "device/camera"
-)
-
-func GetTopic(deviceCode, protocol string) string {
-	return fmt.Sprintf("smart_intersection/%s/%s", deviceCode, protocol)
-}

server/edge/config/config.yaml

@@ -1,16 +0,0 @@
-
-# Logger configurations.
-logger:
-  path: "./log"
-  level: "info"
-  name: "info"
-
-mqtt:
-  server: "tcp://106.52.134.22:1883"
-  id: "smart_intersection_edge"
-  user: "admin"
-  password: "admin"
-#device:
-#  informant: "5b6d335d"
-#  speech_speed: "5b73355d"
-#  speech_volume: "5b7631305d"

server/edge/dev/dev.yaml

@@ -1,16 +0,0 @@
-cameraDevs:
-  - code: "SXT-11111111"
-    ip: "192.168.110.4"
-    user: "admin"
-    password: "78585Lc@"
-    name: "宇视测试球机"
-    brand: "海康"
-    model: "SX-A"
-  - code: "SXT-1KGEK40UCW"
-    ip: "192.168.110.14"
-    user: "admin"
-    password: "78585Lc@"
-    name: "宇视测试枪机"
-    brand: "海康"
-    model: "SX-B"
-

server/edge/main.go

@@ -1,20 +0,0 @@
-package main
-
-import (
-	"github.com/sirupsen/logrus"
-	"server/edge/camera"
-	"server/edge/util/logger"
-	"server/edge/util/task"
-)
-
-func main() {
-	logger.InitLog()
-	//初始化摄像头
-	err := camera.GetCameraDeviceMgr().InitAllCameraDevice()
-	if err != nil {
-		logrus.Errorf("InitAllCameraDevice:%s", err.Error())
-		return
-	}
-	task.TimeTasks()
-	select {}
-}

server/edge/util/config/config.go

@@ -1,52 +0,0 @@
-package config
-
-import (
-	"gopkg.in/yaml.v2"
-	"os"
-	"sync"
-)
-
-var (
-	instance *config
-	once     sync.Once
-)
-
-func init() {
-	once.Do(func() {
-		var conf config
-		filePath := "./edge/config/config.yaml"
-
-		if f, err := os.Open(filePath); err != nil {
-			panic(err)
-		} else {
-			err := yaml.NewDecoder(f).Decode(&conf)
-			if err != nil {
-				panic(err)
-			}
-		}
-		instance = &conf
-	})
-}
-
-// 获取配置文档实例
-func Instance() *config {
-	return instance
-}
-
-type config struct {
-	Logger logger `yaml:"logger"`
-	Mqtt   mqtt   `yaml:"mqtt"`
-}
-
-type logger struct {
-	Path  string `yaml:"path"`
-	Name  string `yaml:"name"`
-	Level string `yaml:"level"`
-}
-
-type mqtt struct {
-	Server   string `yaml:"server"`
-	Id       string `yaml:"id"`
-	User     string `yaml:"user"`
-	Password string `yaml:"password"`
-}

server/edge/util/logger/lclog.go

@@ -1,42 +0,0 @@
-package logger
-
-import (
-	"github.com/druidcaesa/gotool"
-	rotatelogs "github.com/lestrrat/go-file-rotatelogs"
-	"github.com/sirupsen/logrus"
-	"os"
-	"path"
-	"server/edge/util/config"
-	"time"
-)
-
-var Logger *logrus.Logger
-
-func InitLog() {
-	logFilePath := config.Instance().Logger.Path
-	logFileName := config.Instance().Logger.Name
-
-	err := os.MkdirAll(logFilePath, os.ModeDir)
-	if err != nil {
-		gotool.Logs.ErrorLog().Println(err)
-		panic(err)
-	}
-
-	// 日志文件
-	fileName := path.Join(logFilePath, logFileName)
-	writer, _ := rotatelogs.New(
-		fileName+".%Y%m%d.log",
-		rotatelogs.WithMaxAge(2*24*time.Hour),     // 文件最大保存时间
-		rotatelogs.WithRotationTime(24*time.Hour), // 日志切割时间间隔
-	)
-	// 实例化
-	logger := logrus.New()
-
-	logger.SetFormatter(&logrus.JSONFormatter{
-		TimestampFormat: "2006-01-02 15:04:05.000",
-	})
-	// 设置日志级别
-	logger.SetLevel(logrus.DebugLevel)
-	logger.SetOutput(writer)
-	Logger = logger
-}

server/edge/util/mqtt/mqtt.go

@@ -1,164 +0,0 @@
-package mqtt
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-
-	paho "github.com/eclipse/paho.mqtt.golang"
-	"github.com/google/uuid"
-)
-
-type ConnHandler interface {
-	ConnectionLostHandler(err error)
-	OnConnectHandler()
-	GetWill() (topic string, payload string)
-}
-
-// Client for talking using mqtt
-type Client struct {
-	Options     ClientOptions // The options that were used to create this client
-	client      paho.Client
-	router      *router
-	connhandler ConnHandler
-}
-
-// ClientOptions is the list of options used to create a client
-type ClientOptions struct {
-	Servers  []string // The list of broker hostnames to connect to
-	ClientID string   // If left empty a uuid will automatically be generated
-	Username string   // If not set then authentication will not be used
-	Password string   // Will only be used if the username is set
-
-	AutoReconnect bool // If the client should automatically try to reconnect when the connection is lost
-}
-
-// QOS describes the quality of service of an mqtt publish
-type QOS byte
-
-const (
-	// AtMostOnce means the broker will deliver at most once to every subscriber - this means message delivery is not guaranteed
-	AtMostOnce QOS = iota
-	// AtLeastOnce means the broker will deliver a message at least once to every subscriber
-	AtLeastOnce
-	// ExactlyOnce means the broker will deliver a message exactly once to every subscriber
-	ExactlyOnce
-)
-
-var (
-	// ErrMinimumOneServer means that at least one server should be specified in the client options
-	ErrMinimumOneServer = errors.New("mqtt: at least one server needs to be specified")
-)
-
-func handle(callback MessageHandler) paho.MessageHandler {
-	return func(client paho.Client, message paho.Message) {
-		if callback != nil {
-			callback(Message{message: message})
-		}
-	}
-}
-
-// NewClient creates a new client with the specified options
-func NewClient(options ClientOptions, connhandler ConnHandler) (*Client, error) {
-	pahoOptions := paho.NewClientOptions()
-
-	// brokers
-	if options.Servers != nil && len(options.Servers) > 0 {
-		for _, server := range options.Servers {
-			pahoOptions.AddBroker(server)
-		}
-	} else {
-		return nil, ErrMinimumOneServer
-	}
-
-	// client id
-	if options.ClientID == "" {
-		options.ClientID = uuid.New().String()
-	}
-	pahoOptions.SetClientID(options.ClientID)
-
-	tls := &tls.Config{
-		InsecureSkipVerify: true,
-	}
-	pahoOptions.SetTLSConfig(tls)
-
-	// auth
-	if options.Username != "" {
-		pahoOptions.SetUsername(options.Username)
-		pahoOptions.SetPassword(options.Password)
-	}
-
-	// auto reconnect
-	pahoOptions.SetAutoReconnect(options.AutoReconnect)
-
-	pahoOptions.SetCleanSession(false)
-
-	var client Client
-	pahoOptions.SetConnectionLostHandler(client.ConnectionLostHandler) //断连
-	pahoOptions.SetOnConnectHandler(client.OnConnectHandler)           //连接
-	if t, m := connhandler.GetWill(); t != "" {
-		pahoOptions.SetWill(t, m, 0, false) //遗嘱消息
-	}
-
-	pahoClient := paho.NewClient(pahoOptions)
-	router := newRouter()
-	pahoClient.AddRoute("#", handle(func(message Message) {
-		routes := router.match(&message)
-		for _, route := range routes {
-			m := message
-			m.vars = route.vars(&message)
-			route.handler(m)
-		}
-	}))
-
-	client.client = pahoClient
-	client.Options = options
-	client.router = router
-	client.connhandler = connhandler
-
-	return &client, nil
-}
-
-// Connect tries to establish a connection with the mqtt servers
-func (c *Client) Connect(ctx context.Context) error {
-	// try to connect to the client
-	token := c.client.Connect()
-	return tokenWithContext(ctx, token)
-}
-
-// Connect tries to establish a connection with the mqtt servers
-func (c *Client) IsConnected() bool {
-	// try to connect to the client
-	return c.client.IsConnected()
-}
-
-// DisconnectImmediately will immediately close the connection with the mqtt servers
-func (c *Client) DisconnectImmediately() {
-	c.client.Disconnect(0)
-}
-
-func tokenWithContext(ctx context.Context, token paho.Token) error {
-	completer := make(chan error)
-
-	// TODO: This go routine will not be removed up if the ctx is cancelled or a the ctx timeout passes
-	go func() {
-		token.Wait()
-		completer <- token.Error()
-	}()
-
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case err := <-completer:
-			return err
-		}
-	}
-}
-func (c *Client) ConnectionLostHandler(client paho.Client, err error) {
-	c.connhandler.ConnectionLostHandler(err)
-}
-
-func (c *Client) OnConnectHandler(client paho.Client) {
-	c.connhandler.OnConnectHandler()
-}

server/edge/util/mqtt/mqttclient.go

@@ -1,125 +0,0 @@
-package mqtt
-
-import (
-	"context"
-	"fmt"
-	"server/edge/util/logger"
-	"sync"
-	"time"
-)
-
-type BaseMqttOnline interface {
-	GetOnlineMsg() (string, string)
-	GetWillMsg() (string, string)
-}
-
-type EmptyMqttOnline struct {
-}
-
-func (o *EmptyMqttOnline) GetOnlineMsg() (string, string) {
-	return "", ""
-}
-func (o *EmptyMqttOnline) GetWillMsg() (string, string) {
-	return "", ""
-}
-
-type MClient struct {
-	mqtt       *Client
-	mu         sync.Mutex     //保护mapTopics
-	mapTopics  map[string]QOS //订阅的主题
-	timeout    uint           //超时时间,毫秒为单位
-	MqttOnline BaseMqttOnline //是否发布上线消息&遗嘱消息
-}
-
-func NewMqttClient(server, clientId, user, password string, timeout uint, mqttOnline BaseMqttOnline) *MClient {
-	o := MClient{
-		mapTopics:  make(map[string]QOS),
-		timeout:    timeout,
-		MqttOnline: mqttOnline,
-	}
-	client, err := NewClient(ClientOptions{
-		Servers:       []string{server},
-		ClientID:      clientId,
-		Username:      user,
-		Password:      password,
-		AutoReconnect: true,
-	}, &o)
-	if err != nil {
-		panic(fmt.Sprintf("MQTT错误: %s", err.Error()))
-		return nil
-	}
-	o.mqtt = client
-	err = client.Connect(o.Ctx())
-	return &o
-}
-
-func (o *MClient) ConnectionLostHandler(err error) {
-	logger.Logger.Errorln("MClient.ConnectionLostHandler:MQTT连接已经断开,原因:", err)
-}
-
-func (o *MClient) OnConnectHandler() {
-	logger.Logger.Infoln("MClient.OnConnectHandler:MQTT连接成功")
-	//连接成功则订阅主题
-	for k, v := range o.mapTopics {
-		err := o.Subscribe(k, v)
-		if err != nil {
-			return
-		}
-	}
-	topic, str := o.MqttOnline.GetOnlineMsg()
-	if topic != "" {
-		err := o.PublishString(topic, str, 0)
-		if err != nil {
-			return
-		}
-	}
-}
-
-func (o *MClient) GetWill() (topic string, payload string) {
-	return o.MqttOnline.GetWillMsg()
-}
-
-func (o *MClient) Connect() error {
-	return o.mqtt.Connect(o.Ctx())
-}
-
-func (o *MClient) IsConnected() bool {
-	return o.mqtt.IsConnected()
-}
-
-func (o *MClient) Publish(topic string, payload interface{}, qos QOS) error {
-	return o.mqtt.Publish(o.Ctx(), topic, payload, qos)
-}
-func (o *MClient) PublishString(topic string, payload string, qos QOS) error {
-	return o.mqtt.PublishString(o.Ctx(), topic, payload, qos)
-}
-func (o *MClient) PublishJSON(topic string, payload interface{}, qos QOS) error {
-	return o.mqtt.PublishJSON(o.Ctx(), topic, payload, qos)
-}
-
-func (o *MClient) Subscribe(topic string, qos QOS) error {
-	o.mu.Lock()
-	defer o.mu.Unlock()
-	if _, ok := o.mapTopics[topic]; !ok {
-		o.mapTopics[topic] = qos
-	}
-	return o.mqtt.Subscribe(o.Ctx(), topic, qos)
-}
-
-func (o *MClient) Unsubscribe(topic string) error {
-	o.mu.Lock()
-	defer o.mu.Unlock()
-	if _, ok := o.mapTopics[topic]; ok {
-		delete(o.mapTopics, topic)
-	}
-	return o.mqtt.Unsubscribe(o.Ctx(), topic)
-}
-
-func (o *MClient) Handle(topic string, handler MessageHandler) Route {
-	return o.mqtt.Handle(topic, handler)
-}
-
-func (o *MClient) Ctx() context.Context {
-	ctx, _ := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(o.timeout))
-	return ctx
-}

server/edge/util/mqtt/mqttmgr.go

@@ -1,50 +0,0 @@
-package mqtt
-
-import (
-	"server/edge/util/config"
-	"sync"
-)
-
-var _once sync.Once
-var _mgr *Mgr
-
-func GetMQTTMgr() *Mgr {
-	_once.Do(func() {
-		_mgr = _newMQTTMgr()
-	})
-	return _mgr
-}
-
-type Mgr struct {
-	Cloud *MClient
-}
-
-func _newMQTTMgr() *Mgr {
-	cfg := config.Instance()
-	return &Mgr{
-		Cloud: NewMqttClient(cfg.Mqtt.Server,
-			cfg.Mqtt.Id,
-			cfg.Mqtt.User,
-			cfg.Mqtt.Password,
-			3000, &EmptyMqttOnline{}),
-	}
-}
-
-func (o *Mgr) Subscribe(topic string, qos QOS, handler MessageHandler) {
-	o.Cloud.Handle(topic, handler)
-	err := o.Cloud.Subscribe(topic, qos)
-	if err != nil {
-		return
-	}
-}
-
-func (o *Mgr) UnSubscribe(topic string) {
-	err := o.Cloud.Unsubscribe(topic)
-	if err != nil {
-		return
-	}
-}
-
-func (o *Mgr) Publish(topic string, payload interface{}, qos QOS) error {
-	return o.Cloud.Publish(topic, payload, qos)
-}

server/edge/util/mqtt/publish.go

@@ -1,46 +0,0 @@
-package mqtt
-
-import (
-	"context"
-	"encoding/json"
-)
-
-// PublishOption are extra options when publishing a message
-type PublishOption int
-
-const (
-	// Retain tells the broker to retain a message and send it as the first message to new subscribers.
-	Retain PublishOption = iota
-)
-
-// Publish a message with a byte array payload
-func (c *Client) Publish(ctx context.Context, topic string, payload interface{}, qos QOS, options ...PublishOption) error {
-	return c.publish(ctx, topic, payload, qos, options)
-}
-
-// PublishString publishes a message with a string payload
-func (c *Client) PublishString(ctx context.Context, topic string, payload string, qos QOS, options ...PublishOption) error {
-	return c.publish(ctx, topic, []byte(payload), qos, options)
-}
-
-// PublishJSON publishes a message with the payload encoded as JSON using encoding/json
-func (c *Client) PublishJSON(ctx context.Context, topic string, payload interface{}, qos QOS, options ...PublishOption) error {
-	data, err := json.Marshal(payload)
-	if err != nil {
-		return err
-	}
-	return c.publish(ctx, topic, data, qos, options)
-}
-
-func (c *Client) publish(ctx context.Context, topic string, payload interface{}, qos QOS, options []PublishOption) error {
-	var retained = false
-	for _, option := range options {
-		switch option {
-		case Retain:
-			retained = true
-		}
-	}
-
-	token := c.client.Publish(topic, byte(qos), retained, payload)
-	return tokenWithContext(ctx, token)
-}

server/edge/util/mqtt/queue.go

@@ -1,156 +0,0 @@
-package mqtt
-
-import (
-	"fmt"
-	"runtime"
-	"sync/atomic"
-)
-
-type mlCache struct {
-	putNo uint32
-	getNo uint32
-	value interface{}
-}
-
-type MlQueue struct {
-	capacity uint32
-	capMod   uint32
-	putPos   uint32
-	getPos   uint32
-	cache    []mlCache
-}
-
-func NewQueue(capacity uint32) *MlQueue {
-	q := new(MlQueue)
-	q.capacity = minQuantity(capacity)
-	q.capMod = q.capacity - 1
-	q.putPos = 0
-	q.getPos = 0
-	q.cache = make([]mlCache, q.capacity)
-	for i := range q.cache {
-		cache := &q.cache[i]
-		cache.getNo = uint32(i)
-		cache.putNo = uint32(i)
-	}
-	cache := &q.cache[0]
-	cache.getNo = q.capacity
-	cache.putNo = q.capacity
-	return q
-}
-
-func (q *MlQueue) String() string {
-	getPos := atomic.LoadUint32(&q.getPos)
-	putPos := atomic.LoadUint32(&q.putPos)
-	return fmt.Sprintf("Queue{capacity: %v, capMod: %v, putPos: %v, getPos: %v}",
-		q.capacity, q.capMod, putPos, getPos)
-}
-
-func (q *MlQueue) Capacity() uint32 {
-	return q.capacity
-}
-
-func (q *MlQueue) Quantity() uint32 {
-	var putPos, getPos uint32
-	var quantity uint32
-	getPos = atomic.LoadUint32(&q.getPos)
-	putPos = atomic.LoadUint32(&q.putPos)
-
-	if putPos >= getPos {
-		quantity = putPos - getPos
-	} else {
-		quantity = q.capMod + (putPos - getPos)
-	}
-
-	return quantity
-}
-
-func (q *MlQueue) Put(val interface{}) (ok bool, quantity uint32) {
-	var putPos, putPosNew, getPos, posCnt uint32
-	var cache *mlCache
-	capMod := q.capMod
-
-	getPos = atomic.LoadUint32(&q.getPos)
-	putPos = atomic.LoadUint32(&q.putPos)
-
-	if putPos >= getPos {
-		posCnt = putPos - getPos
-	} else {
-		posCnt = capMod + (putPos - getPos)
-	}
-
-	if posCnt >= capMod-1 {
-		runtime.Gosched()
-		return false, posCnt
-	}
-
-	putPosNew = putPos + 1
-	if !atomic.CompareAndSwapUint32(&q.putPos, putPos, putPosNew) {
-		runtime.Gosched()
-		return false, posCnt
-	}
-
-	cache = &q.cache[putPosNew&capMod]
-
-	for {
-		getNo := atomic.LoadUint32(&cache.getNo)
-		putNo := atomic.LoadUint32(&cache.putNo)
-		if putPosNew == putNo && getNo == putNo {
-			cache.value = val
-			atomic.AddUint32(&cache.putNo, q.capacity)
-			return true, posCnt + 1
-		} else {
-			runtime.Gosched()
-		}
-	}
-}
-
-func (q *MlQueue) Get() (val interface{}, ok bool, quantity uint32) {
-	var putPos, getPos, getPosNew, posCnt uint32
-	var cache *mlCache
-	capMod := q.capMod
-
-	putPos = atomic.LoadUint32(&q.putPos)
-	getPos = atomic.LoadUint32(&q.getPos)
-
-	if putPos >= getPos {
-		posCnt = putPos - getPos
-	} else {
-		posCnt = capMod + (putPos - getPos)
-	}
-
-	if posCnt < 1 {
-		runtime.Gosched()
-		return nil, false, posCnt
-	}
-
-	getPosNew = getPos + 1
-	if !atomic.CompareAndSwapUint32(&q.getPos, getPos, getPosNew) {
-		runtime.Gosched()
-		return nil, false, posCnt
-	}
-
-	cache = &q.cache[getPosNew&capMod]
-
-	for {
-		getNo := atomic.LoadUint32(&cache.getNo)
-		putNo := atomic.LoadUint32(&cache.putNo)
-		if getPosNew == getNo && getNo == putNo-q.capacity {
-			val = cache.value
-			atomic.AddUint32(&cache.getNo, q.capacity)
-			return val, true, posCnt - 1
-		} else {
-			runtime.Gosched()
-		}
-	}
-}
-
-func minQuantity(v uint32) uint32 {
-	v--
-	v |= v >> 1
-	v |= v >> 2
-	v |= v >> 4
-	v |= v >> 8
-	v |= v >> 16
-	v++
-	return v
-}

server/edge/util/mqtt/router.go

@@ -1,125 +0,0 @@
-package mqtt
-
-import (
-	"strings"
-	"sync"
-
-	"github.com/google/uuid"
-)
-
-type router struct {
-	routes []Route
-	lock   sync.RWMutex
-}
-
-func newRouter() *router {
-	return &router{routes: []Route{}, lock: sync.RWMutex{}}
-}
-
-// Route is a receipt for listening or handling certain topic
-type Route struct {
-	router  *router
-	id      string
-	topic   string
-	handler MessageHandler
-}
-
-func newRoute(router *router, topic string, handler MessageHandler) Route {
-	return Route{router: router, id: uuid.New().String(), topic: topic, handler: handler}
-}
-
-func match(route []string, topic []string) bool {
-	if len(route) == 0 {
-		return len(topic) == 0
-	}
-
-	if len(topic) == 0 {
-		return route[0] == "#"
-	}
-
-	if route[0] == "#" {
-		return true
-	}
-
-	if (route[0] == "+") || (route[0] == topic[0]) {
-		return match(route[1:], topic[1:])
-	}
-	return false
-}
-
-func routeIncludesTopic(route, topic string) bool {
-	return match(routeSplit(route), strings.Split(topic, "/"))
-}
-
-func routeSplit(route string) []string {
-	var result []string
-	if strings.HasPrefix(route, "$share") {
-		result = strings.Split(route, "/")[2:]
-	} else {
-		result = strings.Split(route, "/")
-	}
-	return result
-}
-
-func (r *Route) match(message *Message) bool {
-	return r.topic == message.Topic() || routeIncludesTopic(r.topic, message.Topic())
-}
-
-func (r *Route) vars(message *Message) []string {
-	var vars []string
-	route := routeSplit(r.topic)
-	topic := strings.Split(message.Topic(), "/")
-
-	for i, section := range route {
-		if section == "+" {
-			if len(topic) > i {
-				vars = append(vars, topic[i])
-			}
-		} else if section == "#" {
-			if len(topic) > i {
-				vars = append(vars, topic[i:]...)
-			}
-		}
-	}
-
-	return vars
-}
-
-func (r *router) addRoute(topic string, handler MessageHandler) Route {
-	if handler != nil {
-		route := newRoute(r, topic, handler)
-		r.lock.Lock()
-		r.routes = append(r.routes, route)
-		r.lock.Unlock()
-		return route
-	}
-	return Route{router: r}
-}
-
-func (r *router) removeRoute(removeRoute *Route) {
-	r.lock.Lock()
-	for i, route := range r.routes {
-		if route.id == removeRoute.id {
-			r.routes[i] = r.routes[len(r.routes)-1]
-			r.routes = r.routes[:len(r.routes)-1]
-		}
-	}
-	r.lock.Unlock()
-}
-
-func (r *router) match(message *Message) []Route {
-	routes := []Route{}
-	r.lock.RLock()
-	for _, route := range r.routes {
-		if route.match(message) {
-			routes = append(routes, route)
-		}
-	}
-	r.lock.RUnlock()
-	return routes
-}
-
-// Stop removes this route from the router and stops matching it
-func (r *Route) Stop() {
-	r.router.removeRoute(r)
-}

server/edge/util/mqtt/subscribe.go

@@ -1,99 +0,0 @@
-package mqtt
-
-import (
-	"context"
-	"encoding/json"
-
-	paho "github.com/eclipse/paho.mqtt.golang"
-)
-
-// A Message from or to the broker
-type Message struct {
-	message paho.Message
-	vars    []string
-}
-
-// A MessageHandler to handle incoming messages
-type MessageHandler func(Message)
-
-// TopicVars is a list of all the message specific matches for a wildcard in a route topic.
-// If the route would be `config/+/full` and the messages topic is `config/server_1/full` then thous would return `[]string{"server_1"}`
-func (m *Message) TopicVars() []string {
-	return m.vars
-}
-
-// Topic is the topic the message was recieved on
-func (m *Message) Topic() string {
-	return m.message.Topic()
-}
-
-// QOS is the quality of service the message was recieved with
-func (m *Message) QOS() QOS {
-	return QOS(m.message.Qos())
-}
-
-// IsDuplicate is true if this exact message has been recieved before (due to a AtLeastOnce QOS)
-func (m *Message) IsDuplicate() bool {
-	return m.message.Duplicate()
-}
-
-// Acknowledge explicitly acknowledges to a broker that the message has been recieved
-func (m *Message) Acknowledge() {
-	m.message.Ack()
-}
-
-// Payload returns the payload as a byte array
-func (m *Message) Payload() []byte {
-	return m.message.Payload()
-}
-
-// PayloadString returns the payload as a string
-func (m *Message) PayloadString() string {
-	return string(m.message.Payload())
-}
-
-// PayloadJSON unmarshal the payload into the provided interface using encoding/json and returns an error if anything fails
-func (m *Message) PayloadJSON(v interface{}) error {
-	return json.Unmarshal(m.message.Payload(), v)
-}
-
-// Handle adds a handler for a certain topic. This handler gets called if any message arrives that matches the topic.
-// Also returns a route that can be used to unsubscribe. Does not automatically subscribe.
-func (c *Client) Handle(topic string, handler MessageHandler) Route {
-	return c.router.addRoute(topic, handler)
-}
-
-// Listen returns a stream of messages that match the topic.
-// Also returns a route that can be used to unsubscribe. Does not automatically subscribe.
-func (c *Client) Listen(topic string) (chan Message, Route) {
-	queue := make(chan Message)
-	route := c.router.addRoute(topic, func(message Message) {
-		queue <- message
-	})
-	return queue, route
-}
-
-// Subscribe subscribes to a certain topic and errors if this fails.
-func (c *Client) Subscribe(ctx context.Context, topic string, qos QOS) error {
-	token := c.client.Subscribe(topic, byte(qos), nil)
-	err := tokenWithContext(ctx, token)
-	return err
-}
-
-// SubscribeMultiple subscribes to multiple topics and errors if this fails.
-func (c *Client) SubscribeMultiple(ctx context.Context, subscriptions map[string]QOS) error {
-	subs := make(map[string]byte, len(subscriptions))
-	for topic, qos := range subscriptions {
-		subs[topic] = byte(qos)
-	}
-	token := c.client.SubscribeMultiple(subs, nil)
-	err := tokenWithContext(ctx, token)
-	return err
-}
-
-// Unsubscribe unsubscribes from a certain topic and errors if this fails.
-func (c *Client) Unsubscribe(ctx context.Context, topic string) error {
-	token := c.client.Unsubscribe(topic)
-	err := tokenWithContext(ctx, token)
-	return err
-}

server/edge/util/mqtt/topic.go

@@ -1,5 +0,0 @@
-package mqtt
-
-const (
-	TopicDeviceCamera = "device/camera"
-)

server/edge/util/task/task.go

@@ -1,16 +0,0 @@
-package task
-
-import (
-	"github.com/robfig/cron"
-	"server/edge/camera"
-)
-
-func TimeTasks() {
-	c := cron.New()
-	//每3分钟监测状态
-	_ = c.AddFunc("0 */3 * * * ?", func() {
-		//检查摄像头是否在线
-		camera.TestCameraOnline(camera.CameraDevices)
-	})
-	c.Start()
-}

server/go.mod

@@ -57,7 +57,6 @@ require (
 
 require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/beevik/etree v1.4.0 // indirect
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/casbin/govaluate v1.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -66,7 +65,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6 // indirect
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -81,7 +79,6 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
@@ -100,7 +97,6 @@ require (
 	github.com/jonboulle/clockwork v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/juju/errors v1.0.0 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
@@ -119,7 +115,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/rs/zerolog v1.26.1 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/spf13/afero v1.9.5 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
@@ -131,7 +126,6 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/use-go/onvif v0.0.9 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.uber.org/atomic v1.9.0 // indirect

server/go.sum

@@ -50,9 +50,6 @@ github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible h1:KpbJFXwhVeuxNtBJ74MCG
 github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/aws/aws-sdk-go v1.44.307 h1:2R0/EPgpZcFSUwZhYImq/srjaOrOfLv5MNRzrFyAM38=
 github.com/aws/aws-sdk-go v1.44.307/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
-github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
-github.com/beevik/etree v1.4.0 h1:oz1UedHRepuY3p4N5OjE0nK1WLCqtzHf25bxplKOHLs=
-github.com/beevik/etree v1.4.0/go.mod h1:cyWiXwGoasx60gHvtnEh5x8+uIjUVnjWqBvEnhnqKDA=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
 github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
@@ -82,8 +79,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -97,9 +92,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eclipse/paho.mqtt.golang v1.4.3 h1:2kwcUGn8seMUfWndX0hGbvH8r7crgcJguQNCyp70xik=
 github.com/eclipse/paho.mqtt.golang v1.4.3/go.mod h1:CSYvoAlsMkhYOXh/oKyxa8EcBci6dVkLCbo5tTC1RIE=
-github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae/go.mod h1:wruC5r2gHdr/JIUs5Rr1V45YtsAzKXZxAnn/5rPC97g=
-github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6 h1:x9TA+vnGEyqmWY+eA9HfgxNRkOQqwiEpFE9IPXSGuEA=
-github.com/elgs/gostrgen v0.0.0-20220325073726-0c3e00d082f6/go.mod h1:wruC5r2gHdr/JIUs5Rr1V45YtsAzKXZxAnn/5rPC97g=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -127,7 +119,6 @@ github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/gin-gonic/gin v1.7.0/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/glebarez/go-sqlite v1.21.1 h1:7MZyUPh2XTrHS7xNEHQbrhfMZuPSzhkm2A1qgg0y5NY=
@@ -174,10 +165,6 @@ github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
-github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M=
 github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
@@ -234,8 +221,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -314,9 +301,6 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/juju/errors v0.0.0-20220331221717-b38fca44723b/go.mod h1:jMGj9DWF/qbo91ODcfJq6z/RYc3FX3taCBZMCcpI4Ls=
-github.com/juju/errors v1.0.0 h1:yiq7kjCLll1BiaRuNY53MGI0+EQ3rF6GB+wvboZDefM=
-github.com/juju/errors v1.0.0/go.mod h1:B5x9thDqx0wIMH3+aLIMP9HjItInYWObRovoCFM5Qe8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
@@ -327,12 +311,10 @@ github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZX
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
@@ -411,9 +393,6 @@ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
-github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
 github.com/shirou/gopsutil/v3 v3.23.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08=
 github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
@@ -477,8 +456,6 @@ github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4d
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/unrolled/secure v1.13.0 h1:sdr3Phw2+f8Px8HE5sd1EHdj1aV3yUwed/uZXChLFsk=
 github.com/unrolled/secure v1.13.0/go.mod h1:BmF5hyM6tXczk3MpQkFf1hpKSRqCyhqcbiQtiAF7+40=
-github.com/use-go/onvif v0.0.9 h1:t6y5uN1LGrdSpNDiy4Vn9HazYgVxdWUBfdBb5cApR7g=
-github.com/use-go/onvif v0.0.9/go.mod h1:l6K5BgFel7AARm7a9oVj5uvTdwvgttudcP8pUxUf5go=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
@@ -493,7 +470,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -531,14 +507,11 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
-golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
 golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -578,10 +551,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -617,7 +588,6 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
@@ -625,8 +595,6 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
 golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -651,8 +619,6 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -699,7 +665,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -733,8 +698,6 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -792,11 +755,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -898,7 +858,6 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=

server/initialize/task.go

@@ -1,17 +0,0 @@
-package initialize
-
-import (
-	"github.com/robfig/cron"
-	"server/edge/camera"
-)
-
-func TimeTasks() {
-	c := cron.New()
-	//每五分钟监测状态
-	//_ = c.AddFunc("0 */5 * * * ?", func() {
-	_ = c.AddFunc("0/5 * * * * ?", func() {
-		//检查摄像头是否在线
-		camera.TestCameraOnline(camera.CameraDevices)
-	})
-	c.Start()
-}

server/main.go

@@ -6,6 +6,7 @@ import (
 	"server/core"
 	"server/global"
 	"server/initialize"
+	"server/tcp"
 	"server/utils"
 	"server/utils/logger"
 	"server/utils/mqtt"
@@ -42,5 +43,6 @@ func main() {
 	logger.InitLog()      //日志
 	mqtt.InitMqtt()       //mqtt来消息时执行
 	utils.ScheduledTask() //定时任务
+	go tcp.ListenTcp()    //监听tcp连接
 	core.RunWindowsServer()
 }

server/model/common/request/common.go

@@ -21,6 +21,13 @@ type IdsReq struct {
 	Ids []int `json:"ids" form:"ids"`
 }
 
+type DeviceStatus struct {
+	Status        int `json:"status"`        //在线状态 1 在线 0 离线
+	PlayStatus    int `json:"playStatus"`    // 播放状态 1 正常 0 异常
+	DisplayStatus int `json:"displayStatus"` // 显示模板状态 1 正常 0 异常
+	SourceStatus  int `json:"sourceStatus"`  // 素材状态 1 正常 0 异常
+}
+
 // GetAuthorityId Get role by id structure
 type GetAuthorityId struct {
 	AuthorityId uint `json:"authorityId" form:"authorityId"` // 角色ID

server/task/devices.go

@@ -10,10 +10,10 @@ func GatewayRoutingInspection() {
 	gatewayList, _ := g.PublicGateway()
 	for _, gateway := range gatewayList {
 		currentTime := time.Now()
-		status := 0
+		status := 1
 		if (gateway.RecentOnline == time.Time{} || currentTime.Sub(gateway.RecentOnline).Minutes() > 15) { //如果上次在线时间与当前时间对比超过十五分钟则离线
 			//离线 && 修改网关下所有设备的状态为离线
-			status = 1
+			status = 0
 			_ = devices.UpdateCameraStatusByGatewayId(gateway.ID, status)
 			_ = devices.UpdateScreensStatusByGatewayId(gateway.ID, status)
 			//_ = devices.UpdateRadarStatusByGatewayId(gateway.ID, status)

server/tcp/deviceMgr.go

@@ -0,0 +1,108 @@
+package tcp
+
+import (
+	"encoding/hex"
+	"go.uber.org/zap"
+	"net"
+	"server/dao/devices"
+	Dev "server/dao/devices"
+	"server/model/common/request"
+	"server/utils/logger"
+	"strings"
+	"time"
+)
+
+type Device struct {
+	info     devices.Screens
+	conn     net.Conn
+	lastTime time.Time
+}
+
+func (s *Device) Start(conn net.Conn) {
+	s.conn = conn
+	go s.Process()
+	go s.Handle()
+}
+
+func (s *Device) Process() {
+	// 函数执行完之后关闭连接
+	defer s.conn.Close()
+	for {
+		buf := make([]byte, 256)
+		// 将tcp连接读取到的数据读取到byte数组中, 返回读取到的byte的数目
+		n, err := s.conn.Read(buf)
+		if err != nil {
+			// 从客户端读取数据的过程中发生错误
+			logger.Logger.Errorf("read from client failed, err:%v", err)
+			break
+		}
+		data := hex.EncodeToString(buf[:n])
+		if len(data) > 51 {
+			logger.Logger.Debugf("led sn = %v", data[34:50])
+		}
+		if !strings.Contains(strings.ToLower(data), "fe5c4b89") {
+			continue
+		}
+		switch data[16:18] {
+		case "61":
+			logger.Logger.Debug("登录")
+			reply, _ := hex.DecodeString(
+				"fe5c4b892a0000006200000000170000003123323032333035313530313038333431352330363023ffff")
+			s.conn.Write(reply)
+		case "91":
+			logger.Logger.Debug("心跳")
+			if data[34:50] != s.info.ScreensCode {
+				continue
+			}
+			s.UpdateInfo(data[82:84], data[86:88], data[90:92])
+		}
+	}
+}
+
+func (s *Device) Handle() {
+	t2 := time.NewTicker(3 * time.Minute) //在线监测
+	for {
+		select {
+		case <-t2.C:
+			state := request.DeviceStatus{
+				Status:        1,
+				PlayStatus:    s.info.PlayStatus,
+				DisplayStatus: s.info.DisplayStatus,
+				SourceStatus:  s.info.SourceStatus,
+			}
+			if time.Now().Add(-2 * time.Minute).After(s.lastTime) {
+				//离线
+				state.Status = 0
+			} else {
+				logger.Logger.Debugf("%s在线", s.info.ScreensCode)
+			}
+			//修改数据库状态
+			err := Dev.UpdateScreensStatus(s.info.ScreensCode, state)
+			if err != nil {
+				logger.Logger.Error("UpdateScreensStatus err", zap.Error(err))
+				continue
+			}
+			break
+		default:
+			continue
+		}
+	}
+}
+
+func (s *Device) UpdateInfo(playStatus, displayStatus, sourceStatus string) {
+	play, display, source := 0, 0, 0
+	if playStatus != "31" {
+		play = 1
+	}
+	if displayStatus != "30" {
+		display = 1
+	}
+	if sourceStatus != "30" {
+		source = 1
+	}
+	s.info.Status = 1
+	s.info.PlayStatus = play
+	s.info.DisplayStatus = display
+	s.info.SourceStatus = source
+	s.lastTime = time.Now()
+}

server/tcp/tcp.go

@@ -0,0 +1,46 @@
+package tcp
+
+import (
+	"errors"
+	"net"
+	"server/dao/devices"
+	"server/utils/logger"
+	"strings"
+)
+
+var ScreenList []devices.Screens
+
+func ListenTcp() {
+	// 监听当前的tcp连接
+	listen, err := net.Listen("tcp", "0.0.0.0:9200")
+	if err != nil {
+		logger.Logger.Errorf("listen failed, err:%v", err)
+		return
+	}
+	for {
+		conn, err := listen.Accept() // 建立连接
+		if err != nil {
+			logger.Logger.Errorf("Accept failed, err:%v", err)
+			continue
+		}
+		err = CheckConn(conn)
+		if err != nil {
+			continue
+		}
+	}
+}
+
+func CheckConn(conn net.Conn) error {
+	logger.Logger.Debugf("StartDevice addr:%s", conn.RemoteAddr().String())
+	arr := strings.Split(conn.RemoteAddr().String(), ":")
+	ip := arr[0]
+	ScreenList = devices.QueryAllScreens()
+	for _, v := range ScreenList {
+		if v.IPAddress == ip {
+			dev := Device{info: v}
+			dev.Start(conn)
+			return nil
+		}
+	}
+	return errors.New("not found")
+}

server/utils/mqtt/mqtt_handle.go

@@ -2,10 +2,12 @@ package mqtt
 
 import (
 	"errors"
+	jsoniter "github.com/json-iterator/go"
 	"go.uber.org/zap"
 	"runtime"
 	"runtime/debug"
 	Dev "server/dao/devices"
+	"server/model/common/request"
 	"server/utils/logger"
 	"strconv"
 	"strings"
@@ -20,6 +22,7 @@ func InitMqtt() {
 }
 
 var MqttService *MqttHandler
+var jsoni = jsoniter.ConfigFastest
 
 type MqttHandler struct {
 	queue *MlQueue
@@ -93,21 +96,12 @@ func (o *MqttHandler) Handler() interface{} {
 				logger.Logger.Error("UpdateCameraStatus err", zap.Error(err))
 			}
 		case TopicDeviceScreens:
-			status := 0
-			if m.PayloadString() == "offline" {
-				status = 1
-			}
-			err := Dev.UpdateScreensStatus(deviceCode, status)
+			var stat request.DeviceStatus
+			jsoni.Unmarshal([]byte(m.PayloadString()), &stat)
+			err = Dev.UpdateScreensStatus(deviceCode, stat)
 			if err != nil {
 				logger.Logger.Error("UpdateScreensStatus err", zap.Error(err))
 			}
-		case TopicIntersect:
-			//修改路口运行状态(根据路口id)
-			status, _ := strconv.Atoi(m.PayloadString())
-			err := Dev.UpdateIntersectStatus(deviceCode, status)
-			if err != nil {
-				logger.Logger.Error("UpdateIntersectStatus err", zap.Error(err))
-			}
 		}
 	}
 }
@@ -125,5 +119,4 @@ const (
 	TopicDeviceGateway = "device/gateway"
 	TopicDeviceCamera  = "device/camera"
 	TopicDeviceScreens = "device/screens"
-	TopicIntersect     = "device/intersect"
 )