发布文章bug修改

controllers/article/article_controller.go

@@ -31,6 +31,8 @@ func ArticleRouters() {
 	beego.Router("/api/article/Delete",&ArticleManage{},"Delete:DeleteArticle")
 	beego.Router("/api/acticle/getMenus",&ArticleManage{},"Get:GetMenus")
 	beego.Router("/api/acticle/updateArticlesInfo",&ArticleManage{},"Post:UpdataArticleInfo")
+	beego.Router("/api/acticle/saveArticleDraft",&ArticleManage{},"Post:SaveArticleDraft")
+	beego.Router("/api/acticle/updateVidoInfo",&ArticleManage{},"Post:UpdateVidoInfo")
 	beego.Router("/api/acticle/previewEditArticle",&ArticleManage{},"Post:PreviewEditArticle")
 	beego.Router("/api/acticle/getPreviewInfo",&ArticleManage{},"Post:GetPreviewInfo")
 	beego.Router("/api/acticle/getAllComment",&ArticleManage{},"Get:GetAllComment")
@@ -45,6 +47,8 @@ func ArticleRouters() {
 	beego.Router("/api/article/spread",&ArticleManage{},"Get:GetSpreadInfo")
 	beego.Router("/api/article/clear",&ArticleManage{},"Delete:ClearReply")
 	beego.Router("/api/article/deleteComments",&ArticleManage{},"Delete:DeleteComments")
+	beego.Router("/api/acticle/getEditVidoInfo",&ArticleManage{},"Get:GetVidoInfo")
+    beego.Router("/api/acticle/savevidodraft",&ArticleManage{},"Post:SaveVidoDraft")
 }
 
 type ArticleManage struct {
@@ -101,6 +105,7 @@ func (this *ArticleManage) CreateArticle(){
 				Status:1,
 				Type:1,
 				ArticleStatus:1,
+
 		}
 		err = article_service.AddAritcle(articles)
 		if err !=nil{
@@ -148,7 +153,9 @@ func (this *ArticleManage) GetAllArticles()  {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
-
+	org := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
+	OrgName := org.OrgName
+	fmt.Println("机构姓名:",OrgName)
 	if(status == 1){
 		articles, total, err := article_service.GetPublished(userOrgID, page, limit, searchKey)
 		category, err := article_service.FindCategoryList(userOrgID)
@@ -160,6 +167,7 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
+			"OrgName":OrgName,
 		})
 	}
 	if(status == 2){
@@ -173,6 +181,7 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
+			"OrgName":OrgName,
 		})
 	}
 
@@ -187,6 +196,7 @@ func (this *ArticleManage) GetAllArticles()  {
 			"articles":articles,
 			"total":total,
 			"category":category,
+			"OrgName":OrgName,
 		})
 	}
 
@@ -208,6 +218,7 @@ func (this *ArticleManage) GetAllArticles()  {
 		"articles":articles,
 		"total":total,
 		"category":category,
+		"OrgName":OrgName,
 	})
 	return
 }
@@ -447,6 +458,7 @@ func (this *ArticleManage) Addvido(){
        Imgs:vidpic,
        ClassId:vidtype,
        ArticleStatus:1,
+       Status:1,
 	}
 
 	err = article_service.AddVido(articles)
@@ -511,6 +523,7 @@ func (this *ArticleManage) SaveDraft()  {
 		Imgs:vidpic,
 		ClassId:vidtype,
 		ArticleStatus:2,
+		Status:1,
 	}
 
 	err = article_service.AddVido(articles)
@@ -676,6 +689,21 @@ func (this *ArticleManage) GetArticleInfo()  {
 	})
 }
 
+func (this *ArticleManage) GetVidoInfo()  {
+	id, _ := this.GetInt64("id")
+	fmt.Println("视频id是多少?",id)
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	vidos, err := article_service.GetArticleInfo(userOrgID, id)
+	if err !=nil{
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询文章信息失败")
+		return
+	}
+	fmt.Println("内容是啥什么",vidos)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"vidos":vidos,
+	})
+}
 func (this *ArticleManage) DeleteArticle()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
@@ -787,6 +815,7 @@ func (this * ArticleManage) UpdataArticleInfo(){
 		ClassId: classid,
 		Status:  1,
 		Mtime:   time.Now().Unix(),
+		ArticleStatus:1,
 	}
 	 fmt.Println("为什么",articles)
 	 article_service.UpdataArticleInfo(&articles,userOrgID, id)
@@ -795,6 +824,109 @@ func (this * ArticleManage) UpdataArticleInfo(){
 	})
 }
 
