Merge branch 'dev' of http://gitea.tools.fontree.cn:3000/fiee/fonchain-fiee into dev

pkg/common/qwen/qwen_vl.go

@@ -70,8 +70,9 @@ func VL(videoURLs []string, imageURLs []string, text string, model string) (resp
 
 	// 发送请求，使用PostBytesHeader获取状态码和响应体
 	statusCode, body, err := utils.PostBytesHeader(modelQwen.DashscopeVLURL, map[string]interface{}{
-		"Authorization": "Bearer " + modelQwen.DashscopeAPIKey,
+		"Authorization":                  "Bearer " + modelQwen.DashscopeAPIKey,
-		"Content-Type":  "application/json",
+		"Content-Type":                   "application/json",
+		"X-DashScope-OssResourceResolve": "enable", // 启用OSS资源解析
 	}, jsonData)
 	if err != nil {
 		zap.L().Error("VL Post failed", zap.Error(err))

pkg/router/taskBench.go

@@ -16,28 +16,22 @@ func TaskBenchRouter(r *gin.RouterGroup) {
 	taskBenchRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 	// 任务台管理
 	{
-		// 查询待指派任务记录
-		taskBenchRoute.POST("pending-task-list", taskbench.GetPendingTaskList)
-
 		// 待指派任务布局
 		taskBenchRoute.POST("pending-task-layout", taskbench.GetPendingTaskLayout)
 		taskBenchRoute.POST("set-pending-task-layout", taskbench.SetPendingTaskLayout)
 
-		// 指派某位员工完成某个艺人的任务
+		// 指派
 		taskBenchRoute.POST("assign-task", taskbench.AssignTask)
 
-		// 批量指派任务
+		// 批量指派
 		taskBenchRoute.POST("batch-assign-task", taskbench.BatchAssignTask)
 
-		// 中止指派任务（根据任务指派记录UUID）
+		// 中止指派
 		taskBenchRoute.POST("terminate-task-by-uuid", taskbench.TerminateTaskByUUID)
 
-		// 批量中止指派任务（根据多个任务指派记录UUID）
+		// 批量中止指派
 		taskBenchRoute.POST("batch-terminate-task", taskbench.BatchTerminateTask)
 
-		// 修改待发数量
-		taskBenchRoute.POST("update-pending-count", taskbench.UpdatePendingCount)
-
 		// 查询最近被指派记录
 		taskBenchRoute.POST("recent-assign-records", taskbench.GetRecentAssignRecords)
 
@@ -62,12 +56,6 @@ func TaskBenchRouter(r *gin.RouterGroup) {
 		// 员工手动点击完成任务
 		taskBenchRoute.POST("complete-manually", taskbench.CompleteTaskManually)
 
-		// 查询艺人套餐剩余数量
-		taskBenchRoute.POST("artist-bundle-balance", taskbench.GetArtistBundleBalance)
-
-		// 批量查询艺人待上传数量
-		taskBenchRoute.POST("batch-get-pending-upload", taskbench.GetPendingUploadBreakdown)
-
 		// 查询艺人待上传列表
 		taskBenchRoute.POST("pending-upload-list", taskbench.GetArtistUploadStatsList)
 
@@ -81,12 +69,4 @@ func TaskBenchRouter(r *gin.RouterGroup) {
 		taskBenchRoute.POST("pending-data-list", taskbench.GetPendingAssign)
 	}
 
-	// 员工任务相关路由（需要App登录验证）
-	taskBenchAppRoute := r.Group("task-bench")
-	taskBenchAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
-
-	{
-		// 员工实际完成任务状态更新
-		taskBenchAppRoute.POST("update-progress", taskbench.UpdateTaskProgress)
-	}
 }

pkg/service/taskbench/taskBench.go

@@ -22,23 +22,6 @@ import (
 	"go.uber.org/zap"
 )
 
-// GetPendingTaskList 查询待指派任务记录
-func GetPendingTaskList(c *gin.Context) {
-	var req bundle.TaskQueryRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	res, err := service.BundleProvider.GetPendingTaskList(context.Background(), &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	service.Success(c, res)
-}
-
 func GetPendingTaskLayout(c *gin.Context) {
 	res, err := service.BundleProvider.GetPendingTaskLayout(context.Background(), &bundle.GetPendingTaskLayoutReq{})
 	if err != nil {
@@ -144,26 +127,6 @@ func BatchTerminateTask(c *gin.Context) {
 	service.Success(c, res)
 }
 
-// UpdatePendingCount 修改待发数量
-func UpdatePendingCount(c *gin.Context) {
-	var req bundle.UpdatePendingCountRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		service.Error(c, err)
-		return
-	}
-	userInfo := login.GetUserInfoFromC(c)
-	req.OperatorNum = userInfo.TelNum
-	req.Operator = userInfo.Name
-
-	res, err := service.BundleProvider.UpdatePendingCount(context.Background(), &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	service.Success(c, res)
-}
-
 // GetRecentAssignRecords 查询最近被指派记录
 func GetRecentAssignRecords(c *gin.Context) {
 	var req bundle.RecentAssignRecordsRequest
@@ -238,23 +201,6 @@ func CompleteTaskManually(c *gin.Context) {
 	service.Success(c, res)
 }
 
-// UpdateTaskProgress 员工实际完成任务状态更新
-func UpdateTaskProgress(c *gin.Context) {
-	var req bundle.UpdateTaskProgressRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	res, err := service.BundleProvider.UpdateTaskProgress(context.Background(), &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	service.Success(c, res)
-}
-
 // GetTaskAssignRecordsList 多条件查询操作记录表
 func GetTaskAssignRecordsList(c *gin.Context) {
 	var req bundle.TaskAssignRecordsQueryRequest
@@ -532,23 +478,6 @@ func UpdateWorkVideoWithUUID(ctx *gin.Context) {
 	return
 }
 
-// GetArtistBundleBalance 查询艺人套餐剩余数量
-func GetArtistBundleBalance(c *gin.Context) {
-	var req bundle.ArtistBundleBalanceRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	res, err := service.BundleProvider.GetArtistBundleBalance(context.Background(), &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	service.Success(c, res)
-}
-
 // GetArtistUploadStatsList 查询艺人待上传列表
 func GetArtistUploadStatsList(c *gin.Context) {
 	var req bundle.TaskQueryRequest
@@ -566,22 +495,6 @@ func GetArtistUploadStatsList(c *gin.Context) {
 	service.Success(c, res)
 }
 
-func GetPendingUploadBreakdown(c *gin.Context) {
-	var req bundle.PendingUploadBreakdownRequest
-	if err := c.ShouldBindJSON(&req); err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	res, err := service.BundleProvider.GetPendingUploadBreakdown(context.Background(), &req)
-	if err != nil {
-		service.Error(c, err)
-		return
-	}
-
-	service.Success(c, res)
-}
-
 // GetArtistUploadStatsListDownload 导出艺人待上传列表为Excel
 func GetArtistUploadStatsListDownload(c *gin.Context) {
 	var req bundle.TaskQueryRequest