From 321c92040e9a787de748b2ca860017c3faaeb9db Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 10 Dec 2024 15:25:18 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E8=A1=A8=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E7=99=BB=E5=BD=95=E9=A1=B5=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A3=80=E6=9F=A5=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=BF=BD=E7=95=A5admin=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf/imes/framework/common/validation/Mobile.java | 2 ++ .../framework/common/validation/MobileValidator.java | 12 ++++++++++++ .../dal/mysql/template/ReportTemplateMapper.java | 10 ++++++++++ .../service/template/ReportTemplateServiceImpl.java | 2 +- .../system/controller/admin/auth/AuthController.java | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java index 7d089476d..048bbf5ae 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/Mobile.java @@ -21,6 +21,8 @@ public @interface Mobile { String message() default "手机号格式不正确，请重新确认"; + String[] ignoreWhenCheck() default {}; + Class[] groups() default {}; Class[] payload() default {}; diff --git a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java index 5e8fc95f6..663f6fa07 100644 --- a/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java +++ b/cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/validation/MobileValidator.java @@ -1,6 +1,7 @@ package com.cf.imes.framework.common.validation; import cn.hutool.core.text.CharSequenceUtil; +import cn.hutool.core.util.ArrayUtil; import com.cf.imes.framework.common.util.validation.ValidationUtils; import javax.validation.ConstraintValidator; @@ -8,8 +9,19 @@ import javax.validation.ConstraintValidatorContext; public class MobileValidator implements ConstraintValidator { + private String[] ignoreWhenCheck; + + @Override + public void initialize(Mobile constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + this.ignoreWhenCheck = constraintAnnotation.ignoreWhenCheck(); + } + @Override public boolean isValid(String value, ConstraintValidatorContext context) { + if (ArrayUtil.isNotEmpty(ignoreWhenCheck) && ArrayUtil.contains(ignoreWhenCheck, value)) { + return true; + } // 如果手机号为空，默认不校验，即校验通过 if (CharSequenceUtil.isEmpty(value)) { return true; diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportTemplateMapper.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportTemplateMapper.java index 2e2f9ff0d..1f47e97ba 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportTemplateMapper.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/dal/mysql/template/ReportTemplateMapper.java @@ -7,6 +7,7 @@ import com.cf.imes.framework.organ.core.aop.OrganIgnore; import com.cf.imes.module.report.controller.admin.template.vo.ReportTemplateSaveReqVO; import com.cf.imes.module.report.dal.dataobject.template.ReportTemplateDO; import com.cf.imes.module.report.enums.template.ReportTemplateTypeEnum; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +71,13 @@ public interface ReportTemplateMapper extends BaseMapperX { * @return */ int selectExistTemplateName(@Param("reqVO") ReportTemplateSaveReqVO reqVO, @Param("isSuperAdmin") boolean isSuperAdmin, @Param("type") Integer type); + + /** + * 根据id物理删除report_template + * + * @param id + * @return 改动数量 + */ + @Delete("DELETE FROM report_template WHERE id = #{id}") + int physicalDeleteById(@Param("id") Long id); } diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java index 399e77140..79f43283c 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/service/template/ReportTemplateServiceImpl.java @@ -212,7 +212,7 @@ public class ReportTemplateServiceImpl implements ReportTemplateService { // 校验内置模板操作权限 validateSystemTemplate(reportTemplateDO); // 删除 - templateMapper.deleteById(id); + templateMapper.physicalDeleteById(id); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java index a0af46a69..bccbb2dea 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/auth/AuthController.java @@ -112,7 +112,7 @@ public class AuthController { @OperateLog(enable = false) @Parameter(name = "mobile", description = "手机号", required = true) public CommonResult loginCheck( - @Param("mobile") @NotEmpty(message = "手机号不能为空") @Mobile String mobile) { + @Param("mobile") @NotEmpty(message = "手机号不能为空") @Mobile(ignoreWhenCheck = {"admin"}) String mobile) { return success(authService.loginCheck(mobile)); }