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-common/cloud-common-core/pom.xml

@@ -51,23 +51,10 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
-            <version>3.5.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.github.jsqlparser</groupId>
-                    <artifactId>jsqlparser</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-
         <dependency>
-            <groupId>org.mybatis</groupId>
+            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis</artifactId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
-            <version>3.5.16</version>
         </dependency>
 
         <!-- Hibernate Validator -->

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java

@@ -0,0 +1,21 @@
+package com.muyu.common.core.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 添加分页插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加
+        return interceptor;
+    }
+}

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java

@@ -3,6 +3,7 @@ package com.muyu.common.core.web.model;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.PageReq;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -62,8 +63,10 @@ public class QueryModel<T> {
      */
     public <I> Page<I> buildPage(){
         Page<I> page = Page.of(this.getPageNum(), this.getPageSize());
-        page.setOrders(List.of(this.isAsc()
+        if(StringUtils.isNotBlank(this.getOrderByColumn())){
-                ? OrderItem.asc(this.getOrderByColumn()) : OrderItem.desc(this.getOrderByColumn())));
+            page.setOrders(List.of(this.isAsc()
+                    ? OrderItem.asc(this.getOrderByColumn()) : OrderItem.desc(this.getOrderByColumn())));
+        }
         return page;
     }
 }

cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,2 +1,3 @@
 com.muyu.common.core.utils.SpringUtils
 com.muyu.common.core.feign.FeginConfig
+com.muyu.common.core.config.MybatisPlusConfig

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java

