yucheng 3 лет назад
Родитель
Сommit
1002678a17

+ 5 - 6
revit-algorithm/src/main/kotlin/cn/sagacloud/server/algorithm/services/modelCheck/TaskService.kt

@@ -7,7 +7,6 @@ import cn.sagacloud.server.algorithm.models.dataCheck.*
 import cn.sagacloud.server.algorithm.models.entities.Project
 import cn.sagacloud.server.algorithm.models.modelFile.*
 import cn.sagacloud.server.algorithm.services.endpoint.ReportService
-import cn.sagacloud.service.TaskServiceRequest
 import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONArray
 import com.alibaba.fastjson.JSONObject
@@ -31,7 +30,7 @@ class TaskService {
 
     // var taskRequest = TaskRequest()
     @Autowired
-    private lateinit var taskServiceRequest: TaskServiceRequest
+    private lateinit var taskRequest: TaskRequest
 
     @Autowired
     private lateinit var reportService: ReportService
@@ -73,7 +72,7 @@ class TaskService {
         }
         sb.append("]")
         request.filters = sb.toString()
-        val response = taskServiceRequest.queryTask(request)
+        val response = taskRequest.queryTask(request)
         if(response.result == "success"){
             return response.content
         }else
@@ -88,7 +87,7 @@ class TaskService {
         val sb = StringBuilder()
         sb.append("TaskId in [\"${taskId}\"]")
         request.filters = sb.toString()
-        val response = taskServiceRequest.queryTaskResult(request)
+        val response = taskRequest.queryTaskResult(request)
         if(response.result == "success"){
             try {
                 return response.content?.get(0)!!.content
@@ -125,7 +124,7 @@ class TaskService {
                 request.content!!.add(download)
             }
         }
-        val response = taskServiceRequest.createDownload(request)
+        val response = taskRequest.createDownload(request)
         return response.result == "success"
     }
 
@@ -168,7 +167,7 @@ class TaskService {
                 request.content = ArrayList()
             request.content!!.add(task)
         }
-        val response = taskServiceRequest.createTask(request)
+        val response = taskRequest.createTask(request)
         val map = HashMap<String, String>()  // modelId --> 调度器taskId
         val resultMap = HashMap<String, TaskEntity>()
         if(response!!.entityList != null && response.entityList!!.isNotEmpty()){