Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化日志管理接口

结构优化
648540858 2024-01-17 00:08:27 +08:00
parent 9c3eb1493d
commit 20be213faf
5 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
View File

@ -51,7 +51,7 @@ public class ApiAccessFilter extends OncePerRequestFilter {
filterChain.doFilter(servletRequest, servletResponse); 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 logDto = new LogDto();
logDto.setName(uriName); logDto.setName(uriName);

3
src/main/java/com/genersoft/iot/vmp/service/ILogService.java
View File

@ -18,7 +18,7 @@ public interface ILogService {
* @param endTime 结束时间 * @param endTime 结束时间
* @return 日志列表 * @return 日志列表
*/ */
PageInfo<LogDto> getAll(int page, int count, String query, String type, String startTime, String endTime); PageInfo<LogDto> getAll(int page, int count, String query, String type, String startTime, String endTime, Boolean result);
/** /**
* 添加日志 * 添加日志
@ -31,4 +31,5 @@ public interface ILogService {
*/ */
int clear(); int clear();
void deleteById(int id);
} }

9
src/main/java/com/genersoft/iot/vmp/service/impl/LogServiceImpl.java
View File

@ -18,9 +18,9 @@ public class LogServiceImpl implements ILogService {
private LogMapper logMapper; private LogMapper logMapper;
@Override @Override
public PageInfo<LogDto> getAll(int page, int count, String query, String type, String startTime, String endTime) { public PageInfo<LogDto> getAll(int page, int count, String query, String type, String startTime, String endTime, Boolean result) {
PageHelper.startPage(page, count); PageHelper.startPage(page, count);
List<LogDto> all = logMapper.query(query, type, startTime, endTime); List<LogDto> all = logMapper.query(query, type, startTime, endTime, result);
return new PageInfo<>(all); return new PageInfo<>(all);
} }
@ -33,4 +33,9 @@ public class LogServiceImpl implements ILogService {
public int clear() { public int clear() {
return logMapper.clear(); return logMapper.clear();
} }
@Override
public void deleteById(int id) {
logMapper.deleteById(id);
}
} }

19
src/main/java/com/genersoft/iot/vmp/storager/dao/LogMapper.java
View File

@ -24,14 +24,23 @@ public interface LogMapper {
@Select(value = {"<script>" + @Select(value = {"<script>" +
" SELECT * FROM wvp_log " + " SELECT * FROM wvp_log " +
" WHERE 1=1 " + " WHERE 1=1 " +
" <if test=\"query != null\"> AND (name LIKE concat('%',#{query},'%'))</if> " + " <if test='query != null'> AND (name LIKE concat('%',#{query},'%'))</if> " +
" <if test=\"type != null\" > AND type = #{type}</if>" + " <if test='type != null' > AND type = #{type}</if>" +
" <if test=\"startTime != null\" > AND create_time &gt;= #{startTime} </if>" + " <if test='startTime != null' > AND create_time &gt;= #{startTime} </if>" +
" <if test=\"endTime != null\" > AND create_time &lt;= #{endTime} </if>" + " <if test='endTime != null' > AND create_time &lt;= #{endTime} </if>" +
" <if test='result != null and result == true' > AND result = '200 OK' </if>" +
" <if test='result != null and result == false' > AND result != '200 OK' </if>" +
" ORDER BY create_time DESC " + " ORDER BY create_time DESC " +
" </script>"}) " </script>"})
List<LogDto> query(@Param("query") String query, @Param("type") String type, @Param("startTime") String startTime, @Param("endTime") String endTime); List<LogDto> 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") @Delete("DELETE FROM wvp_log")
int clear(); int clear();
@Delete("DELETE FROM wvp_log where id = #{id}")
void deleteById(@Param("id") int id);
} }

18
src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
View File

@ -57,11 +57,15 @@ public class LogController {
@RequestParam(required = false) String query, @RequestParam(required = false) String query,
@RequestParam(required = false) String type, @RequestParam(required = false) String type,
@RequestParam(required = false) String startTime, @RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime @RequestParam(required = false) String endTime,
@RequestParam(required = false) Boolean result
) { ) {
if (ObjectUtils.isEmpty(query)) { if (ObjectUtils.isEmpty(query)) {
query = null; query = null;
} }
if (ObjectUtils.isEmpty(type)) {
type = null;
}
if (!userSetting.getLogInDatabase()) { if (!userSetting.getLogInDatabase()) {
logger.warn("自动记录日志功能已关闭，查询结果可能不完整。"); logger.warn("自动记录日志功能已关闭，查询结果可能不完整。");
@ -79,7 +83,17 @@ public class LogController {
throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime格式为" + DateUtil.PATTERN); 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());
} }
/** /**