#4389 fix-4083

Merged
zouap merged 3 commits from fix-4083 into V20230628 11 months ago
  1. +7
    -7
      modules/setting/setting.go
  2. +16
    -6
      services/cloudbrain/util.go

+ 7
- 7
modules/setting/setting.go View File

@@ -653,11 +653,11 @@ var (
RunAtStart bool
}{}

C2NetInfos *C2NetSqInfos
CenterInfos *AiCenterInfos
C2NetMapInfo map[string]*C2NetSequenceInfo
AiCenterCodeAndNameMapInfo map[string]*C2NetSequenceInfo
C2NetInfos *C2NetSqInfos
CenterInfos *AiCenterInfos
C2NetMapInfo map[string]*C2NetSequenceInfo
AiCenterCodeAndNameMapInfo map[string]*C2NetSequenceInfo
C2NetLocInfos *C2NetSqInfos
AiCenterCodeAndNameAndLocMapInfo map[string]*C2NetSequenceInfo

//elk config
@@ -1870,11 +1870,11 @@ func GetGrampusConfig() {
}
}
if Grampus.AiCenterCodeAndNameAndLocInfo != "" {
if err := json.Unmarshal([]byte(Grampus.AiCenterCodeAndNameAndLocInfo), &C2NetInfos); err != nil {
if err := json.Unmarshal([]byte(Grampus.AiCenterCodeAndNameAndLocInfo), &C2NetLocInfos); err != nil {
log.Error("Unmarshal(AiCenterCodeAndNameLocInfo) failed:%v", err)
}
AiCenterCodeAndNameAndLocMapInfo = make(map[string]*C2NetSequenceInfo)
for _, value := range C2NetInfos.C2NetSqInfo {
for _, value := range C2NetLocInfos.C2NetSqInfo {
AiCenterCodeAndNameAndLocMapInfo[value.Name] = value
}
}


+ 16
- 6
services/cloudbrain/util.go View File

@@ -12,8 +12,9 @@ import (
)

func GetAiCenterShowByAiCenterId(aiCenterId string, ctx *context.Context) string {
if setting.AiCenterCodeAndNameMapInfo != nil {
if info, ok := setting.AiCenterCodeAndNameMapInfo[aiCenterId]; ok {
aiCenterAndNameInfo := getAiCenterAndNameInfo()
if aiCenterAndNameInfo != nil {
if info, ok := aiCenterAndNameInfo[aiCenterId]; ok {
if ctx.Language() == "zh-CN" {
return info.Content
} else {
@@ -24,12 +25,20 @@ func GetAiCenterShowByAiCenterId(aiCenterId string, ctx *context.Context) string
return aiCenterId
}

func getAiCenterAndNameInfo() map[string]*setting.C2NetSequenceInfo {
if setting.AiCenterCodeAndNameAndLocMapInfo != nil {
return setting.AiCenterCodeAndNameAndLocMapInfo
}
return setting.AiCenterCodeAndNameMapInfo
}

func GetAiCenterShow(aiCenter string, ctx *context.Context) string {
aiCenterInfo := strings.Split(aiCenter, "+")

if len(aiCenterInfo) == 2 {
if setting.AiCenterCodeAndNameMapInfo != nil {
if info, ok := setting.AiCenterCodeAndNameMapInfo[aiCenterInfo[0]]; ok {
aiCenterAndNameInfo := getAiCenterAndNameInfo()
if aiCenterAndNameInfo != nil {
if info, ok := aiCenterAndNameInfo[aiCenterInfo[0]]; ok {
if ctx.Language() == "zh-CN" {
return info.Content
} else {
@@ -72,8 +81,9 @@ func jobNamePrefixValid(s string) string {
}

func GetAiCenterInfoByCenterCode(aiCenterCode string) *setting.C2NetSequenceInfo {
if setting.AiCenterCodeAndNameAndLocMapInfo != nil {
if info, ok := setting.AiCenterCodeAndNameAndLocMapInfo[aiCenterCode]; ok {
aiCenterAndNameInfo := getAiCenterAndNameInfo()
if aiCenterAndNameInfo != nil {
if info, ok := aiCenterAndNameInfo[aiCenterCode]; ok {
return info
} else {
return nil


Loading…
Cancel
Save