fix:知识资源库增加外部资源字段

controllers/report_open.go

@@ -425,7 +425,7 @@ func (this *ReportOpenController) ReportApprove() {
 						utils.FileLog.Error(fmt.Sprintf("ReportKnowledgeResourceClassifyCheckAndSave-报告分类保存失败,reportId:%d,classifyId:%d,err: %v", v.Id, classifyId, err))
 						return
 					}
-					msg, err := knowledge.ViewPointSave(0, v.AdminId, v.AdminRealName, v.Title, v.Abstract, "市场信息研究所", "", classifyId, &v.ApproveTime)
+					msg, err := knowledge.ViewPointSave(0, v.AdminId, v.AdminRealName, v.Title, v.Abstract, "市场信息研究所", "", classifyId, models.KnowledgeOutSourceIntelligence, &v.ApproveTime)
 					if err != nil {
 						utils.FileLog.Error(fmt.Sprintf("ViewPointSave-报告摘要知识资源库添加失败,reportId:%d,msg:%s,err: %v", v.Id, msg, err))
 						return
@@ -536,7 +536,7 @@ func (this *ReportOpenController) ReportApprove() {
 						utils.FileLog.Error(fmt.Sprintf("ReportKnowledgeResourceClassifyCheckAndSave-PPT分类保存失败,pptId:%d,classifyId:%d,err: %v", v.PptId, v.ClassifyId, err))
 						return
 					}
-					msg, err := knowledge.ViewPointSave(0, v.AdminId, v.AdminRealName, v.Title, v.Abstract, "市场信息研究所", "", classifyId, &v.ApproveTime)
+					msg, err := knowledge.ViewPointSave(0, v.AdminId, v.AdminRealName, v.Title, v.Abstract, "市场信息研究所", "", classifyId, models.KnowledgeOutSourceIntelligence, &v.ApproveTime)
 					if err != nil {
 						utils.FileLog.Error(fmt.Sprintf("ViewPointSave-ppt摘要知识库添加失败,pptId:%d,msg:%s,err: %v", v.PptId, msg, err))
 						return
@@ -684,116 +684,116 @@ func (this *ReportOpenController) ReportRemove() {
 // @Param request body models.ReportViewPointReq true "type json string"
 // @Success 200 string "操作成功"
 // @router /viewpoint/save [post]
-func (this *ReportOpenController) ViewPointSave() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req *models.ReportViewPointSaveReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常"
-		br.ErrMsg = fmt.Sprintf("参数解析失败，%v", e)
-		return
-	}
-	req.Content = strings.TrimSpace(req.Content)
-	req.Title = strings.TrimSpace(req.Title)
-	req.Category = strings.TrimSpace(req.Category)
-	if req.Title == "" {
-		br.Msg = "观点标题不能为空"
-		return
-	}
-	if req.Content == "" {
-		br.Msg = "观点内容不能为空"
-		return
-	}
-	if req.Category == "" {
-		br.Msg = "观点分类不能为空"
-		return
-	}
-	if req.DataDate == "" {
-		br.Msg = "观点日期不能为空"
-		return
-	}
-	dataDate, err := time.ParseInLocation(utils.FormatDateTime, req.DataDate, time.Local)
-	if err != nil {
-		br.Msg = "观点日期格式不正确"
-		return
-	}
-	msg, err := knowledge.ViewPointSave(req.Id, 0, "", req.Title, req.Content, req.DataSource, req.Category, 0, &dataDate)
-	if err != nil {
-		if msg == "" {
-			msg = "保存观点失败"
-		}
-		br.Msg = msg
-		br.ErrMsg = fmt.Sprintf("保存观点失败, %v", err)
-		return
-	}
-
-	br.Msg = "保存观点成功"
-	br.Success = true
-	br.Ret = 200
-}
-
-// @Title 观点删除
-// @Description 观点删除
-// @Param request body models.ReportViewPointReq true "type json string"
-// @Success 200 string "操作成功"
-// @router /viewpoint/delete [post]
-func (this *ReportOpenController) ViewPointDelete() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	var req *models.ReportViewPointDeleteRep
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数解析异常"
-		br.ErrMsg = fmt.Sprintf("参数解析失败，%v", e)
-		return
-	}
-	if req.Id == nil {
-		br.Msg = "观点ID不能为空"
-		return
-	}
-
-	obj := new(models.KnowledgeResource)
-	obj, err := obj.GetKnowledgeResourceByOutId(*req.Id)
-	if err != nil {
-		if utils.IsErrNoRow(err) {
-			br.Msg = "观点不存在"
-			return
-		}
-		br.Msg = "删除观点失败"
-		br.ErrMsg = fmt.Sprintf("删除观点失败, %v", err)
-		return
-	}
-	obj.IsDelete = 1
-	if err = obj.Update([]string{"IsDelete"}); err != nil {
-		br.Msg = "删除观点失败"
-		br.ErrMsg = fmt.Sprintf("删除观点失败, %v", err)
-		return
-	}
-	updateMap := map[string]interface{}{
-		"IsDelete": "1",
-	}
-	err = knowledge.UpdateEsKnowledgeResource(obj.KnowledgeResourceId, updateMap)
-	if err != nil {
-		br.Msg = "删除观点失败"
-		br.ErrMsg = fmt.Sprintf("es删除观点失败, %v", err)
-		return
-	}
-
-	br.Msg = "删除观点成功"
-	br.Success = true
-	br.Ret = 200
-}
+// func (this *ReportOpenController) ViewPointSave() {
+// 	br := new(models.BaseResponse).Init()
+// 	defer func() {
+// 		if br.ErrMsg == "" {
+// 			br.IsSendEmail = false
+// 		}
+// 		this.Data["json"] = br
+// 		this.ServeJSON()
+// 	}()
+// 	var req *models.ReportViewPointSaveReq
+// 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+// 		br.Msg = "参数解析异常"
+// 		br.ErrMsg = fmt.Sprintf("参数解析失败，%v", e)
+// 		return
+// 	}
+// 	req.Content = strings.TrimSpace(req.Content)
+// 	req.Title = strings.TrimSpace(req.Title)
+// 	req.Category = strings.TrimSpace(req.Category)
+// 	if req.Title == "" {
+// 		br.Msg = "观点标题不能为空"
+// 		return
+// 	}
+// 	if req.Content == "" {
+// 		br.Msg = "观点内容不能为空"
+// 		return
+// 	}
+// 	if req.Category == "" {
+// 		br.Msg = "观点分类不能为空"
+// 		return
+// 	}
+// 	if req.DataDate == "" {
+// 		br.Msg = "观点日期不能为空"
+// 		return
+// 	}
+// 	dataDate, err := time.ParseInLocation(utils.FormatDateTime, req.DataDate, time.Local)
+// 	if err != nil {
+// 		br.Msg = "观点日期格式不正确"
+// 		return
+// 	}
+// 	msg, err := knowledge.ViewPointSave(req.Id, 0, "", req.Title, req.Content, req.DataSource, req.Category, 0, &dataDate)
+// 	if err != nil {
+// 		if msg == "" {
+// 			msg = "保存观点失败"
+// 		}
+// 		br.Msg = msg
+// 		br.ErrMsg = fmt.Sprintf("保存观点失败, %v", err)
+// 		return
+// 	}
+
+// 	br.Msg = "保存观点成功"
+// 	br.Success = true
+// 	br.Ret = 200
+// }
+
+// // @Title 观点删除
+// // @Description 观点删除
+// // @Param request body models.ReportViewPointReq true "type json string"
+// // @Success 200 string "操作成功"
+// // @router /viewpoint/delete [post]
+// func (this *ReportOpenController) ViewPointDelete() {
+// 	br := new(models.BaseResponse).Init()
+// 	defer func() {
+// 		if br.ErrMsg == "" {
+// 			br.IsSendEmail = false
+// 		}
+// 		this.Data["json"] = br
+// 		this.ServeJSON()
+// 	}()
+// 	var req *models.ReportViewPointDeleteRep
+// 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
+// 		br.Msg = "参数解析异常"
+// 		br.ErrMsg = fmt.Sprintf("参数解析失败，%v", e)
+// 		return
+// 	}
+// 	if req.Id == nil {
+// 		br.Msg = "观点ID不能为空"
+// 		return
+// 	}
+
+// 	obj := new(models.KnowledgeResource)
+// 	obj, err := obj.GetKnowledgeResourceByOutId(*req.Id)
+// 	if err != nil {
+// 		if utils.IsErrNoRow(err) {
+// 			br.Msg = "观点不存在"
+// 			return
+// 		}
+// 		br.Msg = "删除观点失败"
+// 		br.ErrMsg = fmt.Sprintf("删除观点失败, %v", err)
+// 		return
+// 	}
+// 	obj.IsDelete = 1
+// 	if err = obj.Update([]string{"IsDelete"}); err != nil {
+// 		br.Msg = "删除观点失败"
+// 		br.ErrMsg = fmt.Sprintf("删除观点失败, %v", err)
+// 		return
+// 	}
+// 	updateMap := map[string]interface{}{
+// 		"IsDelete": "1",
+// 	}
+// 	err = knowledge.UpdateEsKnowledgeResource(obj.KnowledgeResourceId, updateMap)
+// 	if err != nil {
+// 		br.Msg = "删除观点失败"
+// 		br.ErrMsg = fmt.Sprintf("es删除观点失败, %v", err)
+// 		return
+// 	}
+
+// 	br.Msg = "删除观点成功"
+// 	br.Success = true
+// 	br.Ret = 200
+// }
 
 // @Title 知识资源报告库上传
 // @Description 知识资源报告库上传

