From c0337afbaa1b5b0e97d7bc081e9b7cc6883c1337 Mon Sep 17 00:00:00 2001 From: paulGao Date: Fri, 27 May 2022 16:32:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= =?UTF-8?q?=E5=8D=87=E7=BA=A7hutool=E5=92=8Clombok=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/goods/entity/dos/StudioCommodity.java | 4 ++++ .../cn/lili/modules/permission/entity/dos/Department.java | 5 ++++- .../lili/modules/promotion/entity/vos/PromotionSkuVO.java | 6 +++++- .../permission/DepartmentManagerController.java | 8 ++++---- pom.xml | 4 ++-- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java index 1b6e90d7..061dac65 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -15,11 +16,14 @@ import lombok.NoArgsConstructor; * @since 2021/5/18 5:42 下午 */ @Data +@EqualsAndHashCode(callSuper = true) @ApiModel(value = "直播间商品") @TableName("li_studio_commodity") @NoArgsConstructor public class StudioCommodity extends BaseIdEntity { + private static final long serialVersionUID = 8383627725577840261L; + @ApiModelProperty(value = "房间ID") private Integer roomId; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java index aa8d7348..854db81f 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java @@ -5,8 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; /** @@ -18,11 +19,13 @@ import java.math.BigDecimal; @Data @TableName("li_department") @ApiModel(value = "部门") +@EqualsAndHashCode(callSuper = true) public class Department extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "部门名称") + @NotNull(message = "部门名称不能为空") private String title; @ApiModelProperty(value = "父id") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionSkuVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionSkuVO.java index 57c54dad..24b3558d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionSkuVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionSkuVO.java @@ -5,6 +5,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * 促销skuVO * @@ -15,7 +17,9 @@ import lombok.NoArgsConstructor; @Data @AllArgsConstructor @NoArgsConstructor -public class PromotionSkuVO { +public class PromotionSkuVO implements Serializable { + + private static final long serialVersionUID = -8587010496940375179L; /** * 促销类型 diff --git a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java index 724b6c97..86087a74 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/DepartmentManagerController.java @@ -1,15 +1,16 @@ package cn.lili.controller.permission; import cn.lili.common.enums.ResultUtil; -import cn.lili.mybatis.util.PageUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.SearchVO; import cn.lili.modules.permission.entity.dos.Department; import cn.lili.modules.permission.entity.vo.DepartmentVO; import cn.lili.modules.permission.service.DepartmentService; +import cn.lili.mybatis.util.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,15 +46,14 @@ public class DepartmentManagerController { @PostMapping @ApiOperation(value = "新增部门") - public ResultMessage save(Department department) { + public ResultMessage save(@Validated Department department) { departmentService.save(department); return ResultUtil.data(department); } @PutMapping("/{id}") @ApiOperation(value = "更新部门") - public ResultMessage update(@PathVariable String id, Department department) { - departmentService.updateById(department); + public ResultMessage update(@PathVariable String id, @Validated Department department) { departmentService.updateById(department); return ResultUtil.data(department); } diff --git a/pom.xml b/pom.xml index 53b79e7e..a9d92a59 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,11 @@ 1 4.22.32.ALL 3.5.1 - 5.7.20 + 5.8.0 2.0.3.RELEASE 3.0.4 2.9.10 - 1.18.22 + 1.18.24 3.15.6 4.5.18 3.11.1