巡检消息内容修改

models/data_manage/edb_inspection/edb_inspection_config.go

@@ -22,6 +22,10 @@ type EdbInspectionConfig struct {
 	InspectionTime   string    `gorm:"-"` // 用于显示巡检时间，不存储到数据库
 }
 
+type EdbInspectionConfigList struct {
+	EdbInspectionConfig
+	TerminalName string 
+}
 // Add
 // @Description: 添加巡检配置
 // @receiver m
@@ -99,8 +103,8 @@ func GetListBySource(source int) (list []*EdbInspectionConfig, err error) {
 }
 
 // 获取所有启用的配置项
-func GetAllEnabledConfigs() (list []*EdbInspectionConfig, err error) {
-	sql := `SELECT * FROM edb_inspection_config WHERE status = 1 ORDER BY config_id ASC`
+func GetAllEnabledConfigs() (list []*EdbInspectionConfigList, err error) {
+	sql := `SELECT c.*, t.name AS terminal_name FROM edb_inspection_config c left join edb_terminal t on c.terminal_code = t.terminal_code WHERE c.status = 1 ORDER BY c.modify_time DESC`
 	err = global.DbMap[utils.DbNameIndex].Raw(sql).Find(&list).Error
 	return
 }

services/edb_inspection.go

@@ -18,7 +18,7 @@ import (
 // @param now time.Time
 // @return sourceEdbInfoListMap map[string][]*edb_inspection.EdbInspectionConfig
 // @return err error
-func GetInspectionConfigData(now time.Time) (configList []*edb_inspection.EdbInspectionConfig, err error) {
+func GetInspectionConfigData(now time.Time) (configList []*edb_inspection.EdbInspectionConfigList, err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
@@ -67,7 +67,7 @@ func GetInspectionConfigData(now time.Time) (configList []*edb_inspection.EdbIns
 // @param config *edb_inspection.EdbInspectionConfig
 // @param currTimeStr string
 // @return bool
-func isInspectionTime(config *edb_inspection.EdbInspectionConfig, currTimeStr string) bool {
+func isInspectionTime(config *edb_inspection.EdbInspectionConfigList, currTimeStr string) bool {
 	// 查询所有的日期配置
 	dateConfigs, err := edb_inspection.GetEdbInspectionDateConfigListByConfigId(config.ConfigId)
 	if err != nil {
@@ -131,6 +131,7 @@ func AddEdbInspectionRecord(cont context.Context) (err error) {
 	if err != nil {
 		return
 	}
+
 	errMsgList := make([]string, 0)
 	defer func() {
 		if len(errMsgList) > 0 {
@@ -253,7 +254,7 @@ func AddEdbInspectionRecord(cont context.Context) (err error) {
 		
 		// 4. 如果巡检失败，添加消息记录
 		if record.InspectionResult == 2 {
-			msg := fmt.Sprintf("指标[%s]巡检结果异常: %s", edbInfo.EdbCode, record.ErrorReason)
+			msg := fmt.Sprintf("%s巡检结果异常: %s", config.TerminalName, edbInfo.EdbCode, record.ErrorReason)
 			adminList := strings.Split(config.NotifyUsers, ",")
 			for _, adminIdStr := range adminList {
 				adminId, _ := strconv.ParseInt(adminIdStr, 10, 64)
@@ -270,8 +271,8 @@ func AddEdbInspectionRecord(cont context.Context) (err error) {
 				}
 				err = message.Add()
 				if err != nil {
-					errMsgList = append(errMsgList, fmt.Sprintf("添加消息记录失败: recordId=%d, adminId=%d, err=%v", 
-						record.InspectionRecordId, adminId, err))
+					errMsgList = append(errMsgList, fmt.Sprintf("添加消息记录失败: recordId=%d, adminId=%d, edb_code=%s, err=%v", 
+						record.InspectionRecordId, adminId, edbInfo.EdbCode, err))
 					continue
 				}
 			}