diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java index e3349f46..b457b18b 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/AssetAuthorizedDataServiceController.java @@ -63,7 +63,7 @@ public class AssetAuthorizedDataServiceController { @IgnoreLog(IgnoreLogMode.RET) @GetMapping("/current-host") @Operation(summary = "查询当前用户已授权的主机") - public AuthorizedHostWrapperVO getCurrentAuthorizedHost(@RequestParam("type") String type) { + public AuthorizedHostWrapperVO getCurrentAuthorizedHost(@RequestParam(value = "type", required = false) String type) { return assetAuthorizedDataService.getUserAuthorizedHost(SecurityUtils.getLoginUserId(), type); } diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java index d0123b1d..da025b20 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/dao/TerminalConnectLogDAO.java @@ -49,7 +49,17 @@ public interface TerminalConnectLogDAO extends IMapper { * @param limit limit * @return hostId */ - List selectLatestConnectHostId(@Param("userId") Long userId, @Param("type") String type, @Param("limit") Integer limit); + default List selectLatestConnectHostId(Long userId, String type, Integer limit) { + return this.of() + .createWrapper(true) + .select(TerminalConnectLogDO::getHostId) + .eq(TerminalConnectLogDO::getUserId, userId) + .eq(TerminalConnectLogDO::getType, type) + .orderByDesc(TerminalConnectLogDO::getId) + .then() + .limit(limit) + .list(TerminalConnectLogDO::getHostId); + } /** * 查询终端连接日志用户数量 diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml index 7e11d36b..ff13af98 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml @@ -33,16 +33,6 @@ id, user_id, username, host_id, host_name, host_address, type, session_id, status, start_time, end_time, extra_info, create_time, update_time, deleted - -