diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesController.java index b07656f..727903a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/controller/CookDishesController.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.cook.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; import com.bonus.canteen.core.cook.dto.MenuDishesImportDTO; import com.bonus.common.log.enums.OperaType; @@ -70,7 +71,7 @@ public class CookDishesController extends BaseController { @ApiOperation(value = "新增菜品信息") @SysLog(title = "菜品信息", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增菜品信息") @PostMapping("/add") - public AjaxResult add(@RequestBody CookDishes cookDishes) { + public AjaxResult add(@RequestBody @Valid CookDishes cookDishes) { try { return toAjax(cookDishesService.insertCookDishes(cookDishes)); } catch (Exception e) { @@ -84,7 +85,7 @@ public class CookDishesController extends BaseController { @ApiOperation(value = "修改菜品信息") @SysLog(title = "菜品信息", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改菜品信息") @PostMapping("/edit") - public AjaxResult edit(@RequestBody CookDishes cookDishes) { + public AjaxResult edit(@RequestBody @Valid CookDishes cookDishes) { try { return toAjax(cookDishesService.updateCookDishes(cookDishes)); } catch (Exception e) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java index 759c39f..4181baa 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java @@ -13,6 +13,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import javax.validation.constraints.Max; + /** * 菜品信息对象 cook_dishes * @@ -147,21 +149,25 @@ public class CookDishes extends BaseEntity { /** 菜品基础单价(分) */ @Excel(name = "菜品基础单价(分)") @ApiModelProperty(value = "菜品基础单价(分)") + @Max(value = 999999L, message = "菜品价格超过限制") private Long price; - /** 称重单位多少克(默认100g) */ - @Excel(name = "称重单位多少克(默认100g)") - @ApiModelProperty(value = "称重单位多少克(默认100g)") + /** 单位价格 */ + @Excel(name = "单位价格") + @ApiModelProperty(value = "单位价格") + @Max(value = 999999L, message = "菜品单价超过限制") private Long unitPrice; /** 大份单价 */ @Excel(name = "大份单价") @ApiModelProperty(value = "大份单价") + @Max(value = 999999L, message = "菜品单价超过限制") private Long largePrice; /** 小份单价 */ @Excel(name = "小份单价") @ApiModelProperty(value = "小份单价") + @Max(value = 999999L, message = "菜品单价超过限制") private Long littlePrice; /** 菜品图片url */ @@ -322,6 +328,7 @@ public class CookDishes extends BaseEntity { /** 成本价 */ @Excel(name = "成本价") @ApiModelProperty(value = "成本价") + @Max(value = 999999L, message = "菜品成本价超过限制") private Long materialCost; /** 毛利 */