From 280196c9e540f88c65cdf1b8c0964dac65bbfb81 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 26 七月 2021 13:13:46 +0800
Subject: [PATCH] udpate 更新新功能演示案例
---
/dev/null | 59 -----------
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 28 +++--
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java | 20 +--
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java | 16 +-
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 49 ++++++---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java | 49 +++++++--
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java | 3
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java | 29 +++--
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java | 20 +--
ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java | 16 +-
ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml | 2
ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java | 4
12 files changed, 139 insertions(+), 156 deletions(-)
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 10520ae..0000000
--- 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 639443b..0000000
--- 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 ca2bb5a..0000000
--- 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;
- /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
- @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 a9a4b5e..0000000
--- 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 {
-
- /** 鐖秈d */
- @ApiModelProperty("鐖秈d")
- 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 e3d359d..0000000
--- 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;
-
-
- /** 鐖秈d */
- @ApiModelProperty("鐖秈d")
- 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 3ed482b..0000000
--- 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;
- /** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
- @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 9ba8a2a..ade20f8 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 @@
* 娴嬭瘯鍗曡〃Controller
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+@Validated
@Api(value = "娴嬭瘯鍗曡〃鎺у埗鍣�", tags = {"娴嬭瘯鍗曡〃绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@@ -44,7 +46,7 @@
@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 @@
@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 @@
@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 @@
@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 @@
@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);
}
/**
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 54f1027..8cab868 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 @@
* 娴嬭瘯鏍戣〃Controller
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
+@Validated
@Api(value = "娴嬭瘯鏍戣〃鎺у埗鍣�", tags = {"娴嬭瘯鏍戣〃绠＄悊"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@@ -43,8 +45,9 @@
@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 @@
@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 @@
@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 @@
@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);
}
/**
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 26f652a..13fdc24 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 @@
* 娴嬭瘯鍗曡〃瀵硅薄 test_demo
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@NoArgsConstructor
@@ -32,43 +32,66 @@
@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 b9bd2ba..799a6d4 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 @@
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@NoArgsConstructor
@@ -25,44 +23,65 @@
private static final long serialVersionUID=1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
@TableId(value = "id")
- @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- /** 鐖秈d */
+ /**
+ * 鐖秈d
+ */
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 45dc539..efbbffc 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.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 @@
* 娴嬭瘯鍗曡〃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 20a3e9b..05b0153 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 @@
* 娴嬭瘯鏍戣〃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> {
}
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 ded47f7..eb4f21b 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 @@
* 娴嬭瘯鍗曡〃Service鎺ュ彛
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
public interface ITestDemoService extends IServicePlus<TestDemo, TestDemoVo> {
@@ -28,31 +26,31 @@
/**
* 鏌ヨ鍒楄〃
*/
- 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);
/**
* 鏍￠獙骞跺垹闄ゆ暟鎹�
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 e27fda0..9b8acb9 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 @@
* 娴嬭瘯鏍戣〃Service鎺ュ彛
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
public interface ITestTreeService extends IServicePlus<TestTree, TestTreeVo> {
/**
@@ -26,21 +24,21 @@
/**
* 鏌ヨ鍒楄〃
*/
- 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);
/**
* 鏍￠獙骞跺垹闄ゆ暟鎹�
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 7387a12..81893df 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.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 @@
* 娴嬭瘯鍗曡〃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 @@
@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 @@
*/
@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 @@
}
@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);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
index a84558b..a953412 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java
@@ -6,13 +6,11 @@
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 @@
* 娴嬭瘯鏍戣〃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 @@
// @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 @@
}
@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);
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java
deleted file mode 100644
index d1eb8bf..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java
+++ /dev/null
@@ -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;
-
-
-}
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
deleted file mode 100644
index c6ea558..0000000
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
+++ /dev/null
@@ -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;
-
- /** 鐖秈d */
- @Excel(name = "鐖秈d")
- @ApiModelProperty("鐖秈d")
- 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;
-
-
-}
diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
index bfec5a0..3caf98a 100644
--- a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
+++ b/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
@@ -18,7 +18,7 @@
<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>
--
Gitblit v1.9.3