From d45551a88b1861e890636690544da30e05f617e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Sat, 6 Apr 2024 23:20:01 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/SysLogController.java | 89 ++++++++++--------- .../pig/admin/service/SysLogService.java | 37 +++++--- .../admin/service/impl/SysLogServiceImpl.java | 68 +++++++++----- 3 files changed, 115 insertions(+), 79 deletions(-) diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java index 0cc74fa74..7ed53c5a2 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/SysLogController.java @@ -20,7 +20,6 @@ package com.pig4cloud.pig.admin.controller; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pig.admin.api.dto.SysLogDTO; import com.pig4cloud.pig.admin.api.entity.SysLog; @@ -54,51 +53,55 @@ @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class SysLogController { - private final SysLogService sysLogService; + private final SysLogService sysLogService; - /** - * 简单分页查询 - * @param page 分页对象 - * @param sysLog 系统日志 - * @return - */ - @GetMapping("/page") - public R getLogPage(@ParameterObject Page page, @ParameterObject SysLogDTO sysLog) { - return R.ok(sysLogService.getLogByPage(page, sysLog)); - } + /** + * 简单分页查询 + * + * @param page 分页对象 + * @param sysLog 系统日志 + * @return + */ + @GetMapping("/page") + public R getLogPage(@ParameterObject Page page, @ParameterObject SysLogDTO sysLog) { + return R.ok(sysLogService.getLogByPage(page, sysLog)); + } - /** - * 批量删除日志 - * @param ids ID - * @return success/false - */ - @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_log_del')") - public R removeByIds(@RequestBody Long[] ids) { - return R.ok(sysLogService.removeBatchByIds(CollUtil.toList(ids))); - } + /** + * 批量删除日志 + * + * @param ids ID + * @return success/false + */ + @DeleteMapping + @PreAuthorize("@pms.hasPermission('sys_log_del')") + public R removeByIds(@RequestBody Long[] ids) { + return R.ok(sysLogService.removeBatchByIds(CollUtil.toList(ids))); + } - /** - * 插入日志 - * @param sysLog 日志实体 - * @return success/false - */ - @Inner - @PostMapping("/save") - public R save(@Valid @RequestBody SysLog sysLog) { - return R.ok(sysLogService.saveLog(sysLog)); - } + /** + * 插入日志 + * + * @param sysLog 日志实体 + * @return success/false + */ + @Inner + @PostMapping("/save") + public R save(@Valid @RequestBody SysLog sysLog) { + return R.ok(sysLogService.saveLog(sysLog)); + } - /** - * 导出excel 表格 - * @param sysLog 查询条件 - * @return - */ - @ResponseExcel - @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_log_export')") - public List export(SysLog sysLog) { - return sysLogService.list(Wrappers.query(sysLog)); - } + /** + * 导出excel 表格 + * + * @param sysLog 查询条件 + * @return + */ + @ResponseExcel + @GetMapping("/export") + @PreAuthorize("@pms.hasPermission('sys_log_export')") + public List export(SysLogDTO sysLog) { + return sysLogService.getList(sysLog); + } } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java index 7fe4dc7b5..ce4226961 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java @@ -24,6 +24,8 @@ import com.pig4cloud.pig.admin.api.dto.SysLogDTO; import com.pig4cloud.pig.admin.api.entity.SysLog; +import java.util.List; + /** *

* 日志表 服务类 @@ -34,19 +36,28 @@ */ public interface SysLogService extends IService { - /** - * 分页查询日志 - * @param page - * @param sysLog - * @return - */ - Page getLogByPage(Page page, SysLogDTO sysLog); + /** + * 分页查询日志 + * + * @param page + * @param sysLog + * @return + */ + Page getLogByPage(Page page, SysLogDTO sysLog); - /** - * 插入日志 - * @param sysLog 日志对象 - * @return true/false - */ - Boolean saveLog(SysLog sysLog); + /** + * 插入日志 + * + * @param sysLog 日志对象 + * @return true/false + */ + Boolean saveLog(SysLog sysLog); + /** + * 查询日志列表 + * + * @param sysLog 查询条件 + * @return List + */ + List getList(SysLogDTO sysLog); } diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java index f956a0ae6..9944e8a15 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java @@ -32,6 +32,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + /** *

* 日志表 服务实现类 @@ -43,32 +45,52 @@ @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { - @Override - public Page getLogByPage(Page page, SysLogDTO sysLog) { + @Override + public Page getLogByPage(Page page, SysLogDTO sysLog) { + return baseMapper.selectPage(page, buildQuery(sysLog)); + } - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (StrUtil.isNotBlank(sysLog.getLogType())) { - wrapper.eq(SysLog::getLogType, sysLog.getLogType()); - } + /** + * 插入日志 + * + * @param sysLog 日志对象 + * @return true/false + */ + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean saveLog(SysLog sysLog) { + baseMapper.insert(sysLog); + return Boolean.TRUE; + } - if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) { - wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0]) - .le(SysLog::getCreateTime, sysLog.getCreateTime()[1]); - } + /** + * 查询日志列表 + * + * @param sysLog 查询条件 + * @return List + */ + @Override + public List getList(SysLogDTO sysLog) { + return baseMapper.selectList(buildQuery(sysLog)); + } - return baseMapper.selectPage(page, wrapper); - } + /** + * 构建查询条件 + * + * @param sysLog 前端条件 + * @return LambdaQueryWrapper + */ + private LambdaQueryWrapper buildQuery(SysLogDTO sysLog) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + if (StrUtil.isNotBlank(sysLog.getLogType())) { + wrapper.eq(SysLog::getLogType, sysLog.getLogType()); + } - /** - * 插入日志 - * @param sysLog 日志对象 - * @return true/false - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean saveLog(SysLog sysLog) { - baseMapper.insert(sysLog); - return Boolean.TRUE; - } + if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) { + wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0]) + .le(SysLog::getCreateTime, sysLog.getCreateTime()[1]); + } + return wrapper; + } }