diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 3b21311..f3591e8 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -51,23 +51,10 @@ com.baomidou mybatis-plus-spring-boot3-starter - 3.5.6 - - - com.github.jsqlparser - jsqlparser - - - org.mybatis - mybatis - - - - org.mybatis - mybatis - 3.5.16 + com.baomidou + mybatis-plus-jsqlparser diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java new file mode 100644 index 0000000..e19980c --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java index 7e1389d..8a2609e 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java +++ b/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 { */ public Page buildPage(){ Page page = Page.of(this.getPageNum(), this.getPageSize()); - page.setOrders(List.of(this.isAsc() - ? OrderItem.asc(this.getOrderByColumn()) : OrderItem.desc(this.getOrderByColumn()))); + if(StringUtils.isNotBlank(this.getOrderByColumn())){ + page.setOrders(List.of(this.isAsc() + ? OrderItem.asc(this.getOrderByColumn()) : OrderItem.desc(this.getOrderByColumn()))); + } return page; } } diff --git a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 17f73ec..0db8834 100644 --- a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/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 \ No newline at end of file diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java index c66f131..a931f13 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java +++ b/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 extends BaseEntity { +public class SysLogininfor { private static final long serialVersionUID = 1L; /** diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 6a83d59..64e0b76 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/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> genList (GenTable genTable) { List list = genTableService.selectGenTableList(genTable); return Result.success(new DataPageResp<>(0,list)); diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm index 537ef9a..baa0527 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm +++ b/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 list(${ClassName} ${className}) { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index c08bc67..e46a363 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/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> list (SysConfigListReq sysConfigListReq) { + public Result> list (@RequestBody SysConfigListReq sysConfigListReq) { PageQueryModel pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); return resultList(pageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 3bf1e62..4db25b8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -35,8 +35,8 @@ public class SysDeptController extends BaseController { * 获取部门列表 */ @RequiresPermissions("system:dept:list") - @GetMapping("/list") - public Result list (SysDept dept) { + @PostMapping("/list") + public Result list (@RequestBody SysDept dept) { List depts = deptService.selectDeptList(dept); return success(depts); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 3c634bc..79a9cab 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -35,8 +35,8 @@ public class SysDictDataController extends BaseController { private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") - @GetMapping("/list") - public Result> list (SysDictData dictData) { + @PostMapping("/list") + public Result> list (@RequestBody SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index fd98413..1e17fe7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -29,8 +29,8 @@ public class SysDictTypeController extends BaseController { private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") - @GetMapping("/list") - public Result> list (SysDictType dictType) { + @PostMapping("/list") + public Result> list (@RequestBody SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index d4e1b77..5293796 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -5,12 +5,16 @@ 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.redis.service.RedisService; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforExportModel; +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; import org.springframework.web.bind.annotation.*; @@ -33,19 +37,21 @@ public class SysLogininforController extends BaseController { private RedisService redisService; @RequiresPermissions("system:logininfor:list") - @GetMapping("/list") - public Result> list (SysLogininfor logininfor) { - List list = logininforService.selectLogininforList(logininfor); - return Result.success(new DataPageResp<>(0,list)); + @PostMapping("/list") + public Result> list (@RequestBody SysLogininforListReq sysLogininforListReq) { + PageQueryModel pageQueryModel = logininforService.pageQuery(SysLogininforListModel.reqBuild(sysLogininforListReq)); + return Result.success( + DataPageResp.of(pageQueryModel) + ); } @Log(title = "登录日志", businessType = BusinessType.EXPORT) @RequiresPermissions("system:logininfor:export") @PostMapping("/export") - public void export (HttpServletResponse response, SysLogininfor logininfor) { - List list = logininforService.selectLogininforList(logininfor); + public void export (HttpServletResponse response, SysLogininforListReq sysLogininforListReq) { + List sysLogininforList = logininforService.exportQuery(SysLogininforExportModel.reqBuild(sysLogininforListReq)); ExcelUtil util = new ExcelUtil(SysLogininfor.class); - util.exportExcel(response, list, "登录日志"); + util.exportExcel(response, sysLogininforList, "登录日志"); } @RequiresPermissions("system:logininfor:remove") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index e5ae348..5f055b8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -32,8 +32,8 @@ public class SysMenuController extends BaseController { * 获取菜单列表 */ @RequiresPermissions("system:menu:list") - @GetMapping("/list") - public Result list (SysMenu menu) { + @PostMapping("/list") + public Result list (@RequestBody SysMenu menu) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(menu, userId); return success(menus); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index 83e0617..eb29bfa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -30,8 +30,8 @@ public class SysNoticeController extends BaseController { * 获取通知公告列表 */ @RequiresPermissions("system:notice:list") - @GetMapping("/list") - public Result> list (SysNotice notice) { + @PostMapping("/list") + public Result> list (@RequestBody SysNotice notice) { List list = noticeService.selectNoticeList(notice); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index e7d3244..c0c5e91 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -28,8 +28,8 @@ public class SysOperlogController extends BaseController { private SysOperLogService operLogService; @RequiresPermissions("system:operlog:list") - @GetMapping("/list") - public Result> list (SysOperLog operLog) { + @PostMapping("/list") + public Result> list (@RequestBody SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index ae01c19..1888eb7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -32,8 +32,8 @@ public class SysPostController extends BaseController { * 获取岗位列表 */ @RequiresPermissions("system:post:list") - @GetMapping("/list") - public Result> list (SysPost post) { + @PostMapping("/list") + public Result> list (@RequestBody SysPost post) { List list = postService.selectPostList(post); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index adaea36..84066a9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -41,8 +41,8 @@ public class SysRoleController extends BaseController { private SysDeptService deptService; @RequiresPermissions("system:role:list") - @GetMapping("/list") - public Result> list (SysRole role) { + @PostMapping("/list") + public Result> list (@RequestBody SysRole role) { List list = roleService.selectRoleList(role); return Result.success(new DataPageResp<>(0,list)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 2a21776..0bd1796 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -60,8 +60,8 @@ public class SysUserController extends BaseController { * 获取用户列表 */ @RequiresPermissions("system:user:list") - @GetMapping("/list") - public Result> list (SysUser user) { + @PostMapping("/list") + public Result> list (@RequestBody SysUser user) { List list = userService.selectUserList(user); return Result.success(new DataPageResp<>(0,list)); } @@ -134,7 +134,7 @@ public class SysUserController extends BaseController { * * @return 用户信息 */ - @GetMapping("getInfo") + @GetMapping("/getInfo") public Result getInfo () { SysUser user = userService.selectUserById(SecurityUtils.getUserId()); // 角色集合 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 36dd19d..99a2325 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/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") - public Result> list (String ipaddr, String userName) { + @PostMapping("/list") + public Result> list (@RequestBody String ipaddr, String userName) { Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); for (String key : keys) { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java new file mode 100644 index 0000000..4a55bda --- /dev/null +++ b/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(); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java new file mode 100644 index 0000000..6b0d3bf --- /dev/null +++ b/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 { + /** + * 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); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java new file mode 100644 index 0000000..eefc8a8 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java @@ -0,0 +1,45 @@ +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.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户登录请求对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysLogininforListReq extends PageReq { + /** + * IP地址 + */ + private String ipaddr; + + /** + * 用户名称 + */ + private String userName; + + /** + * 装填 + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java index bb3031e..92819a9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java @@ -1,7 +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.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforExportModel; +import com.muyu.system.domain.model.SysLogininforListModel; import java.util.List; @@ -21,11 +24,11 @@ public interface SysLogininforService extends IService { /** * 查询系统登录日志集合 * - * @param logininfor 访问日志对象 + * @param sysLogininforListModel 访问日志对象 * * @return 登录记录集合 */ - public List selectLogininforList (SysLogininfor logininfor); + public PageQueryModel pageQuery(SysLogininforListModel sysLogininforListModel); /** * 批量删除系统登录日志 @@ -40,4 +43,11 @@ public interface SysLogininforService extends IService { * 清空系统登录日志 */ public void cleanLogininfor (); + + /** + * 导出查询 + * @param sysLogininforExportModel + * @return + */ + List exportQuery(SysLogininforExportModel sysLogininforExportModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index 1a7c7a0..a834c38 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -1,7 +1,15 @@ 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.SysLogininfor; +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; @@ -33,13 +41,19 @@ public class SysLogininforServiceImpl extends ServiceImpl selectLogininforList (SysLogininfor logininfor) { - return logininforMapper.selectLogininforList(logininfor); + public PageQueryModel pageQuery(SysLogininforListModel pageQueryModel) { + LambdaQueryWrapper 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 page = this.page(pageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); } /** @@ -61,4 +75,19 @@ public class SysLogininforServiceImpl extends ServiceImpl exportQuery(SysLogininforExportModel exportModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(exportModel.getIpaddr()), SysLogininfor::getIpaddr, exportModel.getIpaddr()); + queryWrapper.eq(StringUtils.isNotEmpty(exportModel.getStatus()), SysLogininfor::getStatus, exportModel.getStatus()); + queryWrapper.like(StringUtils.isNotEmpty(exportModel.getUserName()), SysLogininfor::getUserName, exportModel.getUserName()); + queryWrapper.between(!ObjectUtil.hasNull(exportModel.getBeginTime(),exportModel.getEndTime()), SysLogininfor::getAccessTime, exportModel.getBeginTime(), exportModel.getEndTime()); + return this.list(queryWrapper); + } } diff --git a/pom.xml b/pom.xml index 56f46aa..68d2326 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,7 @@ 5.8.27 4.1.0 2.4.1 + 3.5.9 @@ -140,6 +141,20 @@ ${commons.io.version} + + + com.baomidou + mybatis-plus-spring-boot3-starter + ${mybatis-plus.version} + + + + com.baomidou + mybatis-plus-jsqlparser + + ${mybatis-plus.version} + + org.apache.poi