节目创建更新

app/multimedia/controller/libraryController.go

@@ -60,15 +60,17 @@ func (c *libraryCtl) List(ctx *gin.Context) {
 }
 
 func (c *libraryCtl) Remove(ctx *gin.Context) {
-	var req *model.ReqLibraryRemove
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
+	ids := ctx.Query("ids")
+	id, e := strconv.Atoi(ids)
+	if e != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
 		return
 	}
+
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
 
-	err := service.LibraryService.Remove(claims.UserId, claims.TenantId, req.IDs)
+	err := service.LibraryService.Remove(claims.UserId, claims.TenantId, id)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/multimedia/controller/programController.go

@@ -0,0 +1,126 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/middleware"
+	"iot_manager_service/app/multimedia/model"
+	"iot_manager_service/app/multimedia/service"
+	"iot_manager_service/util/common"
+	"math"
+	"net/http"
+	"strconv"
+)
+
+var Program = new(programCtl)
+
+type programCtl struct{}
+
+func (c *programCtl) Detail(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+	Program, err := service.ProgramService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, Program))
+}
+
+func (c *programCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	libraries, err := service.ProgramService.List(claims.TenantId, searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(libraries)) / float64(size))
+	rsp := model.RsqProgramList{
+		Current: current,
+		Size:    size,
+		Total:   len(libraries),
+		Pages:   int(pages),
+		Records: libraries,
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, rsp))
+}
+
+func (c *programCtl) Remove(ctx *gin.Context) {
+	ids := ctx.Query("ids")
+	id, e := strconv.Atoi(ids)
+	if e != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	err := service.ProgramService.Remove(claims.UserId, claims.TenantId, id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, nil))
+}
+
+func (c *programCtl) GetList(ctx *gin.Context) {
+	name := ctx.Query("name")
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	Program, err := service.ProgramService.GetList(claims.TenantId, name)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, Program))
+}
+
+func (c *programCtl) Submit(ctx *gin.Context) {
+	var req model.ReqProgramSubmit
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+	e := service.ProgramService.Submit(claims.TenantId, claims.UserId, req)
+	if e != nil {
+		ctx.JSON(http.StatusOK, e)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, nil))
+}
+
+func (c *programCtl) GetLibraryList(ctx *gin.Context) {
+	id := ctx.Query("id")
+	programId, e := strconv.Atoi(id)
+	if e != nil {
+		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+	value, _ := ctx.Get(middleware.Authorization)
+	claims := value.(*middleware.Claims)
+
+	libraries, err := service.ProgramService.GetLibraryList(claims.TenantId, programId)
+	if err != nil {
+		ctx.JSON(http.StatusOK, e)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, libraries))
+}

app/multimedia/dao/common.go

