From dd2f3c7cdd05480e47f71cdfcbec9f9d4f858367 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 14:02:13 +0800
Subject: [PATCH] ---
---
cache/cache.go | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index 177e388..8044054 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -144,17 +144,16 @@
if flag {
var dicss map[string][]Dic
b, _ := json.Marshal(dics)
- if err := json.Unmarshal(b, &dicss) ; err == nil {
+ if err := json.Unmarshal(b, &dicss); err == nil {
for key, dics1 := range dicss {
- for _,dic := range dics1 {
- logger.Info("杞︾墝瀛楀吀锛�",dic.value,dic.Name,dic.Sort)
- logger.Debug("瀛楀吀缂撳瓨鍒濆鍖�",PREFIX_DIC+key+dic.value, dic)
- cMap.Set(PREFIX_DIC+key+dic.value, dic)
+ for _, dic := range dics1 {
+ logger.Debug("瀛楀吀缂撳瓨鍒濆鍖�", PREFIX_DIC+key+dic.Value, dic)
+ cMap.Set(PREFIX_DIC+key+dic.Value, dic)
}
}
}
}
- logger.Info("鍙栧瓧鍏哥紦瀛橈細",GetDic(PREFIX_DIC+"nCarColor1"))
+ logger.Info("鍙栧瓧鍏哥紦瀛橈細", GetDic(PREFIX_DIC+"nCarColor1"))
}
func initCameraTaskRules() {
@@ -230,16 +229,17 @@
return sdk, errors.New("sdk not found")
}
}
+
// 鑾峰彇瀛楀吀鍊�
-func GetDic(key string) (value string) {
- obj, b := cMap.Get(PREFIX_SDK + key)
+func GetDic(key string) (name string) {
+ obj, b := cMap.Get(PREFIX_DIC + key)
+ logger.Info("鍙栧瓧鍏稿�硷細",obj.(Dic))
if b {
- return obj.(Dic).value
+ return obj.(Dic).Name
} else {
return ""
}
}
-
func initSoData() {
var api dbapi.SoApi
@@ -261,11 +261,11 @@
}
type Dic struct {
- Id string
- value string
- Name string
- Type string
- Description string
- Sort int
- Parent_id string
+ Id string `json:"id"`
+ Value string `json:"value"`
+ Name string `json:"name"`
+ Type string `json:"type"`
+ Description string `json:"description"`
+ Sort int `json:"sort"`
+ Parent_id string `json:"parent_id"`
}
--
Gitblit v1.8.0