From 302cf15a9f56688d6c542c23cdbfe057969cb1d3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 13:46:13 +0800
Subject: [PATCH] ---

---
 cache/cache.go |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/cache/cache.go b/cache/cache.go
index 4906057..8008d55 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -6,6 +6,7 @@
 	"basic.com/pubsub/protomsg.git"
 	"basic.com/valib/gopherdiscovery.git"
 	"basic.com/valib/logger.git"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/gogo/protobuf/proto"
@@ -59,7 +60,7 @@
 
 	initSoData()
 
-	//initDictionary() // 鍒濆鍖栧瓧鍏�
+	initDictionary() // 鍒濆鍖栧瓧鍏�
 
 	initChan <- true
 }
@@ -141,12 +142,19 @@
 	var api dbapi.DicApi
 	flag, dics := api.FindByType("")
 	if flag {
-		for key, dics1 := range dics.(map[string]interface{}) {
-			for _,dic := range dics1.([]interface{}) {
-				cMap.Set(PREFIX_DIC+key+dic.(Dic).value, dic)
+		var dicss map[string][]Dic
+		b, _ := json.Marshal(dics)
+		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)
+				}
 			}
 		}
 	}
+	logger.Info("鍙栧瓧鍏哥紦瀛橈細", GetDic(PREFIX_DIC+"nCarColor1"))
 }
 
 func initCameraTaskRules() {
@@ -222,16 +230,16 @@
 		return sdk, errors.New("sdk not found")
 	}
 }
+
 // 鑾峰彇瀛楀吀鍊�
 func GetDic(key string) (value string) {
 	obj, b := cMap.Get(PREFIX_SDK + key)
 	if b {
-		return obj.(Dic).value
+		return obj.(Dic).Value
 	} else {
 		return ""
 	}
 }
-
 
 func initSoData() {
 	var api dbapi.SoApi
@@ -253,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