@@ -21,8 +21,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+public class SysLogininfor {
-public class SysLogininfor extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**

cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java

@@ -40,7 +40,7 @@ public class GenController extends BaseController {
      * 查询代码生成列表
      */
     @RequiresPermissions("tool:gen:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
     public Result<DataPageResp<GenTable>> genList (GenTable genTable) {
         List<GenTable> list = genTableService.selectGenTableList(genTable);
         return Result.success(new DataPageResp<>(0,list));

cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm

@@ -42,7 +42,7 @@ public class ${ClassName}Controller extends BaseController
      * 查询${functionName}列表
      */
     @RequiresPermissions("${permissionPrefix}:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
 #if($table.crud || $table.sub)
     public Result<DataPageResp> list(${ClassName} ${className})
     {

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java

@@ -40,9 +40,9 @@ public class SysConfigController extends BaseController {
      * 获取参数配置列表
      */
     @RequiresPermissions("system:config:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
     @Operation(summary = "查询集合", description = "更新水果信息")
-    public Result<DataPageResp<SysConfig>> list (SysConfigListReq sysConfigListReq) {
+    public Result<DataPageResp<SysConfig>> list (@RequestBody SysConfigListReq sysConfigListReq) {
         PageQueryModel<SysConfig> pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq));
         return resultList(pageQueryModel);
     }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java

@@ -4,18 +4,11 @@ import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 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.rep.SysConfigListReq;
-import com.muyu.system.domain.rep.SysDeptListReq;
 import com.muyu.system.service.SysDeptService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.ArrayUtils;
@@ -42,10 +35,10 @@ public class SysDeptController extends BaseController {
      * 获取部门列表
      */
     @RequiresPermissions("system:dept:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysDept>> list (SysDeptListReq sysDeptListReq) {
+    public Result list (@RequestBody SysDept dept) {
-        PageQueryModel<SysDept> pageQueryModel = deptService.pageQuery(SysDeptPageQueryModel.reqBuild(sysDeptListReq));
+        List<SysDept> depts = deptService.selectDeptList(dept);
-        return resultList(pageQueryModel);
+        return success(depts);
     }
 
     /**

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java

@@ -5,16 +5,11 @@ import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 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.domain.rep.SysDictDataListReq;
 import com.muyu.system.service.SysDictDataService;
 import com.muyu.system.service.SysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,13 +35,12 @@ public class SysDictDataController extends BaseController {
     private SysDictTypeService dictTypeService;
 
     @RequiresPermissions("system:dict:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysDictData>> list (SysDictDataListReq sysDictDataListReq) {
+    public Result<DataPageResp<SysDictData>> list (@RequestBody SysDictData dictData) {
-        PageQueryModel<SysDictData> pageQueryModel = dictDataService.pageQuery(SysDictDataPageQueryModel.reqBuild(sysDictDataListReq));
+        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
-
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:dict:export")
     @PostMapping("/export")

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java

@@ -4,15 +4,11 @@ import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
 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.domain.rep.SysDictTypeListReq;
 import com.muyu.system.service.SysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -33,10 +29,10 @@ public class SysDictTypeController extends BaseController {
     private SysDictTypeService dictTypeService;
 
     @RequiresPermissions("system:dict:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysDictType>> list (SysDictTypeListReq sysDictTypeListReq) {
+    public Result<DataPageResp<SysDictType>> list (@RequestBody SysDictType dictType) {
-        PageQueryModel<SysDictType> pageQueryModel = dictTypeService.pageQuery(SysDictTypePageQueryModel.reqBuild(sysDictTypeListReq));
+        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java

@@ -11,10 +11,9 @@ import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.common.security.annotation.InnerAuth;
 import com.muyu.common.security.annotation.RequiresPermissions;
-import com.muyu.common.system.domain.SysDictType;
 import com.muyu.common.system.domain.SysLogininfor;
-import com.muyu.system.domain.model.SysDictTypePageQueryModel;
+import com.muyu.system.domain.model.SysLogininforExportModel;
-import com.muyu.system.domain.model.SysLogininforPageQueryModel;
+import com.muyu.system.domain.model.SysLogininforListModel;
 import com.muyu.system.domain.rep.SysLogininforListReq;
 import com.muyu.system.service.SysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,19 +37,21 @@ public class SysLogininforController extends BaseController {
     private RedisService redisService;
 
     @RequiresPermissions("system:logininfor:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysLogininfor>> list (SysLogininforListReq sysLogininforListReq) {
+    public Result<DataPageResp<SysLogininfor>> list (@RequestBody SysLogininforListReq sysLogininforListReq) {
-        PageQueryModel<SysLogininfor> pageQueryModel = logininforService.pageQuery(SysLogininforPageQueryModel.reqBuild(sysLogininforListReq));
+        PageQueryModel<SysLogininfor> pageQueryModel = logininforService.pageQuery(SysLogininforListModel.reqBuild(sysLogininforListReq));
-        return resultList(pageQueryModel);
+        return Result.success(
+                DataPageResp.of(pageQueryModel)
+        );
     }
 
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:logininfor:export")
     @PostMapping("/export")
-    public void export (HttpServletResponse response, SysLogininfor logininfor) {
+    public void export (HttpServletResponse response, SysLogininforListReq sysLogininforListReq) {
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+        List<SysLogininfor> sysLogininforList = logininforService.exportQuery(SysLogininforExportModel.reqBuild(sysLogininforListReq));
         ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
-        util.exportExcel(response, list, "登录日志");
+        util.exportExcel(response, sysLogininforList, "登录日志");
     }
 
     @RequiresPermissions("system:logininfor:remove")

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java

@@ -4,17 +4,11 @@ import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
-import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
-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.rep.SysMenuListReq;
 import com.muyu.system.domain.resp.RoleMenuTreeResp;
 import com.muyu.system.service.SysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +32,11 @@ public class SysMenuController extends BaseController {
      * 获取菜单列表
      */
     @RequiresPermissions("system:menu:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysMenu>> list (SysMenuListReq sysMenuListReq) {
+    public Result list (@RequestBody SysMenu menu) {
         Long userId = SecurityUtils.getUserId();
-        PageQueryModel<SysMenu> pageQueryModel = menuService.pageQuery(SysMenuPageQueryModel.reqBuild(sysMenuListReq),userId);
+        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return resultList(pageQueryModel);
+        return success(menus);
     }
 
     /**

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java

@@ -3,16 +3,11 @@ package com.muyu.system.controller;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.system.domain.SysMenu;
 import com.muyu.system.domain.SysNotice;
-import com.muyu.system.domain.model.SysMenuPageQueryModel;
-import com.muyu.system.domain.model.SysNoticePageQueryModel;
-import com.muyu.system.domain.rep.SysNoticeListReq;
 import com.muyu.system.service.SysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -35,10 +30,10 @@ public class SysNoticeController extends BaseController {
      * 获取通知公告列表
      */
     @RequiresPermissions("system:notice:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysNotice>> list (SysNoticeListReq sysNoticeListReq) {
+    public Result<DataPageResp<SysNotice>> list (@RequestBody SysNotice notice) {
-        PageQueryModel<SysNotice> pageQueryModel = noticeService.pageQuery(SysNoticePageQueryModel.reqBuild(sysNoticeListReq));
+        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     /**

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java

@@ -4,16 +4,11 @@ import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.InnerAuth;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.system.domain.SysOperLog;
-import com.muyu.system.domain.SysNotice;
-import com.muyu.system.domain.model.SysNoticePageQueryModel;
-import com.muyu.system.domain.model.SysOperlogPageQueryModel;
-import com.muyu.system.domain.rep.SysOperlogListReq;
 import com.muyu.system.service.SysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -33,10 +28,10 @@ public class SysOperlogController extends BaseController {
     private SysOperLogService operLogService;
 
     @RequiresPermissions("system:operlog:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysOperLog>> list (SysOperlogListReq sysOperlogListReq) {
+    public Result<DataPageResp<SysOperLog>> list (@RequestBody SysOperLog operLog) {
-        PageQueryModel<SysOperLog> pageQueryModel = operLogService.pageQuery(SysOperlogPageQueryModel.reqBuild(sysOperlogListReq));
+        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java

@@ -4,16 +4,11 @@ import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.common.system.domain.SysOperLog;
 import com.muyu.system.domain.SysPost;
-import com.muyu.system.domain.model.SysOperlogPageQueryModel;
-import com.muyu.system.domain.model.SysPostPageQueryModel;
-import com.muyu.system.domain.rep.SysPostListReq;
 import com.muyu.system.service.SysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -37,10 +32,10 @@ public class SysPostController extends BaseController {
      * 获取岗位列表
      */
     @RequiresPermissions("system:post:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysPost>> list (SysPostListReq sysPostListReq) {
+    public Result<DataPageResp<SysPost>> list (@RequestBody SysPost post) {
-        PageQueryModel<SysPost> pageQueryModel = postService.pageQuery(SysPostPageQueryModel.reqBuild(sysPostListReq));
+        List<SysPost> list = postService.selectPostList(post);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java

@@ -4,7 +4,6 @@ import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
@@ -12,11 +11,7 @@ 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.SysPost;
 import com.muyu.system.domain.SysUserRole;
-import com.muyu.system.domain.model.SysPostPageQueryModel;
-import com.muyu.system.domain.model.SysRolePageQueryModel;
-import com.muyu.system.domain.rep.SysRoleListReq;
 import com.muyu.system.domain.resp.DeptTreeResp;
 import com.muyu.system.service.SysDeptService;
 import com.muyu.system.service.SysRoleService;
@@ -46,10 +41,10 @@ public class SysRoleController extends BaseController {
     private SysDeptService deptService;
 
     @RequiresPermissions("system:role:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysRole>> list (SysRoleListReq sysRoleListReq) {
+    public Result<DataPageResp<SysRole>> list (@RequestBody SysRole role) {
-        PageQueryModel<SysRole> pageQueryModel = roleService.pageQuery(SysRolePageQueryModel.reqBuild(sysRoleListReq));
+        List<SysRole> list = roleService.selectRoleList(role);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java

@@ -5,7 +5,6 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.DataPageResp;
-import com.muyu.common.core.web.page.PageQueryModel;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.InnerAuth;
@@ -15,9 +14,6 @@ import com.muyu.common.system.domain.SysDept;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.domain.LoginUser;
-import com.muyu.system.domain.model.SysRolePageQueryModel;
-import com.muyu.system.domain.model.SysUserPageQueryModel;
-import com.muyu.system.domain.rep.SysUserListReq;
 import com.muyu.system.domain.resp.AuthRoleResp;
 import com.muyu.system.domain.resp.UserDetailInfoResp;
 import com.muyu.system.domain.resp.UserInfoResp;
@@ -64,10 +60,10 @@ public class SysUserController extends BaseController {
      * 获取用户列表
      */
     @RequiresPermissions("system:user:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysUser>> list (SysUserListReq sysUserListReq) {
+    public Result<DataPageResp<SysUser>> list (@RequestBody SysUser user) {
-        PageQueryModel<SysUser> pageQueryModel = userService.pageQuery(SysUserPageQueryModel.reqBuild(sysUserListReq));
+        List<SysUser> list = userService.selectUserList(user);
-        return resultList(pageQueryModel);
+        return Result.success(new DataPageResp<>(0,list));
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@@ -138,7 +134,7 @@ public class SysUserController extends BaseController {
      *
      * @return 用户信息
      */
-    @GetMapping("getInfo")
+    @GetMapping("/getInfo")
     public Result getInfo () {
         SysUser user = userService.selectUserById(SecurityUtils.getUserId());
         // 角色集合

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java

@@ -35,8 +35,8 @@ public class SysUserOnlineController extends BaseController {
     private RedisService redisService;
 
     @RequiresPermissions("monitor:online:list")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public Result<DataPageResp<SysUserOnline>> list (String ipaddr, String userName) {
+    public Result<DataPageResp<SysUserOnline>> list (@RequestBody String ipaddr, String userName) {
         Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys) {

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

@@ -0,0 +1,53 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.system.domain.rep.SysLogininforListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 用户登录日志导出模型对象
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysLogininforExportModel {
+    /**
+     * IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 装填
+     */
+    private String status;
+
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysLogininforExportModel reqBuild(SysLogininforListReq req){
+        return SysLogininforExportModel.builder()
+                .ipaddr(req.getIpaddr())
+                .userName(req.getUserName())
+                .beginTime(req.getBeginTime())
+                .endTime(req.getEndTime())
+                .build();
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.muyu.system.domain.model;
+
+import com.muyu.common.core.web.model.QueryModel;
+import com.muyu.common.core.web.page.PageQueryModel;
+import com.muyu.common.core.web.page.PageReq;
+import com.muyu.system.domain.rep.SysLogininforListReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+/**
+ * 用户登录日志查询模型对象
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysLogininforListModel extends QueryModel<SysLogininforListModel> {
+    /**
+     * IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 装填
+     */
+    private String status;
+
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    public static SysLogininforListModel reqBuild(SysLogininforListReq req){
+        return SysLogininforListModel.builder()
+                .ipaddr(req.getIpaddr())
+                .userName(req.getUserName())
+                .beginTime(req.getBeginTime())
+                .endTime(req.getEndTime())
+                .build()
+                .domainBuild(req);
+    }
+}

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

@@ -1,44 +1,43 @@
 package com.muyu.system.domain.rep;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muyu.common.core.web.page.PageReq;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 
 /**
- * 系统访问记录请求列表查询对象
+ * 用户登录请求对象
- *
- * @ClassName SysLogininforListReq
- * @Author AnNan.Wang
- * @Date 2024/12/16 10:23
  */
-
 @Data
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 public class SysLogininforListReq extends PageReq {
     /**
-     * 用户账号
+     * IP地址
-     */
-    private String userName;
-    /**
-     * 状态 0成功 1失败
-     */
-    private String status;
-    /**
-     * 地址
      */
     private String ipaddr;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 装填
+     */
+    private String status;
+
     /**
      * 开始时间
      */
     private Date beginTime;
+
     /**
      * 结束时间
      */

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

@@ -3,7 +3,8 @@ 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.model.SysLogininforPageQueryModel;
+import com.muyu.system.domain.model.SysLogininforExportModel;
+import com.muyu.system.domain.model.SysLogininforListModel;
 
 import java.util.List;
 
@@ -23,11 +24,11 @@ public interface SysLogininforService extends IService<SysLogininfor> {
     /**
      * 查询系统登录日志集合
      *
-     * @param logininfor 访问日志对象
+     * @param sysLogininforListModel 访问日志对象
      *
      * @return 登录记录集合
      */
-    public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor);
+    public PageQueryModel<SysLogininfor> pageQuery(SysLogininforListModel sysLogininforListModel);
 
     /**
      * 批量删除系统登录日志
@@ -43,5 +44,10 @@ public interface SysLogininforService extends IService<SysLogininfor> {
      */
     public void cleanLogininfor ();
 
-    PageQueryModel<SysLogininfor> pageQuery(SysLogininforPageQueryModel sysLogininforPageQueryModel);
+    /**
+     * 导出查询
+     * @param sysLogininforExportModel
+     * @return
+     */
+    List<SysLogininfor> exportQuery(SysLogininforExportModel sysLogininforExportModel);
 }

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

@@ -1,20 +1,21 @@
 package com.muyu.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 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.SysDictType;
 import com.muyu.common.system.domain.SysLogininfor;
-import com.muyu.system.domain.model.SysLogininforPageQueryModel;
+import com.muyu.system.domain.SysConfig;
+import com.muyu.system.domain.model.SysLogininforExportModel;
+import com.muyu.system.domain.model.SysLogininforListModel;
 import com.muyu.system.mapper.SysLogininforMapper;
 import com.muyu.system.service.SysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 系统访问日志情况信息 服务层处理
@@ -40,13 +41,19 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
     /**
      * 查询系统登录日志集合
      *
-     * @param logininfor 访问日志对象
+     * @param pageQueryModel 访问日志对象
      *
      * @return 登录记录集合
      */
     @Override
-    public List<SysLogininfor> selectLogininforList (SysLogininfor logininfor) {
+    public PageQueryModel<SysLogininfor> pageQuery(SysLogininforListModel pageQueryModel) {
-        return logininforMapper.selectLogininforList(logininfor);
+        LambdaQueryWrapper<SysLogininfor> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getIpaddr()), SysLogininfor::getIpaddr, pageQueryModel.getIpaddr());
+        queryWrapper.eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus());
+        queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName());
+        queryWrapper.between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime());
+        Page<SysLogininfor> page = this.page(pageQueryModel.buildPage(), queryWrapper);
+        return PageQueryModel.of(page);
     }
 
     /**
@@ -69,16 +76,18 @@ public class SysLogininforServiceImpl extends ServiceImpl<SysLogininforMapper, S
         logininforMapper.cleanLogininfor();
     }
 
+    /**
+     * 导出数据
+     * @param exportModel 数据导出模型
+     * @return 返回结果
+     */
     @Override
-    public PageQueryModel<SysLogininfor> pageQuery (SysLogininforPageQueryModel sysLogininforPageQueryModel) {
+    public List<SysLogininfor> exportQuery(SysLogininforExportModel exportModel) {
         LambdaQueryWrapper<SysLogininfor> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getUserName()),SysLogininfor::getUserName, sysLogininforPageQueryModel.getUserName());
+        queryWrapper.like(StringUtils.isNotEmpty(exportModel.getIpaddr()), SysLogininfor::getIpaddr, exportModel.getIpaddr());
-        queryWrapper.like(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getIpaddr()),SysLogininfor::getIpaddr, sysLogininforPageQueryModel.getIpaddr());
+        queryWrapper.eq(StringUtils.isNotEmpty(exportModel.getStatus()), SysLogininfor::getStatus, exportModel.getStatus());
-        queryWrapper.eq(StringUtils.isNotEmpty(sysLogininforPageQueryModel.getStatus()),SysLogininfor::getStatus, sysLogininforPageQueryModel.getStatus());
+        queryWrapper.like(StringUtils.isNotEmpty(exportModel.getUserName()), SysLogininfor::getUserName, exportModel.getUserName());
-        queryWrapper.gt(Objects.nonNull(sysLogininforPageQueryModel.getBeginTime()),SysLogininfor::getAccessTime, sysLogininforPageQueryModel.getBeginTime());
+        queryWrapper.between(!ObjectUtil.hasNull(exportModel.getBeginTime(),exportModel.getEndTime()), SysLogininfor::getAccessTime, exportModel.getBeginTime(), exportModel.getEndTime());
-        queryWrapper.lt(Objects.nonNull(sysLogininforPageQueryModel.getEndTime()),SysLogininfor::getAccessTime, sysLogininforPageQueryModel.getEndTime());
+        return this.list(queryWrapper);
-        Page<SysLogininfor> page = this.page(sysLogininforPageQueryModel.buildPage(), queryWrapper);
-        return PageQueryModel.of(page);
     }
-
 }

pom.xml

@@ -41,6 +41,7 @@
         <hutool.version>5.8.27</hutool.version>
         <knife4j-openapi3.version>4.1.0</knife4j-openapi3.version>
         <xxl-job-core.version>2.4.1</xxl-job-core.version>
+        <mybatis-plus.version>3.5.9</mybatis-plus.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -140,6 +141,20 @@
                 <version>${commons.io.version}</version>
             </dependency>
 
+            <!-- mybatis - plus 依赖 -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <!-- 确保版本和 MyBatis Plus 主包一致 -->
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>