From f3e32ffae7fee9b454a867c72b335dd6a63f806b Mon Sep 17 00:00:00 2001 From: SjS Date: Wed, 23 Apr 2025 19:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E5=9E=8B=E5=8F=B7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/bst/floor/domain/Floor.java | 5 +++-- .../src/main/java/com/ruoyi/bst/store/domain/Store.java | 3 +++ .../src/main/java/com/ruoyi/web/bst/BoothController.java | 6 ++++-- .../src/main/java/com/ruoyi/web/bst/FloorController.java | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/floor/domain/Floor.java b/ruoyi-service/src/main/java/com/ruoyi/bst/floor/domain/Floor.java index 6537343..5dfba3a 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/floor/domain/Floor.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/floor/domain/Floor.java @@ -1,5 +1,6 @@ package com.ruoyi.bst.floor.domain; +import com.ruoyi.common.core.validate.ValidGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -25,12 +26,12 @@ public class Floor extends BaseEntity @Excel(name = "分区ID") @ApiModelProperty("分区ID") - @NotNull(message = "分区ID不能为空") + @NotNull(message = "分区ID不能为空",groups = {ValidGroup.Create.class}) private Long storeId; @Excel(name = "楼层名称") @ApiModelProperty("楼层名称") - @NotBlank(message = "楼层名称不能为空") + @NotBlank(message = "楼层名称不能为空",groups = {ValidGroup.Create.class}) private String floorName; @Excel(name = "楼层图片") diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/store/domain/Store.java b/ruoyi-service/src/main/java/com/ruoyi/bst/store/domain/Store.java index 389ac60..b4e4948 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/store/domain/Store.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/store/domain/Store.java @@ -75,14 +75,17 @@ public class Store extends BaseEntity @Excel(name = "省") @ApiModelProperty("省") + @NotBlank(message = "省不能为空",groups = {ValidGroup.Create.class}) private String province; @Excel(name = "市") @ApiModelProperty("市") + @NotBlank(message = "市不能为空",groups = {ValidGroup.Create.class}) private String city; @Excel(name = "区、县") @ApiModelProperty("区、县") + @NotBlank(message = "区、县不能为空",groups = {ValidGroup.Create.class}) private String county; @Excel(name = "门店照片") diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java index e3dfb62..431ff67 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/BoothController.java @@ -10,11 +10,13 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.ValidGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.user.service.UserValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -81,7 +83,7 @@ public class BoothController extends BaseController @PreAuthorize("@ss.hasPermi('bst:booth:add')") @Log(title = "卡座", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody Booth booth) + public AjaxResult add(@RequestBody @Validated(ValidGroup.Create.class) Booth booth) { // 判断用户能否选择分区 if (!partValidator.canCheckForPart(booth.getPartId())) { @@ -96,7 +98,7 @@ public class BoothController extends BaseController @PreAuthorize("@ss.hasPermi('bst:booth:edit')") @Log(title = "卡座", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody Booth booth) + public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Booth booth) { if (!boothValidator.canEdit(booth.getBoothId())) { return AjaxResult.error("您没有权限修改ID为" + booth.getBoothId() + "的卡座"); diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FloorController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FloorController.java index ac41c4a..7991611 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/FloorController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/FloorController.java @@ -10,10 +10,12 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.ValidGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -80,7 +82,7 @@ public class FloorController extends BaseController @PreAuthorize("@ss.hasPermi('bst:floor:add')") @Log(title = "楼层列表", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody Floor floor) + public AjaxResult add(@RequestBody @Validated(ValidGroup.Create.class) Floor floor) { // 判断能否选择店铺 if (!storeValidator.canCheckForStore(floor.getStoreId())) { @@ -95,7 +97,7 @@ public class FloorController extends BaseController @PreAuthorize("@ss.hasPermi('bst:floor:edit')") @Log(title = "楼层列表", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody Floor floor) + public AjaxResult edit(@RequestBody @Validated(ValidGroup.Update.class) Floor floor) { if (!floorValidator.canEdit(floor.getFloorId())) { return AjaxResult.error("您没有权限修改ID为" + floor.getFloorId() + "的楼层");