@@ -11,6 +11,8 @@ func InitDB(db *gorm.DB) {
 	Db = db
 	err := Db.AutoMigrate(
 		&Library{},
+		&Program{},
+		&ProgramRelation{},
 	).Error
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/multimedia/dao/libraryDao.go

@@ -21,7 +21,6 @@ type Library struct {
 	UpdateTime      time.Time `gorm:"type:datetime" json:"updateTime"`            //修改时间
 	UpdateUser      int64     `gorm:"type:bigint" json:"updateUser"`              //修改用户
 	IsDeleted       int       `gorm:"type:int;default 0" json:"isDeleted"`        //是否删除 0=未删除,1=删除
-	Status          int       `gorm:"type:int;default 2" json:"status"`           //状态 1=正常,2=异常
 }
 
 func (Library) TableName() string {
@@ -48,7 +47,8 @@ func (c *Library) Get() error {
 }
 
 func (c *Library) Delete() error {
-	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime, "update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
 }
 
 func (c *Library) GetAll() ([]Library, error) {
@@ -67,3 +67,10 @@ func (c *Library) GetAll() ([]Library, error) {
 func (c *Library) Update() error {
 	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
+
+func (c *Library) GetLibrariesByIds(ids []int) ([]Library, error) {
+	var libraries []Library
+	err := Db.Debug().Model(&c).Where("is_deleted = 0 and tenant_id = ? and id in (?)",
+		c.TenantId, ids).Find(&libraries).Error
+	return libraries, err
+}

app/multimedia/dao/programDao.go

@@ -0,0 +1,68 @@
+package dao
+
+import (
+	"time"
+)
+
+type Program struct {
+	ID          int       `gorm:"primary_key" json:"id"`                 //编号
+	Name        string    `gorm:"type:varchar(64)" json:"name"`          //名称
+	Resolution  int       `gorm:"type:int" json:"resolution"`            //分辨率 枚举编号
+	Duration    int64     `gorm:"type:bigint" json:"duration"`           //统计总时长
+	FileSize    int64     `gorm:"type:bigint" json:"fileSize"`           //统计文件总大小
+	ImgDuration int       `gorm:"type:int;default 0" json:"imgDuration"` //图片播放时长(毫秒)
+	Remarks     string    `gorm:"type:varchar(4000)" json:"remarks"`     //备注
+	TenantId    int       `gorm:"type:int" json:"tenantId"`              //租户ID
+	CreateTime  time.Time `gorm:"type:datetime" json:"createTime"`       //新增时间
+	CreateUser  int64     `gorm:"type:bigint" json:"createUser"`         //新增记录操作用户ID
+	UpdateTime  time.Time `gorm:"type:datetime" json:"updateTime"`       //修改时间
+	UpdateUser  int64     `gorm:"type:bigint" json:"updateUser"`         //修改用户
+	IsDeleted   int       `gorm:"type:int;default 0" json:"isDeleted"`   //是否删除 0=未删除,1=删除
+}
+
+func (Program) TableName() string {
+	return "media_program"
+}
+
+func (c *Program) Create() error {
+	return Db.Debug().Model(&c).Save(c).Error
+}
+
+func (c *Program) Remove() error {
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Delete(c).Error
+}
+
+func (c *Program) GetPrograms(offset, limit int) ([]Program, error) {
+	var Programs []Program
+	db := Db.Debug().Model(&c)
+	if c.Name != "" {
+		db = db.Where("name like ?", "%"+c.Name+"%")
+	}
+
+	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&Programs).Error
+	return Programs, err
+}
+
+func (c *Program) Get() error {
+	return Db.Debug().Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
+}
+
+func (c *Program) Delete() error {
+	return Db.Debug().Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+}
+
+func (c *Program) GetAll() ([]Program, error) {
+	var Programs []Program
+	db := Db.Debug().Model(&c).Where("tenant_id = ?", c.TenantId)
+	if c.Name != "" {
+		db = db.Where("name like ?", "%"+c.Name+"%")
+	}
+
+	err := db.Find(&Programs).Order("create_time").Error
+	return Programs, err
+}
+
+func (c *Program) Update() error {
+	return Db.Debug().Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+}

app/multimedia/dao/programRelationDao.go

@@ -0,0 +1,38 @@
+package dao
+
+type ProgramRelation struct {
+	ID        int `gorm:"primary_key" json:"id"`               //编号
+	ProgramId int `gorm:"type:int" json:"programId"`           //节目单ID
+	LibraryId int `gorm:"type:int" json:"libraryId"`           //素材ID
+	OrderNo   int `gorm:"type:int" json:"orderNo"`             //排序位置
+	TenantId  int `gorm:"type:int" json:"tenantId"`            //租户ID
+	IsDeleted int `gorm:"type:int;default 0" json:"isDeleted"` //是否删除 0=未删除,1=删除
+}
+
+func (ProgramRelation) TableName() string {
+	return "media_program_relation"
+}
+
+func (c *ProgramRelation) Get() error {
+	return Db.Debug().Model(&c).Where("is_deleted = 0 and id = ?", c.ID).Find(&c).Error
+}
+
+func (c *ProgramRelation) Delete() error {
+	return Db.Debug().Model(&c).Where("program_id = ?", c.ProgramId).Updates(map[string]interface{}{"is_deleted": c.
+		IsDeleted}).Error
+}
+
+func (c *ProgramRelation) GetByProgram() ([]ProgramRelation, error) {
+	var relations []ProgramRelation
+	err := Db.Debug().Model(&c).Where("tenant_id = ? and is_deleted = 0 and program_id = ?", c.TenantId,
+		c.ProgramId).Order("order_no").Find(&relations).Error
+	return relations, err
+}
+
+func (c *ProgramRelation) Save() error {
+	return Db.Debug().Model(&c).Save(&c).Error
+}
+
+func (c *ProgramRelation) Remove() error {
+	return Db.Debug().Model(&c).Where("program_id = ?", c.ProgramId).Delete(c).Error
+}

app/multimedia/model/library.go

@@ -13,7 +13,7 @@ const (
 	LibraryTypeAudioStr = "音频"
 )
 
-func DaoToModel(library dao.Library) LibraryDetail {
+func LibToModel(library dao.Library) LibraryDetail {
 	typeName := ""
 	switch library.LibType {
 	case LibraryTypeVideo:
@@ -45,10 +45,6 @@ type RsqLibraryList struct {
 	Total   int             `json:"total"`   //总数
 }
 
-type ReqLibraryRemove struct {
-	IDs int `json:"ids"`
-}
-
 type RspUploadFile struct {
 	Link         string `json:"link"`
 	Domain       string `json:"domain"`

app/multimedia/model/program.go

@@ -0,0 +1,30 @@
+package model
+
+import (
+	"iot_manager_service/app/multimedia/dao"
+)
+
+type ProgramDetail struct {
+	dao.Program
+	LibraryIds     string `json:"libraryIds"`     //组合素材ID 逗号分割
+	ResolutionName string `json:"resolutionName"` //分辨率
+}
+
+type RsqProgramList struct {
+	Records []ProgramDetail `json:"records"` //记录列表
+	Current int             `json:"current"` //当前分页
+	Size    int             `json:"size"`    //每页数量
+	Pages   int             `json:"pages"`   //总页数
+	Total   int             `json:"total"`   //总数
+}
+
+type ReqProgramSubmit struct {
+	Name           string `json:"name"`           //名称
+	Resolution     int    `json:"resolution"`     //分辨率 枚举编号
+	Duration       int64  `json:"duration"`       //统计总时长
+	FileSize       int64  `json:"fileSize"`       //统计文件总大小
+	ImgDuration    int    `json:"imgDuration"`    //图片播放时长(毫秒)
+	Remarks        string `json:"remarks"`        //备注
+	LibraryIds     string `json:"libraryIds"`     //组合素材ID 逗号分割
+	ResolutionName string `json:"resolutionName"` //分辨率
+}

app/multimedia/service/libraryService.go

@@ -17,8 +17,7 @@ var LibraryService = new(libraryService)
 
 type libraryService struct{}
 
-func (s *libraryService) Get(id int) (*dao.Library,
-	*common.Errors) {
+func (s *libraryService) Get(id int) (*dao.Library, *common.Errors) {
 	library := &dao.Library{
 		ID: id,
 	}
@@ -48,7 +47,7 @@ func (s *libraryService) List(tenantId int, searchValue string, current, size in
 
 	var rsp []model.LibraryDetail
 	for _, lib := range libraries {
-		rsp = append(rsp, model.DaoToModel(lib))
+		rsp = append(rsp, model.LibToModel(lib))
 	}
 	return rsp, nil
 }

app/multimedia/service/programService.go

@@ -0,0 +1,158 @@
+package service
+
+import (
+	"iot_manager_service/app/multimedia/dao"
+	"iot_manager_service/app/multimedia/model"
+	"iot_manager_service/app/system/service"
+	"iot_manager_service/util/common"
+	"iot_manager_service/util/logger"
+	"time"
+)
+
+var ProgramService = new(programService)
+
+type programService struct{}
+
+func (s *programService) Get(id int) (*dao.Program, *common.Errors) {
+	Program := &dao.Program{
+		ID: id,
+	}
+	err := Program.Get()
+	if err != nil {
+		return nil, common.FailResponse(err.Error(), nil)
+	}
+	return Program, nil
+}
+
+func (s *programService) List(tenantId int, searchValue string, current, size int) ([]model.ProgramDetail,
+	*common.Errors) {
+	Program := &dao.Program{
+		TenantId: tenantId,
+	}
+
+	offset := (current - 1) * size
+	limit := size
+
+	if searchValue != "" {
+		Program.Name = searchValue
+	}
+	programs, err := Program.GetPrograms(offset, limit)
+	if err != nil {
+		return nil, common.FailResponse(err.Error(), nil)
+	}
+
+	var rsp []model.ProgramDetail
+	for _, pro := range programs {
+		rsp = append(rsp, model.ProgramDetail{
+			Program:        pro,
+			ResolutionName: service.DictService.GetResolutionName(tenantId, pro.Resolution),
+		})
+	}
+	return rsp, nil
+}
+
+func (s *programService) Remove(userId int64, tenantId int, id int) *common.Errors {
+	relation := &dao.ProgramRelation{
+		ProgramId: id,
+		TenantId:  tenantId,
+		IsDeleted: 1,
+	}
+	err := relation.Delete()
+	if err != nil {
+		return common.FailResponse(err.Error(), nil)
+	}
+
+	program := &dao.Program{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: userId,
+		UpdateTime: time.Now(),
+	}
+	err = program.Delete()
+	if err != nil {
+		return common.FailResponse(err.Error(), nil)
+	}
+	service.OperationHisService.Save(userId, tenantId, common.OperationRemove, common.ModuleTypeInfoBar,
+		common.DeviceTypeDefault, "", common.OperationSuccess)
+	return nil
+}
+
+func (s *programService) GetList(tenantId int, name string) ([]dao.Program, *common.Errors) {
+	Program := &dao.Program{
+		TenantId: tenantId,
+		Name:     name,
+	}
+	libraries, err := Program.GetAll()
+	if err != nil {
+		return nil, common.FailResponse(err.Error(), nil)
+	}
+
+	return libraries, nil
+}
+
+func (s *programService) Submit(tenantId int, userId int64, req model.ReqProgramSubmit) *common.Errors {
+	program := &dao.Program{
+		Name:        req.Name,
+		Resolution:  req.Resolution,
+		Duration:    req.Duration,
+		FileSize:    req.FileSize,
+		ImgDuration: req.ImgDuration,
+		Remarks:     req.Remarks,
+		TenantId:    tenantId,
+		CreateTime:  time.Now(),
+		CreateUser:  userId,
+		UpdateTime:  time.Now(),
+		UpdateUser:  userId,
+		IsDeleted:   0,
+	}
+	if err := program.Create(); err != nil {
+		logger.Logger.Errorf("Create err = %s \n", err.Error())
+		return common.FailResponse(err.Error(), nil)
+	}
+
+	libraryIds := common.StringToIntArray(req.LibraryIds)
+	for index, libraryId := range libraryIds {
+		relation := &dao.ProgramRelation{
+			ProgramId: program.ID,
+			LibraryId: libraryId,
+			OrderNo:   index + 1,
+			TenantId:  tenantId,
+			IsDeleted: 0,
+		}
+		err := relation.Save()
+		if err != nil {
+			logger.Logger.Errorf("relation save err = %s \n", err.Error())
+			_ = program.Remove()
+			_ = relation.Remove()
+			return common.FailResponse(err.Error(), nil)
+		}
+	}
+
+	service.OperationHisService.Save(userId, tenantId, common.OperationCreate, common.ModuleTypeInfoBar,
+		common.DeviceTypeDefault, program.Name, common.OperationSuccess)
+	return common.SuccessResponse(common.Succeeded, nil)
+}
+
+func (s *programService) GetLibraryList(tenantId, programId int) ([]dao.Library, *common.Errors) {
+	relation := &dao.ProgramRelation{
+		ProgramId: programId,
+		TenantId:  tenantId,
+	}
+	relations, err := relation.GetByProgram()
+	if err != nil {
+		logger.Logger.Errorf("relation BatchCreate err = %s \n", err.Error())
+		return nil, common.FailResponse(err.Error(), nil)
+	}
+	var libraryIds []int
+	for _, relation := range relations {
+		libraryIds = append(libraryIds, relation.LibraryId)
+	}
+
+	library := &dao.Library{TenantId: tenantId}
+	libraries, err := library.GetLibrariesByIds(libraryIds)
+	if err != nil {
+		logger.Logger.Errorf("GetLibrariesByIds err = %s \n", err.Error())
+		return nil, common.FailResponse(err.Error(), nil)
+	}
+	return libraries, nil
+}

app/system/service/dictService.go

@@ -15,63 +15,49 @@ var DictService = new(dictService)
 type dictService struct{}
 
 const (
-	ControlTypeKey = "%d:dict:control_type:%d"
 	ControlType    = "control_type"
 	ModuleType     = "module_his_type"
-	SexNameKey     = "%d:sys:sex_name:%d"
-	ModuleTypeKey  = "%d:dict:module_type:%d"
 	Sex            = "sex"
-)
+	ResolutionType = "resolution_type"
 
-func (s *dictService) GetByCode(code string) ([]dao.Dict, error) {
-	dict := &dao.Dict{Code: code}
-	return dict.GetByCode()
-}
+	SexNameKey        = "%d:sys:sex_name:%d"
+	ModuleTypeKey     = "%d:dict:module_type:%d"
+	ControlTypeKey    = "%d:dict:control_type:%d"
+	ResolutionTypeKey = "%d:dict:resolution_type:%d"
+)
 
-func (s *dictService) GetControlType(tenantId int, id int) string {
+func (s *dictService) GetCacheDict(redisKey, code string, dictId int) string {
 	var name string
-	key := fmt.Sprintf(ControlTypeKey, tenantId, id)
-	name, err := cache.Redis.Get(key).Result()
+	name, err := cache.Redis.Get(redisKey).Result()
 	if err != nil {
-		dict := &dao.Dict{Code: ControlType, DictKey: strconv.Itoa(id)}
+		dict := &dao.Dict{Code: code, DictKey: strconv.Itoa(dictId)}
 		if err := dict.GetByCodeAndKey(); err != nil {
 			logger.Logger.Errorf("GetByCodeAndKey err = %d \n", err)
 		} else {
 			name = dict.DictValue
-			cache.Redis.Set(key, name, -1)
+			cache.Redis.Set(redisKey, name, -1)
 		}
 	}
 	return name
 }
 
+func (s *dictService) GetByCode(code string) ([]dao.Dict, error) {
+	dict := &dao.Dict{Code: code}
+	return dict.GetByCode()
+}
+
+func (s *dictService) GetControlType(tenantId int, id int) string {
+	return s.GetCacheDict(fmt.Sprintf(ControlTypeKey, tenantId, id), ControlType, id)
+}
+
 func (s *dictService) GetModuleName(tenantId int, id int) string {
-	var name string
-	key := fmt.Sprintf(ModuleTypeKey, tenantId, id)
-	name, err := cache.Redis.Get(key).Result()
-	if err != nil {
-		dict := &dao.Dict{Code: ModuleType, DictKey: strconv.Itoa(id)}
-		if err := dict.GetByCodeAndKey(); err != nil {
-			logger.Logger.Errorf("GetByCodeAndKey err = %d \n", err)
-		} else {
-			name = dict.DictValue
-			cache.Redis.Set(key, name, -1)
-		}
-	}
-	return name
+	return s.GetCacheDict(fmt.Sprintf(ModuleTypeKey, tenantId, id), ModuleType, id)
 }
 
 func (s *dictService) GetSexName(tenantId int, id int) string {
-	var name string
-	key := fmt.Sprintf(SexNameKey, tenantId, id)
-	name, err := cache.Redis.Get(key).Result()
-	if err != nil {
-		dict := &dao.Dict{Code: Sex, DictKey: strconv.Itoa(id)}
-		if err := dict.GetByCodeAndKey(); err != nil {
-			logger.Logger.Errorf("GetByCodeAndKey err = %d \n", err)
-		} else {
-			name = dict.DictValue
-			cache.Redis.Set(key, name, -1)
-		}
-	}
-	return name
+	return s.GetCacheDict(fmt.Sprintf(SexNameKey, tenantId, id), Sex, id)
+}
+
+func (s *dictService) GetResolutionName(tenantId int, id int) string {
+	return s.GetCacheDict(fmt.Sprintf(ResolutionTypeKey, tenantId, id), ResolutionType, id)
 }

app/system/service/roleService.go

@@ -150,9 +150,9 @@ func (s *roleService) Remove(id int64) *common.Errors {
 }
 
 func (s *roleService) Grant(req *model.ReqRoleGrant) error {
-	roleIds := common.StringToIntArray(req.RoleIds)
+	roleIds := common.StringToInt64Array(req.RoleIds)
 	//todo 数据权限 接口权限
-	menuIds := common.StringToIntArray(req.MenuIds)
+	menuIds := common.StringToInt64Array(req.MenuIds)
 	menuErr := RoleMenuService.UpdateRoleMenus(roleIds, menuIds)
 	return menuErr
 }

router/router.go

@@ -462,8 +462,19 @@ func InitRouter(engine *gin.Engine) {
 	{
 		multimediaGroup.GET("/list", multimedia.Library.List)
 		multimediaGroup.GET("/detail", multimedia.Library.Detail)
-		multimediaGroup.GET("/remove", multimedia.Library.Remove)
+		multimediaGroup.POST("/remove", multimedia.Library.Remove)
 		multimediaGroup.GET("/getList", multimedia.Library.GetList)
 		multimediaGroup.POST("/putFile", multimedia.Library.UploadFile)
+		multimediaGroup.POST("/submit", multimedia.Library.Submit)
+	}
+	// 媒体节目
+	programGroup := engine.Group("/api/longchi/multimedia/programlibraries")
+	{
+		programGroup.GET("/list", multimedia.Program.List)
+		programGroup.GET("/detail", multimedia.Program.Detail)
+		programGroup.POST("/remove", multimedia.Program.Remove)
+		programGroup.GET("/getList", multimedia.Program.GetList)
+		programGroup.POST("/submit", multimedia.Program.Submit)
+		programGroup.POST("/getLibraryList", multimedia.Program.GetLibraryList)
 	}
 }

util/common/common.go

@@ -118,7 +118,7 @@ func RandomString2(n int) string {
 	return string(b)
 }
 
-func StringToIntArray(str string) []int64 {
+func StringToInt64Array(str string) []int64 {
 	tmp := strings.Split(str, ",")
 	var result []int64
 	for _, t := range tmp {
@@ -128,6 +128,16 @@ func StringToIntArray(str string) []int64 {
 	return result
 }
 
+func StringToIntArray(str string) []int {
+	tmp := strings.Split(str, ",")
+	var result []int
+	for _, t := range tmp {
+		i, _ := strconv.Atoi(t)
+		result = append(result, i)
+	}
+	return result
+}
+
 func MlParseTime(strTime string) (time.Time, error) {
 	if strings.Contains(strTime, ".") {
 		return time.ParseInLocation("2006-01-02 15:04:05.000", strTime, mLocation)