move

controllers/bi_dashboard.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/bi_dashboard"
-	"eta_gn/eta_api/services/ppt"
 	"eta_gn/eta_api/utils"
 	"time"
 )
@@ -112,7 +111,7 @@ func (this *BIDaShboardController) AddDashboard() {
 // EditPpt
 // @Title 编辑看板
 // @Description 编辑看板接口
-// @Param	request	body models.AddPptV2Req true "type json string"
+// @Param	request	body bi_dashboard.EditDashboardReq true "type json string"
 // @Success 200 Ret=200 编辑成功
 // @router /edit [post]
 func (this *BIDaShboardController) EditDashboard() {
@@ -178,10 +177,10 @@ func (this *BIDaShboardController) EditDashboard() {
 	br.IsAddLog = true
 }
 
-// DeletePpt
-// @Title 删除ppt
-// @Description 删除ppt接口
-// @Param	request	body models.DeletePptV2Req true "type json string"
+// DeleteDashboard
+// @Title 删除看板
+// @Description 删除看板接口
+// @Param	request	body bi_dashboard.DelDashboardReq true "type json string"
 // @Success 200 Ret=200 删除成功
 // @router /delete [post]
 func (this *BIDaShboardController) DeleteDashboard() {
@@ -190,34 +189,35 @@ func (this *BIDaShboardController) DeleteDashboard() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	var req models.DeletePptV2Req
+	var req bi_dashboard.DelDashboardReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	if req.PptId <= 0 {
+	if req.BiDashboardId <= 0 {
 		br.Msg = "参数错误"
 		return
 	}
-	pptInfo, err := models.GetPptV2ById(req.PptId)
-	if err != nil {
-		br.Msg = "ppt不存在"
+	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
+	if err != nil && !utils.IsErrNoRow(err) {
+		br.Msg = "获取数据异常！"
+		br.ErrMsg = "获取数据异常，Err:" + err.Error()
 		return
 	}
-	if pptInfo.AdminId != this.SysUser.AdminId {
+	if item.SysAdminId != this.SysUser.AdminId {
 		br.Msg = "无权删除"
 		return
 	}
-	err = models.DeletePptV2(req.PptId)
+	err = bi_dashboard.DelDashboard(req.BiDashboardId)
 	if err != nil {
 		br.Msg = "删除失败"
 		br.ErrMsg = "删除失败,Err:" + err.Error()
 		return
 	}
-	//如果该ppt存在单个共享记录，则删除共享
-	err = ppt.DeleteGroupPpt(req.PptId)
+
+	err = bi_dashboard.DelDashboard(req.BiDashboardId)
 	if err != nil {
 		br.Msg = "删除失败"
 		br.ErrMsg = "删除失败,Err:" + err.Error()
@@ -229,9 +229,9 @@ func (this *BIDaShboardController) DeleteDashboard() {
 	br.Msg = "删除成功"
 }
 
-// DetailPpt
-// @Title 获取ppt详情
-// @Description 获取ppt详情接口
+// DetailDashboard
+// @Title 获取看板详情
+// @Description 获取看板详情接口
 // @Param   PptId   query   int  true       "PptId"
 // @Success 200 {object} models.PptV2
 // @router /detail [get]
@@ -280,3 +280,80 @@ func (this *BIDaShboardController) DetailDashboard() {
 	br.Data = resp
 }
 
+// MoveDashboard
+// @Title 移动看板详情
+// @Description 移动看板详情接口
+// @Param	request	body bi_dashboard.MoveDashboardDetailReq true "type json string"
+// @Success 200 Ret=200 移动成功
+// @router /detail/move [post]
+func (this *BIDaShboardController) MoveDashboard() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req bi_dashboard.MoveDashboardDetailReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if req.BiDashboardId <= 0 {
+		br.Msg = "参数错误"
+		return
+	}
+	if req.BiDashboardDetailId == req.OtherDetailId || req.BiDashboardDetailId <= 0 || req.OtherDetailId <= 0 {
+		br.Msg = "看板Id有误"
+		return
+	}
+	if req.Sort < 0 || req.OtherSort < 0 || req.Sort == req.OtherSort{
+		br.Msg = "排序有误"
+		return
+	}
+
+
+	item, err := bi_dashboard.GetDashboardById(req.BiDashboardId)
+	if err != nil && !utils.IsErrNoRow(err) {
+		br.Msg = "获取数据异常！"
+		br.ErrMsg = "获取数据异常，Err:" + err.Error()
+		return
+	}
+
+	// 判断权限
+	if item.SysAdminId != this.SysUser.AdminId {
+		br.Msg = `无权移动`
+		return
+	}
+
+	// 修改
+	detailItem := &bi_dashboard.BiDashboardDetail{
+		BiDashboardDetailId: req.BiDashboardDetailId,
+		Sort:          req.OtherSort,
+		ModifyTime:    time.Now(),
+	}
+	err = bi_dashboard.EditBiDashboardDetail(detailItem)
+	if err != nil {
+		br.Msg = "编辑详情失败"
+		br.ErrMsg = "编辑详情失败,Err:" + err.Error()
+		return
+	}
+
+	otherItem := &bi_dashboard.BiDashboardDetail{
+		BiDashboardDetailId: req.OtherDetailId,
+		Sort:          req.Sort,
+		ModifyTime:    time.Now(),
+	}
+	err = bi_dashboard.EditBiDashboardDetail(otherItem)
+	if err != nil {
+		br.Msg = "编辑详情失败"
+		br.ErrMsg = "编辑详情失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "编辑成功"
+	br.IsAddLog = true
+}

models/bi_dashboard/bi_dashboard.go

@@ -65,6 +65,11 @@ func GetDashboardById(id int) (item *BiDashboard, err error) {
 	return
 }
 
+// del
+func DelDashboard(id int) (err error) {
+	return global.DEFAULT_DmSQL.Delete(&BiDashboard{BiDashboardId: id}).Error
+}
+
 // DashboardDetailResp 详情响应体
 type DashboardDetailResp struct {
 	*BiDashboard
@@ -91,4 +96,8 @@ type EditDashboardReq struct {
 // update
 func EditDashboard(item *BiDashboard) (err error) {
 	return global.DEFAULT_DmSQL.Model(item).Updates(item).Error
+}
+
+type DelDashboardReq struct {
+	BiDashboardId   int    `description:"看板id"`
 }

models/bi_dashboard/bi_dashboard_detail.go

@@ -40,4 +40,17 @@ func AddBiDashboardDetailMulti(items []*BiDashboardDetail) (err error) {
 // del
 func DeleteBiDashboardDetail(id int) (err error) {
 	return global.DEFAULT_DmSQL.Where("bi_dashboard_id = ?", id).Delete(&BiDashboardDetail{}).Error
+}
+
+type MoveDashboardDetailReq struct {
+	BiDashboardId       int `description:"看板id"`
+	BiDashboardDetailId int `description:"看板详情id"`
+	Sort                int `description:"排序"`
+	OtherDetailId       int `description:"交换的详情id"`
+	OtherSort           int `description:"交换的排序"`
+}
+
+// update
+func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
+	return global.DEFAULT_DmSQL.Model(&BiDashboardDetail{}).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
 }

routers/commentsRouter.go

@@ -8188,6 +8188,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"],
+        beego.ControllerComments{
+            Method: "MoveDashboard",
+            Router: `/detail/move`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:BIDaShboardController"],
         beego.ControllerComments{
             Method: "EditDashboard",