Merge branch 'hotfix/ppt_edit_0805' into debug

controllers/ppt_english.go

@@ -8,7 +8,6 @@ import (
 	"eta/eta_api/services"
 	"eta/eta_api/services/ppt"
 	"eta/eta_api/utils"
-	"fmt"
 	_ "image/gif"
 	_ "image/jpeg"
 	_ "image/png"
@@ -1167,57 +1166,3 @@ func (this *PptEnglishController) Editing() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
-
-// EditCheck
-// @Title 检验是否可以编辑
-// @Description 检验是否可以编辑
-// @Param   PptId   query   int  true       "PptId"
-// @Success 200 {object} ppt_english.PPTEditingCache
-// @router /edit_check [get]
-func (this *PptEnglishController) EditCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	pptId, _ := this.GetInt("PptId")
-	if pptId <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, pptId: %d", pptId)
-		return
-	}
-
-	_, e := ppt_english.GetPptEnglishById(pptId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "PPT不存在, 请刷新页面"
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprintf("获取失败, %s", e)
-		return
-	}
-
-	// 查询编辑状态
-	editor, e := services.UpdatePptEditing(pptId, 0, sysUser.AdminId, sysUser.RealName, true)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprintf("获取编辑状态失败, %v", e)
-		return
-	}
-
-	br.Data = editor
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}

controllers/ppt_v2.go

@@ -1341,57 +1341,3 @@ func (this *PptV2Controller) Editing() {
 	br.Success = true
 	br.Msg = "操作成功"
 }
-
-// EditCheck
-// @Title 检验是否可以编辑
-// @Description 检验是否可以编辑
-// @Param   PptId   query   int  true       "PptId"
-// @Success 200 {object} ppt_english.PPTEditingCache
-// @router /edit_check [get]
-func (this *PptV2Controller) EditCheck() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-	pptId, _ := this.GetInt("PptId")
-	if pptId <= 0 {
-		br.Msg = "参数有误"
-		br.ErrMsg = fmt.Sprintf("参数有误, pptId: %d", pptId)
-		return
-	}
-
-	_, e := models.GetPptV2ById(pptId)
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			br.Msg = "PPT不存在, 请刷新页面"
-			return
-		}
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprintf("获取失败, %s", e)
-		return
-	}
-
-	// 查询编辑状态
-	editor, e := services.UpdatePptEditing(pptId, 0, sysUser.AdminId, sysUser.RealName, false)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = fmt.Sprintf("获取编辑状态失败, %v", e)
-		return
-	}
-
-	br.Data = editor
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "获取成功"
-}

routers/commentsRouter.go

@@ -8440,15 +8440,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers:PptEnglishController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:PptEnglishController"],
-        beego.ControllerComments{
-            Method: "EditCheck",
-            Router: `/edit_check`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers:PptEnglishController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:PptEnglishController"],
         beego.ControllerComments{
             Method: "Editing",
@@ -8746,15 +8737,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers:PptV2Controller"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:PptV2Controller"],
-        beego.ControllerComments{
-            Method: "EditCheck",
-            Router: `/edit_check`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers:PptV2Controller"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:PptV2Controller"],
         beego.ControllerComments{
             Method: "Editing",