修复 led屏

app/device/controller/infoBoardController.go

@@ -185,8 +185,7 @@ func (s *infoBoardCtl) CronSyncLedPaying(id int) {
 	for _, led := range list {
 		_, retState := cache.GetDeviceState(led.Sn)
 		currPaying := cache.GetDeviceLedData(led.Sn)
-		if retState == "1" {
-
+		if retState == "1" && len(currPaying) != 0 {
 			playing := currPaying["playing"].(string) //得到当前正播放的节目
 			fmt.Printf("led信息屏设备Sn = %v 当前正在播放[%v]", led.Sn, playing)
 			playJson := service2.PublishLibrariesService.LedPaying(led.ID, playing)

app/device/dao/lightControlDao.go

@@ -114,7 +114,7 @@ func (c LightControl) GetDevices(offset, limit int) ([]LightControl, int64, erro
 
 	db = db.Where("is_deleted = 0")
 	db.Count(&count)
-	err := db.Offset(offset).Limit(limit).Find(&devices).Error
+	err := db.Offset(offset).Limit(limit).Order("name asc").Find(&devices).Error
 	return devices, count, err
 }
 

app/device/service/infoBoardService.go

@@ -110,7 +110,7 @@ func (s *infoBoardService) rewriteBoardDetail(d dao.InfoBoard) model.InfoBoardDe
 			logger.Logger.Errorf("rewriteBoardDetail err2 = %v \n", err)
 			return detail
 		}
-		detail.Power = "不在线"
+		detail.Power = "边缘程序未升级"
 		if cltData.RealWidth != "" {
 			detail.ResolutionName = fmt.Sprintf("%v * %v", cltData.RealWidth, cltData.RealHeight)
 			detail.OnTheAir = cltData.Playing

app/multimedia/service/libraryService.go

@@ -105,7 +105,8 @@ func (s *libraryService) UploadFile(tenantId string, fileHeader *multipart.FileH
 	// happy8as8f0980f_92389h.jpg
 	objectName := "library/" + common.RandomString2(16) + "_" + common.RandomString2(6) + "." + fileNameArray[len(
 		fileNameArray)-1]
-	bucket := fmt.Sprintf("longchi-%d", tenantId)
+
+	bucket := fmt.Sprintf("longchi-%v", tenantId)
 	err = minio.PutFile(minio.FileObject{
 		Bucket:     bucket,
 		ObjectName: objectName,