acepanel/panel
2
0
Fork 0
mirror of https://github.com/acepanel/panel.git synced 2026-02-04 11:27:17 +08:00
Code Issues Packages Releases Activity

fix: 优化查询

Browse Source
This commit is contained in:
耗子
2024-06-25 02:51:34 +08:00
parent 31bd15217b
commit fa41b18ced
1 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
internal/services/plugin.go
View File

@@ -113,17 +113,8 @@ func (r *PluginImpl) Install(slug string) error {
}
}
var count int64
if err = facades.Orm().Query().
Model(&models.Task{}).
Where("log LIKE ?", "%"+plugin.Slug+"%").
Where("status", models.TaskStatusWaiting).
OrWhere("status", models.TaskStatusRunning).
Count(&count); err != nil {
return errors.New("查询任务失败")
}
if count > 0 {
return errors.New("任务已添加，请勿重复添加")
if err = r.checkTaskExists(slug); err != nil {
return err
}
var task models.Task
@@ -172,17 +163,8 @@ func (r *PluginImpl) Uninstall(slug string) error {
}
}
var count int64
if err = facades.Orm().Query().
Model(&models.Task{}).
Where("log LIKE ?", "%"+plugin.Slug+"%").
Where("status", models.TaskStatusWaiting).
OrWhere("status", models.TaskStatusRunning).
Count(&count); err != nil {
return errors.New("查询任务失败")
}
if count > 0 {
return errors.New("任务已添加，请勿重复添加")
if err = r.checkTaskExists(slug); err != nil {
return err
}
var task models.Task
@@ -231,17 +213,8 @@ func (r *PluginImpl) Update(slug string) error {
}
}
var count int64
if err = facades.Orm().Query().
Model(&models.Task{}).
Where("log LIKE ?", "%"+plugin.Slug+"%").
Where("status", models.TaskStatusWaiting).
OrWhere("status", models.TaskStatusRunning).
Count(&count); err != nil {
return errors.New("查询任务失败")
}
if count > 0 {
return errors.New("任务已添加，请勿重复添加")
if err = r.checkTaskExists(slug); err != nil {
return err
}
var task models.Task
@@ -256,3 +229,18 @@ func (r *PluginImpl) Update(slug string) error {
_ = io.Remove(task.Log)
return r.task.Process(task.ID)
}
func (r *PluginImpl) checkTaskExists(slug string) error {
var count int64
if err := facades.Orm().Query().
Model(&models.Task{}).
Where("log LIKE ? AND (status = ? OR status = ?)", "%"+slug+"%", models.TaskStatusWaiting, models.TaskStatusRunning).
Count(&count); err != nil {
return errors.New("查询任务失败")
}
if count > 0 {
return errors.New("任务已添加，请勿重复添加")
}
return nil
}