diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java index 0da49ed..5ea6977 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java @@ -59,7 +59,6 @@ public class InspectionPlanSaveReqVO { private LocalDate endTime; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") - @NotEmpty(message = "备注不能为空") private String remark; @NotNull(message = "角色Ids不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java index 312a585..740ac4e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanController.java @@ -42,6 +42,9 @@ public class MaintainPlanController { @Operation(summary = "创建养护计划汇总") @PreAuthorize("@ss.hasPermission('garden:maintain-plan:create')") public CommonResult createMaintainPlan(@Valid @RequestBody MaintainPlanSaveReqVO createReqVO) { + if(!createReqVO.verify()){ + + } return maintainPlanService.createMaintainPlan(createReqVO); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java index ac3b4a7..a2e3ff0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java @@ -1,6 +1,6 @@ package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; -import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRoadReqVO; +import com.zteits.urbanops.module.garden.util.StringValidateUtil; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.Valid; import lombok.*; @@ -76,4 +76,7 @@ public class MaintainPlanSaveReqVO { @Size(min = 1) private Set roleIds; + public boolean verify(){ + return StringValidateUtil.validate(rateValue); + } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/StringValidateUtil.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/StringValidateUtil.java new file mode 100644 index 0000000..755644d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/util/StringValidateUtil.java @@ -0,0 +1,63 @@ +package com.zteits.urbanops.module.garden.util; + +import java.util.regex.Pattern; + +/** + * 字符串校验工具:校验是否为1-20的整数或合法分数(如1/3) + */ +public class StringValidateUtil { + // 正则1:匹配1-20的整数(无前置0,如"05"非法) + private static final Pattern INTEGER_PATTERN = Pattern.compile("^(1|[1-9]\\d?|20)$"); + // 正则2:匹配分数格式(分子/分母均为正整数,无空格、无空值) + private static final Pattern FRACTION_PATTERN = Pattern.compile("^[1-9]\\d*/[1-9]\\d*$"); + + /** + * 核心校验方法 + * @param input 待校验的字符串 + * @return true=合法,false=非法 + */ + public static boolean validate(String input) { + // 空值/空字符串直接非法 + if (input == null || input.trim().isEmpty()) { + return false; + } + String trimInput = input.trim(); // 去除首尾空格(若允许空格可省略) + + // 先校验是否为1-20的整数 + if (INTEGER_PATTERN.matcher(trimInput).matches()) { + return true; + } + + // 再校验是否为合法分数格式 + if (FRACTION_PATTERN.matcher(trimInput).matches()) { + // 可选:若需要限制分子/分母范围(如1-20),可添加以下逻辑 + String[] parts = trimInput.split("/"); + int numerator = Integer.parseInt(parts[0]); // 分子 + int denominator = Integer.parseInt(parts[1]); // 分母 + // 示例:限制分子、分母均为1-20 + return numerator >= 1 && numerator <= 20 && denominator >= 1 && denominator <= 20; + } + + // 既不是整数也不是分数 + return false; + } + + // 测试用例 + public static void main(String[] args) { + // 合法用例 + System.out.println(validate("5")); // true(1-20整数) + System.out.println(validate("20")); // true(1-20整数) + System.out.println(validate("1/3")); // true(分数,分子分母1-20) + System.out.println(validate("10/20")); // true(分数,分子分母1-20) + + // 非法用例 + System.out.println(validate("0")); // false(小于1) + System.out.println(validate("21")); // false(大于20) + System.out.println(validate("1.5")); // false(小数,非整数/分数) + System.out.println(validate("1/0")); // false(分母为0) + System.out.println(validate(" 1/3")); // false(首尾空格,trim后合法,若保留空格则false) + System.out.println(validate("1//3")); // false(格式错误) + System.out.println(validate("21/5")); // false(分子超20) + System.out.println(validate(null)); // false(空值) + } +}