wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udpate 更新新功能演示案例

This commit is contained in:
疯狂的狮子li 2021-07-26 13:13:46 +08:00
parent 83cc800e97
commit 280196c9e5
19 changed files with 139 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java
View File

@ -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;
}

52
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoEditBo.java
View File

@ -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;
}

42
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoQueryBo.java
View File

@ -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;
}

39
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeAddBo.java
View File

@ -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;
}

47
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeEditBo.java
View File

@ -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;
}

42
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestTreeQueryBo.java
View File

@ -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;
}

28
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
View File

@ -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<TestDemoVo> list(@Validated TestDemoQueryBo bo) {
public TableDataInfo<TestDemoVo> 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<TestDemoVo> page(@Validated TestDemoQueryBo bo) {
public TableDataInfo<TestDemoVo> 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<TestDemoVo> export(@Validated TestDemoQueryBo bo) {
public AjaxResult<TestDemoVo> export(@Validated TestDemoBo bo) {
List<TestDemoVo> list = iTestDemoService.queryList(bo);
ExcelUtil<TestDemoVo> util = new ExcelUtil<TestDemoVo>(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<Void> add(@Validated @RequestBody TestDemoAddBo bo) {
return toAjax(iTestDemoService.insertByAddBo(bo) ? 1 : 0);
public AjaxResult<Void> 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<Void> edit(@Validated @RequestBody TestDemoEditBo bo) {
return toAjax(iTestDemoService.updateByEditBo(bo) ? 1 : 0);
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestDemoBo bo) {
return toAjax(iTestDemoService.updateByBo(bo) ? 1 : 0);
}
/**

29
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
View File

@ -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<TestTreeVo>> list(@Validated TestTreeQueryBo bo) {
return AjaxResult.success(iTestTreeService.queryList(bo));
public AjaxResult<List<TestTreeVo>> list(@Validated TestTreeBo bo) {
List<TestTreeVo> 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<TestTreeVo> export(@Validated TestTreeQueryBo bo) {
public AjaxResult<TestTreeVo> export(@Validated TestTreeBo bo) {
List<TestTreeVo> list = iTestTreeService.queryList(bo);
ExcelUtil<TestTreeVo> util = new ExcelUtil<TestTreeVo>(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<Void> add(@Validated @RequestBody TestTreeAddBo bo) {
return toAjax(iTestTreeService.insertByAddBo(bo) ? 1 : 0);
public AjaxResult<Void> 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<Void> edit(@Validated @RequestBody TestTreeEditBo bo) {
return toAjax(iTestTreeService.updateByEditBo(bo) ? 1 : 0);
public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody TestTreeBo bo) {
return toAjax(iTestTreeService.updateByBo(bo) ? 1 : 0);
}
/**

49
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java
View File

@ -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;
}

49
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
View File

@ -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;

4
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java
View File

@ -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)

3
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java
View File

@ -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<TestTree> {
}

20
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java
View File

@ -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<TestDemo, TestDemoVo> {
@ -28,31 +26,31 @@ public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
/**
* 查询列表
*/
TableDataInfo<TestDemoVo> queryPageList(TestDemoQueryBo bo);
TableDataInfo<TestDemoVo> queryPageList(TestDemoBo bo);
/**
* 自定义分页查询
*/
TableDataInfo<TestDemoVo> customPageList(TestDemoQueryBo bo);
TableDataInfo<TestDemoVo> customPageList(TestDemoBo bo);
/**
* 查询列表
*/
List<TestDemoVo> queryList(TestDemoQueryBo bo);
List<TestDemoVo> 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);
/**
* 校验并删除数据

16
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java
View File

@ -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<TestTree, TestTreeVo> {
/**
@ -26,21 +24,21 @@ public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
/**
* 查询列表
*/
List<TestTreeVo> queryList(TestTreeQueryBo bo);
List<TestTreeVo> 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);
/**
* 校验并删除数据

20
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java
View File

@ -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<TestDemoMapper, TestDemo, TestDemoVo> implements ITestDemoService {
@ -39,7 +37,7 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
@DataScope(isUser = true)
@Override
public TableDataInfo<TestDemoVo> queryPageList(TestDemoQueryBo bo) {
public TableDataInfo<TestDemoVo> queryPageList(TestDemoBo bo) {
PagePlus<TestDemo, TestDemoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@ -49,18 +47,18 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
*/
@DataScope(isUser = true)
@Override
public TableDataInfo<TestDemoVo> customPageList(TestDemoQueryBo bo) {
public TableDataInfo<TestDemoVo> customPageList(TestDemoBo bo) {
Page<TestDemoVo> result = baseMapper.customPageList(PageUtils.buildPage(), buildQueryWrapper(bo));
return PageUtils.buildDataInfo(result);
}
@DataScope(isUser = true)
@Override
public List<TestDemoVo> queryList(TestDemoQueryBo bo) {
public List<TestDemoVo> queryList(TestDemoBo bo) {
return listVo(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<TestDemo> buildQueryWrapper(TestDemoQueryBo bo) {
private LambdaQueryWrapper<TestDemo> buildQueryWrapper(TestDemoBo bo) {
Map<String, Object> params = bo.getParams();
Object dataScope = params.get("dataScope");
LambdaQueryWrapper<TestDemo> lqw = Wrappers.lambdaQuery();
@ -74,14 +72,14 @@ public class TestDemoServiceImpl extends ServicePlusImpl<TestDemoMapper, TestDem
}
@Override
public Boolean insertByAddBo(TestDemoAddBo bo) {
public Boolean insertByBo(TestDemoBo bo) {
TestDemo add = BeanUtil.toBean(bo, TestDemo.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean updateByEditBo(TestDemoEditBo bo) {
public Boolean updateByBo(TestDemoBo bo) {
TestDemo update = BeanUtil.toBean(bo, TestDemo.class);
validEntityBeforeSave(update);
return updateById(update);

16
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
View File

@ -6,13 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
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.domain.bo.TestTreeBo;
import com.ruoyi.demo.domain.vo.TestTreeVo;
import com.ruoyi.demo.mapper.TestTreeMapper;
import com.ruoyi.demo.service.ITestTreeService;
import com.ruoyi.demo.vo.TestTreeVo;
import org.springframework.stereotype.Service;
import java.util.Collection;
@ -23,7 +21,7 @@ import java.util.Map;
* 测试树表Service业务层处理
*
* @author Lion Li
* @date 2021-05-30
* @date 2021-07-26
*/
@Service
public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTree, TestTreeVo> implements ITestTreeService {
@ -36,11 +34,11 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
// @DataSource(DataSourceType.SLAVE) // 切换从库查询
@DataScope(isUser = true)
@Override
public List<TestTreeVo> queryList(TestTreeQueryBo bo) {
public List<TestTreeVo> queryList(TestTreeBo bo) {
return listVo(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeQueryBo bo) {
private LambdaQueryWrapper<TestTree> buildQueryWrapper(TestTreeBo bo) {
Map<String, Object> params = bo.getParams();
Object dataScope = params.get("dataScope");
LambdaQueryWrapper<TestTree> lqw = Wrappers.lambdaQuery();
@ -53,14 +51,14 @@ public class TestTreeServiceImpl extends ServicePlusImpl<TestTreeMapper, TestTre
}
@Override
public Boolean insertByAddBo(TestTreeAddBo bo) {
public Boolean insertByBo(TestTreeBo bo) {
TestTree add = BeanUtil.toBean(bo, TestTree.class);
validEntityBeforeSave(add);
return save(add);
}
@Override
public Boolean updateByEditBo(TestTreeEditBo bo) {
public Boolean updateByBo(TestTreeBo bo) {
TestTree update = BeanUtil.toBean(bo, TestTree.class);
validEntityBeforeSave(update);
return updateById(update);

83
ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java
View File

@ -1,83 +0,0 @@
package com.ruoyi.demo.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 测试单表视图对象 test_demo
*
* @author Lion Li
* @date 2021-05-30
*/
@Data
@ApiModel("测试单表视图对象")
public class TestDemoVo {
private static final long serialVersionUID = 1L;
/**
* 主键
* 如果是自定义id 或者 雪花id
* 需要增加序列化为字符串注解 因为Long到前端会失真
*/
@ApiModelProperty("主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 部门id */
@Excel(name = "部门id")
@ApiModelProperty("部门id")
private Long deptId;
/** 用户id */
@Excel(name = "用户id")
@ApiModelProperty("用户id")
private Long userId;
/** 排序号 */
@Excel(name = "排序号")
@ApiModelProperty("排序号")
private Long orderNum;
/** key键 */
@Excel(name = "key键")
@ApiModelProperty("key键")
private String testKey;
/** 值 */
@Excel(name = "值")
@ApiModelProperty("值")
private String value;
/** 创建时间 */
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private Date createTime;
/** 创建人 */
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createBy;
/** 更新时间 */
@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("更新时间")
private Date updateTime;
/** 更新人 */
@Excel(name = "更新人")
@ApiModelProperty("更新人")
private String updateBy;
}

59
ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
View File

@ -1,59 +0,0 @@
package com.ruoyi.demo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 测试树表视图对象 test_tree
*
* @author Lion Li
* @date 2021-05-30
*/
@Data
@ApiModel("测试树表视图对象")
public class TestTreeVo {
private static final long serialVersionUID = 1L;
/** 主键 */
@ApiModelProperty("主键")
@JsonSerialize(using = ToStringSerializer.class)
private Long id;
/** 父id */
@Excel(name = "父id")
@ApiModelProperty("父id")
private Long parentId;
/** 部门id */
@Excel(name = "部门id")
@ApiModelProperty("部门id")
private Long deptId;
/** 用户id */
@Excel(name = "用户id")
@ApiModelProperty("用户id")
private Long userId;
/** 树节点名 */
@Excel(name = "树节点名")
@ApiModelProperty("树节点名")
private String treeName;
/** 创建时间 */
@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
private Date createTime;
}

2
ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
View File

@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
<select id="customPageList" resultType="com.ruoyi.demo.vo.TestDemoVo">
<select id="customPageList" resultType="com.ruoyi.demo.domain.vo.TestDemoVo">
SELECT * FROM test_demo ${ew.customSqlSegment}
</select>