From 1882999b4ee899b79fa5e064238796f1e315d963 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 30 七月 2025 15:01:46 +0800
Subject: [PATCH] 修改算力管理，统计信息以及增加摄像机关联任务描述事件等级
---
camera-service/controllers/camera.go | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/camera-service/controllers/camera.go b/camera-service/controllers/camera.go
index a4764fd..4cb9ce3 100644
--- a/camera-service/controllers/camera.go
+++ b/camera-service/controllers/camera.go
@@ -166,10 +166,14 @@
}
m["resolutions"] = []models.Resolution{dRe0, dRe1, dRe2}
+
+ //鑾峰彇鐫ｆ煡浠诲姟
+ tasks := models.GetTasks()
//澶勭悊鎽勫儚鏈虹殑鐘舵��
- var crApi bhomedbapi.CameraRuleApi
+ //var crApi bhomedbapi.CameraRuleApi
if cam.RunType == models.TYPE_RUNTYPE_POLL || cam.RunType == models.TYPE_RUNTYPE_REALTIME {
- if crApi.ExistRunningTask(cam.Id) {
+ //if crApi.ExistRunningTask(cam.Id) {
+ if taskInfo, ok := tasks[cam.Id]; ok && taskInfo != nil && len(taskInfo) > 0 {
if cam.IsRunning {
m["status"] = models.Camera_Status_Doing
} else {
@@ -323,9 +327,9 @@
sv := service.CameraService{}
if sv.ChangeRunType(ccrVo) {
- cIds := strings.Join(ccrVo.CameraIds, ",")
- cc.addDbChangeMsg(h.Bk, protomsg.TableChanged_T_Camera, cIds, protomsg.DbAction_Update, "")
- _, _ = service2.DoBusReq("/data/api-v/saas/syncCamera", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
+ //cIds := strings.Join(ccrVo.CameraIds, ",")
+ //cc.addDbChangeMsg(h.Bk, protomsg.TableChanged_T_Camera, cIds, protomsg.DbAction_Update, "")
+ // _, _ = service2.DoBusReq("/data/api-v/saas/syncCamera", config.Server.AnalyServerId, aiot.RequestMethod_Post, aiot.RequestContentType_ApplicationJson, map[string]interface{}{})
return &bhomeclient.Reply{Success: true, Msg: "鏇存柊鎴愬姛"}
} else {
return &bhomeclient.Reply{Success: false, Msg: "鏇存柊澶辫触"}
@@ -1045,7 +1049,7 @@
}
}
//鏍规嵁id鏌ヨ瑙嗛id
- var vids []int
+ var vids []int64
cameras, _ := models.GetCameraIds(videoIds)
for _, camera := range cameras {
if len(camera.Id) > 0 {
@@ -1054,7 +1058,7 @@
}
idStr := make([]string, len(vids))
for i, id := range vids {
- idStr[i] = strconv.Itoa(id)
+ idStr[i] = strconv.FormatInt(id, 10)
}
filter += fmt.Sprintf(" and %s in [%s]", "video_point_id", strings.Join(idStr, ","))
}
--
Gitblit v1.8.0