数据查询分析
This commit is contained in:
@@ -126,5 +126,51 @@ public class FileMetadataInfo implements Serializable {
|
||||
@TableField("fileSize")
|
||||
private Long fileSize;
|
||||
|
||||
@ApiModelProperty(value = "任务ID")
|
||||
@TableField("taskId")
|
||||
private String taskId;
|
||||
|
||||
@ApiModelProperty(value = "算列ID")
|
||||
@TableField("runId")
|
||||
private String runId;
|
||||
|
||||
@ApiModelProperty(value = "tag1")
|
||||
@TableField("tag1")
|
||||
private String tag1;
|
||||
|
||||
@ApiModelProperty(value = "tag2")
|
||||
@TableField("tag2")
|
||||
private String tag2;
|
||||
|
||||
@ApiModelProperty(value = "tag3")
|
||||
@TableField("tag3")
|
||||
private String tag3;
|
||||
|
||||
@ApiModelProperty(value = "tag4")
|
||||
@TableField("tag4")
|
||||
private String tag4;
|
||||
|
||||
@ApiModelProperty(value = "tag5")
|
||||
@TableField("tag5")
|
||||
private String tag5;
|
||||
|
||||
@ApiModelProperty(value = "tag6")
|
||||
@TableField("tag6")
|
||||
private String tag6;
|
||||
|
||||
@ApiModelProperty(value = "tag7")
|
||||
@TableField("tag7")
|
||||
private String tag7;
|
||||
|
||||
@ApiModelProperty(value = "tag8")
|
||||
@TableField("tag8")
|
||||
private String tag8;
|
||||
|
||||
@ApiModelProperty(value = "tag9")
|
||||
@TableField("tag9")
|
||||
private String tag9;
|
||||
|
||||
@ApiModelProperty(value = "tag10")
|
||||
@TableField("tag10")
|
||||
private String tag10;
|
||||
}
|
||||
|
||||
@@ -9,8 +9,11 @@ import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class GetSimulationTaskFileReq extends BaseReq {
|
||||
@Schema(description = "任务ID(simulationtTask的id)")
|
||||
Long taskId;
|
||||
@Schema(description = "任务工况ID(simulationtTask的id)")
|
||||
String taskId;
|
||||
|
||||
@Schema(description = "算列ID")
|
||||
String runId;
|
||||
|
||||
@Schema(description = "文件类型", implementation = Constants.FileType.class)
|
||||
Integer fileType;
|
||||
@@ -25,4 +28,34 @@ public class GetSimulationTaskFileReq extends BaseReq {
|
||||
@Schema(description = "结束时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
@Schema(description = "标签1")
|
||||
private String tag1;
|
||||
|
||||
@Schema(description = "标签2")
|
||||
private String tag2;
|
||||
|
||||
@Schema(description = "标签3")
|
||||
private String tag3;
|
||||
|
||||
@Schema(description = "标签4")
|
||||
private String tag4;
|
||||
|
||||
@Schema(description = "标签5")
|
||||
private String tag5;
|
||||
|
||||
@Schema(description = "标签6")
|
||||
private String tag6;
|
||||
|
||||
@Schema(description = "标签7")
|
||||
private String tag7;
|
||||
|
||||
@Schema(description = "标签8")
|
||||
private String tag8;
|
||||
|
||||
@Schema(description = "标签9")
|
||||
private String tag9;
|
||||
|
||||
@Schema(description = "标签10")
|
||||
private String tag10;
|
||||
}
|
||||
|
||||
@@ -37,18 +37,20 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
|
||||
|
||||
@Override
|
||||
public SdmResponse getSimulationTaskFile(GetSimulationTaskFileReq getSimulationTaskFileReq) {
|
||||
String objectKey = null;
|
||||
if (ObjectUtils.isNotNull(getSimulationTaskFileReq.getTaskId())) {
|
||||
FileMetadataInfo nodeFileMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getNodeId, getSimulationTaskFileReq.getTaskId()).one();
|
||||
if(nodeFileMetadataInfo == null ){
|
||||
return SdmResponse.failed("节点不存在");
|
||||
}
|
||||
objectKey = nodeFileMetadataInfo.getObjectKey();
|
||||
}
|
||||
|
||||
PageHelper.startPage(getSimulationTaskFileReq.getCurrent(), getSimulationTaskFileReq.getSize());
|
||||
List<FileMetadataInfo> simulationTaskFileMetadataInfos = fileMetadataInfoService.lambdaQuery()
|
||||
.likeRight(ObjectUtils.isNotNull(objectKey), FileMetadataInfo::getObjectKey, objectKey)
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getRunId()), FileMetadataInfo::getRunId, getSimulationTaskFileReq.getRunId())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTaskId()), FileMetadataInfo::getTaskId, getSimulationTaskFileReq.getTaskId())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag1()), FileMetadataInfo::getTag1, getSimulationTaskFileReq.getTag1())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag2()), FileMetadataInfo::getTag2, getSimulationTaskFileReq.getTag2())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag3()), FileMetadataInfo::getTag3, getSimulationTaskFileReq.getTag3())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag4()), FileMetadataInfo::getTag4, getSimulationTaskFileReq.getTag4())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag5()), FileMetadataInfo::getTag5, getSimulationTaskFileReq.getTag5())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag6()), FileMetadataInfo::getTag6, getSimulationTaskFileReq.getTag6())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag7()), FileMetadataInfo::getTag7, getSimulationTaskFileReq.getTag7())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag8()), FileMetadataInfo::getTag8, getSimulationTaskFileReq.getTag8())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag9()), FileMetadataInfo::getTag9, getSimulationTaskFileReq.getTag9())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getTag10()), FileMetadataInfo::getTag10, getSimulationTaskFileReq.getTag10())
|
||||
.eq(ObjectUtils.isNotNull(getSimulationTaskFileReq.getFileType()), FileMetadataInfo::getFileType, getSimulationTaskFileReq.getFileType())
|
||||
.like(ObjectUtils.isNotNull(getSimulationTaskFileReq.getFileName()), FileMetadataInfo::getOriginalName, getSimulationTaskFileReq.getFileName())
|
||||
.ge(ObjectUtils.isNotNull(getSimulationTaskFileReq.getStartTime()), FileMetadataInfo::getCreateTime, getSimulationTaskFileReq.getStartTime())
|
||||
|
||||
Reference in New Issue
Block a user