OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

trace&measure

Browse Source
This commit is contained in:
simonzhangsz
2023-09-20 11:20:07 +08:00
parent b42821f47f
commit 80aa686e84
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
database/upgrade/upgrade.sql
View File

@@ -58,4 +58,12 @@ ALTER TABLE `omc_db`.`user`
MODIFY COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `account_id`; MODIFY COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `account_id`;
ALTER TABLE `omc_db`.`measure_threshold` ALTER TABLE `omc_db`.`measure_threshold`
CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`; CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`;
ALTER TABLE `omc_db`.`measure_task`
ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`,
ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;
ALTER TABLE `omc_db`.`trace_task`
ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `update_time`,
ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;

2
features/trace/trace.go
View File

@@ -48,6 +48,8 @@ type TraceTask struct {
Status string `json:"-" xorm:"status"` Status string `json:"-" xorm:"status"`
SuccNEs []string `json:"-" xorm:"succ_nes"` SuccNEs []string `json:"-" xorm:"succ_nes"`
FailNEs []string `json:"-" xorm:"fail_nes"` FailNEs []string `json:"-" xorm:"fail_nes"`
AccountID string `json:"accountId" xorm:"account_id"`
Comment string `json:"comment" xorm:"comment"`
UpdateTime string `json:"-" xorm:"-"` UpdateTime string `json:"-" xorm:"-"`
} }

4
lib/dborm/dborm.go
View File

@@ -553,6 +553,8 @@ type MeasureTask struct {
Schedule []ScheduleJ `json:"Schedule" xorm:"schedule"` Schedule []ScheduleJ `json:"Schedule" xorm:"schedule"`
GranulOption string `json:"granulOption" xorm:"granul_option"` GranulOption string `json:"granulOption" xorm:"granul_option"`
Status string `json:"status" xorm:"status"` Status string `json:"status" xorm:"status"`
AccountID string `json:"accountId" xorm:"account_id"`
Comment string `json:"comment" xorm:"comment"`
CreateTime string `json:"createTime" xorm:"create_time"` CreateTime string `json:"createTime" xorm:"create_time"`
UpdateTime string `json:"updateTime" xorm:"update_time"` UpdateTime string `json:"updateTime" xorm:"update_time"`
DeleteTime string `json:"deleteTime xorm:"delete_time"` DeleteTime string `json:"deleteTime xorm:"delete_time"`
@@ -563,7 +565,7 @@ func GetMeasureTask(taskId int) (*MeasureTask, error) {
measureTask := new(MeasureTask) measureTask := new(MeasureTask)
has, err := xEngine.Table("measure_task").Where("id=?", taskId).Get(measureTask) has, err := xEngine.Table("measure_task").Where("id=?", taskId).Get(measureTask)
if err != nil || has == false { if err != nil || !has {
log.Error("Failed to get table measure_task from database:", err) log.Error("Failed to get table measure_task from database:", err)
return nil, err return nil, err