From e4fc307d58856a0b319c41f0930cd3b731cb0b24 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期二, 11 二月 2025 10:19:47 +0800
Subject: [PATCH] 修复规律分析bug
---
db/db.go | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 158 insertions(+), 6 deletions(-)
diff --git a/db/db.go b/db/db.go
index b23ab8c..7a108d7 100644
--- a/db/db.go
+++ b/db/db.go
@@ -63,7 +63,7 @@
},
Name: "鐤戜技鑱氶泦",
Description: "閫氱敤鑱氶泦妯″瀷",
- Version: "v1.0.1",
+ Version: "v1.0.2",
Enabled: false,
},
{
@@ -72,13 +72,39 @@
},
Name: "鐤戜技鑴辩",
Description: "閫氱敤鑴辩妯″瀷",
+ Version: "v1.1.0",
+ Enabled: false,
+ }, {
+ BaseModel: BaseModel{
+ ID: ModelIdLocationAnalysis,
+ },
+ Name: "閲嶇偣鍦烘墍鍒嗘瀽",
+ Description: "閫氱敤鍦烘墍鍒嗘瀽妯″瀷",
+ Version: "v1.0.0",
+ Enabled: false,
+ }, {
+ BaseModel: BaseModel{
+ ID: ModelIdAccessRegularity,
+ },
+ Name: "鍑鸿瑙勫緥鍒嗘瀽",
+ Description: "鍑鸿瑙勫緥鍒嗘瀽妯″瀷",
Version: "v1.0.0",
Enabled: false,
},
+ //{
+ // BaseModel: BaseModel{
+ // ID: ModelIdNightAnalysis,
+ // },
+ // Name: "鏄间紡澶滃嚭鍒嗘瀽",
+ // Description: "鏄间紡澶滃嚭鍒嗘瀽",
+ // Version: "v1.0.0",
+ // Enabled: false,
+ //},
}
for i := range models {
- if err := GetDB().Model(models[i]).First(models[i].ID).Error; err != nil {
+ var existingModel Model
+ if err := GetDB().Model(models[i]).Where("id = ?", models[i].ID).First(&existingModel).Error; err != nil {
GetDB().Model(models[i]).Create(models[i])
} else {
GetDB().Model(models[i]).Update("version", models[i].Version)
@@ -154,6 +180,8 @@
Sort: 3,
},
},
+
+ // 鎵樼
{
Id: "7a1f0a3a-c207-4d94-bc28-cc9e017b3628",
ModelId: ModelIdDisappear,
@@ -178,14 +206,14 @@
RuleArg: RuleArg{
Alias: "age",
Name: "骞撮緞娈�",
- Type: "input",
- Must: true,
+ Type: "range",
+ Must: false,
Unit: "宀�",
Range: "1,100",
Value: "60, 90",
ValType: "int",
Operator: "==",
- Sort: 1,
+ Sort: 2,
},
},
{
@@ -193,7 +221,7 @@
ModelId: ModelIdDisappear,
Scope: "",
RuleArg: RuleArg{
- Alias: "age",
+ Alias: "lastDirection",
Name: "杩涘嚭鏂瑰悜",
Type: "input",
Must: false,
@@ -202,9 +230,133 @@
Value: "",
ValType: "string",
Operator: "==",
+ Sort: 1,
+ },
+ },
+
+ // 鍦烘墍鍒嗘瀽
+ {
+ Id: "3f667e5a-bd10-4673-be45-f385e19a9c25",
+ ModelId: ModelIdLocationAnalysis,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "duration",
+ Name: "鏃堕棿娈�",
+ Type: "input",
+ Must: false,
+ Unit: "澶�",
+ Range: "1,2400",
+ Value: "30",
+ ValType: "int",
+ Operator: ">=",
Sort: 2,
},
},
+ {
+ Id: "ce298639-0cf8-4a8f-89f9-a932034a1e86",
+ ModelId: ModelIdLocationAnalysis,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "personCount",
+ Name: "鍑虹幇浜烘暟",
+ Type: "input",
+ Must: true,
+ Unit: "涓�",
+ Range: "1,100",
+ Value: "1, 90",
+ ValType: "int",
+ Operator: ">=",
+ Sort: 0,
+ },
+ },
+ {
+ Id: "f85ae400-0114-4862-99f7-14a41530d235",
+ ModelId: ModelIdLocationAnalysis,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "appearances",
+ Name: "鍑虹幇娆℃暟",
+ Type: "input",
+ Must: true,
+ Unit: "",
+ Range: "",
+ Value: "",
+ ValType: "int",
+ Operator: ">=",
+ Sort: 1,
+ },
+ },
+
+ // 鍑鸿瑙勫緥
+ {
+ Id: "6ba7b810-9dad-11d1-80b4-00c04fd430c8",
+ ModelId: ModelIdAccessRegularity,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "duration",
+ Name: "鐩戞帶鏃堕棿娈�",
+ Type: "input",
+ Must: true,
+ Unit: "澶╁唴",
+ Range: "1,60",
+ Value: "30",
+ ValType: "int",
+ Operator: ">=",
+ Sort: 0,
+ },
+ },
+ {
+ Id: "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+ ModelId: ModelIdAccessRegularity,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "timeRange",
+ Name: "鍑鸿鏃堕棿娈�",
+ Type: "range",
+ Must: true,
+ Unit: "鐐�",
+ Range: "1,24",
+ Value: "21,3",
+ ValType: "int",
+ Operator: ">=",
+ Sort: 1,
+ },
+ },
+ {
+ Id: "c9bf9e57-1685-4c89-bafb-ff5af830be8a",
+ ModelId: ModelIdAccessRegularity,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "appearances",
+ Name: "鍑鸿娆℃暟",
+ Type: "input",
+ Must: false,
+ Unit: "娆�",
+ Range: "1,100",
+ Value: "2",
+ ValType: "int",
+ Operator: "==",
+ Sort: 2,
+ },
+ },
+ {
+ Id: "e4eaaaf2-d142-11e1-b3e4-080027620cdd",
+ ModelId: ModelIdAccessRegularity,
+ Scope: "",
+ RuleArg: RuleArg{
+ Alias: "direction",
+ Name: "杩涘嚭鏂瑰悜",
+ Type: "select",
+ Must: false,
+ Unit: "",
+ Range: "",
+ Value: "",
+ ValType: "string",
+ Operator: "==",
+ Options: "[{\"label\":\"杩沑", \"value\":\"in\"},{\"label\":\"鍑篭", \"value\":\"out\"}]",
+ Sort: 3,
+ },
+ },
}
for i := range rules {
--
Gitblit v1.8.0