|
|
@@ -4,7 +4,6 @@ import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.cec.plugins.config.properties.ProjectProperties;
|
|
|
-import com.cec.plugins.core.JsonUtils;
|
|
|
import com.cec.plugins.core.retry.RetryException;
|
|
|
import com.cec.plugins.core.retry.RetryTemplate;
|
|
|
import com.cec.plugins.domain.BaseData;
|
|
|
@@ -40,6 +39,12 @@ public class TaskService {
|
|
|
return redisClientSource.writeRedis(map);
|
|
|
}
|
|
|
|
|
|
+ /** 当前是否是结课状态 */
|
|
|
+ public boolean isTaskEnd() {
|
|
|
+ String status = redisClientSource.getCacheStr(TaskEnum.TaskStatusOrder.getKey());
|
|
|
+ return StrUtil.equals(StrUtil.trim(status), "2");
|
|
|
+ }
|
|
|
+
|
|
|
public ResultData checkTaskStatus(BaseData dto) {
|
|
|
Map<TaskEnum, String> map = new HashMap<>();
|
|
|
map.put(TaskEnum.TaskId, dto.getTaskId());
|
|
|
@@ -106,6 +111,20 @@ public class TaskService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /** 资源被占用上报数据 */
|
|
|
+ @Async
|
|
|
+ public void resourceOccupied(BaseData dto) {
|
|
|
+ ReportedData data = new ReportedData();
|
|
|
+ data.setTaskId(dto.getTaskId());
|
|
|
+ data.setSubtaskId(dto.getSubtaskId());
|
|
|
+ data.setXdschemaId(dto.getXdschemaId());
|
|
|
+ data.setIdent(dto.getIdent());
|
|
|
+ data.setInstanceId(dto.getInstanceId());
|
|
|
+ data.setStatus(1);
|
|
|
+ data.setReason("任务资源被占用");
|
|
|
+ reportPlatform("/config/api/v1/receivetaskstatus", data);
|
|
|
+ }
|
|
|
+
|
|
|
public void reportPlatform(String apiUrl, Object body) {
|
|
|
ProjectProperties.PlatformModel platform = properties.getPlatform();
|
|
|
String url = platform.getHttpUtl(apiUrl);
|