From 86aff69316e2345f742b5e2b5bbab62543cb6e67 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期五, 25 七月 2025 10:14:58 +0800
Subject: [PATCH] 修复camera自增id问题;查询任务关联表增加isai,runtype状态判断;milvus字段精度问题修复
---
chanmanage-service/controllers/pollSet.go | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/chanmanage-service/controllers/pollSet.go b/chanmanage-service/controllers/pollSet.go
index b3e7f01..a0d3514 100644
--- a/chanmanage-service/controllers/pollSet.go
+++ b/chanmanage-service/controllers/pollSet.go
@@ -1,10 +1,6 @@
package controllers
import (
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/bhomeclient.git"
- "basic.com/valib/bhomedbapi.git"
- "basic.com/valib/logger.git"
"strconv"
"strings"
commonModel "vamicro/camera-common/models"
@@ -13,6 +9,11 @@
"vamicro/chanmanage-service/models"
"vamicro/chanmanage-service/service"
"vamicro/config"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/bhomeclient.git"
+ "basic.com/valib/bhomedbapi.git"
+ "basic.com/valib/logger.git"
)
type PollSetController struct {
@@ -252,6 +253,9 @@
}
}
_, allLinks := crApi.FindAllCameraLink()
+
+ //鑾峰彇鐫ｆ煡浠诲姟
+
for _, cE := range list {
var cri vo.CameraRunInfo
cri.CopyFromProtoCamera(cE)
@@ -265,17 +269,21 @@
}
}
- if cgs, ok := ruleM[cE.Id]; ok {
- for _, g := range cgs.Rules {
- var crTask vo.CameraRunTask
+ // if cgs, ok := ruleM[cE.Id]; ok {
+ // for _, g := range cgs.Rules {
+ // var crTask vo.CameraRunTask
- crTask.HasRule = g.Enable
- crTask.TaskName = g.SceneName
- cri.Tasks = append(cri.Tasks, crTask)
- }
- } else {
- cri.Tasks = []vo.CameraRunTask{}
- }
+ // crTask.HasRule = g.Enable
+ // crTask.TaskName = g.SceneName
+ // cri.Tasks = append(cri.Tasks, crTask)
+ // }
+ // } else {
+ // cri.Tasks = []vo.CameraRunTask{}
+ // }
+ var ids []string
+ ids = append(ids, cE.Id)
+ cri.AllTasks, _ = models.GetListTask(ids)
+
//澶勭悊鎽勫儚鏈虹殑鐘舵��
if cE.RunType == commonModel.TYPE_RUNTYPE_POLL || cE.RunType == commonModel.TYPE_RUNTYPE_REALTIME {
if crInfo, ok := ruleM[cE.Id]; ok && crInfo.Rules != nil && len(crInfo.Rules) > 0 {
--
Gitblit v1.8.0