feat(taskcenter): 设备花名册与在线状态接口

新增 GET /api/admin/task-center/devices:任务设备(近 30 天)∪ 客户端日志设备
(近 7 天、uid 非空)合并去重,设备名取日志侧、最近任务时间取任务侧;在线 =
最近活动(任务 updated_at ∪ 日志上报)≤ 5 分钟,在线优先排序。`web-` 前缀标
webDevice 供前端标注「网页」。

SQL 侧把原来的 ROSTER_ROWS 拆成 TASK_DEVICE_ROWS + LOG_DEVICE_ROWS 再组合,
统计口径与列表共用同一段并集,避免两处漂移;新增按设备统计进行中任务数
(空设备号不归属任何设备)。overview 的 deviceTotal/deviceOnline 继续走
COUNT 查询(同一并集常量派生),不再从列表二次计算。

测试:Service 合并/在线阈值/空设备号/排序/网页标记 8 项,Mapper 动态 SQL 9 项。
This commit is contained in:
2026-09-28 22:54:36 +08:00
parent 8485469137
commit cd9bf509ec
8 changed files with 425 additions and 17 deletions
@@ -4,6 +4,7 @@ import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
import com.nanri.aiimage.common.security.AdminAuthSupport;
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo;
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterQueryService;
import com.nanri.aiimage.modules.taskcenter.service.TaskCenterScopeService;
@@ -16,6 +17,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 后台「客户端任务管理」:按账号 × 设备 × 业务统一看客户端任务,不必逐台排查。
*
@@ -41,6 +44,14 @@ public class AdminTaskCenterController {
return ApiResponse.success(queryService.overview(scope));
}
@GetMapping("/devices")
@Operation(summary = "设备列表",
description = "设备花名册(任务设备近 30 天 ∪ 客户端日志设备近 7 天)+ 在线/跑任务状态;在线优先排序。")
public ApiResponse<List<TaskCenterDeviceVo>> devices(HttpServletRequest request) {
TaskCenterScopeService.ScopeContext scope = resolveScope(request);
return ApiResponse.success(queryService.devices(scope));
}
private TaskCenterScopeService.ScopeContext resolveScope(HttpServletRequest request) {
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
permissionMenuService.requireClientTaskCenterAccess(operator);
@@ -1,5 +1,6 @@
package com.nanri.aiimage.modules.taskcenter.mapper;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -38,10 +39,11 @@ public interface TaskCenterQueryMapper {
String BRAND_TERMINAL_STATUSES = "'success','failed','cancelled'";
/**
* 设备花名册原始行:任务设备(近 N 天创建过任务)+ 日志设备(近 N 天有上报,uid 为空不归组)。
* 每行 {@code device_id + activity_at},同设备多行由外层聚合。
* 任务设备原始行:近 N 天创建过任务、设备号非空(biz_file_task ∪ brand_crawl_tasks)。
* {@code createdAt} 供「最近任务时间」,{@code activityAt} 供在线判定;任务侧没有设备名。
*/
String ROSTER_ROWS = "(SELECT t.device_id AS device_id, t.updated_at AS activity_at"
String TASK_DEVICE_ROWS = "(SELECT t.device_id AS deviceId, NULL AS deviceName,"
+ " t.updated_at AS activityAt, t.created_at AS createdAt"
+ " FROM biz_file_task t"
+ " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")"
+ " AND t.device_id IS NOT NULL AND t.device_id != ''"
@@ -49,13 +51,19 @@ public interface TaskCenterQueryMapper {
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ " UNION ALL"
+ " SELECT b.device_id, b.updated_at FROM brand_crawl_tasks b"
+ " SELECT b.device_id, NULL, b.updated_at, b.created_at FROM brand_crawl_tasks b"
+ " WHERE b.device_id IS NOT NULL AND b.device_id != ''"
+ " AND b.created_at >= #{taskSince}"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ " UNION ALL"
+ " SELECT d.device_id, COALESCE(d.last_upload_at, d.updated_at) FROM device_log_file d"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
/**
* 日志设备原始行:客户端日志、uid 非空(为空无法归组)、近 N 天有上报。
* {@code createdAt} 恒空,只为了与任务侧列对齐。
*/
String LOG_DEVICE_ROWS = "(SELECT d.device_id AS deviceId, d.device_name AS deviceName,"
+ " COALESCE(d.last_upload_at, d.updated_at) AS activityAt, NULL AS createdAt"
+ " FROM device_log_file d"
+ " WHERE d.source = 'client'"
+ " AND d.device_id != ''"
+ " AND d.uid IS NOT NULL"
@@ -63,6 +71,24 @@ public interface TaskCenterQueryMapper {
+ " <if test='userIds != null'> AND d.uid IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
/** 设备花名册:任务设备 ∪ 日志设备(同设备多行由外层聚合)。 */
String ROSTER_ROWS = "(" + TASK_DEVICE_ROWS + " UNION ALL " + LOG_DEVICE_ROWS + ")";
/** 进行中任务原始行(带设备号),供按设备计数。 */
String RUNNING_TASK_DEVICE_ROWS = "(SELECT t.device_id AS deviceId"
+ " FROM biz_file_task t"
+ " WHERE t.module_type IN (" + CLIENT_MODULE_TYPES + ")"
+ " AND t.status IN (" + ACTIVE_STATUSES + ")"
+ " AND t.device_id IS NOT NULL AND t.device_id != ''"
+ " <if test='userIds != null'> AND t.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>"
+ " UNION ALL"
+ " SELECT b.device_id FROM brand_crawl_tasks b"
+ " WHERE b.status IN (" + BRAND_ACTIVE_STATUSES + ")"
+ " AND b.device_id IS NOT NULL AND b.device_id != ''"
+ " <if test='userIds != null'> AND b.user_id IN"
+ " <foreach collection='userIds' item='uid' open='(' separator=',' close=')'>#{uid}</foreach></if>)";
@Select("<script>"
+ "SELECT COUNT(*) FROM ("
+ " SELECT t.id FROM biz_file_task t"
@@ -118,7 +144,7 @@ public interface TaskCenterQueryMapper {
@Param("since") LocalDateTime since);
@Select("<script>"
+ "SELECT COUNT(DISTINCT u.device_id) FROM " + ROSTER_ROWS + " u"
+ "SELECT COUNT(DISTINCT u.deviceId) FROM " + ROSTER_ROWS + " u"
+ "</script>")
long countRosterDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@@ -126,13 +152,32 @@ public interface TaskCenterQueryMapper {
@Select("<script>"
+ "SELECT COUNT(*) FROM ("
+ " SELECT u.device_id, MAX(u.activity_at) AS last_active FROM " + ROSTER_ROWS + " u"
+ " GROUP BY u.device_id"
+ " HAVING MAX(u.activity_at) >= #{onlineSince}"
+ " SELECT u.deviceId, MAX(u.activityAt) AS lastActiveAt FROM " + ROSTER_ROWS + " u"
+ " GROUP BY u.deviceId"
+ " HAVING MAX(u.activityAt) >= #{onlineSince}"
+ ") online"
+ "</script>")
long countOnlineDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@Param("logSince") LocalDateTime logSince,
@Param("onlineSince") LocalDateTime onlineSince);
/** 设备花名册列表:名称取日志侧,活动时间取两侧最大,最近任务时间取任务侧最大创建时间。 */
@Select("<script>"
+ "SELECT u.deviceId AS deviceId, MAX(u.deviceName) AS deviceName,"
+ " MAX(u.activityAt) AS lastActiveAt, MAX(u.createdAt) AS recentTaskAt"
+ " FROM " + ROSTER_ROWS + " u"
+ " GROUP BY u.deviceId"
+ "</script>")
List<TaskCenterDeviceRow> listRosterDevices(@Param("userIds") List<Long> userIds,
@Param("taskSince") LocalDateTime taskSince,
@Param("logSince") LocalDateTime logSince);
/** 按设备统计进行中任务数(设备号为空的任务不归属任何设备)。 */
@Select("<script>"
+ "SELECT u.deviceId AS deviceId, COUNT(*) AS runningTasks"
+ " FROM " + RUNNING_TASK_DEVICE_ROWS + " u"
+ " GROUP BY u.deviceId"
+ "</script>")
List<TaskCenterDeviceRow> countRunningTasksByDevice(@Param("userIds") List<Long> userIds);
}
@@ -0,0 +1,27 @@
package com.nanri.aiimage.modules.taskcenter.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 设备聚合行:三条查询各填一部分字段(MyBatis 自动映射,未选出的列留空)。
*
* <ul>
* <li>花名册查询(任务设备 ∪ 日志设备):deviceId / deviceName / lastActiveAt / recentTaskAt</li>
* <li>进行中统计(按设备):deviceId / runningTasks</li>
* </ul>
*/
@Data
public class TaskCenterDeviceRow {
private String deviceId;
/** 日志侧展示名(机器名/登录名);任务侧无此数据。 */
private String deviceName;
/** 最近活动:任务 updated_at ∪ 日志上报时间。 */
private LocalDateTime lastActiveAt;
/** 最近一次任务的创建时间(30 天窗口内)。 */
private LocalDateTime recentTaskAt;
/** 该设备进行中任务数。 */
private Long runningTasks;
}
@@ -0,0 +1,24 @@
package com.nanri.aiimage.modules.taskcenter.model.vo;
import lombok.Data;
import java.time.LocalDateTime;
/** 设备状态行:花名册内的设备 + 在线/跑任务状态。 */
@Data
public class TaskCenterDeviceVo {
private String deviceId;
/** 展示名(device_log_file 的主机名/登录名);任务侧设备无此字段,前端按 deviceId 截断显示。 */
private String deviceName;
/** 最近活动时间;为空表示只有进行中任务、窗口内无活动记录。 */
private LocalDateTime lastActiveAt;
/** 在线 = 最近活动 ≤ 5 分钟。 */
private boolean online;
/** 该设备进行中任务数。 */
private long runningTasks;
/** 最近一次任务创建时间(30 天窗口内)。 */
private LocalDateTime recentTaskAt;
/** 网页登录设备(device_id 前缀 web-)。 */
private boolean webDevice;
}
@@ -1,13 +1,19 @@
package com.nanri.aiimage.modules.taskcenter.service;
import com.nanri.aiimage.modules.taskcenter.mapper.TaskCenterQueryMapper;
import com.nanri.aiimage.modules.taskcenter.model.dto.TaskCenterDeviceRow;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterDeviceVo;
import com.nanri.aiimage.modules.taskcenter.model.vo.TaskCenterOverviewVo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
/**
* 客户端任务管理的只读查询。时间口径:卡住 10 分钟、在线 5 分钟、
@@ -39,4 +45,53 @@ public class TaskCenterQueryService {
now.minusMinutes(ONLINE_WINDOW_MINUTES)));
return vo;
}
/** 设备花名册:任务设备 ∪ 日志设备,在线优先、活动时间倒序。 */
public List<TaskCenterDeviceVo> devices(TaskCenterScopeService.ScopeContext scope) {
LocalDateTime now = LocalDateTime.now();
List<Long> userIds = scope.sqlUserIds();
Map<String, TaskCenterDeviceVo> byDevice = new LinkedHashMap<>();
for (TaskCenterDeviceRow row : queryMapper.listRosterDevices(userIds,
now.minusDays(TASK_DEVICE_WINDOW_DAYS), now.minusDays(LOG_DEVICE_WINDOW_DAYS))) {
TaskCenterDeviceVo vo = deviceOf(byDevice, row.getDeviceId());
if (vo != null) {
vo.setDeviceName(row.getDeviceName());
vo.setLastActiveAt(row.getLastActiveAt());
vo.setRecentTaskAt(row.getRecentTaskAt());
}
}
for (TaskCenterDeviceRow row : queryMapper.countRunningTasksByDevice(userIds)) {
TaskCenterDeviceVo vo = deviceOf(byDevice, row.getDeviceId());
if (vo != null && row.getRunningTasks() != null) {
vo.setRunningTasks(row.getRunningTasks());
}
}
LocalDateTime onlineSince = now.minusMinutes(ONLINE_WINDOW_MINUTES);
List<TaskCenterDeviceVo> devices = new ArrayList<>(byDevice.values());
for (TaskCenterDeviceVo vo : devices) {
vo.setOnline(vo.getLastActiveAt() != null && !vo.getLastActiveAt().isBefore(onlineSince));
}
devices.sort(Comparator
.comparing(TaskCenterDeviceVo::isOnline, Comparator.reverseOrder())
.thenComparing(TaskCenterDeviceVo::getLastActiveAt, Comparator.nullsLast(Comparator.reverseOrder()))
.thenComparing(vo -> vo.getDeviceName() == null ? "" : vo.getDeviceName())
.thenComparing(TaskCenterDeviceVo::getDeviceId));
return devices;
}
/** 空设备号入册无意义(SQL 已滤,这里挡住直调服务或脏数据)。 */
private static TaskCenterDeviceVo deviceOf(Map<String, TaskCenterDeviceVo> byDevice, String deviceId) {
if (deviceId == null || deviceId.isBlank()) {
return null;
}
String key = deviceId.trim();
return byDevice.computeIfAbsent(key, id -> {
TaskCenterDeviceVo vo = new TaskCenterDeviceVo();
vo.setDeviceId(id);
vo.setWebDevice(id.startsWith("web-"));
return vo;
});
}
}