|
@@ -811,7 +811,7 @@ func (this *MaterialController) List() {
|
|
|
}
|
|
|
|
|
|
//获取图表信息
|
|
|
- list, err := material.GetMaterialListByCondition(condition, pars, startSize, pageSize)
|
|
|
+ list, err := material.GetMaterialListPageByCondition(condition, pars, startSize, pageSize)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
br.Success = true
|
|
|
br.Msg = "获取素材库信息失败"
|
|
@@ -930,7 +930,7 @@ func (this *MaterialController) Save() {
|
|
|
// @Description 删除素材库接口
|
|
|
// @Param request body material.DeleteSandbox true "type json string"
|
|
|
// @Success 200 标记成功
|
|
|
-// @router /delete [post]
|
|
|
+// @router /del [post]
|
|
|
func (this *MaterialController) Delete() {
|
|
|
br := new(models.BaseResponse).Init()
|
|
|
defer func() {
|
|
@@ -958,7 +958,82 @@ func (this *MaterialController) Delete() {
|
|
|
}
|
|
|
|
|
|
//删除素材库
|
|
|
- err = materialService.DeleteMaterial(req.MaterialId)
|
|
|
+ err = material.DeleteByMaterialIds([]int{req.MaterialId})
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "操作失败"
|
|
|
+ br.ErrMsg = "操作失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ msg := "删除成功"
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = msg
|
|
|
+}
|
|
|
+
|
|
|
+// BatchDelete
|
|
|
+// @Title 批量删除素材库
|
|
|
+// @Description 删除素材库接口
|
|
|
+// @Param request body material.DeleteSandbox true "type json string"
|
|
|
+// @Success 200 标记成功
|
|
|
+// @router /batch/del [post]
|
|
|
+func (this *MaterialController) BatchDelete() {
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
+ defer func() {
|
|
|
+ this.Data["json"] = br
|
|
|
+ this.ServeJSON()
|
|
|
+ }()
|
|
|
+ sysUser := this.SysUser
|
|
|
+ if sysUser == nil {
|
|
|
+ br.Msg = "请登录"
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
+ br.Ret = 408
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var req material.BatchDeleteMaterialReq
|
|
|
+ err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "参数解析异常!"
|
|
|
+ br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ deleteMaterialIds := make([]int, 0)
|
|
|
+ if req.IsSelectAll {
|
|
|
+ classifyId := req.ClassifyId
|
|
|
+ keyword := req.Keyword
|
|
|
+ isShowMe := req.IsShowMe
|
|
|
+ //获取图表信息
|
|
|
+ list, e, msg := materialService.GetBatchSelectedMaterialList(classifyId, keyword, isShowMe, sysUser)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取素材库信息失败"
|
|
|
+ if msg != "" {
|
|
|
+ br.Msg = msg
|
|
|
+ }
|
|
|
+ br.ErrMsg = "获取素材库信息失败,Err:" + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ notSelectIds := make(map[int]struct{})
|
|
|
+ if len(req.MaterialIds) >= 0 {
|
|
|
+ for _, v := range req.MaterialIds {
|
|
|
+ notSelectIds[v] = struct{}{}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for _, v := range list {
|
|
|
+ if _, ok := notSelectIds[v.MaterialId]; !ok {
|
|
|
+ deleteMaterialIds = append(deleteMaterialIds, v.MaterialId)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ deleteMaterialIds = req.MaterialIds
|
|
|
+ }
|
|
|
+
|
|
|
+ if len(deleteMaterialIds) <= 0 {
|
|
|
+ br.Msg = "请选择删除的素材"
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ //删除素材库
|
|
|
+ err = material.DeleteByMaterialIds(deleteMaterialIds)
|
|
|
if err != nil {
|
|
|
br.Msg = err.Error()
|
|
|
return
|
|
@@ -1278,3 +1353,77 @@ func (this *MaterialController) Upload() {
|
|
|
br.Success = true
|
|
|
br.Data = resp
|
|
|
}
|
|
|
+
|
|
|
+// BatchChangeClassify
|
|
|
+// @Title 批量更换分类
|
|
|
+// @Description 批量更换分类
|
|
|
+// @Param request body material.DeleteSandbox true "type json string"
|
|
|
+// @Success 200 标记成功
|
|
|
+// @router /batch/changeClassify [post]
|
|
|
+func (this *MaterialController) BatchChangeClassify() {
|
|
|
+ br := new(models.BaseResponse).Init()
|
|
|
+ defer func() {
|
|
|
+ this.Data["json"] = br
|
|
|
+ this.ServeJSON()
|
|
|
+ }()
|
|
|
+ sysUser := this.SysUser
|
|
|
+ if sysUser == nil {
|
|
|
+ br.Msg = "请登录"
|
|
|
+ br.ErrMsg = "请登录,SysUser Is Empty"
|
|
|
+ br.Ret = 408
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var req material.BatchChangeClassifyMaterialReq
|
|
|
+ err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "参数解析异常!"
|
|
|
+ br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ updateMaterialIds := make([]int, 0)
|
|
|
+ if req.IsSelectAll {
|
|
|
+ classifyId := req.ClassifyId
|
|
|
+ keyword := req.Keyword
|
|
|
+ isShowMe := req.IsShowMe
|
|
|
+ //获取图表信息
|
|
|
+ list, e, msg := materialService.GetBatchSelectedMaterialList(classifyId, keyword, isShowMe, sysUser)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "获取素材库信息失败"
|
|
|
+ if msg != "" {
|
|
|
+ br.Msg = msg
|
|
|
+ }
|
|
|
+ br.ErrMsg = "获取素材库信息失败,Err:" + e.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ notSelectIds := make(map[int]struct{})
|
|
|
+ if len(req.MaterialIds) >= 0 {
|
|
|
+ for _, v := range req.MaterialIds {
|
|
|
+ notSelectIds[v] = struct{}{}
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for _, v := range list {
|
|
|
+ if _, ok := notSelectIds[v.MaterialId]; !ok {
|
|
|
+ updateMaterialIds = append(updateMaterialIds, v.MaterialId)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ updateMaterialIds = req.MaterialIds
|
|
|
+ }
|
|
|
+
|
|
|
+ if len(updateMaterialIds) <= 0 {
|
|
|
+ br.Msg = "请选择删除的素材"
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ //删除素材库
|
|
|
+ err = material.UpdateClassifyByMaterialIds(updateMaterialIds, req.NewClassifyId, time.Now())
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ msg := "操作成功"
|
|
|
+ br.Ret = 200
|
|
|
+ br.Success = true
|
|
|
+ br.Msg = msg
|
|
|
+}
|