From 87b55a899bc1b4bc7d5a0f8d6ad1a1ede233ebd1 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期四, 04 九月 2025 17:35:24 +0800
Subject: [PATCH] 系统监控模型进程统计实时监控摄像机名称为空问题修复
---
sync-service/models/cameraPolygon.go | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/sync-service/models/cameraPolygon.go b/sync-service/models/cameraPolygon.go
index 04a4376..8e50e25 100644
--- a/sync-service/models/cameraPolygon.go
+++ b/sync-service/models/cameraPolygon.go
@@ -1,26 +1,25 @@
package models
import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
- "encoding/json"
"regexp"
+
+ "basic.com/valib/logger.git"
)
type CameraPolygon struct {
Id string `gorm:"primary_key;column:id" json:"id"`
- CameraId string `gorm:"column:camera_id" json:"camera_id"` //鎽勫儚鏈篿d
- Name string `gorm:"column:name" json:"name"` //褰㈢姸鍚嶇О
- Polygon string `gorm:"column:polygon" json:"polygon"` //褰㈢姸缁撴瀯瀹氫箟
- DirectionLine string `gorm:"column:direction_line" json:"direction_line"` //鏂瑰悜绾�
- Type string `gorm:"column:type" json:"type"` //绫诲瀷锛孾"line","rect","polygon"]
+ CameraId string `gorm:"column:camera_id" json:"camera_id"` //鎽勫儚鏈篿d
+ Name string `gorm:"column:name" json:"name"` //褰㈢姸鍚嶇О
+ Polygon string `gorm:"column:polygon" json:"polygon"` //褰㈢姸缁撴瀯瀹氫箟
+ DirectionLine string `gorm:"column:direction_line" json:"direction_line"` //鏂瑰悜绾�
+ Type string `gorm:"column:type" json:"type"` //绫诲瀷锛孾"line","rect","polygon"]
DefenceState int `gorm:"column:defence_state;default:0" json:"defence_state"` //甯冩挙闃茬姸鎬�
}
const (
- TYPE_LINE = "line" //绾�
- TYPE_RECT = "rect" //鐭╁舰
- TYPE_POLYGON = "polygon" //闈�
+ TYPE_LINE = "line" //绾�
+ TYPE_RECT = "rect" //鐭╁舰
+ TYPE_POLYGON = "polygon" //闈�
CAMERAPOLYGON_AREA_ALL = "鍏ㄩ儴鍖哄煙"
)
@@ -35,44 +34,44 @@
}
func (cp *CameraPolygon) FindAll() (polygons []CameraPolygon) {
- if err := db.Table("camera_polygon").Scan(&polygons).Error;err !=nil {
+ if err := db.Table("camera_polygon").Scan(&polygons).Error; err != nil {
return nil
}
return polygons
}
func (cp *CameraPolygon) FindAllMap() map[string]CameraPolygon {
- m := make(map[string]CameraPolygon,0)
+ m := make(map[string]CameraPolygon, 0)
polygons := cp.FindAll()
- if polygons !=nil {
- for _,p :=range polygons {
+ if polygons != nil {
+ for _, p := range polygons {
m[p.Id] = p
}
}
return m
}
-func (cp *CameraPolygon) SelectById(id string) (model CameraPolygon,flag bool) {
- exist := db.Table("camera_polygon").First(&model,"id=?",id).RecordNotFound()
- return model,!exist
+func (cp *CameraPolygon) SelectById(id string) (model CameraPolygon, flag bool) {
+ exist := db.Table("camera_polygon").First(&model, "id=?", id).RecordNotFound()
+ return model, !exist
}
func (cp *CameraPolygon) FindAllByCameraId(cameraId string) (polygons []CameraPolygon, err error) {
- if err := db.Table("camera_polygon").Where("camera_id = ?", cameraId).Scan(&polygons).Error;err !=nil {
+ if err := db.Table("camera_polygon").Where("camera_id = ?", cameraId).Scan(&polygons).Error; err != nil {
return nil, err
}
- return polygons,nil
+ return polygons, nil
}
-//FindByCameraId 鏍规嵁鎽勫儚鏈篿d鏌ユ壘鍦ㄨ鍒欎腑浣跨敤鐨勫杈瑰舰
+// FindByCameraId 鏍规嵁鎽勫儚鏈篿d鏌ユ壘鍦ㄨ鍒欎腑浣跨敤鐨勫杈瑰舰
func (cp *CameraPolygon) FindRulePolygonsByCameraId(cameraId string) (polygons []CameraPolygon, err error) {
- if err := db.Table("camera_polygon").Where("camera_id = ? and type !=?", cameraId, TYPE_LINE).Scan(&polygons).Error;err !=nil {
+ if err := db.Table("camera_polygon").Where("camera_id = ? and type !=?", cameraId, TYPE_LINE).Scan(&polygons).Error; err != nil {
return nil, err
}
- return polygons,nil
+ return polygons, nil
}
-//淇濆瓨鎽勫儚鏈哄尯鍩�
+// 淇濆瓨鎽勫儚鏈哄尯鍩�
func (cp *CameraPolygon) Insert() (result bool, err error) {
if err = db.Table("camera_polygon").Save(&cp).Error; err != nil {
return false, err
@@ -80,63 +79,63 @@
return true, nil
}
-//鏇存柊鎽勫儚鏈哄尯鍩�
-func (cp *CameraPolygon) Update() (bool,error) {
- result := db.Exec("update camera_polygon set camera_id=?,name=?,polygon=?,direction_line=?,type=?,defence_state=? where id=?",cp.CameraId,cp.Name,cp.Polygon,cp.DirectionLine,cp.Type,cp.DefenceState,cp.Id)
+// 鏇存柊鎽勫儚鏈哄尯鍩�
+func (cp *CameraPolygon) Update() (bool, error) {
+ result := db.Exec("update camera_polygon set camera_id=?,name=?,polygon=?,direction_line=?,type=?,defence_state=? where id=?", cp.CameraId, cp.Name, cp.Polygon, cp.DirectionLine, cp.Type, cp.DefenceState, cp.Id)
if result.Error != nil {
return false, result.Error
}
return result.RowsAffected > 0, nil
}
-//鍒ゆ柇鎽勫儚鏈烘湁娌℃湁閲嶅悕鐨勫尯鍩�
+// 鍒ゆ柇鎽勫儚鏈烘湁娌℃湁閲嶅悕鐨勫尯鍩�
func (cp CameraPolygon) Exist(cameraId string, name string) (model CameraPolygon, exist bool) {
exist = db.Table("camera_polygon").First(&model, "camera_id=? and name=?", cameraId, name).RecordNotFound()
return model, !exist
}
-//UnInstall 鍒犻櫎鎽勫儚鏈哄尯鍩�
-func (cp *CameraPolygon) Delete(id string,name string) bool {
- if err := db.Table("camera_polygon").Where("id=?",id).Delete(&CameraPolygon{}).Error; err != nil {
+// UnInstall 鍒犻櫎鎽勫儚鏈哄尯鍩�
+func (cp *CameraPolygon) Delete(id string, name string) bool {
+ if err := db.Table("camera_polygon").Where("id=?", id).Delete(&CameraPolygon{}).Error; err != nil {
return false
}
var crg CameraRuleGroup
groups := crg.FindGroupByPolygonId(id)
if groups != nil {
- for _,g :=range groups {
+ for _, g := range groups {
//灏唃roupText涓殑宸插垹闄ょ殑澶氳竟褰㈠悕绉版浛鎹负NULL
- reg := regexp.MustCompile(`(`+name+`浜�)`)
+ reg := regexp.MustCompile(`(` + name + `浜�)`)
newGText := reg.ReplaceAllString(g.GroupText, `<span style="color:RGB(255,0,0);">NULL</span>浜巂)
crg.UpdateText(g.Id, newGText)
}
}
- err := db.Exec("update camera_task_args set polygon_id='' where polygon_id=?",id).Error
- if err !=nil {
- logger.Debug("rm polygon_id in camera_task_args err:",err)
+ err := db.Exec("update camera_task_args set polygon_id='' where polygon_id=?", id).Error
+ if err != nil {
+ logger.Debug("rm polygon_id in camera_task_args err:", err)
}
return true
}
-func (cp *CameraPolygon) UpdateDefenceStateByPolygonId(polygonId string,state int) bool {
- result := db.Exec("update camera_polygon set defence_state=? where id=?",state,polygonId)
- if result.Error!=nil{
+func (cp *CameraPolygon) UpdateDefenceStateByPolygonId(polygonId string, state int) bool {
+ result := db.Exec("update camera_polygon set defence_state=? where id=?", state, polygonId)
+ if result.Error != nil {
return false
}
- if result.RowsAffected>0{
+ if result.RowsAffected > 0 {
return true
} else {
return false
}
}
-func (cp *CameraPolygon) UpdateDefenceStateByCameraId(cameraId string,state int) bool {
- result := db.Exec("update camera_polygon set defence_state=? where camera_id=?",state,cameraId)
- if result.Error!=nil{
+func (cp *CameraPolygon) UpdateDefenceStateByCameraId(cameraId string, state int) bool {
+ result := db.Exec("update camera_polygon set defence_state=? where camera_id=?", state, cameraId)
+ if result.Error != nil {
return false
}
- if result.RowsAffected>0{
+ if result.RowsAffected > 0 {
return true
} else {
return false
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0