节目库相关功能修复

Makefile

@@ -0,0 +1,11 @@
+BINARY="build/iot_service"
+VERSION=1.0.0
+BASH_PATH=D:\Programs\Git\bin\bash.exe
+export GOARCH=amd64 #环境变量设置
+export GOOS=linux
+build:
+	@go build -o ${BINARY} ./
+
+push-test:
+	${BASH_PATH} ./push.sh
+.PHONY: build push-test

app/device/dao/infoBoardDao.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-//InfoBoard信息基本屏
+// InfoBoard InfoBoard信息基本屏
 type InfoBoard struct {
 	ID               int         `gorm:"primary_key" json:"id"`                            //编号
 	InfoName         string      `gorm:"type:varchar(60)" json:"infoName"`                 //名称

app/multimedia/controller/libraryController.go

@@ -35,6 +35,7 @@ func (c *libraryCtl) List(ctx *gin.Context) {
 	current, _ := strconv.Atoi(ctx.Query("current"))
 	size, _ := strconv.Atoi(ctx.Query("size"))
 	s := ctx.Query("sysType")
+	libTypeStr := ctx.Query("libType")
 
 	if current == 0 {
 		current = 1
@@ -47,9 +48,14 @@ func (c *libraryCtl) List(ctx *gin.Context) {
 		sysType, _ = strconv.Atoi(s)
 	}
 
+	libType := -1
+	if s != "" {
+		libType, _ = strconv.Atoi(libTypeStr)
+	}
+
 	value, _ := ctx.Get(middleware.Authorization)
 	claims := value.(*middleware.Claims)
-	libraries, err := service.LibraryService.List(claims.TenantId, searchValue, current, size, sysType)
+	libraries, err := service.LibraryService.List(claims.TenantId, searchValue, current, size, sysType, libType)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/multimedia/dao/libraryDao.go

@@ -41,6 +41,9 @@ func (c *Library) GetLibraries(offset, limit int) ([]Library, error) {
 	if c.SysType == 0 || c.SysType == 1 {
 		db = db.Where("sys_type = ?", c.SysType)
 	}
+	if c.LibType >= 1 {
+		db = db.Where("lib_type = ?", c.LibType)
+	}
 
 	err := db.Where("is_deleted = 0 and tenant_id = ?", c.TenantId).Offset(offset).Limit(limit).Find(&libraries).Error
 	return libraries, err
@@ -57,7 +60,7 @@ func (c *Library) Delete() error {
 
 func (c *Library) GetAll() ([]Library, error) {
 	var libraries []Library
-	db := Db.Debug().Model(&c).Where("tenant_id = ?", c.TenantId)
+	db := Db.Debug().Model(&c).Where("is_deleted=0 and tenant_id = ?", c.TenantId)
 	if c.LibName != "" {
 		db = db.Where("lib_name like ?", "%"+c.LibName+"%")
 	}
@@ -77,7 +80,8 @@ func (c *Library) Update() 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 (?)",
+	//err := Db.Debug().Model(&c).Where("is_deleted = 0 and tenant_id = ? and id in (?)",
+	err := Db.Debug().Model(&c).Where("tenant_id = ? and id in (?)",
 		c.TenantId, ids).Find(&libraries).Error
 	return libraries, err
 }

app/multimedia/service/libraryService.go

@@ -29,11 +29,12 @@ func (s *libraryService) Get(id int) (*dao.Library, *common.Errors) {
 	return library, nil
 }
 
-func (s *libraryService) List(tenantId int, searchValue string, current, size, sysType int) ([]model.LibraryDetail,
+func (s *libraryService) List(tenantId int, searchValue string, current, size, sysType, libType int) ([]model.LibraryDetail,
 	*common.Errors) {
 	library := &dao.Library{
 		TenantId: tenantId,
 		SysType:  sysType,
+		LibType:  libType,
 	}
 
 	offset := (current - 1) * size
@@ -45,6 +46,7 @@ func (s *libraryService) List(tenantId int, searchValue string, current, size, s
 	if sysType != -1 {
 		library.SysType = sysType
 	}
+	//fmt.Printf("sysType = %v", sysType)
 	libraries, err := library.GetLibraries(offset, limit)
 	if err != nil {
 		return nil, common.FailResponse(err.Error(), nil)
@@ -127,6 +129,10 @@ func (s *libraryService) UploadFile(tenantId int, fileHeader *multipart.FileHead
 		fileType = 1
 	} else if contentType == "audio/mpeg" {
 		fileType = 3
+	}
+	duration := 0
+	if strings.Contains(objectName, "mp4") || strings.Contains(objectName, "mp3") {
+
 	}
 	return &model.RspUploadFile{
 		Link:         config.Instance().Minio.Link + "/" + bucket + "/" + objectName,
@@ -134,7 +140,7 @@ func (s *libraryService) UploadFile(tenantId int, fileHeader *multipart.FileHead
 		Name:         objectName,
 		OriginalName: fileHeader.Filename,
 		AttachId:     0,
-		Duration:     0,
+		Duration:     duration,
 		Resolution:   "",
 		FileSize:     fileHeader.Size,
 		FileType:     fileType,
@@ -147,6 +153,7 @@ func (s *libraryService) Submit(tenantId int, userId int64, req dao.Library) *co
 	library.UpdateUser = userId
 	library.UpdateTime = time.Now()
 
+	fmt.Printf("library = %v", library)
 	if library.ID == 0 {
 		library.CreateTime = time.Now()
 		library.CreateUser = userId

app/multimedia/service/programService.go

@@ -154,8 +154,14 @@ func (s *programService) GetLibraryList(tenantId, programId int) ([]dao.Library,
 	for _, relation := range relations {
 		libraryIds = append(libraryIds, relation.LibraryId)
 	}
+	//fmt.Printf("libraryIds = %v", libraryIds)
 	library := &dao.Library{TenantId: tenantId}
 	libraries, err := library.GetLibrariesByIds(libraryIds)
+	for i, librarie := range libraries {
+		if librarie.LibDuration == 0 {
+			libraries[i].LibDuration = 3000 //图片默认给个3秒
+		}
+	}
 	if err != nil {
 		logger.Logger.Errorf("GetLibrariesByIds err = %s \n", err.Error())
 		return nil, common.FailResponse(err.Error(), nil)
@@ -182,7 +188,6 @@ func (s *programService) RelationDeviceList(tenantId, sysType, resolution int) (
 				infoBoardMap[device.GroupId] = []model.ProgramDevice{programDevice}
 			}
 		}
-
 	} else if sysType == model.SysTypeBroadcast {
 		ipBroadcastDevices := deviceService.IpBroadcastService.GetAll(tenantId)
 		for _, device := range ipBroadcastDevices {

main.go

@@ -23,9 +23,12 @@ import (
 )
 
 func main() {
-	// 开始调试模式
-	gin.SetMode("debug")
-
+	// 只在本地开调试模式
+	if isDevEnv() {
+		gin.SetMode(gin.DebugMode)
+	} else {
+		gin.SetMode(gin.ReleaseMode)
+	}
 	logger.InitLog()
 	// 实例化配置
 	initDB()
@@ -37,6 +40,11 @@ func main() {
 	controller.CalcTask()
 	engine := gin.Default()
 	router.InitRouter(engine)
+	if isDevEnv() {
+		println(gin.DebugMode + "当前为开发环境，会产生较多调试日志")
+	} else {
+		println(gin.ReleaseMode)
+	}
 	_ = engine.Run(config.Instance().Server.Address)
 }
 
@@ -49,7 +57,7 @@ func initDB() {
 		Colorful:      true,
 	})
 	// 如果是本地开发环境 则 打印gorm 查询日志到控制台
-	if os.Getenv("DEV_ENV") == "1" {
+	if isDevEnv() {
 		logCfg = gormLogger.Default
 	}
 	//logCfg = gormLogger.Default
@@ -76,3 +84,13 @@ func initDB() {
 	data.InitDB(db)
 	record.InitDB(db)
 }
+
+// isDevEnv 是否开发环境 本地开发需要添加环境变量
+// 		[windows] CMD下执行 setx "DEV_ENV" "1"
+//		[linux] export DEV_ENV="1"
+func isDevEnv() bool {
+	if os.Getenv("DEV_ENV") == "1" {
+		return true
+	}
+	return false
+}

push.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
-ssh root@110.40.223.170 "/usr/bin/killall iot_service"
-ssh root@110.40.223.170 "/usr/bin/rm -r /opt/lc/iot_svr/iot_service"
+ssh root@110.40.223.170 "service  go-iot_service stop;/usr/bin/rm -r /opt/lc/iot_svr/iot_service"
 scp -r build/* root@110.40.223.170:/opt/lc/iot_svr/
-
-# 以下需要 在线上服务器执行
-# /opt/lc/iot_svr/start.sh
+ssh root@110.40.223.170 "chmod +x /opt/lc/iot_svr/iot_service;service  go-iot_service start;sleep 3;service  go-iot_service status"