commmit

src/package/domain/comm_with_redis.go

@@ -1,7 +1,8 @@
 package domain
 
 import (
-	"dcl_dispatch_server/src/package/entity"
+	"dcl_dispatch_server/src/package/domain/project"
+	"dcl_dispatch_server/src/package/domain/task_cache"
 	"dcl_dispatch_server/src/package/global"
 	"dcl_dispatch_server/src/package/infra"
 	"dcl_dispatch_server/src/package/util"
@@ -45,8 +46,8 @@ func CanRunCluster() (bool, infra.GpuNode, error) {
 	return can, maxNode, nil
 }
 
-func AddWaitingUser(project *entity.Project, task entity.Task) error {
-	taskCacheTemp := entity.TaskCache{
+func AddWaitingUser(project *project.Project, task project.Task) error {
+	taskCacheTemp := task_cache.TaskCache{
 		UserId:             project.UserId,
 		AlgorithmObjectKey: project.AlgorithmObjectKey,
 		UserParallelism:    project.Parallelism,
@@ -54,7 +55,7 @@ func AddWaitingUser(project *entity.Project, task entity.Task) error {
 		Task:               task,
 	}
 	// 转 json
-	taskCacheJson, err := TaskCacheToJson(taskCacheTemp)
+	taskCacheJson, err := task_cache.TaskCacheToJson(taskCacheTemp)
 	if err != nil {
 		return errors.New("任务缓存对象" + util.ToString(taskCacheTemp) + " 转 json 失败，错误信息为: " + util.ToString(err))
 	}
@@ -79,8 +80,8 @@ func DeleteWaitingUser(taskCacheJson string) error {
 	return nil
 }
 
-func AddWaitingCluster(project *entity.Project, task entity.Task) error {
-	taskCacheTemp := entity.TaskCache{
+func AddWaitingCluster(project *project.Project, task project.Task) error {
+	taskCacheTemp := task_cache.TaskCache{
 		Env:                project.Env,
 		UserId:             project.UserId,
 		AlgorithmObjectKey: project.AlgorithmObjectKey,
@@ -89,7 +90,7 @@ func AddWaitingCluster(project *entity.Project, task entity.Task) error {
 		Task:               task,
 	}
 	// 转 json
-	taskCacheJson, err := TaskCacheToJson(taskCacheTemp)
+	taskCacheJson, err := task_cache.TaskCacheToJson(taskCacheTemp)
 	if err != nil {
 		return errors.New("任务缓存对象" + util.ToString(taskCacheTemp) + " 转 json 失败，错误信息为: " + util.ToString(err))
 	}
@@ -101,10 +102,10 @@ func AddWaitingCluster(project *entity.Project, task entity.Task) error {
 	return nil
 }
 
-func AddRunningCluster(taskCache entity.TaskCache, nodeName string) error {
+func AddRunningCluster(taskCache task_cache.TaskCache, nodeName string) error {
 	taskCacheTemp := taskCache
 	// 转 json
-	taskCacheJson, err := TaskCacheToJson(taskCacheTemp)
+	taskCacheJson, err := task_cache.TaskCacheToJson(taskCacheTemp)
 	if err != nil {
 		return errors.New("任务缓存对象" + util.ToString(taskCacheTemp) + " 转 json 失败，错误信息为: " + util.ToString(err))
 	}
@@ -135,14 +136,6 @@ func AddRunningCluster(taskCache entity.TaskCache, nodeName string) error {
 	return nil
 }
 
-func TaskCacheToJson(taskCache entity.TaskCache) (string, error) {
-	jsonData, err := json.MarshalIndent(taskCache, "", "    ")
-	if err != nil {
-		return "", err
-	}
-	return string(jsonData), nil
-}
-
 func JsonToGpuNode(jsonData string) (infra.GpuNode, error) {
 	// 创建一个 Person 类型的变量
 	var taskCache infra.GpuNode

src/package/domain/task_cache/task_cache.go

@@ -27,3 +27,11 @@ func JsonToTaskCache(jsonData string) (TaskCache, error) {
 	}
 	return taskCache, nil
 }
+
+func TaskCacheToJson(taskCache TaskCache) (string, error) {
+	jsonData, err := json.MarshalIndent(taskCache, "", "    ")
+	if err != nil {
+		return "", err
+	}
+	return string(jsonData), nil
+}