Merge remote-tracking branch 'origin/developing' into developing

This commit is contained in:
jipengfei-jpf
2023-08-12 20:13:11 +08:00
33 changed files with 1044 additions and 473 deletions

View File

@ -74,4 +74,9 @@ public class Operation {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}

View File

@ -41,4 +41,9 @@ public class OperationPageQueryParam extends PageQueryParam {
* orderBy modify time desc
*/
private boolean orderByDesc;
/**
* operation type
*/
private String operationType;
}

View File

@ -49,4 +49,9 @@ public class OperationSavedParam {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}

View File

@ -57,4 +57,9 @@ public class OperationUpdateParam {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}

View File

@ -101,6 +101,9 @@ public class OperationServiceImpl implements OperationService {
if (StringUtils.isNotBlank(param.getTabOpened())) {
queryWrapper.eq("tab_opened", param.getTabOpened());
}
if (StringUtils.isNotBlank(param.getOperationType())) {
queryWrapper.eq("operation_type", param.getOperationType());
}
Integer start = param.getPageNo();
Integer offset = param.getPageSize();
Page<OperationSavedDO> page = new Page<>(start, offset);

View File

@ -83,4 +83,9 @@ public class OperationSavedDO implements Serializable {
* schema名称
*/
private String dbSchemaName;
/**
* operation type
*/
private String operationType;
}

View File

@ -0,0 +1,2 @@
ALTER TABLE `operation_saved` ADD COLUMN `operation_type` varchar(1024) NULL COMMENT '操作类型';

View File

@ -43,4 +43,9 @@ public class OperationCreateRequest extends DataSourceBaseRequest {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}

View File

@ -41,4 +41,9 @@ public class OperationQueryRequest extends PageQueryRequest {
* orderBy modify time desc
*/
private Boolean orderByDesc;
/**
* operation type
*/
private String operationType;
}

View File

@ -38,4 +38,9 @@ public class OperationUpdateRequest {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}

View File

@ -65,4 +65,9 @@ public class OperationVO {
* 是否在tab中被打开,y表示打开,n表示未打开
*/
private String tabOpened;
/**
* operation type
*/
private String operationType;
}