hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-23 23:45:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!446 配合周建进行测试所提bug的后端修改

Browse Source 
Merge pull request !446 from clockdotnet/master_pr
This commit is contained in:
芋道源码
2023-04-09 02:30:08 +00:00
committed by Gitee
parent 75c74590e5 2b1e5f1a3a
commit aa16b8279f
10 changed files with 88 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ 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;

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

@ -29,8 +29,8 @@ 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 = "备注一下很帅气！")

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()));
}