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

项目结构调整 x 9 : 分拆字典类型的枚举分拆

Browse Source
This commit is contained in:
YunaiV
2021-04-30 00:35:04 +08:00
parent 1fe8d1cc89
commit 35f1eb95b6
29 changed files with 111 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/DashboardApplication.java → yudao-admin-server/src/main/java/cn/iocoder/dashboard/AdminServerApplication.java
View File

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

6
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/vo/InfConfigExcelVO.java
View File

@@ -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("备注")

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/job/InfJobExcelVO.java
View File

@@ -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("处理器的名字")

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/job/vo/log/InfJobLogExcelVO.java
View File

@@ -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("结果数据")

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
View File

@@ -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("应用名")

9
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java
View File

@@ -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("处理时间")

19
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/infra/enums/InfDictTypeConstants.java Normal file
View File

@@ -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"; // 错误码的类型枚举
}

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/vo/post/SysPostExcelVO.java
View File

@@ -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;
}

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java
View File

@@ -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;
}

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java
View File

@@ -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;
}

5
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/errorcode/vo/SysErrorCodeExcelVO.java
View File

@@ -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("应用名")

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java
View File

@@ -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")

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java
View File

@@ -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("操作人")

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/vo/role/SysRoleExcelVO.java
View File

@@ -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;
}

11
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java
View File

@@ -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("接收时间")

9
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java
View File

@@ -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("创建时间")

8
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserExcelVO.java
View File

@@ -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")

6
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/controller/user/vo/user/SysUserImportExcelVO.java
View File

@@ -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;
}

25
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/system/enums/SysDictTypeConstants.java Normal file
View File

@@ -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"; // 短信接收状态
}

10
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java
View File

@@ -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("备注")

4
yudao-admin-server/src/main/java/cn/iocoder/dashboard/modules/tool/service/codegen/impl/ToolCodegenEngine.java
View File

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