From 20be213faf12b27870eb1cf5b31ab49d6ca9026f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 17 Jan 2024 00:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/conf/ApiAccessFilter.java | 2 +- .../iot/vmp/service/ILogService.java | 3 ++- .../iot/vmp/service/impl/LogServiceImpl.java | 9 +++++++-- .../iot/vmp/storager/dao/LogMapper.java | 19 ++++++++++++++----- .../iot/vmp/vmanager/log/LogController.java | 18 ++++++++++++++++-- 5 files changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java index b449b1b7..190fe9f1 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java @@ -51,7 +51,7 @@ public class ApiAccessFilter extends OncePerRequestFilter { filterChain.doFilter(servletRequest, servletResponse); - if (uriName != null && userSetting != null && userSetting.getLogInDatabase() != null && userSetting.getLogInDatabase()) { + if (!servletRequest.getRequestURI().startsWith("/api/log") && uriName != null && userSetting != null && userSetting.getLogInDatabase() != null && userSetting.getLogInDatabase()) { LogDto logDto = new LogDto(); logDto.setName(uriName); diff --git a/src/main/java/com/genersoft/iot/vmp/service/ILogService.java b/src/main/java/com/genersoft/iot/vmp/service/ILogService.java index b7a67ede..623e7756 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/ILogService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/ILogService.java @@ -18,7 +18,7 @@ public interface ILogService { * @param endTime 结束时间 * @return 日志列表 */ - PageInfo getAll(int page, int count, String query, String type, String startTime, String endTime); + PageInfo getAll(int page, int count, String query, String type, String startTime, String endTime, Boolean result); /** * 添加日志 @@ -31,4 +31,5 @@ public interface ILogService { */ int clear(); + void deleteById(int id); } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java index 92fa5960..ca772ad5 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java @@ -18,9 +18,9 @@ public class LogServiceImpl implements ILogService { private LogMapper logMapper; @Override - public PageInfo getAll(int page, int count, String query, String type, String startTime, String endTime) { + public PageInfo getAll(int page, int count, String query, String type, String startTime, String endTime, Boolean result) { PageHelper.startPage(page, count); - List all = logMapper.query(query, type, startTime, endTime); + List all = logMapper.query(query, type, startTime, endTime, result); return new PageInfo<>(all); } @@ -33,4 +33,9 @@ public class LogServiceImpl implements ILogService { public int clear() { return logMapper.clear(); } + + @Override + public void deleteById(int id) { + logMapper.deleteById(id); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java index f1c45850..0d2fa015 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java @@ -24,14 +24,23 @@ public interface LogMapper { @Select(value = {""}) - List query(@Param("query") String query, @Param("type") String type, @Param("startTime") String startTime, @Param("endTime") String endTime); + List query(@Param("query") String query, @Param("type") String type, + @Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("result") Boolean result + ); @Delete("DELETE FROM wvp_log") int clear(); + + @Delete("DELETE FROM wvp_log where id = #{id}") + void deleteById(@Param("id") int id); } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java index 7ad595d7..e0f19d88 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java @@ -57,11 +57,15 @@ public class LogController { @RequestParam(required = false) String query, @RequestParam(required = false) String type, @RequestParam(required = false) String startTime, - @RequestParam(required = false) String endTime + @RequestParam(required = false) String endTime, + @RequestParam(required = false) Boolean result ) { if (ObjectUtils.isEmpty(query)) { query = null; } + if (ObjectUtils.isEmpty(type)) { + type = null; + } if (!userSetting.getLogInDatabase()) { logger.warn("自动记录日志功能已关闭，查询结果可能不完整。"); @@ -79,7 +83,17 @@ public class LogController { throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime格式为" + DateUtil.PATTERN); } - return logService.getAll(page, count, query, type, startTime, endTime); + return logService.getAll(page, count, query, type, startTime, endTime, result); + } + + /** + * 删除日志 + * + */ + @Operation(summary = "删除日志", security = @SecurityRequirement(name = JwtUtils.HEADER)) + @DeleteMapping("/delete") + public void delete(@RequestBody LogDto logDto) { + logService.deleteById(logDto.getId()); } /**