diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracetemplate/vo/TraceTemplateCreateReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracetemplate/vo/TraceTemplateCreateReqVO.java index 9d5b30f..ff3cce3 100644 --- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracetemplate/vo/TraceTemplateCreateReqVO.java +++ b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/tracetemplate/vo/TraceTemplateCreateReqVO.java @@ -3,6 +3,8 @@ package cn.iocoder.yudao.module.configure.controller.admin.tracetemplate.vo; import lombok.*; import java.util.*; import io.swagger.annotations.*; +import org.hibernate.validator.constraints.Length; + import javax.validation.constraints.*; @ApiModel("管理后台 - 溯源模板创建 Request VO") @@ -10,6 +12,8 @@ import javax.validation.constraints.*; public class TraceTemplateCreateReqVO { @ApiModelProperty(value = "模板名称") + @NotBlank(message = "模板名称不能为空") + @Length(max = 32, message = "模板名称最长32个字符") private String templateName; @ApiModelProperty(value = "商品编码", required = true) diff --git a/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/CodeController.java b/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/CodeController.java index 55f1268..51685e7 100644 --- a/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/CodeController.java +++ b/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/CodeController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.identity.controller.admin.code; +import cn.hutool.core.bean.BeanUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; @@ -93,7 +94,7 @@ public class CodeController { List list = codeService.getCodesByGenerateRecordId(generateRecordId); // 导出 Excel - List datas = CodeConvert.INSTANCE.convertList02(list); + List datas = BeanUtil.copyToList(list, CodeExcelVO.class); //拼接getIdentityCode路径 for (CodeExcelVO codeExcelVO : datas) { String identityCode = qrCodeProperties.getUrl() + codeExcelVO.getIdentityCode(); diff --git a/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/vo/CodeExcelVO.java b/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/vo/CodeExcelVO.java index 57b6721..c9a37a2 100644 --- a/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/vo/CodeExcelVO.java +++ b/yudao-module-identity/yudao-module-identity-biz/src/main/java/cn/iocoder/yudao/module/identity/controller/admin/code/vo/CodeExcelVO.java @@ -49,7 +49,7 @@ public class CodeExcelVO { @ExcelProperty("经销商编码") private String dealerId; - @ExcelProperty("所属商户编码") + @ExcelProperty("所属商户ID") private Long belongBusinessId; @ExcelProperty("所属商户名称") diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/BlockCertificateSaveReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/BlockCertificateSaveReqVO.java index 2cb0346..263f86e 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/BlockCertificateSaveReqVO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/BlockCertificateSaveReqVO.java @@ -28,7 +28,7 @@ public class BlockCertificateSaveReqVO { private Integer operateType; @ApiModelProperty(value = "操作类型描述") - @Length(max = 255) + @Length(max = 255, message = "操作类型描述最大长度不能超过255个字符") private String operateName; @ApiModelProperty(value = "操作对象id:根据operate_type的值,存储不同关联表的id") @@ -42,7 +42,7 @@ public class BlockCertificateSaveReqVO { @ApiModelProperty(value = "环节名称", required = true) @NotNull(message = "环节名称不能为空") - @Length(max = 255) + @Length(max = 255, message = "环节名称最大长度不能超过255个字符") private String linkName; @ApiModelProperty(value = "上链状态 0未上链 1已上链") diff --git a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/OperateDetailSaveReqVO.java b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/OperateDetailSaveReqVO.java index c8b18cd..de76e4d 100644 --- a/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/OperateDetailSaveReqVO.java +++ b/yudao-module-product/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/harvestbatch/vo/OperateDetailSaveReqVO.java @@ -16,7 +16,7 @@ public class OperateDetailSaveReqVO { private Long id; @ApiModelProperty(value = "内容标题") - @Length(max = 255) + @Length(max = 255, message = "内容标题最大长度不能超过255个字符") private String title; @ApiModelProperty(value = "内容类型,详见字典") @@ -24,11 +24,11 @@ public class OperateDetailSaveReqVO { private Integer type; @ApiModelProperty(value = "详细内容,如图片视频url地址、文本、文件链接等") - @Length(max = 1024) + @Length(max = 1024, message = "详细内容最大长度不能超过1024个字符") private String content; @ApiModelProperty(value = "链接地址") - @Length(max = 255) + @Length(max = 255, message = "链接地址最大长度不能超过255个字符") private String linkText; @ApiModelProperty(value = "是否扫码展示")