Parcourir la source

修复敏感词的 Swagger 注解错误,导致 Knife4j 无法使用

YunaiV il y a 3 ans
Parent
commit
1737714a22

+ 5 - 1
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExcelVO.java

@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.system.controller.admin.sensitiveword.vo;
 
+import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
+import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 
@@ -23,7 +26,8 @@ public class SensitiveWordExcelVO {
     @ExcelProperty("标签")
     private List<String> tags;
 
-    @ExcelProperty("状态,true-启用,false-禁用")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
     private Integer status;
 
     @ExcelProperty("描述")

+ 1 - 1
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordExportReqVO.java

@@ -19,7 +19,7 @@ public class SensitiveWordExportReqVO {
     @ApiModelProperty(value = "标签", example = "短信,评论")
     private String tag;
 
-    @ApiModelProperty(value = "状态", example = "true-启用,false-禁用")
+    @ApiModelProperty(value = "状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
     private Integer status;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 1 - 1
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordPageReqVO.java

@@ -24,7 +24,7 @@ public class SensitiveWordPageReqVO extends PageParam {
     @ApiModelProperty(value = "标签", example = "短信,评论")
     private String tag;
 
-    @ApiModelProperty(value = "状态", example = "true-启用,true-禁用")
+    @ApiModelProperty(value = "状态", example = "1", notes = "参见 CommonStatusEnum 枚举类")
     private Integer status;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

+ 3 - 2
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/vo/tenant/TenantExcelVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.tenant.vo.tenant;
 
+import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
 import lombok.*;
 import java.util.*;
 
@@ -28,8 +29,8 @@ public class TenantExcelVO {
     @ExcelProperty("联系手机")
     private String contactMobile;
 
-    @ExcelProperty(value = "租户状态(0正常 1停用)", converter = DictConvert.class)
-    @DictFormat("sys_common_status") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.COMMON_STATUS)
     private Integer status;
 
     @ExcelProperty("创建时间")