素材和节目

app/multimedia/controller/libraryController.go

@@ -3,6 +3,7 @@ package controller
 import (
 	"github.com/gin-gonic/gin"
 	"iot_manager_service/app/middleware"
+	"iot_manager_service/app/multimedia/dao"
 	"iot_manager_service/app/multimedia/model"
 	"iot_manager_service/app/multimedia/service"
 	"iot_manager_service/util/common"
@@ -33,17 +34,22 @@ func (c *libraryCtl) List(ctx *gin.Context) {
 	searchValue := ctx.Query("searchValue")
 	current, _ := strconv.Atoi(ctx.Query("current"))
 	size, _ := strconv.Atoi(ctx.Query("size"))
+	s := ctx.Query("sysType")
+
 	if current == 0 {
 		current = 1
 	}
 	if size <= 0 || size > 100 {
 		size = 10
 	}
+	sysType := -1
+	if s != "" {
+		sysType, _ = strconv.Atoi(s)
+	}
 
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
-
-	libraries, err := service.LibraryService.List(claims.TenantId, searchValue, current, size)
+	libraries, err := service.LibraryService.List(claims.TenantId, searchValue, current, size, sysType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -81,6 +87,7 @@ func (c *libraryCtl) Remove(ctx *gin.Context) {
 func (c *libraryCtl) GetList(ctx *gin.Context) {
 	libName := ctx.Query("libName")
 	t := ctx.Query("libType")
+	s := ctx.Query("sysType")
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
 
@@ -88,8 +95,12 @@ func (c *libraryCtl) GetList(ctx *gin.Context) {
 	if t != "" {
 		libType, _ = strconv.Atoi(t)
 	}
+	sysType := -1
+	if s != "" {
+		sysType, _ = strconv.Atoi(s)
+	}
 
-	library, err := service.LibraryService.GetList(claims.TenantId, libName, libType)
+	library, err := service.LibraryService.GetList(claims.TenantId, libName, libType, sysType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -115,7 +126,7 @@ func (c *libraryCtl) UploadFile(ctx *gin.Context) {
 }
 
 func (c *libraryCtl) Submit(ctx *gin.Context) {
-	var req *model.ReqLibrarySubmit
+	var req dao.Library
 	if err := ctx.ShouldBindJSON(&req); err != nil {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
 		return

app/multimedia/controller/programController.go

@@ -33,17 +33,22 @@ func (c *programCtl) List(ctx *gin.Context) {
 	searchValue := ctx.Query("searchValue")
 	current, _ := strconv.Atoi(ctx.Query("current"))
 	size, _ := strconv.Atoi(ctx.Query("size"))
+	s := ctx.Query("sysType")
 	if current == 0 {
 		current = 1
 	}
 	if size <= 0 || size > 100 {
 		size = 10
 	}
+	sysType := -1
+	if s != "" {
+		sysType, _ = strconv.Atoi(s)
+	}
 
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
 
-	libraries, err := service.ProgramService.List(claims.TenantId, searchValue, current, size)
+	libraries, err := service.ProgramService.List(claims.TenantId, searchValue, current, size, sysType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
@@ -124,3 +129,21 @@ func (c *programCtl) GetLibraryList(ctx *gin.Context) {
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, libraries))
 }
+
+func (c *programCtl) RelationDeviceList(ctx *gin.Context) {
+	resolutionStr := ctx.Query("resolution")
+	resolution, e := strconv.Atoi(resolutionStr)
+	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.RelationDeviceList(claims.TenantId, resolution)
+	if err != nil {
+		ctx.JSON(http.StatusOK, e)
+		return
+	}
+	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, libraries))
+}

app/multimedia/dao/libraryDao.go

@@ -15,6 +15,7 @@ type Library struct {
 	LibDuration     int       `gorm:"type:int;default 0" json:"libDuration"`      //获取视频时长
 	FileId          string    `gorm:"type:varchar(255)" json:"fileId"`            //文件ID，系统类型为广播系统时使用
 	TalkSpeed       int       `gorm:"type:int;default 0" json:"talkSpeed"`        //语速(用于文字广播)：0-正常,1-快一些,2-很快
+	SysType         int       `gorm:"type:int" json:"sysType"`                    //系统类型：0-信息发布系统，1-广播系统
 	TenantId        int       `gorm:"type:int" json:"tenantId"`                   //租户ID
 	CreateTime      time.Time `gorm:"type:datetime" json:"createTime"`            //新增时间
 	CreateUser      int64     `gorm:"type:bigint" json:"createUser"`              //新增记录操作用户ID
@@ -37,6 +38,9 @@ func (c *Library) GetLibraries(offset, limit int) ([]Library, error) {
 	if c.LibName != "" {
 		db = db.Where("lib_name like ?", "%"+c.LibName+"%")
 	}
+	if c.SysType == 0 || c.SysType == 1 {
+		db = db.Where("sys_type = ?", c.SysType)
+	}
 
 	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&libraries).Error
 	return libraries, err
@@ -60,6 +64,9 @@ func (c *Library) GetAll() ([]Library, error) {
 	if c.LibType > 0 {
 		db = db.Where("lib_type = ?", c.LibType)
 	}
+	if c.SysType == 0 || c.SysType == 1 {
+		db = db.Where("sys_type = ?", c.SysType)
+	}
 	err := db.Find(&libraries).Order("create_time").Error
 	return libraries, err
 }

app/multimedia/dao/programDao.go

@@ -12,6 +12,7 @@ type Program struct {
 	FileSize    int64     `gorm:"type:bigint" json:"fileSize"`           //统计文件总大小
 	ImgDuration int       `gorm:"type:int;default 0" json:"imgDuration"` //图片播放时长(毫秒)
 	Remarks     string    `gorm:"type:varchar(4000)" json:"remarks"`     //备注
+	SysType     int       `gorm:"type:int" json:"sysType"`               //系统类型：0-信息发布系统，1-广播系统
 	TenantId    int       `gorm:"type:int" json:"tenantId"`              //租户ID
 	CreateTime  time.Time `gorm:"type:datetime" json:"createTime"`       //新增时间
 	CreateUser  int64     `gorm:"type:bigint" json:"createUser"`         //新增记录操作用户ID
@@ -38,6 +39,9 @@ func (c *Program) GetPrograms(offset, limit int) ([]Program, error) {
 	if c.Name != "" {
 		db = db.Where("name like ?", "%"+c.Name+"%")
 	}
+	if c.SysType == 0 || c.SysType == 1 {
+		db = db.Where("sys_type = ?", c.SysType)
+	}
 
 	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&Programs).Error
 	return Programs, err

app/multimedia/model/program.go

@@ -25,6 +25,7 @@ type ReqProgramSubmit struct {
 	FileSize       int64  `json:"fileSize"`       //统计文件总大小
 	ImgDuration    int    `json:"imgDuration"`    //图片播放时长(毫秒)
 	Remarks        string `json:"remarks"`        //备注
+	SysType        int    `json:"sysType"`        //系统类型：0-信息发布系统，1-广播系统
 	LibraryIds     string `json:"libraryIds"`     //组合素材ID 逗号分割
 	ResolutionName string `json:"resolutionName"` //分辨率
 }

app/multimedia/service/libraryService.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"fmt"
 	"iot_manager_service/app/multimedia/dao"
 	"iot_manager_service/app/multimedia/model"
 	"iot_manager_service/app/system/service"
@@ -28,10 +29,11 @@ func (s *libraryService) Get(id int) (*dao.Library, *common.Errors) {
 	return library, nil
 }
 
-func (s *libraryService) List(tenantId int, searchValue string, current, size int) ([]model.LibraryDetail,
+func (s *libraryService) List(tenantId int, searchValue string, current, size, sysType int) ([]model.LibraryDetail,
 	*common.Errors) {
 	library := &dao.Library{
 		TenantId: tenantId,
+		SysType:  sysType,
 	}
 
 	offset := (current - 1) * size
@@ -40,6 +42,9 @@ func (s *libraryService) List(tenantId int, searchValue string, current, size in
 	if searchValue != "" {
 		library.LibName = searchValue
 	}
+	if sysType != -1 {
+		library.SysType = sysType
+	}
 	libraries, err := library.GetLibraries(offset, limit)
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
@@ -68,11 +73,12 @@ func (s *libraryService) Remove(userId int64, tenantId int, id int) *common.Erro
 	return nil
 }
 
-func (s *libraryService) GetList(tenantId int, libName string, libType int) ([]dao.Library, *common.Errors) {
+func (s *libraryService) GetList(tenantId int, libName string, libType, sysType int) ([]dao.Library, *common.Errors) {
 	library := &dao.Library{
 		TenantId: tenantId,
 		LibName:  libName,
 		LibType:  libType,
+		SysType:  sysType,
 	}
 	libraries, err := library.GetAll()
 	if err != nil {
@@ -97,9 +103,9 @@ func (s *libraryService) UploadFile(tenantId int, fileHeader *multipart.FileHead
 	// happy8as8f0980f_92389h.jpg
 	objectName := "library/" + common.RandomString2(16) + "_" + common.RandomString2(6) + "." + fileNameArray[len(
 		fileNameArray)-1]
-
+	bucket := fmt.Sprintf("longchi-%d", tenantId)
 	err = minio.PutFile(minio.FileObject{
-		TenantId:   tenantId,
+		Bucket:     bucket,
 		ObjectName: objectName,
 		ObjectSize: fileHeader.Size,
 		Reader:     fileContent,
@@ -123,7 +129,7 @@ func (s *libraryService) UploadFile(tenantId int, fileHeader *multipart.FileHead
 		fileType = 3
 	}
 	return &model.RspUploadFile{
-		Link:         config.Instance().Minio.Endpoint,
+		Link:         config.Instance().Minio.Link + "/" + bucket + "/" + objectName,
 		Domain:       "",
 		Name:         objectName,
 		OriginalName: fileHeader.Filename,
@@ -135,22 +141,11 @@ func (s *libraryService) UploadFile(tenantId int, fileHeader *multipart.FileHead
 	}, nil
 }
 
-func (s *libraryService) Submit(tenantId int, userId int64, req *model.ReqLibrarySubmit) *common.Errors {
-	library := &dao.Library{
-		ID:              req.Id,
-		MaterialAddress: req.MaterialAddress,
-		LibName:         req.LibName,
-		LibExplain:      req.LibExplain,
-		LibType:         req.LibType,
-		Resolution:      req.Resolution,
-		FileSize:        req.FileSize,
-		LibDuration:     req.LibDuration,
-		TalkSpeed:       req.TalkSpeed,
-		TenantId:        tenantId,
-		UpdateTime:      time.Now(),
-		UpdateUser:      userId,
-		IsDeleted:       0,
-	}
+func (s *libraryService) Submit(tenantId int, userId int64, req dao.Library) *common.Errors {
+	library := &req
+	library.TenantId = tenantId
+	library.UpdateUser = userId
+	library.UpdateTime = time.Now()
 
 	if library.ID == 0 {
 		library.CreateTime = time.Now()

app/multimedia/service/programService.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	deviceModel "iot_manager_service/app/device/model"
 	"iot_manager_service/app/multimedia/dao"
 	"iot_manager_service/app/multimedia/model"
 	"iot_manager_service/app/system/service"
@@ -24,9 +25,9 @@ func (s *programService) Get(id int) (*dao.Program, *common.Errors) {
 	return Program, nil
 }
 
-func (s *programService) List(tenantId int, searchValue string, current, size int) ([]model.ProgramDetail,
+func (s *programService) List(tenantId int, searchValue string, current, size, sysType int) ([]model.ProgramDetail,
 	*common.Errors) {
-	Program := &dao.Program{
+	program := &dao.Program{
 		TenantId: tenantId,
 	}
 
@@ -34,9 +35,13 @@ func (s *programService) List(tenantId int, searchValue string, current, size in
 	limit := size
 
 	if searchValue != "" {
-		Program.Name = searchValue
+		program.Name = searchValue
+	}
+	if sysType != -1 {
+		program.SysType = sysType
 	}
-	programs, err := Program.GetPrograms(offset, limit)
+
+	programs, err := program.GetPrograms(offset, limit)
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
 	}
@@ -143,11 +148,11 @@ func (s *programService) GetLibraryList(tenantId, programId int) ([]dao.Library,
 		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 {
@@ -156,3 +161,8 @@ func (s *programService) GetLibraryList(tenantId, programId int) ([]dao.Library,
 	}
 	return libraries, nil
 }
+
+func (s *programService) RelationDeviceList(tenantId, resolution int) ([]deviceModel.LampPoleGroupDetail,
+	*common.Errors) {
+	return nil, nil
+}

config/config.go

@@ -69,6 +69,7 @@ type logger struct {
 
 type minio struct {
 	Endpoint  string `yaml:"endpoint"`
+	Link      string `yaml:"link"`
 	AccessKey string `yaml:"access_key"`
 	SecretKey string `yaml:"secret_key"`
 }

config/config.yaml

@@ -30,5 +30,6 @@ redis:
 
 minio:
   endpoint: "110.40.223.170:9000"
+  link: "http://110.40.223.170:9000"
   access_key: "lczm*minio"
   secret_key: "lczm*minio"

router/router.go

@@ -476,5 +476,6 @@ func InitRouter(engine *gin.Engine) {
 		programGroup.GET("/getList", multimedia.Program.GetList)
 		programGroup.POST("/submit", multimedia.Program.Submit)
 		programGroup.POST("/getLibraryList", multimedia.Program.GetLibraryList)
+		programGroup.POST("/relationDeviceList", multimedia.Program.RelationDeviceList)
 	}
 }

util/minio/minio.go

@@ -0,0 +1,44 @@
+package minio
+
+import (
+	"context"
+	"fmt"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"io"
+	"iot_manager_service/config"
+	"iot_manager_service/util/logger"
+)
+
+type FileObject struct {
+	Bucket     string
+	ObjectName string
+	ObjectSize int64
+	Reader     io.Reader
+}
+
+var minioClient *minio.Client
+
+func InitMinio() {
+	cfg := config.Instance()
+
+	client, err := minio.New(cfg.Minio.Endpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(cfg.Minio.AccessKey, cfg.Minio.SecretKey, ""),
+		Secure: false,
+	})
+	if err != nil {
+		panic(fmt.Sprintf("InitMinio err = %s", err.Error()))
+	}
+	minioClient = client
+}
+
+func PutFile(fileObject FileObject) error {
+	ctx := context.Background()
+	_, err := minioClient.PutObject(ctx, fileObject.Bucket, fileObject.ObjectName, fileObject.Reader, fileObject.ObjectSize,
+		minio.PutObjectOptions{})
+	if err != nil {
+		logger.Logger.Errorf("PutObject fail, err = %s", err.Error())
+		return err
+	}
+	return nil
+}