新需求更新 同步更新
This commit is contained in:
+8
-32
@@ -1338,10 +1338,9 @@ public class AppearancePatentTaskService {
|
||||
}
|
||||
}
|
||||
}
|
||||
boolean failedByConclusion = hasInfringingPersistedConclusion(task.getId());
|
||||
boolean failed = finalError != null && !finalError.isBlank() || failedByConclusion;
|
||||
boolean failed = finalError != null && !finalError.isBlank();
|
||||
boolean waitingForAssemble = !failed && assembleWorkbook && !shouldAssembleSynchronously();
|
||||
task.setStatus(waitingForAssemble ? STATUS_RUNNING : (failed ? STATUS_FAILED : STATUS_SUCCESS));
|
||||
task.setStatus(resolveTaskExecutionStatus(waitingForAssemble, failed));
|
||||
task.setSuccessFileCount(failed ? 0 : 1);
|
||||
task.setFailedFileCount(failed ? 1 : 0);
|
||||
task.setErrorMessage(finalError);
|
||||
@@ -2418,10 +2417,9 @@ public class AppearancePatentTaskService {
|
||||
saveFileBuildProgress(task, job, totalProgressUnits, totalProgressUnits - 1, "正在上传结果文件");
|
||||
fileResultMapper.updateById(result);
|
||||
boolean taskAlreadyFailed = STATUS_FAILED.equals(task.getStatus())
|
||||
|| (task.getErrorMessage() != null && !task.getErrorMessage().isBlank())
|
||||
|| hasInfringingPersistedConclusion(task.getId());
|
||||
|| (task.getErrorMessage() != null && !task.getErrorMessage().isBlank());
|
||||
String existingError = task.getErrorMessage();
|
||||
task.setStatus(taskAlreadyFailed ? STATUS_FAILED : STATUS_SUCCESS);
|
||||
task.setStatus(resolveTaskExecutionStatus(false, taskAlreadyFailed));
|
||||
task.setSuccessFileCount(taskAlreadyFailed ? 0 : 1);
|
||||
task.setFailedFileCount(taskAlreadyFailed ? 1 : 0);
|
||||
task.setErrorMessage(taskAlreadyFailed ? existingError : null);
|
||||
@@ -4199,33 +4197,11 @@ public class AppearancePatentTaskService {
|
||||
return resultRow == null || resultRow.getPrice() == null ? "" : resultRow.getPrice().trim();
|
||||
}
|
||||
|
||||
private boolean hasInfringingPersistedConclusion(Long taskId) {
|
||||
if (taskId == null) {
|
||||
return false;
|
||||
static String resolveTaskExecutionStatus(boolean waitingForAssemble, boolean executionFailed) {
|
||||
if (waitingForAssemble) {
|
||||
return STATUS_RUNNING;
|
||||
}
|
||||
return loadPersistedResultRows(taskId).values().stream()
|
||||
.map(AppearancePatentResultRowDto::getConclusion)
|
||||
.anyMatch(this::isInfringingConclusion);
|
||||
}
|
||||
|
||||
private boolean isInfringingConclusion(String value) {
|
||||
String normalized = normalize(value);
|
||||
return normalized.contains("侵权")
|
||||
&& !isNoInfringementConclusion(normalized);
|
||||
}
|
||||
|
||||
private boolean isNoInfringementConclusion(String value) {
|
||||
String normalized = normalize(value);
|
||||
if (normalized.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
return normalized.contains("无侵权")
|
||||
|| normalized.contains("未侵权")
|
||||
|| normalized.contains("不侵权")
|
||||
|| normalized.contains("未发现") && normalized.contains("侵权")
|
||||
|| normalized.contains("未见") && normalized.contains("侵权")
|
||||
|| normalized.contains("不存在") && normalized.contains("侵权")
|
||||
|| normalized.contains("无明显") && normalized.contains("侵权");
|
||||
return executionFailed ? STATUS_FAILED : STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
private String userFacingCozeCellValue(AppearancePatentResultRowDto row, String value) {
|
||||
|
||||
Reference in New Issue
Block a user