Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -232,6 +232,42 @@ func (this *BIDaShboardController) DeleteDashboard() {
 	br.Msg = "删除成功"
 }
 
+// DeleteDashboard
+// @Title 删除看板详情
+// @Description 删除看板详情接口
+// @Param	request	body bi_dashboard.DelDashboardDetailReq true "type json string"
+// @Success 200 Ret=200 删除成功
+// @router /detail/delete [post]
+func (this *BIDaShboardController) DeleteDashboardDetail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req bi_dashboard.DelDashboardDetailReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.BiDashboardDetailId <= 0 {
+		br.Msg = "参数错误"
+		return
+	}
+
+	err = bi_dashboard.DeleteBiDashboardDetailByDetailId(req.BiDashboardDetailId)
+	if err != nil {
+		br.Msg = "删除失败"
+		br.ErrMsg = "删除失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.IsAddLog = true
+	br.Msg = "删除成功"
+}
+
 // DetailDashboard
 // @Title 获取看板详情
 // @Description 获取看板详情接口
@@ -667,6 +703,45 @@ func (this *BIDaShboardController) EditDashboardClassify() {
 	br.IsAddLog = true
 }
 
+// EditDashboardClassify
+// @Title 删除看板分类
+// @Description 删除看板分类接口
+// @Param	request	body bi_dashboard.DelDashboardClassifyReq true "type json string"
+// @Success 200 Ret=200 编辑成功
+// @router /classify/del [post]
+func (this *BIDaShboardController) DelDashboardClassify() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req bi_dashboard.DelDashboardClassifyReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if req.BiDashboardClassifyId <= 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = fmt.Sprintf("参数有误, BiDashboardClassifyId: %d", req.BiDashboardClassifyId)
+		return
+	}
+
+	err = bi_dashboard.DelBiDashboardClassify(req.BiDashboardClassifyId)
+	if err != nil {
+		br.Msg = "编辑失败"
+		br.ErrMsg = "编辑失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "删除成功"
+	br.IsAddLog = true
+}
+
 // Grant
 // @Title 分配ppt权限
 // @Description 分配ppt权限接口

models/bi_dashboard/bi_dashboard_classify.go

@@ -95,9 +95,18 @@ type EditDashboardClassifyReq struct {
 	ClassifyName          string `description:"看板名称"`
 }
 
+type DelDashboardClassifyReq struct {
+	BiDashboardClassifyId int    `description:"看板id"`
+}
+
 // GetBiDashboardClassifyMaxSort 获取看板分类下最大的排序数
 func GetBiDashboardClassifyMaxSort() (sort int, err error) {
 	sql := `SELECT Max(sort) AS sort FROM bi_dashboard_classify `
 	err = global.DEFAULT_DmSQL.Raw(sql).First(&sort).Error
 	return
 }
+
+// del
+func DelBiDashboardClassify(id int) (err error) {
+	return global.DEFAULT_DmSQL.Where("bi_dashboard_classify_id = ?", id).Delete(&BiDashboardClassify{}).Error
+}

models/bi_dashboard/bi_dashboard_detail.go

@@ -53,4 +53,14 @@ type MoveDashboardDetailReq struct {
 // update
 func EditBiDashboardDetail(item *BiDashboardDetail) (err error){
 	return global.DEFAULT_DmSQL.Model(item).Where("bi_dashboard_detail_id = ?", item.BiDashboardDetailId).Updates(item).Error
+}
+
+type DelDashboardDetailReq struct {
+	BiDashboardDetailId int `description:"看板详情id"`
+}
+
+
+// del
+func DeleteBiDashboardDetailByDetailId(id int) (err error) {
+	return global.DEFAULT_DmSQL.Where("bi_dashboard_detail_id = ?", id).Delete(&BiDashboardDetail{}).Error
 }

routers/commentsRouter.go

@@ -8242,6 +8242,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: "DelDashboardClassify",
+            Router: `/classify/del`,
+            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: "EditDashboardClassify",
@@ -8269,6 +8278,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: "DeleteDashboardDetail",
+            Router: `/detail/delete`,
+            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: "MoveDashboard",