From 55d25e7f8b73bf400f361a4f98a2a9602248c3af Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 15 Oct 2024 11:04:12 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A0=87=E7=AD=BE=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E6=A3=80=E6=9F=A5=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=9B2=E3=80=81=E9=83=A8=E5=88=86=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=99=A8=E7=B1=BB=E5=8C=85=E5=90=8D=E5=92=8C=E7=B1=BB?= =?UTF-8?q?=E5=90=8D=E8=A7=84=E8=8C=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/enums/label/LabelTemplateType.java | 36 ++++++++++++++ .../admin/dept/vo/dept/DeptListReqVO.java | 2 +- .../admin/dept/vo/dept/DeptSaveReqVO.java | 2 +- .../admin/dict/vo/data/DictDataSaveReqVO.java | 2 +- .../LabelTemplateController.java | 48 +------------------ .../vo/LabelTemplatePageReqVO.java | 5 +- .../vo/LabelTemplateSaveReqVO.java | 4 ++ .../admin/notice/vo/NoticePageReqVO.java | 2 +- .../admin/organ/vo/organ/OrganPageReqVO.java | 2 +- .../admin/organ/vo/organ/OrganSaveReqVO.java | 2 +- .../vo/packages/TenantPackagePageReqVO.java | 2 +- .../vo/packages/TenantPackageSaveReqVO.java | 2 +- .../permission/vo/role/RolePageReqVO.java | 2 +- .../permission/vo/role/RoleSaveReqVO.java | 2 +- .../vo/role/RoleUpdateStatusReqVO.java | 2 +- .../vo/profile/UserProfileUpdateReqVO.java | 4 +- .../admin/user/vo/user/UserPageReqVO.java | 2 +- .../admin/user/vo/user/UserSaveReqVO.java | 6 +-- .../user/vo/user/UserUpdateStatusReqVO.java | 2 +- .../labeltemplate/LabelTemplateService.java | 18 ------- .../LabelTemplateServiceImpl.java | 14 ------ .../{system => }/common/CommonStatus.java | 2 +- .../common/CommonStatusValidator.java | 2 +- .../{system => }/dict/CssClassValid.java | 2 +- .../{system => }/dict/CssClassValidator.java | 2 +- .../label/LabelTemplateTypeValid.java | 32 +++++++++++++ .../label/LabelTemplateTypeValidator.java | 31 ++++++++++++ .../user/Sex.java => user/SexValid.java} | 4 +- .../{system => }/user/SexValidator.java | 4 +- 29 files changed, 135 insertions(+), 105 deletions(-) create mode 100644 cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system => }/common/CommonStatus.java (92%) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system => }/common/CommonStatusValidator.java (92%) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system => }/dict/CssClassValid.java (93%) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system => }/dict/CssClassValidator.java (92%) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValid.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidator.java rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system/user/Sex.java => user/SexValid.java} (88%) rename cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/{system => }/user/SexValidator.java (80%) diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java new file mode 100644 index 000000000..6406c8dc6 --- /dev/null +++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/label/LabelTemplateType.java @@ -0,0 +1,36 @@ +package com.cf.imes.module.system.enums.label; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 标签模板类型枚举 + * + * @author Gqr + * @since 2024/10/15 10:46 + */ +@Getter +@AllArgsConstructor +public enum LabelTemplateType { + /** + * 板材包裹 + */ + PLATEPACKAGELABEL("platePackageLabel"), + + /** + * 机台标签 + */ + MACHINELABEL("machineLabel"), + + /** + * 配件包裹标签 + */ + PARTSPACKAGELABEL("partsPackageLabel"), + + /** + * 订单包裹标签 + */ + ORDERPACKAGELABEL("orderPackageLabel"); + + private String type; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index a7869deeb..ec7531992 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.dept.vo.dept; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java index 32a8f0b63..6ff84dffc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.controller.admin.dept.vo.dept; import com.cf.imes.framework.common.validation.Mobile; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java index 10650ce47..6acc14c6b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java @@ -2,7 +2,7 @@ package com.cf.imes.module.system.controller.admin.dict.vo.data; import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.validation.InEnum; -import com.cf.imes.module.system.validation.system.dict.CssClassValid; +import com.cf.imes.module.system.validation.dict.CssClassValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index b72f168b4..6152b2afc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.labeltemplate; -import com.cf.imes.framework.common.util.json.JsonUtils; +import com.cf.imes.module.system.validation.label.LabelTemplateTypeValid; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -8,22 +8,13 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import java.util.*; -import java.io.IOException; -import java.util.stream.Collectors; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.CommonResult; -import com.cf.imes.framework.common.util.object.BeanUtils; import static com.cf.imes.framework.common.pojo.CommonResult.success; -import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.module.system.service.labeltemplate.LabelTemplateService; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; @Tag(name = "标签模板管理") @@ -61,24 +52,6 @@ public class LabelTemplateController { return success(true); } - @GetMapping("/get") - @Operation(summary = "获得标签模板") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:label-template:query')") - @OperateLog(enable = false) - public CommonResult getLabelTemplate(@RequestParam("id") Long id) { - return success(labelTemplateService.getLabelTemplate(id)); - } - - @GetMapping("/page") - @Operation(summary = "获得标签模板分页") - @PreAuthorize("@ss.hasPermission('system:label-template:query')") - @OperateLog(enable = false) - public CommonResult> getLabelTemplatePage(@Valid LabelTemplatePageReqVO pageReqVO) { - PageResult pageResult = labelTemplateService.getLabelTemplatePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, LabelTemplateRespVO.class)); - } - @GetMapping("/group-list") @Operation(summary = "获得分组标签模板列表") @PreAuthorize("@ss.hasPermission('system:label-template:query')") @@ -92,7 +65,7 @@ public class LabelTemplateController { @Parameter(name = "type", description = "标签类型", required = true, example = "1024") @PreAuthorize("@ss.hasAnyPermissions('system:label-template:query','sysTagDesignManager:query')") @OperateLog(enable = false) - public CommonResult getDefaultLabelTemplate(@RequestParam("type") String type) { + public CommonResult getDefaultLabelTemplate(@RequestParam("type") @LabelTemplateTypeValid String type) { return success(labelTemplateService.getDefaultLabelTemplate(type)); } @@ -102,21 +75,4 @@ public class LabelTemplateController { public CommonResult setDefaultTemplate(@RequestParam Long id) { return success(labelTemplateService.setDefaultTemplate(id)); } - - - @GetMapping("/export-excel") - @Operation(summary = "导出标签模板 Excel") - @PreAuthorize("@ss.hasPermission('system:label-template:export')") - @OperateLog(type = EXPORT) - public void exportLabelTemplateExcel(@Valid LabelTemplatePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = labelTemplateService.getLabelTemplatePage(pageReqVO).getList() - .stream().map(m->m.setTemplate(JsonUtils.unzipString(m.getTemplate()))).collect(Collectors.toList()); - // 导出 Excel - ExcelUtils.write(response, "标签模板.xls", "数据", LabelTemplateRespVO.class, - BeanUtils.toBean(list, LabelTemplateRespVO.class)); - } - - } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplatePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplatePageReqVO.java index 08d6e06ea..eb12234cb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplatePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplatePageReqVO.java @@ -1,10 +1,11 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import com.cf.imes.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.Size; import java.time.LocalDateTime; import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -16,9 +17,11 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH public class LabelTemplatePageReqVO extends PageParam { @Schema(description = "标签类型", example = "2") + @Size(max = 50, message = "标签类型长度不能超过50") private String type; @Schema(description = "标签名称", example = "王五") + @Size(max = 50, message = "标签名称长度不能超过50") private String name; @Schema(description = "备注", example = "你猜") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java index 3f9e08b79..e318b362f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; @Schema(description = "管理后台 - 标签模板新增/修改 Request VO") @Data @@ -14,14 +15,17 @@ public class LabelTemplateSaveReqVO { @Schema(description = "标签类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @NotNull(message = "标签类型不能为空") + @Size(max = 50, message = "标签类型长度不能超过50") private String type; @Schema(description = "标签名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @NotEmpty(message = "标签名称不能为空") + @Size(max = 50, message = "标签名称长度不能超过50") private String name; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜") @NotEmpty(message = "备注不能为空") + @Size(max = 255, message = "备注长度不能超过255") private String remark; @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/vo/NoticePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/vo/NoticePageReqVO.java index 0b52549fa..1de067edc 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/vo/NoticePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/notice/vo/NoticePageReqVO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.controller.admin.notice.vo; import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java index 321da4dd5..333ee11e3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganPageReqVO.java @@ -2,7 +2,7 @@ package com.cf.imes.module.system.controller.admin.organ.vo.organ; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.validation.Mobile; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java index d9fa4a6e3..6e6060bf5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/organ/OrganSaveReqVO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.controller.admin.organ.vo.organ; import com.cf.imes.framework.common.validation.Mobile; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackagePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackagePageReqVO.java index f9acc4521..314171ac3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackagePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackagePageReqVO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.controller.admin.organ.vo.packages; import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackageSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackageSaveReqVO.java index 30ee9e837..3fc9402ac 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackageSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/vo/packages/TenantPackageSaveReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.organ.vo.packages; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RolePageReqVO.java index 99f7a825e..6bbeb9f3f 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RolePageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RolePageReqVO.java @@ -1,7 +1,7 @@ package com.cf.imes.module.system.controller.admin.permission.vo.role; import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java index 12dd68ee5..f560442e4 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.permission.vo.role; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java index f5e4aac83..16d62e156 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/permission/vo/role/RoleUpdateStatusReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.permission.vo.role; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java index 371f54b3a..ab70e96d8 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.user.vo.profile; -import com.cf.imes.module.system.validation.system.user.Sex; +import com.cf.imes.module.system.validation.user.SexValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -22,7 +22,7 @@ public class UserProfileUpdateReqVO { private String email; @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1") - @Sex + @SexValid private Integer sex; private Long organId; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java index 68955e0e8..b2894f8ab 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserPageReqVO.java @@ -2,7 +2,7 @@ package com.cf.imes.module.system.controller.admin.user.vo.user; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.validation.Mobile; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java index 220899c04..26d159330 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserSaveReqVO.java @@ -1,8 +1,8 @@ package com.cf.imes.module.system.controller.admin.user.vo.user; import com.cf.imes.framework.common.validation.Mobile; -import com.cf.imes.module.system.validation.system.common.CommonStatus; -import com.cf.imes.module.system.validation.system.user.Sex; +import com.cf.imes.module.system.validation.common.CommonStatus; +import com.cf.imes.module.system.validation.user.SexValid; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -45,7 +45,7 @@ public class UserSaveReqVO { private String mobile; @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1") - @Sex + @SexValid private Integer sex; @Schema(description = "用户头像", example = "https://www.cf.com/xxx.png") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java index 9c97a9145..5238667b7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/user/vo/user/UserUpdateStatusReqVO.java @@ -1,6 +1,6 @@ package com.cf.imes.module.system.controller.admin.user.vo.user; -import com.cf.imes.module.system.validation.system.common.CommonStatus; +import com.cf.imes.module.system.validation.common.CommonStatus; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java index 8c8ed0e11..efb917de7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java @@ -2,8 +2,6 @@ package com.cf.imes.module.system.service.labeltemplate; import java.util.*; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; -import com.cf.imes.framework.common.pojo.PageResult; import javax.validation.Valid; @@ -36,22 +34,6 @@ public interface LabelTemplateService { */ void deleteLabelTemplate(Long id); - /** - * 获得标签模板 - * - * @param id 编号 - * @return 标签模板 - */ - LabelTemplateRespVO getLabelTemplate(Long id); - - /** - * 获得标签模板分页 - * - * @param pageReqVO 分页查询 - * @return 标签模板分页 - */ - PageResult getLabelTemplatePage(LabelTemplatePageReqVO pageReqVO); - // ==================== 子表（标签元素模板） ==================== diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index e01aceb95..76c0c3d3a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -11,7 +11,6 @@ import java.util.*; import java.util.stream.Collectors; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; -import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelTemplateMapper; import javax.annotation.Resource; @@ -74,19 +73,6 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } } - @Override - public LabelTemplateRespVO getLabelTemplate(Long id) { - LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); - labelTemplateDO.setTemplate(JsonUtils.unzipString(labelTemplateDO.getTemplate())); - LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - return labelTemplateRespVO; - } - - @Override - public PageResult getLabelTemplatePage(LabelTemplatePageReqVO pageReqVO) { - return labelTemplateMapper.selectPage(pageReqVO); - } - @Override public Map> getGroupList() { diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatus.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatus.java similarity index 92% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatus.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatus.java index f99d200bb..607020663 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatus.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatus.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.common; +package com.cf.imes.module.system.validation.common; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatusValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatusValidator.java similarity index 92% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatusValidator.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatusValidator.java index f51baef25..30b1a1f2e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/common/CommonStatusValidator.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/common/CommonStatusValidator.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.common; +package com.cf.imes.module.system.validation.common; import cn.hutool.core.util.ObjectUtil; import com.cf.imes.framework.common.enums.CommonStatusEnum; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValid.java similarity index 93% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValid.java index 4c4fe19de..7e780b8eb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValid.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValid.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.dict; +package com.cf.imes.module.system.validation.dict; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValidator.java similarity index 92% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValidator.java index b699b2cb9..2b3367e32 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/dict/CssClassValidator.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/dict/CssClassValidator.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.dict; +package com.cf.imes.module.system.validation.dict; import org.apache.commons.lang3.StringUtils; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValid.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValid.java new file mode 100644 index 000000000..588d22a3f --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValid.java @@ -0,0 +1,32 @@ +package com.cf.imes.module.system.validation.label; + +import javax.validation.Constraint; +import javax.validation.Payload; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 标签模版类型校验注解 + * + * @author Gqr + * @since 2024/10/15 10:42 + */ +@Target({ + ElementType.FIELD, + ElementType.PARAMETER +}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Constraint( + validatedBy = {LabelTemplateTypeValidator.class} +) +public @interface LabelTemplateTypeValid { + String message() default "标签模板类型不合法"; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidator.java new file mode 100644 index 000000000..1e23b49e9 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/label/LabelTemplateTypeValidator.java @@ -0,0 +1,31 @@ +package com.cf.imes.module.system.validation.label; + +import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.ObjectUtil; +import com.cf.imes.module.system.enums.label.LabelTemplateType; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +/** + * 标签模版类型校验器 + * + * @author Gqr + * @since 2024/10/15 10:43 + */ +public class LabelTemplateTypeValidator implements ConstraintValidator { + + @Override + public boolean isValid(String value, ConstraintValidatorContext context) { + // 非空使用@NotBlank等进行校验 + if (CharSequenceUtil.isEmpty(value)) { + return true; + } + for (LabelTemplateType type : LabelTemplateType.values()) { + if (ObjectUtil.equal(type.getType(), value)) { + return true; + } + } + return false; + } +} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/Sex.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValid.java similarity index 88% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/Sex.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValid.java index 659e626ff..34a32734b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/Sex.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValid.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.user; +package com.cf.imes.module.system.validation.user; import javax.validation.Constraint; import javax.validation.Payload; @@ -22,7 +22,7 @@ import java.lang.annotation.Target; @Constraint( validatedBy = {SexValidator.class} ) -public @interface Sex { +public @interface SexValid { String message() default "性别不合法，1：男、2：女"; Class[] groups() default {}; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/SexValidator.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValidator.java similarity index 80% rename from cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/SexValidator.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValidator.java index 7701acb73..037a51365 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/system/user/SexValidator.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/validation/user/SexValidator.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.system.validation.system.user; +package com.cf.imes.module.system.validation.user; import com.cf.imes.module.system.enums.common.SexEnum; @@ -12,7 +12,7 @@ import java.util.Objects; * @author Gqr * @since 2024/10/12 9:50 */ -public class SexValidator implements ConstraintValidator { +public class SexValidator implements ConstraintValidator { @Override public boolean isValid(Integer value, ConstraintValidatorContext context) {