Merge branch 'feat-cjy-taskBench2' into dev

api/bundle/bundle.validator.pb.go

@@ -571,6 +571,9 @@ func (this *CompleteTaskManuallyRequest) Validate() error {
 func (this *TerminateTaskByUUIDRequest) Validate() error {
 	return nil
 }
+func (this *BatchTerminateTaskRequest) Validate() error {
+	return nil
+}
 func (this *GetTaskActualStatusByUUIDRequest) Validate() error {
 	return nil
 }

api/bundle/bundle_triple.pb.go

@@ -100,6 +100,7 @@ type BundleClient interface {
 	TerminateTaskByUUID(ctx context.Context, in *TerminateTaskByUUIDRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	GetTaskActualStatusByUUID(ctx context.Context, in *GetTaskActualStatusByUUIDRequest, opts ...grpc_go.CallOption) (*GetTaskActualStatusByUUIDResponse, common.ErrorWithAttachment)
 	BatchAssignTask(ctx context.Context, in *BatchAssignTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
+	BatchTerminateTask(ctx context.Context, in *BatchTerminateTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment)
 	GetArtistUploadStatsList(ctx context.Context, in *TaskQueryRequest, opts ...grpc_go.CallOption) (*ArtistUploadStatsResponse, common.ErrorWithAttachment)
 	MetricsBusiness(ctx context.Context, in *MetricsBusinessReq, opts ...grpc_go.CallOption) (*MetricsBusinessResp, common.ErrorWithAttachment)
 	MetricsOperatingCreate(ctx context.Context, in *MetricsOperatingCreateReq, opts ...grpc_go.CallOption) (*MetricsOperatingCreateResp, common.ErrorWithAttachment)
@@ -179,6 +180,7 @@ type BundleClientImpl struct {
 	TerminateTaskByUUID                      func(ctx context.Context, in *TerminateTaskByUUIDRequest) (*ComResponse, error)
 	GetTaskActualStatusByUUID                func(ctx context.Context, in *GetTaskActualStatusByUUIDRequest) (*GetTaskActualStatusByUUIDResponse, error)
 	BatchAssignTask                          func(ctx context.Context, in *BatchAssignTaskRequest) (*ComResponse, error)
+	BatchTerminateTask                       func(ctx context.Context, in *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList                 func(ctx context.Context, in *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
 	MetricsBusiness                          func(ctx context.Context, in *MetricsBusinessReq) (*MetricsBusinessResp, error)
 	MetricsOperatingCreate                   func(ctx context.Context, in *MetricsOperatingCreateReq) (*MetricsOperatingCreateResp, error)
@@ -590,6 +592,12 @@ func (c *bundleClient) BatchAssignTask(ctx context.Context, in *BatchAssignTaskR
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchAssignTask", in, out)
 }
 
+func (c *bundleClient) BatchTerminateTask(ctx context.Context, in *BatchTerminateTaskRequest, opts ...grpc_go.CallOption) (*ComResponse, common.ErrorWithAttachment) {
+	out := new(ComResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/BatchTerminateTask", in, out)
+}
+
 func (c *bundleClient) GetArtistUploadStatsList(ctx context.Context, in *TaskQueryRequest, opts ...grpc_go.CallOption) (*ArtistUploadStatsResponse, common.ErrorWithAttachment) {
 	out := new(ArtistUploadStatsResponse)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -708,6 +716,7 @@ type BundleServer interface {
 	TerminateTaskByUUID(context.Context, *TerminateTaskByUUIDRequest) (*ComResponse, error)
 	GetTaskActualStatusByUUID(context.Context, *GetTaskActualStatusByUUIDRequest) (*GetTaskActualStatusByUUIDResponse, error)
 	BatchAssignTask(context.Context, *BatchAssignTaskRequest) (*ComResponse, error)
+	BatchTerminateTask(context.Context, *BatchTerminateTaskRequest) (*ComResponse, error)
 	GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error)
 	MetricsBusiness(context.Context, *MetricsBusinessReq) (*MetricsBusinessResp, error)
 	MetricsOperatingCreate(context.Context, *MetricsOperatingCreateReq) (*MetricsOperatingCreateResp, error)
@@ -918,6 +927,9 @@ func (UnimplementedBundleServer) GetTaskActualStatusByUUID(context.Context, *Get
 func (UnimplementedBundleServer) BatchAssignTask(context.Context, *BatchAssignTaskRequest) (*ComResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BatchAssignTask not implemented")
 }
+func (UnimplementedBundleServer) BatchTerminateTask(context.Context, *BatchTerminateTaskRequest) (*ComResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method BatchTerminateTask not implemented")
+}
 func (UnimplementedBundleServer) GetArtistUploadStatsList(context.Context, *TaskQueryRequest) (*ArtistUploadStatsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetArtistUploadStatsList not implemented")
 }
@@ -2852,6 +2864,35 @@ func _Bundle_BatchAssignTask_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Bundle_BatchTerminateTask_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BatchTerminateTaskRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("BatchTerminateTask", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Bundle_GetArtistUploadStatsList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(TaskQueryRequest)
 	if err := dec(in); err != nil {
@@ -3322,6 +3363,10 @@ var Bundle_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "BatchAssignTask",
 			Handler:    _Bundle_BatchAssignTask_Handler,
 		},
+		{
+			MethodName: "BatchTerminateTask",
+			Handler:    _Bundle_BatchTerminateTask_Handler,
+		},
 		{
 			MethodName: "GetArtistUploadStatsList",
 			Handler:    _Bundle_GetArtistUploadStatsList_Handler,

pkg/router/taskBench.go

@@ -28,6 +28,9 @@ func TaskBenchRouter(r *gin.RouterGroup) {
 		// 中止指派任务（根据任务指派记录UUID）
 		taskBenchRoute.POST("terminate-task-by-uuid", taskbench.TerminateTaskByUUID)
 
+		// 批量中止指派任务（根据多个任务指派记录UUID）
+		taskBenchRoute.POST("batch-terminate-task", taskbench.BatchTerminateTask)
+
 		// 修改待发数量
 		taskBenchRoute.POST("update-pending-count", taskbench.UpdatePendingCount)
 

pkg/service/taskbench/taskBench.go

@@ -103,6 +103,23 @@ func TerminateTaskByUUID(c *gin.Context) {
 	service.Success(c, res)
 }
 
+// BatchTerminateTask 批量中止指派任务（根据多个指派记录UUID）
+func BatchTerminateTask(c *gin.Context) {
+	var req bundle.BatchTerminateTaskRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.BatchTerminateTask(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, res)
+}
+
 // UpdatePendingCount 修改待发数量
 func UpdatePendingCount(c *gin.Context) {
 	var req bundle.UpdatePendingCountRequest