feat(日志管理): 列表改按上报用户精确筛选,去掉设备/文件名模糊搜索与设备列
- /api/admin/device-logs/files 的 keyword LIKE 换成 uid 等值过滤:device_log_file 只有 uid 没有 username,模糊匹配设备名会跨用户串结果,而下拉里选中的用户必须是精确命中。 - 采集配置弹窗的 keyword(终端覆盖搜索)与查看器标题里的设备名保留:那是设备维度唯一还有用的地方。 - 新增护栏 tests/device-logs-user-filter.test.ts(5 例,变异自证 5/5 转红):表头回出现「设备」、 占位行 colspan 与列数不符、接口带回 keyword、下拉没绑上、用户选项没在 onMounted 加载,都会红。 - 上一笔提交里 DeviceLogsPage 已按 uid 传参,本笔补齐 api 层与后端,故单独 checkout 上一笔时 vue-tsc 不过。
This commit is contained in:
+4
-3
@@ -51,11 +51,12 @@ public class AdminDeviceLogController {
|
||||
|
||||
@GetMapping("/files")
|
||||
@Operation(summary = "日志文件分页列表",
|
||||
description = "source=client/maixiang;keyword 模糊匹配设备名/设备ID/文件名;日期为闭区间(早于保留窗口自动收紧)。")
|
||||
description = "source=client/maixiang;uid 按上报用户精确过滤(未登录/采集机的行 uid 为空,不匹配任何 uid);"
|
||||
+ "日期为闭区间(早于保留窗口自动收紧)。")
|
||||
public ApiResponse<DeviceLogPageVo> files(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "来源") @RequestParam(required = false) String source,
|
||||
@Parameter(description = "关键字(设备/文件名)") @RequestParam(required = false) String keyword,
|
||||
@Parameter(description = "指定用户 uid") @RequestParam(required = false) Long uid,
|
||||
@Parameter(description = "起始日期(含)") @RequestParam(required = false)
|
||||
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate,
|
||||
@Parameter(description = "结束日期(含)") @RequestParam(required = false)
|
||||
@@ -63,7 +64,7 @@ public class AdminDeviceLogController {
|
||||
@RequestParam(defaultValue = "1") Long page,
|
||||
@RequestParam(defaultValue = "20") Long pageSize) {
|
||||
requireSuperAdmin(request);
|
||||
return ApiResponse.success(deviceLogService.page(source, keyword, startDate, endDate, page, pageSize));
|
||||
return ApiResponse.success(deviceLogService.page(source, uid, startDate, endDate, page, pageSize));
|
||||
}
|
||||
|
||||
@GetMapping("/content")
|
||||
|
||||
+5
-8
@@ -159,7 +159,7 @@ public class DeviceLogService {
|
||||
|
||||
// ---------------------------------------------------------------- 查询
|
||||
|
||||
public DeviceLogPageVo page(String source, String keyword, LocalDate startDate, LocalDate endDate,
|
||||
public DeviceLogPageVo page(String source, Long uid, LocalDate startDate, LocalDate endDate,
|
||||
Long pageParam, Long pageSizeParam) {
|
||||
int retentionDays = properties.retentionDaysOrDefault();
|
||||
LocalDate minDate = LocalDate.now().minusDays(retentionDays - 1L);
|
||||
@@ -173,11 +173,8 @@ public class DeviceLogService {
|
||||
if (source != null && !source.isBlank()) {
|
||||
qw.eq(DeviceLogFileEntity::getSource, source.trim());
|
||||
}
|
||||
if (keyword != null && !keyword.isBlank()) {
|
||||
String kw = keyword.trim();
|
||||
qw.and(w -> w.like(DeviceLogFileEntity::getDeviceName, kw)
|
||||
.or().like(DeviceLogFileEntity::getDeviceId, kw)
|
||||
.or().like(DeviceLogFileEntity::getFileName, kw));
|
||||
if (uid != null) {
|
||||
qw.eq(DeviceLogFileEntity::getUid, uid);
|
||||
}
|
||||
qw.ge(DeviceLogFileEntity::getLogDate, from);
|
||||
if (endDate != null) {
|
||||
@@ -207,8 +204,8 @@ public class DeviceLogService {
|
||||
vo.setPage(safePage);
|
||||
vo.setPageSize(safeSize);
|
||||
vo.setRetentionDays(retentionDays);
|
||||
log.info("[device-log] 列表查询 source={} keyword={} 起={} 止={} page={} size={} 命中={}",
|
||||
source, keyword, from, endDate, safePage, safeSize, total);
|
||||
log.info("[device-log] 列表查询 source={} uid={} 起={} 止={} page={} size={} 命中={}",
|
||||
source, uid, from, endDate, safePage, safeSize, total);
|
||||
return vo;
|
||||
}
|
||||
|
||||
|
||||
+35
@@ -1,6 +1,8 @@
|
||||
package com.nanri.aiimage.modules.devicelog.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
@@ -184,4 +186,37 @@ class DeviceLogServiceTest {
|
||||
assertThat(vo.getContent()).isEqualTo("AAAA\nBBBB\n");
|
||||
assertThat(vo.isTruncated()).isFalse();
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 列表筛选
|
||||
|
||||
/** 捕获 page() 传给 selectCount 的查询条件(计数与列表走同一条 wrapper 构造)。 */
|
||||
@SuppressWarnings("rawtypes")
|
||||
private AbstractWrapper capturePageWrapper(String source, Long uid) {
|
||||
when(mapper.selectCount(any())).thenReturn(0L);
|
||||
service().page(source, uid, null, null, 1L, 15L);
|
||||
ArgumentCaptor<Wrapper> captor = ArgumentCaptor.forClass(Wrapper.class);
|
||||
verify(mapper).selectCount(captor.capture());
|
||||
return (AbstractWrapper) captor.getValue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void pageFiltersByUidExactly() {
|
||||
AbstractWrapper wrapper = capturePageWrapper(null, 7L);
|
||||
assertThat(wrapper.getSqlSegment()).contains("uid =");
|
||||
assertThat(wrapper.getParamNameValuePairs().values()).contains(7L);
|
||||
}
|
||||
|
||||
@Test
|
||||
void pageWithoutUidKeepsAnonymousReportersVisible() {
|
||||
// 未登录的桌面端与麦象采集机 uid 为空:不指定用户时它们必须仍在结果里
|
||||
assertThat(capturePageWrapper(null, null).getSqlSegment()).doesNotContain("uid");
|
||||
}
|
||||
|
||||
/** 契约:列表筛选已改为用户维度,设备名/设备ID/文件名的模糊匹配不再存在于查询路径。 */
|
||||
@Test
|
||||
void pageNoLongerMatchesDeviceOrFileNameFuzzily() {
|
||||
String sql = capturePageWrapper("client", 7L).getSqlSegment();
|
||||
assertThat(sql).contains("source =");
|
||||
assertThat(sql).doesNotContain("device_name", "device_id", "file_name");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user