add:看板兼容知识资源

controllers/bi_dashboard.go

@@ -102,11 +102,15 @@ func (this *BIDaShboardController) AddDashboard() {
 	detailList := make([]*bi_dashboard.BiDashboardDetail, 0)
 	var isAddResource bool
 	for i, v := range req.List {
+		tmpConf, er := json.Marshal(v.Conf)
+		if er != nil {
+			tmpConf = []byte("{}")
+		}
 		item := &bi_dashboard.BiDashboardDetail{
 			BiDashboardId: int(id),
 			Type:          v.Type,
 			UniqueCode:    v.UniqueCode,
-			Conf:          v.Conf,
+			Conf:          string(tmpConf),
 			Sort:          i + 1,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),
@@ -197,11 +201,15 @@ func (this *BIDaShboardController) EditDashboard() {
 	detailList := make([]*bi_dashboard.BiDashboardDetail, 0)
 	isEditResource := false
 	for _, v := range req.List {
+		tmpConf, er := json.Marshal(v.Conf)
+		if er != nil {
+			tmpConf = []byte("{}")
+		}
 		item := &bi_dashboard.BiDashboardDetail{
 			BiDashboardId: req.BiDashboardId,
 			Type:          v.Type,
 			UniqueCode:    v.UniqueCode,
-			Conf:          v.Conf,
+			Conf:          string(tmpConf),
 			Sort:          v.Sort,
 			CreateTime:    time.Now(),
 			ModifyTime:    time.Now(),

controllers/knowledge/resource.go

@@ -1428,8 +1428,13 @@ func (this *ResourceController) BiDashboardResourceSave() {
 		br.Msg = "请选择资源"
 		return
 	}
-
-	err := utils.Rc.Put(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE+strconv.Itoa(this.SysUser.AdminId), req.KnowledgeResourceList, time.Hour*24)
+	cacheData, err := json.Marshal(req)
+	if err != nil {
+		br.Msg = "添加失败"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	err = utils.Rc.Put(utils.CACHE_KEY_BI_DASHBOARD_PREPARE_RESOURCE+strconv.Itoa(this.SysUser.AdminId), cacheData, time.Hour*24)
 	if err != nil {
 		br.Msg = "添加失败"
 		br.ErrMsg = "添加失败，Err:" + err.Error()

models/bi_dashboard/bi_dashboard.go

@@ -82,7 +82,7 @@ type AddDashboardListReq struct {
 	Type       int
 	UniqueCode string
 	Sort       int
-	Conf       string
+	Conf       interface{}
 }
 
 type EditDashboardReq struct {