Merge remote-tracking branch 'origin/boot3.0-zxs' into boot3.0-zxs

# Conflicts:
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java
#	cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java

@@ -0,0 +1,43 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysConfigListReq;
+import com.muyu.system.domain.rep.SysDeptListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysDeptPageQueryModel extends QueryModel<SysDeptPageQueryModel> {
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门状态:0正常,1停用
+     */
+    private String status;
+
+
+    public static SysDeptPageQueryModel reqBuild(SysDeptListReq sysDeptListReq) {
+        SysDeptPageQueryModel sysDeptPageQueryModel = SysDeptPageQueryModel.builder()
+                .deptName(sysDeptListReq.getDeptName())
+                .status(sysDeptListReq.getStatus())
+                .build();
+        sysDeptPageQueryModel.domainBuild(sysDeptListReq);
+        return sysDeptPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java

@@ -0,0 +1,46 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysDictDataListReq;
+import com.muyu.system.domain.rep.SysDictTypeListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysDictDataPageQueryModel extends QueryModel<SysDictDataPageQueryModel> {
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    public static SysDictDataPageQueryModel reqBuild(SysDictDataListReq sysDictDataListReq) {
+        SysDictDataPageQueryModel sysDictDataPageQueryModel = SysDictDataPageQueryModel.builder()
+                .dictType(sysDictDataListReq.getDictType())
+                .dictLabel(sysDictDataListReq.getDictLabel())
+                .status(sysDictDataListReq.getStatus())
+                .build();
+        sysDictDataPageQueryModel.domainBuild(sysDictDataListReq);
+        return sysDictDataPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java

@@ -0,0 +1,62 @@
+package com.muyu.system.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysDeptListReq;
+import com.muyu.system.domain.rep.SysDictTypeListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysDictTypePageQueryModel extends QueryModel<SysDictTypePageQueryModel> {
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysDictTypePageQueryModel reqBuild(SysDictTypeListReq sysDictTypeListReq) {
+        SysDictTypePageQueryModel sysDictTypePageQueryModel = SysDictTypePageQueryModel.builder()
+                .dictName(sysDictTypeListReq.getDictName())
+                .dictType(sysDictTypeListReq.getDictType())
+                .status(sysDictTypeListReq.getStatus())
+                .beginTime(sysDictTypeListReq.getBeginTime())
+                .endTime(sysDictTypeListReq.getEndTime())
+                .build();
+        sysDictTypePageQueryModel.domainBuild(sysDictTypeListReq);
+        return sysDictTypePageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java

@@ -0,0 +1,57 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysDictTypeListReq;
+import com.muyu.system.domain.rep.SysLogininforListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysLogininforPageQueryModel extends QueryModel<SysLogininforPageQueryModel> {
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+    /**
+     * 状态 0成功 1失败
+     */
+    private String status;
+    /**
+     * 地址
+     */
+    private String ipaddr;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysLogininforPageQueryModel reqBuild(SysLogininforListReq sysLogininforListReq) {
+        SysLogininforPageQueryModel sysLogininforPageQueryModel = SysLogininforPageQueryModel.builder()
+                .userName(sysLogininforListReq.getUserName())
+                .status(sysLogininforListReq.getStatus())
+                .ipaddr(sysLogininforListReq.getIpaddr())
+                .beginTime(sysLogininforListReq.getBeginTime())
+                .endTime(sysLogininforListReq.getEndTime())
+                .build();
+        sysLogininforPageQueryModel.domainBuild(sysLogininforListReq);
+        return sysLogininforPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java

@@ -0,0 +1,39 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysLogininforListReq;
+import com.muyu.system.domain.rep.SysMenuListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysMenuPageQueryModel extends QueryModel<SysMenuPageQueryModel> {
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    public static SysMenuPageQueryModel reqBuild(SysMenuListReq sysMenuListReq) {
+        SysMenuPageQueryModel sysMenuPageQueryModel = SysMenuPageQueryModel.builder()
+                .menuName(sysMenuListReq.getMenuName())
+                .status(sysMenuListReq.getStatus())
+                .build();
+        sysMenuPageQueryModel.domainBuild(sysMenuListReq);
+        return sysMenuPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java

@@ -0,0 +1,45 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysMenuListReq;
+import com.muyu.system.domain.rep.SysNoticeListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysNoticePageQueryModel extends QueryModel<SysNoticePageQueryModel> {
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    public static SysNoticePageQueryModel reqBuild(SysNoticeListReq sysNoticeListReq) {
+        SysNoticePageQueryModel sysNoticePageQueryModel = SysNoticePageQueryModel.builder()
+                .noticeTitle(sysNoticeListReq.getNoticeTitle())
+                .noticeType(sysNoticeListReq.getNoticeType())
+                .createBy(sysNoticeListReq.getCreateBy())
+                .build();
+        sysNoticePageQueryModel.domainBuild(sysNoticeListReq);
+        return sysNoticePageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java

@@ -0,0 +1,66 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysNoticeListReq;
+import com.muyu.system.domain.rep.SysOperlogListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+
+/**
+ * 参数配置 分页 模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysOperlogPageQueryModel extends QueryModel<SysOperlogPageQueryModel> {
+    /**
+     * 操作地址
+     */
+    private String operIp;
+    /**
+     * 操作模块
+     */
+    private String title;
+    /**
+     * 操作人员
+     */
+    private String operName;
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysOperlogPageQueryModel reqBuild(SysOperlogListReq sysOperlogListReq) {
+        SysOperlogPageQueryModel sysOperlogPageQueryModel = SysOperlogPageQueryModel.builder()
+                .operIp(sysOperlogListReq.getOperIp())
+                .title(sysOperlogListReq.getTitle())
+                .operName(sysOperlogListReq.getOperName())
+                .businessType(sysOperlogListReq.getBusinessType())
+                .status(sysOperlogListReq.getStatus())
+                .beginTime(sysOperlogListReq.getBeginTime())
+                .endTime(sysOperlogListReq.getEndTime())
+                .build();
+        sysOperlogPageQueryModel.domainBuild(sysOperlogListReq);
+        return sysOperlogPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java

@@ -0,0 +1,47 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysOperlogListReq;
+import com.muyu.system.domain.rep.SysPostListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysPostPageQueryModel  extends QueryModel<SysPostPageQueryModel> {
+    /**
+     * 岗位编码
+     */
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    public static SysPostPageQueryModel reqBuild(SysPostListReq sysPostListReq) {
+        SysPostPageQueryModel sysPostPageQueryModel = SysPostPageQueryModel.builder()
+                .postCode(sysPostListReq.getPostCode())
+                .postName(sysPostListReq.getPostName())
+                .status(sysPostListReq.getStatus())
+                .build();
+        sysPostPageQueryModel.domainBuild(sysPostListReq);
+        return sysPostPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java

@@ -0,0 +1,65 @@
+package com.muyu.system.domain.model;
+
+/**
+ * @ClassName SysRolePageQueryModel
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 12:34
+ */
+
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysPostListReq;
+import com.muyu.system.domain.rep.SysRoleListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysRolePageQueryModel extends QueryModel<SysRolePageQueryModel> {
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+
+    public static SysRolePageQueryModel reqBuild(SysRoleListReq sysRoleListReq) {
+        SysRolePageQueryModel sysRolePageQueryModel = SysRolePageQueryModel.builder()
+                .roleName(sysRoleListReq.getRoleName())
+                .roleKey(sysRoleListReq.getRoleKey())
+                .status(sysRoleListReq.getStatus())
+                .beginTime(sysRoleListReq.getBeginTime())
+                .endTime(sysRoleListReq.getEndTime())
+                .build();
+        sysRolePageQueryModel.domainBuild(sysRoleListReq);
+        return sysRolePageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java

@@ -0,0 +1,58 @@
+package com.muyu.system.domain.model;
+
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysPostListReq;
+import com.muyu.system.domain.rep.SysUserListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 参数配置 分页 模型
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class SysUserPageQueryModel extends QueryModel<SysUserPageQueryModel> {
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysUserPageQueryModel reqBuild(SysUserListReq sysUserListReq) {
+        SysUserPageQueryModel sysUserPageQueryModel = SysUserPageQueryModel.builder()
+                .nickName(sysUserListReq.getNickName())
+                .phonenumber(sysUserListReq.getPhonenumber())
+                .status(sysUserListReq.getStatus())
+                .beginTime(sysUserListReq.getBeginTime())
+                .endTime(sysUserListReq.getEndTime())
+                .build();
+        sysUserPageQueryModel.domainBuild(sysUserListReq);
+        return sysUserPageQueryModel;
+    }
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java

@@ -0,0 +1,34 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 部门信息请求列表查询对象
+ *
+ * @ClassName SysDeptListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/14 11:44
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysDeptListReq  extends PageReq {
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门状态:0正常,1停用
+     */
+    private String status;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java

@@ -0,0 +1,37 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 数据字典信息
+ *
+ * @ClassName SysDictDataListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/15 17:29
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysDictDataListReq extends PageReq {
+
+    /**
+     * 字典名称
+     */
+    private String dictType;
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java

@@ -0,0 +1,51 @@
+package com.muyu.system.domain.rep;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 字典数据表 请求列表查询对象
+ *
+ * @author muyu
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysDictTypeListReq extends PageReq {
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java

@@ -0,0 +1,32 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 菜单信息请求列表查询对象
+ *
+ * @ClassName SysMenuListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 10:55
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysMenuListReq extends PageReq {
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java

@@ -0,0 +1,37 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 公告信息操作处理请求列表查询对象
+ *
+ * @ClassName SysNoticeListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 11:02
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysNoticeListReq  extends PageReq {
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+    /**
+     * 创建者
+     */
+    private String createBy;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java

@@ -0,0 +1,54 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 操作日志记录请求列表查询对象
+ *
+ * @ClassName SysOperlogListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 11:18
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysOperlogListReq extends PageReq {
+    /**
+     * 操作地址
+     */
+    private String operIp;
+    /**
+     * 操作模块
+     */
+    private String title;
+    /**
+     * 操作人员
+     */
+    private String operName;
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java

@@ -0,0 +1,40 @@
+package com.muyu.system.domain.rep;
+
+/**
+ * @ClassName SysPostListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 11:32
+ */
+
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 岗位信息操作处理 请求列表查询对象
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysPostListReq extends PageReq {
+    /**
+     * 岗位编码
+     */
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java

@@ -0,0 +1,44 @@
+package com.muyu.system.domain.rep;
+
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 角色信息 请求列表查询对象
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysRoleListReq extends PageReq {
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java

@@ -0,0 +1,48 @@
+package com.muyu.system.domain.rep;
+
+/**
+ * @ClassName SysUserListReq
+ * @Author AnNan.Wang
+ * @Date 2024/12/16 12:30
+ */
+
+import com.muyu.common.core.annotation.Excel;
+import com.muyu.common.core.web.page.PageReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 用户信息 请求列表查询对象
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysUserListReq extends PageReq {
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+}

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java

@@ -1,7 +1,11 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysDept;
+import com.muyu.system.domain.SysConfig;
+import com.muyu.system.domain.model.SysConfigPageQueryModel;
+import com.muyu.system.domain.model.SysDeptPageQueryModel;
 import com.muyu.system.domain.vo.TreeSelect;
 
 import java.util.List;
@@ -135,4 +139,6 @@ public interface SysDeptService extends IService<SysDept> {
      * @return 结果
      */
     public int deleteDeptById (Long deptId);
+
+    PageQueryModel<SysDept> pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java

@@ -1,7 +1,11 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysDictData;
+import com.muyu.common.system.domain.SysDictType;
+import com.muyu.system.domain.model.SysDictDataPageQueryModel;
+import com.muyu.system.domain.model.SysDictTypePageQueryModel;
 
 import java.util.List;
 
@@ -63,4 +67,7 @@ public interface SysDictDataService extends IService<SysDictData> {
      * @return 结果
      */
     public int updateDictData (SysDictData dictData);
+
+    PageQueryModel<SysDictData> pageQuery(SysDictDataPageQueryModel sysDictDataPageQueryModel);
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java

@@ -1,8 +1,10 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysDictData;
 import com.muyu.common.system.domain.SysDictType;
+import com.muyu.system.domain.model.SysDictTypePageQueryModel;
 
 import java.util.List;
 
@@ -103,4 +105,7 @@ public interface SysDictTypeService extends IService<SysDictType> {
      * @return 结果
      */
     public boolean checkDictTypeUnique (SysDictType dictType);
+
+
+    PageQueryModel<SysDictType> pageQuery(SysDictTypePageQueryModel sysDictTypePageQueryModel);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java

@@ -1,7 +1,11 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
+import com.muyu.common.system.domain.SysLogininfor;
 import com.muyu.system.domain.SysMenu;
+import com.muyu.system.domain.model.SysLogininforPageQueryModel;
+import com.muyu.system.domain.model.SysMenuPageQueryModel;
 import com.muyu.system.domain.vo.RouterVo;
 import com.muyu.system.domain.vo.TreeSelect;
 
@@ -158,4 +162,7 @@ public interface SysMenuService extends IService<SysMenu> {
      * @return 结果
      */
     public boolean checkMenuNameUnique (SysMenu menu);
+
+    PageQueryModel<SysMenu> pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId);
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java

@@ -1,7 +1,9 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.system.domain.SysNotice;
+import com.muyu.system.domain.model.SysNoticePageQueryModel;
 
 import java.util.List;
 
@@ -64,4 +66,6 @@ public interface SysNoticeService extends IService<SysNotice> {
      * @return 结果
      */
     public int deleteNoticeByIds (Long[] noticeIds);
+
+    PageQueryModel<SysNotice> pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java

@@ -1,7 +1,9 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysOperLog;
+import com.muyu.system.domain.model.SysOperlogPageQueryModel;
 
 import java.util.List;
 
@@ -51,4 +53,7 @@ public interface SysOperLogService extends IService<SysOperLog> {
      * 清空操作日志
      */
     public void cleanOperLog ();
+
+    PageQueryModel<SysOperLog> pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel);
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java

@@ -1,7 +1,9 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.system.domain.SysPost;
+import com.muyu.system.domain.model.SysPostPageQueryModel;
 
 import java.util.List;
 
@@ -107,4 +109,7 @@ public interface SysPostService extends IService<SysPost> {
      * @return 结果
      */
     public int updatePost (SysPost post);
+
+    PageQueryModel<SysPost> pageQuery(SysPostPageQueryModel sysPostPageQueryModel);
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java

@@ -1,8 +1,10 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.system.domain.SysUserRole;
+import com.muyu.system.domain.model.SysRolePageQueryModel;
 
 import java.util.List;
 import java.util.Set;
@@ -186,4 +188,6 @@ public interface SysRoleService extends IService<SysRole> {
      * @return 结果
      */
     public int insertAuthUsers (Long roleId, Long[] userIds);
+
+    PageQueryModel<SysRole> pageQuery(SysRolePageQueryModel sysRolePageQueryModel);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java

@@ -1,7 +1,9 @@
 package com.muyu.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.system.domain.model.SysUserPageQueryModel;
 
 import java.util.List;
 
@@ -225,4 +227,6 @@ public interface SysUserService extends IService<SysUser> {
      * @return 结果
      */
     public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    PageQueryModel<SysUser> pageQuery(SysUserPageQueryModel sysUserPageQueryModel);
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java

@@ -1,16 +1,21 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.utils.SpringUtils;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.datascope.annotation.DataScope;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysDept;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.system.domain.SysConfig;
+import com.muyu.system.domain.model.SysDeptPageQueryModel;
 import com.muyu.system.domain.vo.TreeSelect;
 import com.muyu.system.mapper.SysDeptMapper;
 import com.muyu.system.mapper.SysRoleMapper;
@@ -21,6 +26,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -38,6 +44,16 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     private SysRoleMapper roleMapper;
 
 
+    @Override
+    public PageQueryModel<SysDept> pageQuery(SysDeptPageQueryModel sysDeptPageQueryModel) {
+        LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus());
+        Page<SysDept> page = this.page(sysDeptPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
+
+
     /**
      * 查询部门管理数据
      *
@@ -282,6 +298,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         return deptMapper.deleteDeptById(deptId);
     }
 
+
+
     /**
      * 递归列表
      */

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java

@@ -1,14 +1,22 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.security.utils.DictUtils;
 import com.muyu.common.system.domain.SysDictData;
+import com.muyu.common.system.domain.SysDictType;
+import com.muyu.system.domain.model.SysDictDataPageQueryModel;
+import com.muyu.system.domain.model.SysDictTypePageQueryModel;
 import com.muyu.system.mapper.SysDictDataMapper;
 import com.muyu.system.service.SysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 字典 业务层处理
@@ -20,6 +28,8 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
+
+
     /**
      * 根据条件分页查询字典数据
      *
@@ -105,4 +115,14 @@ public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDi
         }
         return row;
     }
+
+    @Override
+    public PageQueryModel<SysDictData> pageQuery(SysDictDataPageQueryModel sysDictdataPageQueryModel) {
+        LambdaQueryWrapper<SysDictData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictType()),SysDictData::getDictType, sysDictdataPageQueryModel.getDictType());
+        queryWrapper.like(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictLabel()),SysDictData::getDictLabel, sysDictdataPageQueryModel.getDictLabel());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getStatus()),SysDictData::getDictType, sysDictdataPageQueryModel.getStatus());
+        Page<SysDictData> page = this.page(sysDictdataPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java

@@ -1,12 +1,16 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.security.utils.DictUtils;
 import com.muyu.common.system.domain.SysDictData;
 import com.muyu.common.system.domain.SysDictType;
+import com.muyu.system.domain.model.SysDictTypePageQueryModel;
 import com.muyu.system.mapper.SysDictDataMapper;
 import com.muyu.system.mapper.SysDictTypeMapper;
 import com.muyu.system.service.SysDictTypeService;
@@ -18,6 +22,7 @@ import javax.annotation.PostConstruct;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -33,6 +38,18 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
     @Autowired
     private SysDictDataMapper dictDataMapper;
 
+    @Override
+    public PageQueryModel<SysDictType> pageQuery(SysDictTypePageQueryModel sysDictDataPageQueryModel) {
+        LambdaQueryWrapper<SysDictType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictName()),SysDictType::getDictName, sysDictDataPageQueryModel.getDictName());
+        queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictType()),SysDictType::getDictType, sysDictDataPageQueryModel.getDictType());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getStatus()),SysDictType::getDictType, sysDictDataPageQueryModel.getStatus());
+        queryWrapper.gt(Objects.nonNull(sysDictDataPageQueryModel.getBeginTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getBeginTime());
+        queryWrapper.lt(Objects.nonNull(sysDictDataPageQueryModel.getEndTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getEndTime());
+        Page<SysDictType> page = this.page(sysDictDataPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
+
     /**
      * 项目启动时，初始化字典到缓存
      */

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java

@@ -1,13 +1,18 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.common.system.domain.SysLogininfor;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.system.domain.SysMenu;
+import com.muyu.system.domain.model.SysMenuPageQueryModel;
 import com.muyu.system.domain.vo.MetaVo;
 import com.muyu.system.domain.vo.RouterVo;
 import com.muyu.system.domain.vo.TreeSelect;
@@ -70,6 +75,23 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         }
         return menuList;
     }
+    @Override
+    public PageQueryModel<SysMenu> pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId) {
+        Page<SysMenu> page = null;
+        // 管理员显示所有菜单信息
+        if (SysUser.isAdmin(userId)) {
+            LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName());
+            queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus());
+            page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper);
+        } else {
+            LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName());
+            queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus());
+            page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper);
+        }
+        return PageQueryModel.of(page);
+    }
 
     /**
      * 根据用户ID查询权限
@@ -335,6 +357,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return UserConstants.UNIQUE;
     }
 
+
+
     /**
      * 获取路由名称
      *

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java

@@ -1,13 +1,20 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
+import com.muyu.common.system.domain.SysLogininfor;
 import com.muyu.system.domain.SysNotice;
+import com.muyu.system.domain.model.SysNoticePageQueryModel;
 import com.muyu.system.mapper.SysNoticeMapper;
 import com.muyu.system.service.SysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 公告 服务层实现
@@ -19,6 +26,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
     @Autowired
     private SysNoticeMapper noticeMapper;
 
+
     /**
      * 查询公告信息
      *
@@ -90,4 +98,14 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
     public int deleteNoticeByIds (Long[] noticeIds) {
         return noticeMapper.deleteNoticeByIds(noticeIds);
     }
+
+    @Override
+    public PageQueryModel<SysNotice> pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) {
+        LambdaQueryWrapper<SysNotice> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeTitle()),SysNotice::getNoticeTitle, sysNoticePageQueryModel.getNoticeTitle());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeType()),SysNotice::getNoticeType, sysNoticePageQueryModel.getNoticeType());
+        queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getCreateBy()),SysNotice::getCreateBy, sysNoticePageQueryModel.getCreateBy());
+        Page<SysNotice> page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java

@@ -1,13 +1,20 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
+import com.muyu.common.system.domain.SysLogininfor;
 import com.muyu.common.system.domain.SysOperLog;
+import com.muyu.system.domain.model.SysOperlogPageQueryModel;
 import com.muyu.system.mapper.SysOperLogMapper;
 import com.muyu.system.service.SysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 操作日志 服务层处理
@@ -74,4 +81,18 @@ public class SysOperLogServiceImpl extends ServiceImpl<SysOperLogMapper, SysOper
     public void cleanOperLog () {
         operLogMapper.cleanOperLog();
     }
+
+    @Override
+    public PageQueryModel<SysOperLog> pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel) {
+        LambdaQueryWrapper<SysOperLog> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperIp()),SysOperLog::getOperIp, sysOperlogPageQueryModel.getOperIp());
+        queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getTitle()),SysOperLog::getTitle, sysOperlogPageQueryModel.getTitle());
+        queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperName()),SysOperLog::getOperName, sysOperlogPageQueryModel.getOperName());
+        queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getBusinessType()),SysOperLog::getBusinessType, sysOperlogPageQueryModel.getBusinessType());
+        queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getStatus()),SysOperLog::getStatus, sysOperlogPageQueryModel.getStatus());
+        queryWrapper.gt(Objects.nonNull(sysOperlogPageQueryModel.getBeginTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getBeginTime());
+        queryWrapper.lt(Objects.nonNull(sysOperlogPageQueryModel.getEndTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getEndTime());
+        Page<SysOperLog> page = this.page(sysOperlogPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java

@@ -1,10 +1,15 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
+import com.muyu.common.system.domain.SysLogininfor;
 import com.muyu.system.domain.SysPost;
+import com.muyu.system.domain.model.SysPostPageQueryModel;
 import com.muyu.system.mapper.SysPostMapper;
 import com.muyu.system.mapper.SysUserPostMapper;
 import com.muyu.system.service.SysPostService;
@@ -12,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 岗位信息 服务层处理
@@ -171,4 +177,14 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
     public int updatePost (SysPost post) {
         return postMapper.updatePost(post);
     }
+
+    @Override
+    public PageQueryModel<SysPost> pageQuery(SysPostPageQueryModel sysPostPageQueryModel) {
+        LambdaQueryWrapper<SysPost> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostCode()),SysPost::getPostCode, sysPostPageQueryModel.getPostCode());
+        queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostName()),SysPost::getPostName, sysPostPageQueryModel.getPostName());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysPostPageQueryModel.getStatus()),SysPost::getStatus, sysPostPageQueryModel.getStatus());
+        Page<SysPost> page = this.page(sysPostPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java

@@ -2,18 +2,22 @@ package com.muyu.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.SpringUtils;
 import com.muyu.common.core.utils.StringUtils;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.datascope.annotation.DataScope;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.common.system.domain.SysOperLog;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.system.domain.SysRoleDept;
 import com.muyu.system.domain.SysRoleMenu;
 import com.muyu.system.domain.SysUserRole;
+import com.muyu.system.domain.model.SysRolePageQueryModel;
 import com.muyu.system.mapper.SysRoleDeptMapper;
 import com.muyu.system.mapper.SysRoleMapper;
 import com.muyu.system.mapper.SysRoleMenuMapper;
@@ -439,4 +443,18 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         return userRoleMapper.batchUserRole(list);
     }
+
+    @Override
+    public PageQueryModel<SysRole> pageQuery(SysRolePageQueryModel sysRolePageQueryModel) {
+        LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleName()),SysRole::getRoleName, sysRolePageQueryModel.getRoleName());
+        queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleKey()),SysRole::getRoleKey, sysRolePageQueryModel.getRoleKey());
+        queryWrapper.eq(Objects.nonNull(sysRolePageQueryModel.getStatus()),SysRole::getStatus, sysRolePageQueryModel.getStatus());
+        queryWrapper.gt(Objects.nonNull(sysRolePageQueryModel.getBeginTime()),SysRole::getCreateTime, sysRolePageQueryModel.getBeginTime());
+        queryWrapper.lt(Objects.nonNull(sysRolePageQueryModel.getEndTime()),SysRole::getCreateTime, sysRolePageQueryModel.getEndTime());
+        Page<SysRole> page = this.page(sysRolePageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
+
+
 }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -1,11 +1,14 @@
 package com.muyu.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.SpringUtils;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.bean.BeanValidators;
+import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.datascope.annotation.DataScope;
 import com.muyu.common.security.utils.SecurityUtils;
 import com.muyu.common.system.domain.SysRole;
@@ -13,6 +16,7 @@ import com.muyu.common.system.domain.SysUser;
 import com.muyu.system.domain.SysPost;
 import com.muyu.system.domain.SysUserPost;
 import com.muyu.system.domain.SysUserRole;
+import com.muyu.system.domain.model.SysUserPageQueryModel;
 import com.muyu.system.mapper.*;
 import com.muyu.system.service.SysUserService;
 import com.muyu.system.service.SysConfigService;
@@ -26,6 +30,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -500,4 +505,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return successMsg.toString();
     }
 
+    @Override
+    public PageQueryModel<SysUser> pageQuery(SysUserPageQueryModel sysUserPageQueryModel) {
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(sysUserPageQueryModel.getPhonenumber()),SysUser::getPhonenumber, sysUserPageQueryModel.getPhonenumber());
+        queryWrapper.eq(StringUtils.isNotEmpty(sysUserPageQueryModel.getNickName()),SysUser::getNickName, sysUserPageQueryModel.getNickName());
+        queryWrapper.eq(Objects.nonNull(sysUserPageQueryModel.getStatus()),SysUser::getStatus, sysUserPageQueryModel.getStatus());
+        queryWrapper.gt(Objects.nonNull(sysUserPageQueryModel.getBeginTime()),SysUser::getCreateTime, sysUserPageQueryModel.getBeginTime());
+        queryWrapper.lt(Objects.nonNull(sysUserPageQueryModel.getEndTime()),SysUser::getCreateTime, sysUserPageQueryModel.getEndTime());
+        Page<SysUser> page = this.page(sysUserPageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
+    }
+    //nickName
+    //phonenumber
+    //status
+    //beginTime
+    //endTime
 }