From 280196c9e540f88c65cdf1b8c0964dac65bbfb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Mon, 26 Jul 2021 13:13:46 +0800 Subject: [PATCH] =?UTF-8?q?udpate=20=E6=9B=B4=E6=96=B0=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=BC=94=E7=A4=BA=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/demo/bo/TestDemoAddBo.java | 47 ----------- .../com/ruoyi/demo/bo/TestDemoEditBo.java | 52 ------------ .../com/ruoyi/demo/bo/TestDemoQueryBo.java | 42 ---------- .../java/com/ruoyi/demo/bo/TestTreeAddBo.java | 39 --------- .../com/ruoyi/demo/bo/TestTreeEditBo.java | 47 ----------- .../com/ruoyi/demo/bo/TestTreeQueryBo.java | 42 ---------- .../demo/controller/TestDemoController.java | 28 ++++--- .../demo/controller/TestTreeController.java | 29 ++++--- .../java/com/ruoyi/demo/domain/TestDemo.java | 49 ++++++++--- .../java/com/ruoyi/demo/domain/TestTree.java | 49 +++++++---- .../com/ruoyi/demo/mapper/TestDemoMapper.java | 4 +- .../com/ruoyi/demo/mapper/TestTreeMapper.java | 3 +- .../ruoyi/demo/service/ITestDemoService.java | 20 ++--- .../ruoyi/demo/service/ITestTreeService.java | 16 ++-- .../service/impl/TestDemoServiceImpl.java | 20 ++--- .../service/impl/TestTreeServiceImpl.java | 16 ++-- .../java/com/ruoyi/demo/vo/TestDemoVo.java | 83 ------------------- .../java/com/ruoyi/demo/vo/TestTreeVo.java | 59 ------------- .../resources/mapper/demo/TestDemoMapper.xml | 2 +- 19 files changed, 139 insertions(+), 508 deletions(-) delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoEditBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoQueryBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeAddBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeEditBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeQueryBo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java delete mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java deleted file mode 100644 index 10520aed..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ruoyi.demo.bo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.util.Date; - - -/** - * 测试单表添加对象 test_demo - * - * @author Lion Li - * @date 2021-05-30 - */ -@Data -@ApiModel("测试单表添加对象") -public class TestDemoAddBo { - - /** 部门id */ - @ApiModelProperty("部门id") - private Long deptId; - - /** 用户id */ - @ApiModelProperty("用户id") - private Long userId; - - /** 排序号 */ - @ApiModelProperty("排序号") - private Long orderNum; - - /** key键 */ - @ApiModelProperty("key键") - @NotBlank(message = "key键不能为空") - private String testKey; - - /** 值 */ - @ApiModelProperty("值") - @NotBlank(message = "值不能为空") - private String value; - - /** 创建时间 */ - @ApiModelProperty("创建时间") - private Date createTime; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoEditBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoEditBo.java deleted file mode 100644 index 639443b0..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoEditBo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ruoyi.demo.bo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - - -/** - * 测试单表编辑对象 test_demo - * - * @author Lion Li - * @date 2021-05-30 - */ -@Data -@ApiModel("测试单表编辑对象") -public class TestDemoEditBo { - - - /** 主键 */ - @ApiModelProperty("主键") - private Long id; - - - /** 部门id */ - @ApiModelProperty("部门id") - private Long deptId; - - - /** 用户id */ - @ApiModelProperty("用户id") - private Long userId; - - - /** 排序号 */ - @ApiModelProperty("排序号") - private Long orderNum; - - - /** key键 */ - @ApiModelProperty("key键") - @NotBlank(message = "key键不能为空") - private String testKey; - - - /** 值 */ - @ApiModelProperty("值") - @NotBlank(message = "值不能为空") - private String value; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoQueryBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoQueryBo.java deleted file mode 100644 index ca2bb5a3..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoQueryBo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.demo.bo; - -import com.ruoyi.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 测试单表分页查询对象 test_demo - * - * @author Lion Li - * @date 2021-05-30 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("测试单表分页查询对象") -public class TestDemoQueryBo extends BaseEntity { - - /** 分页大小 */ - @ApiModelProperty("分页大小") - private Integer pageSize; - /** 当前页数 */ - @ApiModelProperty("当前页数") - private Integer pageNum; - /** 排序列 */ - @ApiModelProperty("排序列") - private String orderByColumn; - /** 排序的方向desc或者asc */ - @ApiModelProperty(value = "排序的方向", example = "asc,desc") - private String isAsc; - - - /** key键 */ - @ApiModelProperty("key键") - private String testKey; - /** 值 */ - @ApiModelProperty("值") - private String value; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeAddBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeAddBo.java deleted file mode 100644 index a9a4b5e3..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeAddBo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ruoyi.demo.bo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import java.util.Date; -import javax.validation.constraints.*; - - - -/** - * 测试树表添加对象 test_tree - * - * @author Lion Li - * @date 2021-05-30 - */ -@Data -@ApiModel("测试树表添加对象") -public class TestTreeAddBo { - - /** 父id */ - @ApiModelProperty("父id") - private Long parentId; - - /** 部门id */ - @ApiModelProperty("部门id") - private Long deptId; - - /** 用户id */ - @ApiModelProperty("用户id") - private Long userId; - - /** 树节点名 */ - @ApiModelProperty("树节点名") - @NotBlank(message = "树节点名不能为空") - private String treeName; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeEditBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeEditBo.java deleted file mode 100644 index e3d359d0..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeEditBo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.ruoyi.demo.bo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import java.util.Date; -import javax.validation.constraints.*; - - -/** - * 测试树表编辑对象 test_tree - * - * @author Lion Li - * @date 2021-05-30 - */ -@Data -@ApiModel("测试树表编辑对象") -public class TestTreeEditBo { - - - /** 主键 */ - @ApiModelProperty("主键") - private Long id; - - - /** 父id */ - @ApiModelProperty("父id") - private Long parentId; - - - /** 部门id */ - @ApiModelProperty("部门id") - private Long deptId; - - - /** 用户id */ - @ApiModelProperty("用户id") - private Long userId; - - - /** 树节点名 */ - @ApiModelProperty("树节点名") - @NotBlank(message = "树节点名不能为空") - private String treeName; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeQueryBo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeQueryBo.java deleted file mode 100644 index 3ed482b3..00000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeQueryBo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.ruoyi.demo.bo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * 测试树表分页查询对象 test_tree - * - * @author Lion Li - * @date 2021-05-30 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel("测试树表分页查询对象") -public class TestTreeQueryBo extends BaseEntity { - - /** 分页大小 */ - @ApiModelProperty("分页大小") - private Integer pageSize; - /** 当前页数 */ - @ApiModelProperty("当前页数") - private Integer pageNum; - /** 排序列 */ - @ApiModelProperty("排序列") - private String orderByColumn; - /** 排序的方向desc或者asc */ - @ApiModelProperty(value = "排序的方向", example = "asc,desc") - private String isAsc; - - - /** 树节点名 */ - @ApiModelProperty("树节点名") - private String treeName; - -} diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index 9ba8a2a9..ade20f8d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -1,16 +1,17 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; 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.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.bo.TestDemoAddBo; -import com.ruoyi.demo.bo.TestDemoEditBo; -import com.ruoyi.demo.bo.TestDemoQueryBo; +import com.ruoyi.demo.domain.bo.TestDemoBo; +import com.ruoyi.demo.domain.vo.TestDemoVo; import com.ruoyi.demo.service.ITestDemoService; -import com.ruoyi.demo.vo.TestDemoVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -28,8 +29,9 @@ import java.util.List; * 测试单表Controller * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ +@Validated @Api(value = "测试单表控制器", tags = {"测试单表管理"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @@ -44,7 +46,7 @@ public class TestDemoController extends BaseController { @ApiOperation("查询测试单表列表") @PreAuthorize("@ss.hasPermi('demo:demo:list')") @GetMapping("/list") - public TableDataInfo list(@Validated TestDemoQueryBo bo) { + public TableDataInfo list(@Validated TestDemoBo bo) { return iTestDemoService.queryPageList(bo); } @@ -54,7 +56,7 @@ public class TestDemoController extends BaseController { @ApiOperation("自定义分页查询") @PreAuthorize("@ss.hasPermi('demo:demo:list')") @GetMapping("/page") - public TableDataInfo page(@Validated TestDemoQueryBo bo) { + public TableDataInfo page(@Validated TestDemoBo bo) { return iTestDemoService.customPageList(bo); } @@ -65,7 +67,7 @@ public class TestDemoController extends BaseController { @PreAuthorize("@ss.hasPermi('demo:demo:export')") @Log(title = "测试单表", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(@Validated TestDemoQueryBo bo) { + public AjaxResult export(@Validated TestDemoBo bo) { List list = iTestDemoService.queryList(bo); ExcelUtil util = new ExcelUtil(TestDemoVo.class); return util.exportExcel(list, "测试单表"); @@ -88,9 +90,10 @@ public class TestDemoController extends BaseController { @ApiOperation("新增测试单表") @PreAuthorize("@ss.hasPermi('demo:demo:add')") @Log(title = "测试单表", businessType = BusinessType.INSERT) + @RepeatSubmit @PostMapping() - public AjaxResult add(@Validated @RequestBody TestDemoAddBo bo) { - return toAjax(iTestDemoService.insertByAddBo(bo) ? 1 : 0); + public AjaxResult add(@Validated(AddGroup.class) @RequestBody TestDemoBo bo) { + return toAjax(iTestDemoService.insertByBo(bo) ? 1 : 0); } /** @@ -99,9 +102,10 @@ public class TestDemoController extends BaseController { @ApiOperation("修改测试单表") @PreAuthorize("@ss.hasPermi('demo:demo:edit')") @Log(title = "测试单表", businessType = BusinessType.UPDATE) + @RepeatSubmit @PutMapping() - public AjaxResult edit(@Validated @RequestBody TestDemoEditBo bo) { - return toAjax(iTestDemoService.updateByEditBo(bo) ? 1 : 0); + public AjaxResult edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) { + return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0); } /** diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java index 54f1027e..8cab868c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java @@ -1,15 +1,16 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.bo.TestTreeAddBo; -import com.ruoyi.demo.bo.TestTreeEditBo; -import com.ruoyi.demo.bo.TestTreeQueryBo; +import com.ruoyi.demo.domain.bo.TestTreeBo; +import com.ruoyi.demo.domain.vo.TestTreeVo; import com.ruoyi.demo.service.ITestTreeService; -import com.ruoyi.demo.vo.TestTreeVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -27,8 +28,9 @@ import java.util.List; * 测试树表Controller * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ +@Validated @Api(value = "测试树表控制器", tags = {"测试树表管理"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @@ -43,8 +45,9 @@ public class TestTreeController extends BaseController { @ApiOperation("查询测试树表列表") @PreAuthorize("@ss.hasPermi('demo:tree:list')") @GetMapping("/list") - public AjaxResult> list(@Validated TestTreeQueryBo bo) { - return AjaxResult.success(iTestTreeService.queryList(bo)); + public AjaxResult> list(@Validated TestTreeBo bo) { + List list = iTestTreeService.queryList(bo); + return AjaxResult.success(list); } /** @@ -54,7 +57,7 @@ public class TestTreeController extends BaseController { @PreAuthorize("@ss.hasPermi('demo:tree:export')") @Log(title = "测试树表", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(@Validated TestTreeQueryBo bo) { + public AjaxResult export(@Validated TestTreeBo bo) { List list = iTestTreeService.queryList(bo); ExcelUtil util = new ExcelUtil(TestTreeVo.class); return util.exportExcel(list, "测试树表"); @@ -77,9 +80,10 @@ public class TestTreeController extends BaseController { @ApiOperation("新增测试树表") @PreAuthorize("@ss.hasPermi('demo:tree:add')") @Log(title = "测试树表", businessType = BusinessType.INSERT) + @RepeatSubmit @PostMapping() - public AjaxResult add(@Validated @RequestBody TestTreeAddBo bo) { - return toAjax(iTestTreeService.insertByAddBo(bo) ? 1 : 0); + public AjaxResult add(@Validated(AddGroup.class) @RequestBody TestTreeBo bo) { + return toAjax(iTestTreeService.insertByBo(bo) ? 1 : 0); } /** @@ -88,9 +92,10 @@ public class TestTreeController extends BaseController { @ApiOperation("修改测试树表") @PreAuthorize("@ss.hasPermi('demo:tree:edit')") @Log(title = "测试树表", businessType = BusinessType.UPDATE) + @RepeatSubmit @PutMapping() - public AjaxResult edit(@Validated @RequestBody TestTreeEditBo bo) { - return toAjax(iTestTreeService.updateByEditBo(bo) ? 1 : 0); + public AjaxResult edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) { + return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0); } /** diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java index 26f652a9..13fdc240 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java @@ -14,7 +14,7 @@ import java.util.Date; * 测试单表对象 test_demo * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ @Data @NoArgsConstructor @@ -32,43 +32,66 @@ public class TestDemo implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long id; - /** 部门id */ + /** + * 部门id + */ private Long deptId; - /** 用户id */ + /** + * 用户id + */ private Long userId; - /** 排序号 */ - @OrderBy(isDesc = false, sort = 1) + /** + * 排序号 + */ + @OrderBy(isDesc = false, sort = 1) private Long orderNum; - /** key键 */ + /** + * key键 + */ private String testKey; - /** 值 */ + /** + * 值 + */ private String value; - /** 版本 */ + /** + * 版本 + */ @Version private Long version; - /** 创建时间 */ + /** + * 创建时间 + */ @TableField(fill = FieldFill.INSERT) private Date createTime; - /** 创建人 */ + /** + * 创建人 + */ @TableField(fill = FieldFill.INSERT) private String createBy; - /** 更新时间 */ + /** + * 更新时间 + */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - /** 更新人 */ + /** + * 更新人 + */ @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - /** 删除标志 */ + /** + * 删除标志 + */ + @TableLogic private Long delFlag; } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java index b9bd2ba6..799a6d41 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java @@ -1,8 +1,6 @@ package com.ruoyi.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; @@ -14,7 +12,7 @@ import java.util.Date; * 测试树表对象 test_tree * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ @Data @NoArgsConstructor @@ -25,44 +23,65 @@ public class TestTree implements Serializable { private static final long serialVersionUID=1L; - /** 主键 */ + /** + * 主键 + */ @TableId(value = "id") - @JsonSerialize(using = ToStringSerializer.class) private Long id; - /** 父id */ + /** + * 父id + */ private Long parentId; - /** 部门id */ + /** + * 部门id + */ private Long deptId; - /** 用户id */ + /** + * 用户id + */ private Long userId; - /** 树节点名 */ + /** + * 树节点名 + */ private String treeName; - /** 版本 */ + /** + * 版本 + */ @Version private Long version; - /** 创建时间 */ + /** + * 创建时间 + */ @TableField(fill = FieldFill.INSERT) private Date createTime; - /** 创建人 */ + /** + * 创建人 + */ @TableField(fill = FieldFill.INSERT) private String createBy; - /** 更新时间 */ + /** + * 更新时间 + */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - /** 更新人 */ + /** + * 更新人 + */ @TableField(fill = FieldFill.INSERT_UPDATE) private String updateBy; - /** 删除标志 */ + /** + * 删除标志 + */ @TableLogic private Long delFlag; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java index 45dc539e..efbbffc4 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.vo.TestDemoVo; +import com.ruoyi.demo.domain.vo.TestDemoVo; import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param; * 测试单表Mapper接口 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ // 如使需切换数据源 请勿使用缓存 会造成数据不一致现象 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java index 20a3e9be..05b0153b 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java @@ -7,9 +7,8 @@ import com.ruoyi.demo.domain.TestTree; * 测试树表Mapper接口 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ -//@CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) public interface TestTreeMapper extends BaseMapperPlus { } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java index ded47f73..eb4f21be 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java @@ -1,12 +1,10 @@ package com.ruoyi.demo.service; +import com.ruoyi.demo.domain.TestDemo; +import com.ruoyi.demo.domain.vo.TestDemoVo; +import com.ruoyi.demo.domain.bo.TestDemoBo; import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.demo.bo.TestDemoAddBo; -import com.ruoyi.demo.bo.TestDemoEditBo; -import com.ruoyi.demo.bo.TestDemoQueryBo; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.vo.TestDemoVo; import java.util.Collection; import java.util.List; @@ -15,7 +13,7 @@ import java.util.List; * 测试单表Service接口 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ public interface ITestDemoService extends IServicePlus { @@ -28,31 +26,31 @@ public interface ITestDemoService extends IServicePlus { /** * 查询列表 */ - TableDataInfo queryPageList(TestDemoQueryBo bo); + TableDataInfo queryPageList(TestDemoBo bo); /** * 自定义分页查询 */ - TableDataInfo customPageList(TestDemoQueryBo bo); + TableDataInfo customPageList(TestDemoBo bo); /** * 查询列表 */ - List queryList(TestDemoQueryBo bo); + List queryList(TestDemoBo bo); /** * 根据新增业务对象插入测试单表 * @param bo 测试单表新增业务对象 * @return */ - Boolean insertByAddBo(TestDemoAddBo bo); + Boolean insertByBo(TestDemoBo bo); /** * 根据编辑业务对象修改测试单表 * @param bo 测试单表编辑业务对象 * @return */ - Boolean updateByEditBo(TestDemoEditBo bo); + Boolean updateByBo(TestDemoBo bo); /** * 校验并删除数据 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java index e27fda02..9b8acb9c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java @@ -1,11 +1,9 @@ package com.ruoyi.demo.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.demo.bo.TestTreeAddBo; -import com.ruoyi.demo.bo.TestTreeEditBo; -import com.ruoyi.demo.bo.TestTreeQueryBo; import com.ruoyi.demo.domain.TestTree; -import com.ruoyi.demo.vo.TestTreeVo; +import com.ruoyi.demo.domain.vo.TestTreeVo; +import com.ruoyi.demo.domain.bo.TestTreeBo; +import com.ruoyi.common.core.mybatisplus.core.IServicePlus; import java.util.Collection; import java.util.List; @@ -14,7 +12,7 @@ import java.util.List; * 测试树表Service接口 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ public interface ITestTreeService extends IServicePlus { /** @@ -26,21 +24,21 @@ public interface ITestTreeService extends IServicePlus { /** * 查询列表 */ - List queryList(TestTreeQueryBo bo); + List queryList(TestTreeBo bo); /** * 根据新增业务对象插入测试树表 * @param bo 测试树表新增业务对象 * @return */ - Boolean insertByAddBo(TestTreeAddBo bo); + Boolean insertByBo(TestTreeBo bo); /** * 根据编辑业务对象修改测试树表 * @param bo 测试树表编辑业务对象 * @return */ - Boolean updateByEditBo(TestTreeEditBo bo); + Boolean updateByBo(TestTreeBo bo); /** * 校验并删除数据 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java index 7387a121..81893dff 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java @@ -10,13 +10,11 @@ import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.PagePlus; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.demo.bo.TestDemoAddBo; -import com.ruoyi.demo.bo.TestDemoEditBo; -import com.ruoyi.demo.bo.TestDemoQueryBo; import com.ruoyi.demo.domain.TestDemo; +import com.ruoyi.demo.domain.bo.TestDemoBo; +import com.ruoyi.demo.domain.vo.TestDemoVo; import com.ruoyi.demo.mapper.TestDemoMapper; import com.ruoyi.demo.service.ITestDemoService; -import com.ruoyi.demo.vo.TestDemoVo; import org.springframework.stereotype.Service; import java.util.Collection; @@ -27,7 +25,7 @@ import java.util.Map; * 测试单表Service业务层处理 * * @author Lion Li - * @date 2021-05-30 + * @date 2021-07-26 */ @Service public class TestDemoServiceImpl extends ServicePlusImpl implements ITestDemoService { @@ -39,7 +37,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl queryPageList(TestDemoQueryBo bo) { + public TableDataInfo queryPageList(TestDemoBo bo) { PagePlus result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } @@ -49,18 +47,18 @@ public class TestDemoServiceImpl extends ServicePlusImpl customPageList(TestDemoQueryBo bo) { + public TableDataInfo customPageList(TestDemoBo bo) { Page result = baseMapper.customPageList(PageUtils.buildPage(), buildQueryWrapper(bo)); return PageUtils.buildDataInfo(result); } @DataScope(isUser = true) @Override - public List queryList(TestDemoQueryBo bo) { + public List queryList(TestDemoBo bo) { return listVo(buildQueryWrapper(bo)); } - private LambdaQueryWrapper buildQueryWrapper(TestDemoQueryBo bo) { + private LambdaQueryWrapper buildQueryWrapper(TestDemoBo bo) { Map params = bo.getParams(); Object dataScope = params.get("dataScope"); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -74,14 +72,14 @@ public class TestDemoServiceImpl extends ServicePlusImpl implements ITestTreeService { @@ -36,11 +34,11 @@ public class TestTreeServiceImpl extends ServicePlusImpl queryList(TestTreeQueryBo bo) { + public List queryList(TestTreeBo bo) { return listVo(buildQueryWrapper(bo)); } - private LambdaQueryWrapper buildQueryWrapper(TestTreeQueryBo bo) { + private LambdaQueryWrapper buildQueryWrapper(TestTreeBo bo) { Map params = bo.getParams(); Object dataScope = params.get("dataScope"); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); @@ -53,14 +51,14 @@ public class TestTreeServiceImpl extends ServicePlusImpl - SELECT * FROM test_demo ${ew.customSqlSegment}