admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(base): 重置数据库序列并优化查询语句

Browse Source 
- 在 base 模块初始化时添加重置所有序列的函数
- 修改多个模块中的查询语句，使用 Where(key, value) 替代 Where("key = ?", value)
- 优化部分代码结构，提高可读性和维护性
This commit is contained in:
昔念
2025-07-11 03:36:42 +08:00
parent 123543156b
commit d71b1dd169
13 changed files with 65 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/task/funcs/task_add_task.go
View File

@@ -15,7 +15,7 @@ type TaskAddTask struct {
func (t *TaskAddTask) Func(ctx g.Ctx, id string) error {
taskInfo := model.NewTaskInfo()
result, err := cool.DBM(taskInfo).Where("id = ?", id).One()
result, err := cool.DBM(taskInfo).Where("id", id).One()
if err != nil {
return err
}

2
modules/task/funcs/task_stop_func.go
View File

@@ -14,7 +14,7 @@ type TaskStopFunc struct {
func (t *TaskStopFunc) Func(ctx g.Ctx, id string) error {
taskInfo := model.NewTaskInfo()
_, err := cool.DBM(taskInfo).Where("id = ?", id).Update(g.Map{"status": 0})
_, err := cool.DBM(taskInfo).Where("id", id).Update(g.Map{"status": 0})
if err != nil {
return err
}

4
modules/task/funcs/tast_start_func.go
View File

@@ -15,11 +15,11 @@ type TaskStartFunc struct {
func (t *TaskStartFunc) Func(ctx g.Ctx, id string) error {
taskInfo := model.NewTaskInfo()
_, err := cool.DBM(taskInfo).Where("id = ?", id).Update(g.Map{"status": 1})
_, err := cool.DBM(taskInfo).Where("id", id).Update(g.Map{"status": 1})
if err != nil {
return err
}
result, err := cool.DBM(taskInfo).Where("id = ?", id).One()
result, err := cool.DBM(taskInfo).Where("id", id).One()
if err != nil {
return err
}

14
modules/task/service/task_info.go
View File

@@ -35,7 +35,7 @@ func (s *TaskInfoService) ModifyAfter(ctx g.Ctx, method string, param g.MapStrAn
g.Log().Info(ctx, "TaskInfoService.ModifyAfter", method, param)
if method == "Add" {
if gconv.Int(param["status"]) == 1 {
id, err := cool.DBM(s.Model).Where("name = ?", param["name"]).Value("id")
id, err := cool.DBM(s.Model).Where("name", param["name"]).Value("id")
if err != nil {
return err
}
@@ -69,7 +69,7 @@ func (s *TaskInfoService) Record(ctx g.Ctx, id string, status int, detail string
return err
}
if status == 1 {
record, err := cool.DBM(taskLog).Where("taskId = ?", id).Where("status", 1).Order("id", "desc").Offset(19).One()
record, err := cool.DBM(taskLog).Where("taskId", id).Where("status", 1).Order("id", "desc").Offset(19).One()
if err != nil {
return err
}
@@ -80,7 +80,7 @@ func (s *TaskInfoService) Record(ctx g.Ctx, id string, status int, detail string
if err != nil {
return err
}
_, err = cool.DBM(taskLog).Where("taskId = ?", id).Where("status", 1).Where("id < ?", minId).Delete()
_, err = cool.DBM(taskLog).Where("taskId", id).Where("status", 1).Where("id < ?", minId).Delete()
if err != nil {
return err
}
@@ -90,7 +90,7 @@ func (s *TaskInfoService) Record(ctx g.Ctx, id string, status int, detail string
// Once 执行一次任务
func (s *TaskInfoService) Once(ctx g.Ctx, id int64) error {
record, err := cool.DBM(s.Model).Where("id = ?", id).One()
record, err := cool.DBM(s.Model).Where("id", id).One()
if err != nil {
return err
}
@@ -112,10 +112,10 @@ func (s *TaskInfoService) Log(ctx g.Ctx, param g.MapStrStr) (data interface{}, e
m := cool.DBM(taskLog).LeftJoin("task_info", "task_info.id = task_log.taskId")
if id, ok := param["id"]; ok {
m = m.Where("taskId = ?", id)
m = m.Where("taskId", id)
}
if status, ok := param["status"]; ok {
m = m.Where("status = ?", status)
m = m.Where("status", status)
}
Total, err = m.Clone().Count()
m = m.Fields("task_log.*,task_info.name as taskName")
@@ -164,7 +164,7 @@ func (s *TaskInfoService) SetNextRunTime(ctx g.Ctx, cronId string, cron string)
nextTime, e := getCronNextTime(cron, time.Now())
if e == nil {
_, err := cool.DBM(s.Model).Where("id = ?", cronId).Data("nextRunTime", nextTime).Update()
_, err := cool.DBM(s.Model).Where("id", cronId).Data("nextRunTime", nextTime).Update()
if err != nil {
return err
}

2
modules/task/task.go
View File

@@ -22,7 +22,7 @@ func init() {
g.Log().Debug(ctx, "module task init start ...")
cool.FillInitData(ctx, "task", taskInfo)
result, err := cool.DBM(taskInfo).Where("status = ?", 1).All()
result, err := cool.DBM(taskInfo).Where("status", 1).All()
if err != nil {
panic(err)
}