From 4e269daa939f3da316a0e079ca35b05e162adfcb Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 19 十二月 2024 10:26:26 +0800
Subject: [PATCH] 调整初始化
---
models/gather_model.go | 3 ++-
db/db.go | 18 +++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/db/db.go b/db/db.go
index 057191e..de59e6a 100644
--- a/db/db.go
+++ b/db/db.go
@@ -1,8 +1,6 @@
package db
import (
- "time"
-
"github.com/elastic/go-elasticsearch/v6"
"gorm.io/gorm"
@@ -59,25 +57,27 @@
// InitDefaultData 鍒濆鍖栨暟鎹�
func InitDefaultData() error {
- var models = []Model{
+ var models = []*Model{
{
BaseModel: BaseModel{
- ID: ModelIdGather,
- CreatedAt: time.Time{},
- UpdatedAt: time.Time{},
+ ID: ModelIdGather,
},
Name: "鐤戜技鑱氶泦",
Description: "閫氱敤鑱氶泦妯″瀷",
- Version: "v1.0.0",
+ Version: "v1.0.1",
Enabled: false,
},
}
for i := range models {
- GetDB().Save(&models[i])
+ if err := GetDB().Model(models[i]).First(models[i].ID).Error; err != nil {
+ GetDB().Model(models[i]).Create(models[i])
+ } else {
+ GetDB().Model(models[i]).Update("version", models[i].Version)
+ }
}
- var rules = []ModelRule{
+ var rules = []*ModelRule{
{
Id: "bfbdba7f-ee39-41fb-b188-b4c114a51eaa",
ModelId: ModelIdGather,
diff --git a/models/gather_model.go b/models/gather_model.go
index c576627..3724c0d 100644
--- a/models/gather_model.go
+++ b/models/gather_model.go
@@ -81,9 +81,10 @@
}
}
- fmt.Printf("GatherModel init finish ...task id:%s, name:%s, rule:%+v\n", task.ID, task.Name, task.Rules)
+ fmt.Printf("GatherModel init finish ...task id:%s, name:%s, rule:%+v\n", task.ID, task.Name, m)
if m.GatherPersons == 0 || m.AppearInterval == 0 || m.DaysWindow == 0 || m.Threshold == 0 {
+ fmt.Printf("invalid parameters. task id:%s, name:%s\n", task.ID, task.Name)
return errors.New("invalid parameters")
}
--
Gitblit v1.8.0