diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/mapper/IMapper.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/mapper/IMapper.java index d54c9ed6..41866b81 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/mapper/IMapper.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/mapper/IMapper.java @@ -28,6 +28,15 @@ public interface IMapper extends BaseMapper { return Conditions.wrapper(); } + /** + * 获取 LambdaQueryWrapper 对象 + * + * @return 获取 wrapper + */ + default LambdaQueryWrapper lambda() { + return new LambdaQueryWrapper<>(); + } + /** * 获取 DataQuery 对象 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/TagRelApi.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/TagRelApi.java index a4f4d220..f6040af3 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/TagRelApi.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/TagRelApi.java @@ -51,6 +51,22 @@ public interface TagRelApi { */ Future>> getRelTags(TagTypeEnum type, List relIdList); + /** + * 查询 tag 关联的所有 id + * + * @param tagId tagId + * @return rel + */ + List getRelIdByTagId(Long tagId); + + /** + * 查询 tag 关联的所有 id + * + * @param tagIdList tagIdList + * @return rel + */ + List getRelIdByTagId(List tagIdList); + /** * 通过 relId 删除 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java index 41b933e4..8b735c1a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/FavoriteApiImpl.java @@ -5,7 +5,6 @@ import com.orion.ops.module.infra.entity.request.favorite.FavoriteCreateRequest; import com.orion.ops.module.infra.entity.request.favorite.FavoriteQueryRequest; import com.orion.ops.module.infra.enums.FavoriteTypeEnum; import com.orion.ops.module.infra.service.FavoriteService; -import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -21,7 +20,6 @@ import java.util.concurrent.Future; * @version 1.0.0 * @since 2023-9-1 10:30 */ -@Slf4j @Service public class FavoriteApiImpl implements FavoriteApi { diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/TagRelApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/TagRelApiImpl.java index 4a73158a..01b7da5a 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/TagRelApiImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/TagRelApiImpl.java @@ -57,6 +57,16 @@ public class TagRelApiImpl implements TagRelApi { return CompletableFuture.completedFuture(values); } + @Override + public List getRelIdByTagId(Long tagId) { + return tagRelService.getRelIdByTagId(tagId); + } + + @Override + public List getRelIdByTagId(List tagIdList) { + return tagRelService.getRelIdByTagId(tagIdList); + } + @Override @Async("asyncExecutor") public void deleteRelId(TagTypeEnum type, Long relId) { diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/FavoriteDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/FavoriteDAO.java index 31c7f1f0..a5ca992b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/FavoriteDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/FavoriteDAO.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.dao; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.module.infra.entity.domain.FavoriteDO; import org.apache.ibatis.annotations.Mapper; @@ -15,18 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface FavoriteDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(FavoriteDO entity) { - return this.wrapper() - .eq(FavoriteDO::getId, entity.getId()) - .eq(FavoriteDO::getUserId, entity.getUserId()) - .eq(FavoriteDO::getRelId, entity.getRelId()) - .eq(FavoriteDO::getType, entity.getType()); - } - } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java index da001f93..3b2cc79b 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemMenuDAO.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.dao; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.module.infra.entity.domain.SystemMenuDO; import org.apache.ibatis.annotations.Mapper; @@ -15,25 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemMenuDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(SystemMenuDO entity) { - return this.wrapper() - .eq(SystemMenuDO::getId, entity.getId()) - .eq(SystemMenuDO::getParentId, entity.getParentId()) - .eq(SystemMenuDO::getName, entity.getName()) - .eq(SystemMenuDO::getPermission, entity.getPermission()) - .eq(SystemMenuDO::getType, entity.getType()) - .eq(SystemMenuDO::getSort, entity.getSort()) - .eq(SystemMenuDO::getStatus, entity.getStatus()) - .eq(SystemMenuDO::getCache, entity.getCache()) - .eq(SystemMenuDO::getIcon, entity.getIcon()) - .eq(SystemMenuDO::getPath, entity.getPath()) - .eq(SystemMenuDO::getComponent, entity.getComponent()); - } - } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java index af56e923..585c917f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleDAO.java @@ -18,20 +18,6 @@ import java.util.List; @Mapper public interface SystemRoleDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(SystemRoleDO entity) { - return this.wrapper() - .eq(SystemRoleDO::getId, entity.getId()) - .eq(SystemRoleDO::getName, entity.getName()) - .eq(SystemRoleDO::getCode, entity.getCode()) - .eq(SystemRoleDO::getStatus, entity.getStatus()); - } - /** * 通过编码查询角色 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java index 319d34dc..8bb433f5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemRoleMenuDAO.java @@ -17,19 +17,6 @@ import java.util.List; @Mapper public interface SystemRoleMenuDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(SystemRoleMenuDO entity) { - return this.wrapper() - .eq(SystemRoleMenuDO::getId, entity.getId()) - .eq(SystemRoleMenuDO::getRoleId, entity.getRoleId()) - .eq(SystemRoleMenuDO::getMenuId, entity.getMenuId()); - } - /** * 通过 roleId 删除 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java index ffee0958..cba42eff 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserDAO.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.dao; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.module.infra.entity.domain.SystemUserDO; import org.apache.ibatis.annotations.Mapper; @@ -15,23 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface SystemUserDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(SystemUserDO entity) { - return this.wrapper() - .eq(SystemUserDO::getId, entity.getId()) - .eq(SystemUserDO::getUsername, entity.getUsername()) - .eq(SystemUserDO::getPassword, entity.getPassword()) - .eq(SystemUserDO::getNickname, entity.getNickname()) - .eq(SystemUserDO::getAvatar, entity.getAvatar()) - .eq(SystemUserDO::getMobile, entity.getMobile()) - .eq(SystemUserDO::getEmail, entity.getEmail()) - .eq(SystemUserDO::getStatus, entity.getStatus()) - .eq(SystemUserDO::getLastLoginTime, entity.getLastLoginTime()); - } - } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java index 3597e9ac..f7e5420d 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/SystemUserRoleDAO.java @@ -18,19 +18,6 @@ import java.util.stream.Collectors; @Mapper public interface SystemUserRoleDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(SystemUserRoleDO entity) { - return this.wrapper() - .eq(SystemUserRoleDO::getId, entity.getId()) - .eq(SystemUserRoleDO::getUserId, entity.getUserId()) - .eq(SystemUserRoleDO::getRoleId, entity.getRoleId()); - } - /** * 查询用户的全部 roleId * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagDAO.java index bfaee112..21dab2c5 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagDAO.java @@ -1,6 +1,5 @@ package com.orion.ops.module.infra.dao; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.module.infra.entity.domain.TagDO; import org.apache.ibatis.annotations.Mapper; @@ -15,17 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TagDAO extends IMapper { - /** - * 获取查询条件 - * - * @param entity entity - * @return 查询条件 - */ - default LambdaQueryWrapper queryCondition(TagDO entity) { - return this.wrapper() - .eq(TagDO::getId, entity.getId()) - .eq(TagDO::getName, entity.getName()) - .eq(TagDO::getType, entity.getType()); - } - } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagRelDAO.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagRelDAO.java index 9e5bcd0b..be5d524c 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagRelDAO.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/dao/TagRelDAO.java @@ -5,6 +5,9 @@ import com.orion.ops.framework.mybatis.core.mapper.IMapper; import com.orion.ops.module.infra.entity.domain.TagRelDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.stream.Collectors; + /** * 标签引用 Mapper 接口 * @@ -16,18 +19,35 @@ import org.apache.ibatis.annotations.Mapper; public interface TagRelDAO extends IMapper { /** - * 获取查询条件 + * 查询 tag 关联的所有 id * - * @param entity entity - * @return 查询条件 + * @param tagId tagId + * @return rel */ - default LambdaQueryWrapper queryCondition(TagRelDO entity) { - return this.wrapper() - .eq(TagRelDO::getId, entity.getId()) - .eq(TagRelDO::getTagId, entity.getTagId()) - .eq(TagRelDO::getTagName, entity.getTagName()) - .eq(TagRelDO::getTagType, entity.getTagType()) - .eq(TagRelDO::getRelId, entity.getRelId()); + default List selectRelIdByTagId(Long tagId) { + LambdaQueryWrapper wrapper = this.lambda() + .select(TagRelDO::getRelId) + .eq(TagRelDO::getTagId, tagId); + return this.selectList(wrapper) + .stream() + .map(TagRelDO::getRelId) + .collect(Collectors.toList()); + } + + /** + * 查询 tag 关联的所有 id + * + * @param tagIdList tagIdList + * @return rel + */ + default List selectRelIdByTagId(List tagIdList) { + LambdaQueryWrapper wrapper = this.lambda() + .select(TagRelDO::getRelId) + .in(TagRelDO::getTagId, tagIdList); + return this.selectList(wrapper) + .stream() + .map(TagRelDO::getRelId) + .collect(Collectors.toList()); } } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/TagRelService.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/TagRelService.java index 02a93c38..510b7219 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/TagRelService.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/TagRelService.java @@ -49,6 +49,22 @@ public interface TagRelService { */ List> getRelTags(String type, List relIdList); + /** + * 查询 tag 关联的所有 id + * + * @param tagId tagId + * @return rel + */ + List getRelIdByTagId(Long tagId); + + /** + * 查询 tag 关联的所有 id + * + * @param tagIdList tagIdList + * @return rel + */ + List getRelIdByTagId(List tagIdList); + /** * 通过 relId 删除 * diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagRelServiceImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagRelServiceImpl.java index 90019a83..aaf20589 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagRelServiceImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/service/impl/TagRelServiceImpl.java @@ -148,6 +148,16 @@ public class TagRelServiceImpl implements TagRelService { return cacheValueList; } + @Override + public List getRelIdByTagId(Long tagId) { + return tagRelDAO.selectRelIdByTagId(tagId); + } + + @Override + public List getRelIdByTagId(List tagIdList) { + return tagRelDAO.selectRelIdByTagId(tagIdList); + } + @Override public Integer deleteRelId(String type, Long relId) { // 删除数据库