models/knowledge_resource.go

@@ -32,6 +32,15 @@ const (
 	KnowledgeResourceStateApproved
 )
 
+const (
+	// 内部
+	KnowledgeOutSourceInternal = iota
+	// 智力共享
+	KnowledgeOutSourceIntelligence
+	// 数据节点
+	KnowledgeOutSourceDataNode
+)
+
 type KnowledgeResourceFile struct {
 	KnowledgeResourceFileId int    `gorm:"column:knowledge_resource_file_id;primaryKey;autoIncrement"`
 	KnowledgeResourceId     int    `gorm:"column:knowledge_resource_id"`
@@ -62,6 +71,7 @@ type KnowledgeResource struct {
 	FileUrl             string     `gorm:"column:file_url"`
 	OutId               int        `gorm:"column:out_id" description:"外部系统ID"`
 	IsDelete            int        `gorm:"column:is_delete;default:0;NOT NULL"`
+	OutSource           int        `gorm:"column:out_source" description:"外部来源:0:内部 1:智力共享 2：数据节点"`
 }
 
 func (k KnowledgeResource) TableName() string {

routers/commentsRouter.go

@@ -97,24 +97,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportOpenController"] = append(beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportOpenController"],
-        beego.ControllerComments{
-            Method: "ViewPointDelete",
-            Router: `/viewpoint/delete`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportOpenController"] = append(beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportOpenController"],
-        beego.ControllerComments{
-            Method: "ViewPointSave",
-            Router: `/viewpoint/save`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportShareController"] = append(beego.GlobalControllerRouter["eta_gn/eta_report/controllers:ReportShareController"],
         beego.ControllerComments{
             Method: "Detail",

services/knowledge/knowledge_resource.go

@@ -123,7 +123,7 @@ func ReportKnowledgeResourceClassifyCheckAndSave(reportClassifyId int) (classify
 }
 
 // ViewPointSave 知识资源观点库保存
-func ViewPointSave(outId, adminId int, adminRealName, title, content, sourceFrom, classifyName string, classifyId int, startTime *time.Time) (msg string, err error) {
+func ViewPointSave(outId, adminId int, adminRealName, title, content, sourceFrom, classifyName string, classifyId, outSource int, startTime *time.Time) (msg string, err error) {
 	if classifyId <= 0 {
 		tmpClassifyId, er := ViewPointKnowledgeResourceClassifyCheckAndSave(classifyName, models.KnowledgeResourceTypeOpinion)
 		if er != nil {
@@ -149,6 +149,7 @@ func ViewPointSave(outId, adminId int, adminRealName, title, content, sourceFrom
 		obj.CreateTime = time.Now()
 		obj.ModifyTime = time.Now()
 		obj.State = models.KnowledgeResourceStateApproved
+		obj.OutSource = outSource
 		obj.Content = html.EscapeString(content)
 		timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 		obj.ResourceCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp)