oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复租户名的重复问题 + 配合周建进行测试所提bug的后端修改

Browse Source
This commit is contained in:
YunaiV
2023-04-09 11:03:33 +08:00
parent 79228bd947
commit 83d2e79f96
6 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
View File

@@ -24,8 +24,11 @@ public class CodegenTablePageReqVO extends PageParam {
@Schema(description = "表描述,模糊匹配", example = "芋道")
private String tableComment;
@Schema(description = "实体,模糊匹配", example = "Yudao")
private String className;
@Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}
}

6
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigBaseVO.java
View File

@@ -30,11 +30,11 @@ public class ConfigBaseVO {
@Size(max = 500, message = "参数键值长度不能超过500个字符")
private String value;
@Schema(description = "是否敏感", required = true, example = "true")
@NotNull(message = "是否敏感不能为空")
@Schema(description = "是否可见", required = true, example = "true")
@NotNull(message = "是否可见不能为空")
private Boolean visible;
@Schema(description = "备注", example = "备注一下很帅气！")
private String remark;
}
}

10
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExcelVO.java
View File

@@ -18,10 +18,10 @@ public class ConfigExcelVO {
private Long id;
@ExcelProperty("参数键名")
private String key;
private String configKey;
@ExcelProperty("参数分组")
private String group;
@ExcelProperty("参数分类")
private String category;
@ExcelProperty("参数名称")
private String name;
@@ -33,9 +33,9 @@ public class ConfigExcelVO {
@DictFormat(DictTypeConstants.CONFIG_TYPE)
private Integer type;
@ExcelProperty(value = "是否敏感", converter = DictConvert.class)
@ExcelProperty(value = "是否可见", converter = DictConvert.class)
@DictFormat(DictTypeConstants.BOOLEAN_STRING)
private Boolean sensitive;
private Boolean visible;
@ExcelProperty("备注")
private String remark;

1
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/codegen/CodegenTableMapper.java
View File

@@ -21,6 +21,7 @@ public interface CodegenTableMapper extends BaseMapperX<CodegenTableDO> {
return selectPage(pageReqVO, new LambdaQueryWrapperX<CodegenTableDO>()
.likeIfPresent(CodegenTableDO::getTableName, pageReqVO.getTableName())
.likeIfPresent(CodegenTableDO::getTableComment, pageReqVO.getTableComment())
.likeIfPresent(CodegenTableDO::getClassName, pageReqVO.getClassName())
.betweenIfPresent(CodegenTableDO::getCreateTime, pageReqVO.getCreateTime()));
}