diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/FieldTypeEnum.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java similarity index 94% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/FieldTypeEnum.java rename to kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java index 05b53788a..8bd7c50ce 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/FieldTypeEnum.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java @@ -33,7 +33,7 @@ import lombok.Getter; * @date 2022/1/1 22:29 */ @Getter -public enum FieldTypeEnum { +public enum ThemeFieldTypeEnum { /** * 字符串类型 @@ -49,7 +49,7 @@ public enum FieldTypeEnum { private final String message; - FieldTypeEnum(String code, String message) { + ThemeFieldTypeEnum(String code, String message) { this.code = code; this.message = message; } diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java index 1aa9f9c41..313cec240 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java @@ -23,7 +23,7 @@ import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysTheme; import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysThemeTemplate; import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysThemeTemplateField; import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysThemeTemplateRel; -import cn.stylefeng.roses.kernel.system.modular.theme.enums.FieldTypeEnum; +import cn.stylefeng.roses.kernel.system.modular.theme.enums.ThemeFieldTypeEnum; import cn.stylefeng.roses.kernel.system.modular.theme.factory.DefaultThemeFactory; import cn.stylefeng.roses.kernel.system.modular.theme.mapper.SysThemeMapper; import cn.stylefeng.roses.kernel.system.modular.theme.pojo.AntdvFileInfo; @@ -119,7 +119,7 @@ public class SysThemeServiceImpl extends ServiceImpl i List fileNames = new ArrayList<>(); if (themeKeys.size() > 0) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(SysThemeTemplateField::getFieldCode, themeKeys).eq(SysThemeTemplateField::getFieldType, FieldTypeEnum.FILE.getCode()) + queryWrapper.in(SysThemeTemplateField::getFieldCode, themeKeys).eq(SysThemeTemplateField::getFieldType, ThemeFieldTypeEnum.FILE.getCode()) .select(SysThemeTemplateField::getFieldCode); List sysThemeTemplateFields = sysThemeTemplateFieldService.list(queryWrapper); fileNames = sysThemeTemplateFields.stream().map(SysThemeTemplateField::getFieldCode).collect(Collectors.toList()); @@ -342,7 +342,7 @@ public class SysThemeServiceImpl extends ServiceImpl i // 查询字段中是文件的字段列表 LambdaQueryWrapper sysThemeTemplateFieldLambdaQueryWrapper = new LambdaQueryWrapper<>(); sysThemeTemplateFieldLambdaQueryWrapper.in(SysThemeTemplateField::getFieldCode, fieldCodes); - sysThemeTemplateFieldLambdaQueryWrapper.eq(SysThemeTemplateField::getFieldType, FieldTypeEnum.FILE.getCode()); + sysThemeTemplateFieldLambdaQueryWrapper.eq(SysThemeTemplateField::getFieldType, ThemeFieldTypeEnum.FILE.getCode()); sysThemeTemplateFieldLambdaQueryWrapper.select(SysThemeTemplateField::getFieldCode); List fieldInfoList = this.sysThemeTemplateFieldService.list(sysThemeTemplateFieldLambdaQueryWrapper); diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java index 78a23d25e..ef8faa7d8 100644 --- a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java +++ b/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java @@ -14,7 +14,7 @@ import cn.stylefeng.roses.kernel.system.api.exception.enums.theme.SysThemeTempla import cn.stylefeng.roses.kernel.system.api.pojo.theme.SysThemeTemplateFieldRequest; import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysThemeTemplateField; import cn.stylefeng.roses.kernel.system.modular.theme.entity.SysThemeTemplateRel; -import cn.stylefeng.roses.kernel.system.modular.theme.enums.FieldTypeEnum; +import cn.stylefeng.roses.kernel.system.modular.theme.enums.ThemeFieldTypeEnum; import cn.stylefeng.roses.kernel.system.modular.theme.mapper.SysThemeTemplateFieldMapper; import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateFieldService; import cn.stylefeng.roses.kernel.system.modular.theme.service.SysThemeTemplateRelService; @@ -183,7 +183,7 @@ public class SysThemeTemplateFieldServiceImpl extends ServiceImpl