+func  (this * ArticleManage) SaveArticleDraft()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是多少",id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("视频发布是什么呢",err)
+
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	title := dataBody["title"].(string)
+	if len(title) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+	fmt.Println("title",title)
+	content := dataBody["content"].(string)
+	if len(content) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "内容不能为空")
+		return
+	}
+	fmt.Println("content",content)
+	images := dataBody["imgs"].(string)
+	fmt.Println("images",images)
+	classid :=int64( dataBody["class_id"].(float64))
+	if classid <=0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "分类号不能为空")
+		return
+	}
+	//classid, _ := strconv.ParseInt(class_id, 10, 64)
+	fmt.Println("分类号",classid)
+	fmt.Println("标题",title,"保存文章草稿内容",content,"图片",images,"分类号",classid,"机构ID",userOrgID)
+
+	articles := models.Articles{
+		Title:   title,
+		Content: content,
+		Imgs:    images,
+		ClassId: classid,
+		Status:  1,
+		Mtime:   time.Now().Unix(),
+		ArticleStatus:2,
+	}
+	fmt.Println("为什么",articles)
+	article_service.UpdataArticleInfo(&articles,userOrgID, id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articls":articles,
+	})
+}
+
+func (this * ArticleManage) UpdateVidoInfo()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是多少",id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("视频发布是什么呢",err)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	vidname := dataBody["vid_name"].(string)
+	fmt.Println("视频名称",vidname)
+	if len(vidname) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+
+	vidpic := dataBody["vid_pic"].(string)
+	fmt.Println("视频封面",vidpic)
+	if len(vidpic) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+
+	vidtype := int64( dataBody["vid_type"].(float64))
+	fmt.Println("视频封面",vidtype)
+	if vidtype <= 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+	articles := models.Articles{
+		Title:   vidname,
+		Imgs:    vidpic,
+		ClassId: vidtype,
+		Status:  1,
+		Mtime:   time.Now().Unix(),
+		ArticleStatus:1,
+	}
+	article_service.UpdataArticleInfo(&articles,userOrgID, id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articls":articles,
+	})
+}
+
+
 func (this * ArticleManage) PreviewEditArticle()  {
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
@@ -904,7 +1036,7 @@ func (this * ArticleManage) GetArticleCommentDetail(){
 	adminUserInfo := this.GetAdminUserInfo()
 	userOrgID := adminUserInfo.CurrentOrgId
 	articles, err := article_service.GetArticleCommentDetail(id, userOrgID)
-	comment, total, err := article_service.FindAllComments(page, limit, id)
+	comment, total, err := article_service.FindAllComments(page, limit, 20142)
 	org := adminUserInfo.Orgs[adminUserInfo.CurrentOrgId]
 	fmt.Println("err是什么",err)
 	fmt.Println("total",total)
@@ -1104,4 +1236,52 @@ func  (this * ArticleManage) DeleteComments()  {
 	returnData["msg"] = "ok"
 	this.ServeSuccessJSON(returnData)
 	return
+}
+
+func (this * ArticleManage) SaveVidoDraft()  {
+	adminUserInfo := this.GetAdminUserInfo()
+	userOrgID := adminUserInfo.CurrentOrgId
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是多少",id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("视频发布是什么呢",err)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数错误")
+		return
+	}
+
+	vidname := dataBody["vid_name"].(string)
+	fmt.Println("视频名称",vidname)
+	if len(vidname) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+
+	vidpic := dataBody["vid_pic"].(string)
+	fmt.Println("视频封面",vidpic)
+	if len(vidpic) == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+
+	vidtype := int64( dataBody["vid_type"].(float64))
+	fmt.Println("视频封面",vidtype)
+	if vidtype <= 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "文章标题不能为空")
+		return
+	}
+	articles := models.Articles{
+		Title:   vidname,
+		Imgs:    vidpic,
+		ClassId: vidtype,
+		Status:  1,
+		Mtime:   time.Now().Unix(),
+		ArticleStatus:2,
+	}
+	article_service.SaveVidoDraft(&articles,userOrgID,id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"articls":articles,
+	})
 }

service/article_service/article_category_service.go

@@ -208,8 +208,12 @@ func GetMenus(OrgID int64)(categorys []*models.ArticleCategory,err error)  {
 }
 
 func UpdataArticleInfo(art *models.Articles,orgID int64,id int64){
-	service.PatientWriteDB().Model(art).Where("user_org_id = ? AND id = ? AND status = ?",orgID,id,1).Update(map[string]interface{}{"title":art.Title,"content":art.Content,"imgs":art.Imgs,"class_id":art.ClassId,"mtime":art.Mtime})
+	service.PatientWriteDB().Model(art).Where("user_org_id = ? AND id = ? AND status = ?",orgID,id,1).Update(map[string]interface{}{"title":art.Title,"content":art.Content,"imgs":art.Imgs,"class_id":art.ClassId,"mtime":art.Mtime,"article_status":art.ArticleStatus})
+
+}
 
+func SaveVidoDraft(art *models.Articles,orgID int64,id int64)  {
+	service.PatientWriteDB().Model(art).Where("user_org_id =? AND id = ? AND status = ?",orgID,id,1).Update(map[string]interface{}{"title":art.Title,"imgs":art.Imgs,"class_id":art.ClassId,"mtime":art.Mtime,"article_status":art.ArticleStatus})
 }
 
 func PreviewEditArticle(art models.Articles,orgID int64,id int64)  {