Преглед на файлове

增加了未上传镜像的游戏查询展示

倚楼听风雨 преди 2 години
родител
ревизия
85182ca6c5
променени са 4 файла, в които са добавени 63 реда и са изтрити 10 реда
  1. 14 0
      api/v1/fileManager/file_qiniu.go
  2. 10 10
      initialize/timer.go
  3. 1 0
      router/fileManager/file_qiniu.go
  4. 38 0
      service/fileManager/file_qiniu.go

+ 14 - 0
api/v1/fileManager/file_qiniu.go

@@ -109,3 +109,17 @@ func (v *ApiFileQiniu) UpdateMirrorPushPolicy(c *gin.Context) {
 		response.OkWithMessage("修改镜像更新策略成功", c)
 	}
 }
+
+// CheckIsExistMirror 查询所有游戏任务下是否有镜像
+func (v *ApiFileQiniu) CheckIsExistMirror(c *gin.Context) {
+
+	if list, err := ServiceFileQiniu.CheckIsExistMirror(); err != nil {
+		//global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	} else {
+		//响应结果
+		response.OkWithDetailed(response.PageResult{
+			List: list,
+		}, "获取成功", c)
+	}
+}

+ 10 - 10
initialize/timer.go

@@ -201,14 +201,14 @@ func Timer() {
 	//}
 
 	//一小时同步一次IP信息,播报是否有异常
-	_, err := global.GVA_Timer.AddTaskByFunc("SyncIPMessage", "0 0 * * * ? ", robotService.SyncIPMessage)
-	if err != nil {
-		fmt.Println("add SyncIPMessage timer error:", err)
-	}
-
-	//定时查看延迟更新的镜像是否到期
-	_, err = global.GVA_Timer.AddTaskByFunc("CheckPushTime", "35 0/2 * * * *", serviceFileQiniu.CheckPushTime)
-	if err != nil {
-		fmt.Println("add CheckPushTime timer error:", err)
-	}
+	//_, err := global.GVA_Timer.AddTaskByFunc("SyncIPMessage", "0 0 * * * ? ", robotService.SyncIPMessage)
+	//if err != nil {
+	//	fmt.Println("add SyncIPMessage timer error:", err)
+	//}
+	//
+	////定时查看延迟更新的镜像是否到期
+	//_, err = global.GVA_Timer.AddTaskByFunc("CheckPushTime", "35 0/2 * * * *", serviceFileQiniu.CheckPushTime)
+	//if err != nil {
+	//	fmt.Println("add CheckPushTime timer error:", err)
+	//}
 }

+ 1 - 0
router/fileManager/file_qiniu.go

@@ -20,5 +20,6 @@ func (e *FileQiniuRouter) InitFileQiniuRouter(Router *gin.RouterGroup) {
 		excelRouter.POST("renameQiniuFileAndRecord", api.RenameQiniuFileAndRecord)  //删除单个文件
 		excelRouter.GET("getMirrorDownloadByTaskId", api.GetMirrorDownloadByTaskId) //根据任务id获取最新镜像下载链接
 		excelRouter.POST("updateMirrorPushPolicy", api.UpdateMirrorPushPolicy)      //删除单个文件
+		excelRouter.POST("checkIsExistMirror", api.CheckIsExistMirror)              //查询未上传镜像的游戏任务
 	}
 }

+ 38 - 0
service/fileManager/file_qiniu.go

@@ -10,6 +10,7 @@ import (
 	"log-server/model/fileManager"
 	"log-server/model/fileManager/request"
 	"log-server/model/fileManager/response"
+	"log-server/model/task"
 	"strconv"
 	"strings"
 	"time"
@@ -76,6 +77,43 @@ func (s *ServiceFileQiniu) QueryFilesByParentId(parentId int) (interface{}, erro
 	return fileList, err
 }
 
+// CheckIsExistMirror 查询所有游戏任务下是否有镜像
+func (s *ServiceFileQiniu) CheckIsExistMirror() (interface{}, error) {
+	// 查询所有任务
+	var taskList []task.GameTask
+	db := global.GVA_DB.Model(&task.GameTask{}).Where("status = 1")
+	err := db.Order("user").Find(&taskList).Error
+	if err != nil {
+		return nil, err
+	}
+	// 查询所有镜像
+	var mirrorList []fileManager.FileQiniu
+	db2 := global.GVA_DB.Model(&fileManager.FileQiniu{}).Where(`file_name LIKE '%.ldbk' OR file_name LIKE '%.npbk'`)
+	err = db2.Order("id").Find(&mirrorList).Error
+	if err != nil {
+		return nil, err
+	}
+	var noMirrorList []task.GameTask
+	for _, gameTask := range taskList {
+		exist := false
+		for _, qiniu := range mirrorList {
+			if gameTask.TaskId == qiniu.TaskId {
+				exist = true
+				break
+			}
+		}
+		if exist == false {
+			noMirrorList = append(noMirrorList, gameTask)
+		}
+	}
+
+	//for _, gameTask := range noMirrorList {
+	//	global.GVA_LOG.Warn(gameTask.TaskName)
+	//}
+
+	return noMirrorList, err
+}
+
 // GetMirrorDownloadByTaskId 根据任务id获取最新镜像下载链接
 func (s *ServiceFileQiniu) GetMirrorDownloadByTaskId(taskId string) (interface{}, error) {
 	//SELECT * FROM file_qiniu WHERE task_id = 1000605 AND (file_type = 2 OR file_type = 4) AND push_policy = 1 ORDER BY file_version DESC LIMIT 1