From 4c33c7dc95c3d38078dcdc805e11c00865ea657c Mon Sep 17 00:00:00 2001 From: zhanghan Date: Tue, 26 Dec 2023 15:23:30 +0800 Subject: [PATCH] Adding a description field to the tuning template --- atune/server/dao/taskdao.go | 3 +-- atune/server/dao/tunedao.go | 9 ++------- atune/server/model/common.go | 3 +++ atune/server/service/taskservice.go | 3 +-- atune/server/service/tuneservice.go | 18 +++++++++++++----- atune/server/template/tune/common.go | 1 + 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/atune/server/dao/taskdao.go b/atune/server/dao/taskdao.go index cbd510fe..e22849f6 100644 --- a/atune/server/dao/taskdao.go +++ b/atune/server/dao/taskdao.go @@ -30,10 +30,9 @@ func SaveTask(task *model.Tasks) (int, error) { } func UpdateTask(dbtaskid int) error { var t model.Tasks - update_time := time.Now().Format("2006-01-02 15:04:05") task := model.Tasks{ TaskStatus: global.Completed, - UpdateTime: update_time, + UpdateTime: time.Now().Format("2006-01-02 15:04:05"), } if err := db.MySQL().Model(&t).Where("id = ?", dbtaskid).Updates(&task).Error; err != nil { return err diff --git a/atune/server/dao/tunedao.go b/atune/server/dao/tunedao.go index a5f4ec50..ccbff4ba 100644 --- a/atune/server/dao/tunedao.go +++ b/atune/server/dao/tunedao.go @@ -8,7 +8,7 @@ import ( func QueryTunes(query *response.PaginationQ) ([]*model.Tunes, int64, error) { var tunes []*model.Tunes - if err := db.MySQL().Order("id desc").Limit(query.PageSize).Offset((query.Page - 1) * query.PageSize).Find(&tunes).Error; err != nil { + if err := db.MySQL().Limit(query.PageSize).Offset((query.Page - 1) * query.PageSize).Find(&tunes).Error; err != nil { return nil, 0, err } @@ -44,7 +44,7 @@ func DeleteTune(tuneId int) error { func SearchTune(tune_name string, query *response.PaginationQ) ([]*model.Tunes, int64, error) { var tune []*model.Tunes - if err := db.MySQL().Order("id desc").Limit(query.PageSize).Offset((query.Page-1)*query.PageSize).Where("tune_name LIKE ?", "%"+tune_name+"%").Find(&tune).Error; err != nil { + if err := db.MySQL().Limit(query.PageSize).Offset((query.Page-1)*query.PageSize).Where("tune_name LIKE ?", "%"+tune_name+"%").Find(&tune).Error; err != nil { return nil, 0, nil } @@ -54,8 +54,3 @@ func SearchTune(tune_name string, query *response.PaginationQ) ([]*model.Tunes, } return tune, total, nil } -func IsExistTuneName(tuneName string) (bool, error) { - var t model.Tunes - err := db.MySQL().Where("tune_name = ?", tuneName).Find(&t).Error - return t.ID != 0, err -} diff --git a/atune/server/model/common.go b/atune/server/model/common.go index cbd5362e..b5f1c27a 100644 --- a/atune/server/model/common.go +++ b/atune/server/model/common.go @@ -3,6 +3,9 @@ package model type Tunes struct { ID int `gorm:"primary_key;AUTO_INCREMENT" json:"id"` TuneName string `json:"tuneName"` + Description string `json:"description"` + CreateTime string `json:"create_time"` + UpdateTime string `json:"update_time"` WorkDirectory string `json:"workDir"` Prepare string `json:"prepare"` Tune string `json:"tune"` diff --git a/atune/server/service/taskservice.go b/atune/server/service/taskservice.go index 6e667a30..91d7684b 100644 --- a/atune/server/service/taskservice.go +++ b/atune/server/service/taskservice.go @@ -20,13 +20,12 @@ func QueryTaskLists(query *response.PaginationQ) ([]*model.Tasks, int, error) { } func SaveTask(cmd string, task_name string, uuids []string, tuneId int) (int, error) { - creat_time := time.Now().Format("2006-01-02 15:04:05") task := &model.Tasks{ TaskName: task_name, TuneID: tuneId, Script: cmd, TaskStatus: global.Executing, - CreateTime: creat_time, + CreateTime: time.Now().Format("2006-01-02 15:04:05"), } taskid, err := dao.SaveTask(task) diff --git a/atune/server/service/tuneservice.go b/atune/server/service/tuneservice.go index 99e6b815..d385905e 100644 --- a/atune/server/service/tuneservice.go +++ b/atune/server/service/tuneservice.go @@ -3,6 +3,7 @@ package service import ( "errors" "strconv" + "time" "gitee.com/openeuler/PilotGo/sdk/logger" "gitee.com/openeuler/PilotGo/sdk/response" @@ -22,12 +23,17 @@ func SaveTune(tune model.Tunes) error { if tune.TuneName == "" { return errors.New("内容为空，请检查输入内容") } - - if ok, err := dao.IsExistTuneName(tune.TuneName); err == nil && ok { - return errors.New("已存在该模板，勿重复添加") + t := model.Tunes{ + TuneName: tune.TuneName, + Description: tune.Description, + CreateTime: time.Now().Format("2006-01-02 15:04:05"), + WorkDirectory: tune.WorkDirectory, + Prepare: tune.Prepare, + Tune: tune.Tune, + Restore: tune.Restore, + Notes: tune.Notes, } - - if err := dao.SaveTune(&tune); err != nil { + if err := dao.SaveTune(&t); err != nil { return err } @@ -49,6 +55,8 @@ func DeleteTune(tuneId []int) error { func UpdateTune(t model.Tunes) error { updatetune := &model.Tunes{ + Description: t.Description, + UpdateTime: time.Now().Format("2006-01-02 15:04:05"), WorkDirectory: t.WorkDirectory, Prepare: t.Prepare, Tune: t.Tune, diff --git a/atune/server/template/tune/common.go b/atune/server/template/tune/common.go index 344b425e..5c9ba4f5 100644 --- a/atune/server/template/tune/common.go +++ b/atune/server/template/tune/common.go @@ -29,6 +29,7 @@ type TuneGroup struct { type TuneInfo struct { TuneName string `json:"tuneName"` + Description string `json:"description"` WorkDirectory string `json:"workDir"` Prepare string `json:"prepare"` Tune string `json:"tune"` -- Gitee