From 35f1eb95b6add62df4bd167bd1136dc91dcedaf3 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 30 Apr 2021 00:35:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20x=209=20:=20=E5=88=86=E6=8B=86=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=88=86=E6=8B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++ yudao-admin-server/pom.xml | 6 --- ...ation.java => AdminServerApplication.java} | 4 +- .../config/vo/InfConfigExcelVO.java | 6 +-- .../controller/job/vo/job/InfJobExcelVO.java | 5 +-- .../job/vo/log/InfJobLogExcelVO.java | 4 +- .../apiaccesslog/InfApiAccessLogExcelVO.java | 5 +-- .../vo/apierrorlog/InfApiErrorLogExcelVO.java | 9 ++--- .../infra/enums/InfDictTypeConstants.java | 19 +++++++++ .../dept/vo/post/SysPostExcelVO.java | 5 +-- .../dict/vo/data/SysDictDataExcelVO.java | 5 +-- .../dict/vo/type/SysDictTypeExcelVO.java | 5 +-- .../errorcode/vo/SysErrorCodeExcelVO.java | 5 +-- .../vo/loginlog/SysLoginLogExcelVO.java | 4 +- .../vo/operatelog/SysOperateLogExcelVO.java | 4 +- .../permission/vo/role/SysRoleExcelVO.java | 4 +- .../sms/vo/log/SysSmsLogExcelVO.java | 11 +++--- .../vo/template/SysSmsTemplateExcelVO.java | 9 ++--- .../user/vo/user/SysUserExcelVO.java | 8 ++-- .../user/vo/user/SysUserImportExcelVO.java | 6 +-- .../system/enums/SysDictTypeConstants.java | 25 ++++++++++++ .../test/vo/ToolTestDemoExcelVO.java | 10 ++--- .../codegen/impl/ToolCodegenEngine.java | 4 +- .../system/service/sms/SysSmsServiceTest.java | 2 +- yudao-dependencies/pom.xml | 8 ---- yudao-framework/pom.xml | 10 ----- .../excel/core/annotations/DictFormat.java | 9 +++-- .../excel/core/convert/DictConvert.java | 11 +++--- .../system/enums/dict/SysDictTypeEnum.java | 39 ------------------- 29 files changed, 111 insertions(+), 135 deletions(-) rename yudao-admin-server/src/main/java/cn/iocoder/dashboard/{DashboardApplication.java => AdminServerApplication.java} (68%) create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java delete mode 100644 yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java diff --git a/pom.xml b/pom.xml index c4094b83b..2d8cd6cf8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,10 @@ 1.0.0 + + 1.8 + ${java.version} + ${java.version} diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 23082c6b5..dc30b5234 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,12 +16,6 @@ 管理后台 Server，提供其 API 接口 https://github.com/YunaiV/ruoyi-vue-pro - - 1.8 - ${java.version} - ${java.version} - - cn.iocoder.boot diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java similarity index 68% rename from yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java rename to yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java index 3161e147a..60fd641a2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java @@ -4,10 +4,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class DashboardApplication { +public class AdminServerApplication { public static void main(String[] args) { - SpringApplication.run(DashboardApplication.class, args); + SpringApplication.run(AdminServerApplication.class, args); } } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java index a11de329c..0a572ce8c 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.config.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -30,11 +30,11 @@ public class InfConfigExcelVO { private String value; @ExcelProperty(value = "参数类型", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_CONFIG_TYPE) + @DictFormat(SysDictTypeConstants.CONFIG_TYPE) private Integer type; @ExcelProperty(value = "是否敏感", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_BOOLEAN_STRING) + @DictFormat(SysDictTypeConstants.BOOLEAN_STRING) private Boolean sensitive; @ExcelProperty("备注") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java index 531dd843d..b4fa6856a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.job; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_JOB_STATUS; - /** * 定时任务 Excel VO * @@ -24,7 +23,7 @@ public class InfJobExcelVO { private String name; @ExcelProperty(value = "任务状态", converter = DictConvert.class) - @DictFormat(INF_JOB_STATUS) + @DictFormat(InfDictTypeConstants.JOB_STATUS) private Integer status; @ExcelProperty("处理器的名字") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java index 6f6d829f9..ca8b25d1b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.infra.controller.job.vo.log; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -41,7 +41,7 @@ public class InfJobLogExcelVO { private Integer duration; @ExcelProperty(value = "任务状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.INF_JOB_STATUS) + @DictFormat(InfDictTypeConstants.JOB_STATUS) private Integer status; @ExcelProperty("结果数据") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java index 9d2f4b1c6..9181da0e4 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apiaccesslog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE; - /** * API 访问日志 Excel VO * @@ -27,7 +26,7 @@ public class InfApiAccessLogExcelVO { private Long userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty("应用名") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java index ddf52a1ab..7d722fb93 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java @@ -2,14 +2,13 @@ package cn.iocoder.dashboard.modules.infra.controller.logger.vo.apierrorlog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.INF_API_ERROR_LOG_PROCESS_STATUS; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.USER_TYPE; - /** * API 错误日志 Excel VO * @@ -28,7 +27,7 @@ public class InfApiErrorLogExcelVO { private Integer userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty("应用名") @@ -80,7 +79,7 @@ public class InfApiErrorLogExcelVO { private Date createTime; @ExcelProperty(value = "处理状态", converter = DictConvert.class) - @DictFormat(INF_API_ERROR_LOG_PROCESS_STATUS) + @DictFormat(InfDictTypeConstants.API_ERROR_LOG_PROCESS_STATUS) private Integer processStatus; @ExcelProperty("处理时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java new file mode 100644 index 000000000..d229ec942 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java @@ -0,0 +1,19 @@ +package cn.iocoder.dashboard.modules.infra.enums; + +/** + * Infra 字典类型的枚举类 + * + * @author 芋道源码 + */ +public interface InfDictTypeConstants { + + String REDIS_TIMEOUT_TYPE = "inf_redis_timeout_type"; // Redis 超时类型 + + String JOB_STATUS = "inf_job_status"; // 定时任务状态的枚举 + String JOB_LOG_STATUS = "inf_job_log_status"; // 定时任务日志状态的枚举 + + String API_ERROR_LOG_PROCESS_STATUS = "inf_api_error_log_process_status"; // API 错误日志的处理状态的枚举 + + String ERROR_CODE_TYPE = "inf_error_code_type"; // 错误码的类型枚举 + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java index 74afa919e..d31b4a57f 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dept.vo.post; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 岗位 Excel 导出响应 VO */ @@ -26,7 +25,7 @@ public class SysPostExcelVO { private Integer sort; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private String status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java index 3266d39cf..f137b0ede 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.data; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 字典数据 Excel 导出响应 VO */ @@ -29,7 +28,7 @@ public class SysDictDataExcelVO { private String dictType; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java index b8a9d3d4e..d3b47c4ba 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java @@ -2,11 +2,10 @@ package cn.iocoder.dashboard.modules.system.controller.dict.vo.type; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; - /** * 字典类型 Excel 导出响应 VO */ @@ -23,7 +22,7 @@ public class SysDictTypeExcelVO { private String type; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java index 81461103e..43b8b7f9e 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.errorcode.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_ERROR_CODE_TYPE; - /** * 错误码 Excel VO * @@ -21,7 +20,7 @@ public class SysErrorCodeExcelVO { private Long id; @ExcelProperty(value = "错误码类型", converter = DictConvert.class) - @DictFormat(SYS_ERROR_CODE_TYPE) + @DictFormat(InfDictTypeConstants.ERROR_CODE_TYPE) private Integer type; @ExcelProperty("应用名") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java index 225f91b1f..c41a94229 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -21,7 +21,7 @@ public class SysLoginLogExcelVO { private String username; @ExcelProperty(value = "登陆结果", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_LOGIN_RESULT) + @DictFormat(SysDictTypeConstants.LOGIN_RESULT) private Integer result; @ExcelProperty("登陆 IP") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java index 475d31338..74c35ae9a 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -24,7 +24,7 @@ public class SysOperateLogExcelVO { private String name; @ExcelProperty(value = "操作类型", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_OPERATE_TYPE) + @DictFormat(SysDictTypeConstants.OPERATE_TYPE) private String type; @ExcelProperty("操作人") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java index 44d92a156..a352090e2 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.permission.vo.role; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; @@ -28,7 +28,7 @@ public class SysRoleExcelVO { private Integer dataScope; @ExcelProperty(value = "角色状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private String status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java index 6a385feba..f1f276112 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java @@ -3,14 +3,13 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.log; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; import cn.iocoder.dashboard.framework.excel.core.convert.JsonConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; import java.util.Map; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 短信日志 Excel VO * @@ -35,7 +34,7 @@ public class SysSmsLogExcelVO { private String templateCode; @ExcelProperty(value = "短信类型", converter = DictConvert.class) - @DictFormat(SYS_SMS_TEMPLATE_TYPE) + @DictFormat(SysDictTypeConstants.SMS_TEMPLATE_TYPE) private Integer templateType; @ExcelProperty("短信内容") @@ -54,11 +53,11 @@ public class SysSmsLogExcelVO { private Long userId; @ExcelProperty(value = "用户类型", converter = DictConvert.class) - @DictFormat(USER_TYPE) + @DictFormat(SysDictTypeConstants.USER_TYPE) private Integer userType; @ExcelProperty(value = "发送状态", converter = DictConvert.class) - @DictFormat(SYS_SMS_SEND_STATUS) + @DictFormat(SysDictTypeConstants.SMS_SEND_STATUS) private Integer sendStatus; @ExcelProperty("发送时间") @@ -83,7 +82,7 @@ public class SysSmsLogExcelVO { private String apiSerialNo; @ExcelProperty(value = "接收状态", converter = DictConvert.class) - @DictFormat(SYS_SMS_RECEIVE_STATUS) + @DictFormat(SysDictTypeConstants.SMS_RECEIVE_STATUS) private Integer receiveStatus; @ExcelProperty("接收时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java index 3eef8133b..854f7ddf5 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java @@ -2,13 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.sms.vo.template; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 短信模板 Excel VO * @@ -21,11 +20,11 @@ public class SysSmsTemplateExcelVO { private Long id; @ExcelProperty(value = "短信签名", converter = DictConvert.class) - @DictFormat(SYS_SMS_TEMPLATE_TYPE) + @DictFormat(SysDictTypeConstants.SMS_TEMPLATE_TYPE) private Integer type; @ExcelProperty(value = "开启状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty("模板编码") @@ -47,7 +46,7 @@ public class SysSmsTemplateExcelVO { private Long channelId; @ExcelProperty(value = "短信渠道编码", converter = DictConvert.class) - @DictFormat(SYS_SMS_CHANNEL_CODE) + @DictFormat(SysDictTypeConstants.SMS_CHANNEL_CODE) private String channelCode; @ExcelProperty("创建时间") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java index 37253ac4a..16167ae0b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java @@ -2,14 +2,12 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_COMMON_STATUS; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.SYS_USER_SEX; - /** * 用户 Excel 导出 VO */ @@ -32,11 +30,11 @@ public class SysUserExcelVO { private String mobile; @ExcelProperty(value = "用户性别", converter = DictConvert.class) - @DictFormat(SYS_USER_SEX) + @DictFormat(SysDictTypeConstants.USER_SEX) private Integer sex; @ExcelProperty(value = "帐号状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty("最后登录IP") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java index b50b8942d..7c52bc62d 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.user.vo.user; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -34,11 +34,11 @@ public class SysUserImportExcelVO { private String mobile; @ExcelProperty(value = "用户性别", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_USER_SEX) + @DictFormat(SysDictTypeConstants.USER_SEX) private Integer sex; @ExcelProperty(value = "账号状态", converter = DictConvert.class) - @DictFormat(SysDictTypeEnum.SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; } diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java new file mode 100644 index 000000000..69bdc064e --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java @@ -0,0 +1,25 @@ +package cn.iocoder.dashboard.modules.system.enums; + +/** + * System 字典类型的枚举类 + * + * @author 芋道源码 + */ +public interface SysDictTypeConstants { + + String USER_TYPE = "user_type"; // 用户类型 + String COMMON_STATUS = "sys_common_status"; // 系统状态 + + String USER_SEX = "sys_user_sex"; // 用户性别 + String OPERATE_TYPE = "sys_operate_type"; // 操作类型 + String LOGIN_RESULT = "sys_login_result"; // 登陆结果 + String CONFIG_TYPE = "sys_config_type"; // 参数配置类型 + String BOOLEAN_STRING = "sys_boolean_string"; // Boolean 是否类型 + + String SMS_CHANNEL_CODE = "sys_sms_channel_code"; // 短信渠道编码 + String SMS_TEMPLATE_TYPE = "sys_sms_template_type"; // 短信模板类型 + String SMS_SEND_STATUS = "sys_sms_send_status"; // 短信发送状态 + String SMS_RECEIVE_STATUS = "sys_sms_receive_status"; // 短信接收状态 + + +} diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java index 5bd575299..525db8c4b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java @@ -2,13 +2,13 @@ package cn.iocoder.dashboard.modules.tool.controller.test.vo; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; import cn.iocoder.dashboard.framework.excel.core.convert.DictConvert; +import cn.iocoder.dashboard.modules.infra.enums.InfDictTypeConstants; +import cn.iocoder.dashboard.modules.system.enums.SysDictTypeConstants; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; import java.util.Date; -import static cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum.*; - /** * 测试示例 Excel VO * @@ -24,15 +24,15 @@ public class ToolTestDemoExcelVO { private String name; @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat(SYS_COMMON_STATUS) + @DictFormat(SysDictTypeConstants.COMMON_STATUS) private Integer status; @ExcelProperty(value = "类型", converter = DictConvert.class) - @DictFormat(SYS_OPERATE_TYPE) + @DictFormat(SysDictTypeConstants.OPERATE_TYPE) private Integer type; @ExcelProperty(value = "分类", converter = DictConvert.class) - @DictFormat(INF_REDIS_TIMEOUT_TYPE) + @DictFormat(InfDictTypeConstants.REDIS_TIMEOUT_TYPE) private Integer category; @ExcelProperty("备注") diff --git a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java index 7ccf26001..7c61c9988 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java @@ -18,7 +18,6 @@ import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEn import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenColumnDO; import cn.iocoder.dashboard.modules.tool.dal.dataobject.codegen.ToolCodegenTableDO; import cn.iocoder.dashboard.util.collection.CollectionUtils; @@ -126,7 +125,8 @@ public class ToolCodegenEngine { // VO 类，独有字段 globalBindingMap.put("PageParamClassName", PageParam.class.getName()); globalBindingMap.put("DictFormatClassName", DictFormat.class.getName()); - globalBindingMap.put("SysDictTypeEnumClassName", SysDictTypeEnum.class.getName()); + // TODO 芋艿：代码生成器，解决下枚举类 +// globalBindingMap.put("SysDictTypeEnumClassName", SysDictTypeEnum.class.getName()); // DO 类，独有字段 globalBindingMap.put("baseDOFields", ToolCodegenBuilder.BASE_DO_FIELDS); globalBindingMap.put("BaseDOClassName", BaseDO.class.getName()); diff --git a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java index 5391f117f..7b944275a 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/dashboard/modules/system/service/sms/SysSmsServiceTest.java @@ -1,7 +1,7 @@ package cn.iocoder.dashboard.modules.system.service.sms; import cn.hutool.core.map.MapUtil; -import cn.iocoder.dashboard.framework.test.core.BaseMockitoUnitTest; +import cn.iocoder.dashboard.BaseMockitoUnitTest; import cn.iocoder.dashboard.common.core.KeyValue; import cn.iocoder.dashboard.common.enums.CommonStatusEnum; import cn.iocoder.dashboard.common.enums.UserTypeEnum; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 4d94b1291..e2d8c106d 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,14 +15,6 @@ 1.0.0 - - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 2.4.4 diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 76d4839f1..2c06091e9 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -16,16 +16,6 @@ 基础框架，各种组件的拓展 https://github.com/YunaiV/ruoyi-vue-pro - - UTF-8 - UTF-8 - @ - 1.8 - ${java.version} - ${java.version} - 3.8.0 - - diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java index 8eefcafaf..ae397346a 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/annotations/DictFormat.java @@ -1,7 +1,5 @@ package cn.iocoder.dashboard.framework.excel.core.annotations; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; - import java.lang.annotation.*; /** @@ -14,6 +12,11 @@ import java.lang.annotation.*; @Inherited public @interface DictFormat { - SysDictTypeEnum value(); + /** + * 例如说，SysDictTypeConstants、InfDictTypeConstants + * + * @return 字典类型 + */ + String value(); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java index 90e13c3c0..c16c66944 100644 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java +++ b/yudao-framework/src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java @@ -5,7 +5,6 @@ import cn.hutool.core.convert.Convert; import cn.iocoder.dashboard.framework.dict.core.dto.DictDataRespDTO; import cn.iocoder.dashboard.framework.dict.core.util.DictUtils; import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat; -import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.CellData; @@ -35,9 +34,9 @@ public class DictConvert implements Converter { public Object convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) { // 使用字典解析 - SysDictTypeEnum type = getType(contentProperty); + String type = getType(contentProperty); String label = cellData.getStringValue(); - DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type.getValue(), label); + DictDataRespDTO dictData = DictUtils.parseDictDataFromCache(type, label); if (dictData == null) { log.error("[convertToJavaData][type({}) 解析不掉 label({})]", type, label); return null; @@ -56,9 +55,9 @@ public class DictConvert implements Converter { } // 使用字典格式化 - SysDictTypeEnum type = getType(contentProperty); + String type = getType(contentProperty); String value = String.valueOf(object); - DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type.getValue(), value); + DictDataRespDTO dictData = DictUtils.getDictDataFromCache(type, value); if (dictData == null) { log.error("[convertToExcelData][type({}) 转换不了 label({})]", type, value); return new CellData<>(""); @@ -67,7 +66,7 @@ public class DictConvert implements Converter { return new CellData<>(dictData.getLabel()); } - private static SysDictTypeEnum getType(ExcelContentProperty contentProperty) { + private static String getType(ExcelContentProperty contentProperty) { return contentProperty.getField().getAnnotation(DictFormat.class).value(); } diff --git a/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java b/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java deleted file mode 100644 index 59e6d0d13..000000000 --- a/yudao-framework/src/main/java/cn/iocoder/dashboard/modules/system/enums/dict/SysDictTypeEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.dashboard.modules.system.enums.dict; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 字典类型的类型枚举 - */ -@Getter -@AllArgsConstructor -public enum SysDictTypeEnum { - - USER_TYPE("user_type"), // 用户类型 - - SYS_USER_SEX("sys_user_sex"), // 用户性别 - SYS_COMMON_STATUS("sys_common_status"), // 系统状态 - SYS_OPERATE_TYPE("sys_operate_type"), // 操作类型 - SYS_LOGIN_RESULT("sys_login_result"), // 登陆结果 - SYS_CONFIG_TYPE("sys_config_type"), // 参数配置类型 - SYS_BOOLEAN_STRING("sys_boolean_string"), // Boolean 是否类型 - SYS_SMS_CHANNEL_CODE("sys_sms_channel_code"), // 短信渠道编码 - SYS_SMS_TEMPLATE_TYPE("sys_sms_template_type"), // 短信模板类型 - SYS_SMS_SEND_STATUS("sys_sms_send_status"), // 短信发送状态 - SYS_SMS_RECEIVE_STATUS("sys_sms_receive_status"), // 短信接收状态 - SYS_ERROR_CODE_TYPE("inf_error_code_type"), // 错误码的类型枚举 - - INF_REDIS_TIMEOUT_TYPE("inf_redis_timeout_type"), // Redis 超时类型 - INF_JOB_STATUS("inf_job_status"), // 定时任务状态的枚举 - INF_JOB_LOG_STATUS("inf_job_log_status"), // 定时任务日志状态的枚举 - INF_API_ERROR_LOG_PROCESS_STATUS("inf_api_error_log_process_status"), // API 错误日志的处理状态的枚举 - ; - - - /** - * 值 - */ - private final String value; - -}