From a44a01ea1698fab7168c90cf654c5f75882c2594 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: Tue, 17 Mar 2026 21:41:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20=E6=89=80?= =?UTF-8?q?=E6=9C=89bo=E5=AF=B9=E8=B1=A1=E7=A7=BB=E9=99=A4=E7=BB=A7?= =?UTF-8?q?=E6=89=BFBaseEntity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TestDemoServiceImpl.java | 6 +----- .../service/impl/TestTreeServiceImpl.java | 4 ---- .../dromara/generator/domain/GenTable.java | 8 ++++++++ .../dromara/system/domain/bo/SysDeptBo.java | 7 +++++++ .../dromara/system/domain/bo/SysOssBo.java | 5 +++++ .../dromara/system/domain/bo/SysPostBo.java | 7 +++++++ .../dromara/system/domain/bo/SysUserBo.java | 20 ++++++++++++++----- .../service/impl/SysDictTypeServiceImpl.java | 3 --- .../workflow/domain/bo/FlowSpelBo.java | 7 +++++++ .../workflow/domain/bo/TestLeaveBo.java | 6 ++++++ .../service/impl/FlwSpelServiceImpl.java | 1 - 11 files changed, 56 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index 5c4c29f68..014b7e81d 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; -import java.util.Map; /** * 测试单表Service业务层处理 @@ -89,14 +88,11 @@ public class TestDemoServiceImpl implements ITestDemoService { * @return 查询条件包装器 */ private LambdaQueryWrapper buildQueryWrapper(TestDemoBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getDeptId() != null, TestDemo::getDeptId, bo.getDeptId()); lqw.eq(bo.getUserId() != null, TestDemo::getUserId, bo.getUserId()); lqw.like(StringUtils.isNotBlank(bo.getTestKey()), TestDemo::getTestKey, bo.getTestKey()); lqw.eq(StringUtils.isNotBlank(bo.getValue()), TestDemo::getValue, bo.getValue()); - lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - TestDemo::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); lqw.orderByAsc(TestDemo::getId); return lqw; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java index 9499339cc..4671e4876 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import java.util.Collection; import java.util.List; -import java.util.Map; /** * 测试树表Service业务层处理 @@ -60,13 +59,10 @@ public class TestTreeServiceImpl implements ITestTreeService { * @return 查询条件包装器 */ private LambdaQueryWrapper buildQueryWrapper(TestTreeBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getDeptId() != null, TestTree::getDeptId, bo.getDeptId()); lqw.eq(bo.getUserId() != null, TestTree::getUserId, bo.getUserId()); lqw.like(StringUtils.isNotBlank(bo.getTreeName()), TestTree::getTreeName, bo.getTreeName()); - lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, - TestTree::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); lqw.orderByAsc(TestTree::getId); return lqw; } diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java index 729eb51ed..1ee32e64f 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java @@ -12,7 +12,9 @@ import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 业务表 gen_table @@ -170,6 +172,12 @@ public class GenTable extends BaseEntity { @TableField(exist = false) private String parentMenuName; + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); + /** * 判断当前业务表是否采用树表模板。 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 9f5451d5d..23677148c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -10,6 +10,8 @@ import org.dromara.system.domain.SysDept; import java.io.Serial; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * 部门业务对象 sys_dept @@ -81,4 +83,9 @@ public class SysDeptBo implements Serializable { */ private Long belongDeptId; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java index 095c9ae78..c2df40403 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java @@ -56,6 +56,11 @@ public class SysOssBo implements Serializable { */ private String service; + /** + * 创建者 + */ + private Long createBy; + /** * 请求参数 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java index 589e54c60..164c20a40 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java @@ -9,6 +9,8 @@ import org.dromara.system.domain.SysPost; import java.io.Serial; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * 岗位信息业务对象 sys_post @@ -75,4 +77,9 @@ public class SysPostBo implements Serializable { */ private String remark; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 2583f82fc..bcbc53b1e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -118,6 +118,21 @@ public class SysUserBo implements Serializable { */ private String excludeUserIds; + /** + * 创建者 + */ + private Long createBy; + + /** + * 更新者 + */ + private Long updateBy; + + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + public SysUserBo(Long userId) { this.userId = userId; } @@ -126,9 +141,4 @@ public class SysUserBo implements Serializable { return SystemConstants.SUPER_ADMIN_ID.equals(this.userId); } - /** - * 请求参数 - */ - private Map params = new HashMap<>(); - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index e801aaaea..932b51865 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -81,12 +81,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService * @return 包含名称、类型与创建时间区间的查询包装器 */ private LambdaQueryWrapper buildQueryWrapper(SysDictTypeBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName()); lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime")); lqw.orderByAsc(SysDictType::getDictId); return lqw; } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java index e508b643a..55481bd86 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowSpelBo.java @@ -9,6 +9,8 @@ import org.dromara.workflow.domain.FlowSpel; import java.io.Serial; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * 流程spel表达式定义业务对象 flow_spel @@ -60,4 +62,9 @@ public class FlowSpelBo implements Serializable { */ private String remark; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); + } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java index e0b2cd0a8..a42202271 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java @@ -13,6 +13,8 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 请假业务对象 test_leave @@ -90,5 +92,9 @@ public class TestLeaveBo implements Serializable { */ private String status; + /** + * 请求参数 + */ + private Map params = new HashMap<>(); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index a5e506522..99af8701c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -87,7 +87,6 @@ public class FlwSpelServiceImpl implements IFlwSpelService { * @return 包含排序和筛选条件的查询包装器 */ private LambdaQueryWrapper buildQueryWrapper(FlowSpelBo bo) { - Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(FlowSpel::getId); lqw.like(StringUtils.isNotBlank(bo.getComponentName()), FlowSpel::getComponentName, bo.getComponentName());