Merge branch 'bzq/knowledge_Bi' of eta_gn_server/eta_api into debug

controllers/knowledge/resource.go

@@ -1339,46 +1339,12 @@ func (this *ResourceController) TemplateDownload() {
 	br.Msg = "下载成功"
 }
 
-// BiDashboardResourceList
-// @Title 获取bi看报中的知识资源列表
-// @Description 获取bi看报中的知识资源列表
-// @Success 200 {object} models.EdbdataClassifyResp
-// @Param   BiDashboardDetailId   query   int  true       "bi看板详情ID"
-// @router /resource/bi_dashboard/list [get]
-func (this *ResourceController) BiDashboardResourceList() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	biDashboardDetailId, _ := this.GetInt("BiDashboardDetailId")
-	// resourceType, _ := this.GetInt("ResourceType")
-	// currentIndex, _ := this.GetInt("CurrentIndex")
-	// pageSize, _ := this.GetInt("PageSize")
-
-	resp, msg, err := knowledgeServ.GetKnowledgeResourceList(biDashboardDetailId)
-	if err != nil {
-		if msg == "" {
-			msg = "获取数据失败"
-		}
-		br.Msg = msg
-		br.ErrMsg = "获取数据失败，Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-	br.Data = resp
-}
-
 // BiDashboardTmpResourceList
 // @Title 获取bi看报中的知识资源列表
 // @Description 获取bi看报中的知识资源列表
 // @Success 200 {object} models.EdbdataClassifyResp
 // @Param   biDashboardDetailId   query   int  true       "看板详情ID"
-// @router /resource/bi_dashboard/cache/list [get]
+// @router /resource/bi_dashboard/list [get]
 func (this *ResourceController) BiDashboardCacheResourceList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

routers/commentsRouter.go

@@ -5023,15 +5023,6 @@ func init() {
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
         beego.ControllerComments{
             Method: "BiDashboardCacheResourceList",
-            Router: `/resource/bi_dashboard/cache/list`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers/knowledge:ResourceController"],
-        beego.ControllerComments{
-            Method: "BiDashboardResourceList",
             Router: `/resource/bi_dashboard/list`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),

services/knowledge/resource.go

@@ -1167,8 +1167,12 @@ func toKnowledgeResourceList(list []*knowledge.KnowledgeResource) (res []*knowle
 			TagId:               item.TagId,
 			CreateTime:          utils.TimeTransferString(utils.FormatDateTime, item.CreateTime),
 			ModifyTime:          utils.TimeTransferString(utils.FormatDateTime, item.ModifyTime),
-			StartTime:           utils.TimeTransferString(utils.FormatDateTime, *item.StartTime),
-			EndTime:             utils.TimeTransferString(utils.FormatDateTime, *item.EndTime),
+		}
+		if item.StartTime != nil {
+			resItem.StartTime = utils.TimeTransferString(utils.FormatDateTime, *item.StartTime)
+		}
+		if item.EndTime != nil {
+			resItem.EndTime = utils.TimeTransferString(utils.FormatDateTime, *item.EndTime)
 		}
 		res = append(res, resItem)
 	}