aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-06-16 14:06:34 +08:00
parent 774a20257d 9ad6acf28c
commit fb16840a98
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -1016,7 +1016,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
} catch (Exception e) {
log.error("异步处理图片转sketch失败, taskId: {}", taskId, e);
// 更新redis
redisUtil.addToString(generateResultKey + ":" + taskId, new Gson().toJson(new GenerateResultVO(taskId, "Failed")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
redisUtil.addToString(generateResultKey + ":" + taskId, new Gson().toJson(new GenerateResultVO(taskId, "Fail")), CommonConstant.GENERATE_RESULT_EXPIRE_TIME);
}
}, asyncTaskExecutor);
return taskId;
@@ -1583,7 +1583,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
return new GenerateResultVO(taskId, null, null, "Executing");
} else {
log.warn("万象 异步接口返回生成状态为：{}", taskStatus);
return new GenerateResultVO(taskId, null, null, "Failed");
return new GenerateResultVO(taskId, null, null, "Fail");
}
} catch (ApiException | NoApiKeyException e){
throw new RuntimeException(e.getMessage());
@@ -1655,7 +1655,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
requestBody.set("input", input);
requestBody.set("parameters", parameters);
String response = sendRequestUtil.sendPost(IMAGE_DETECT, requestBody.toString());
String response = sendRequestUtil.sendAliYunPost(IMAGE_DETECT, requestBody.toString());
System.out.println("API响应: " + response);
JSONObject jsonResponse = JSONUtil.parseObj(response);
@@ -1838,7 +1838,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
break;
case STATUS_FAILED:
case STATUS_UNKNOWN:
poseTransformationVO.setStatus("Failed");
poseTransformationVO.setStatus("Fail");
break;
case STATUS_RUNNING:
case STATUS_PENDING:
@@ -1847,7 +1847,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
break;
default:
log.info("未知状态: {}", status);
poseTransformationVO.setStatus("Failed");
poseTransformationVO.setStatus("Fail");
}
poseTransformationVO.setTaskId(taskId);
@@ -2104,7 +2104,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
String status = respObj.getStr("status");
switch (status){
case "Task not found":
return "Failed";
return "Fail";
case "Pending":
case "Request Moderated":
case "Content Moderated":
@@ -2120,7 +2120,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
return userBucket + "/" + objectName;
case "Error":
// 出错
return "Failed";
return "Fail";
}
return null;
}
@@ -2133,8 +2133,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
String objectName = accountId + "/imageToSketch/" + taskId + ".png";
String fluxResult = getFluxResult(taskId, objectName);
if (Objects.isNull(generateDetail)){
if (fluxResult.equals("Failed") || fluxResult.equals("Pending")){
String status = fluxResult.equals("Failed") ? "Failed" : "Executing";
if (fluxResult.equals("Fail") || fluxResult.equals("Pending")){
String status = fluxResult.equals("Fail") ? "Fail" : "Executing";
return new GenerateResultVO(taskId, status);
}