From 02c6a7d40450a958609c99eed1f1b7c311221909 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Tue, 3 Dec 2024 19:47:49 +0800 Subject: [PATCH] [improvement][headless]Use LamdaQueryWrapper to avoid hard-coded column names. --- .../repository/impl/UserRepositoryImpl.java | 4 +-- .../parse/QueryRecommendProcessor.java | 2 +- .../impl/DimensionRepositoryImpl.java | 25 +++++++++-------- .../repository/impl/MetricRepositoryImpl.java | 28 +++++++++---------- .../impl/QueryRuleRepositoryImpl.java | 2 +- .../repository/impl/StatRepositoryImpl.java | 6 ++-- 6 files changed, 35 insertions(+), 32 deletions(-) diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java index 1549a1db6..07ab94c75 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/repository/impl/UserRepositoryImpl.java @@ -51,7 +51,7 @@ public class UserRepositoryImpl implements UserRepository { @Override public List getUserTokenListByName(String userName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_name", userName); + queryWrapper.lambda().eq(UserTokenDO::getUserName, userName); return userTokenDOMapper.selectList(queryWrapper); } @@ -68,7 +68,7 @@ public class UserRepositoryImpl implements UserRepository { @Override public void deleteUserTokenByName(String userName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_name", userName); + queryWrapper.lambda().eq(UserTokenDO::getUserName, userName); userTokenDOMapper.delete(queryWrapper); } diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java index ab0865f56..b060d0055 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/parse/QueryRecommendProcessor.java @@ -56,7 +56,7 @@ public class QueryRecommendProcessor implements ParseResultProcessor { private void updateChatQuery(ChatQueryDO chatQueryDO) { ChatQueryRepository chatQueryRepository = ContextUtils.getBean(ChatQueryRepository.class); UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("question_id", chatQueryDO.getQuestionId()); + updateWrapper.lambda().eq(ChatQueryDO::getQuestionId, chatQueryDO.getQuestionId()); chatQueryRepository.updateChatQuery(chatQueryDO, updateWrapper); } } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java index 61f3d157f..95c48d6f4 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java @@ -54,36 +54,39 @@ public class DimensionRepositoryImpl implements DimensionRepository { @Override public List getDimension(DimensionFilter dimensionFilter) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("status", 3); + queryWrapper.lambda().ne(DimensionDO::getStatus, 3); if (Objects.nonNull(dimensionFilter.getIds()) && !dimensionFilter.getIds().isEmpty()) { - queryWrapper.in("id", dimensionFilter.getIds()); + queryWrapper.lambda().in(DimensionDO::getId, dimensionFilter.getIds()); } if (StringUtils.isNotBlank(dimensionFilter.getId())) { - queryWrapper.eq("id", dimensionFilter.getId()); + queryWrapper.lambda().eq(DimensionDO::getId, dimensionFilter.getId()); } if (Objects.nonNull(dimensionFilter.getModelIds()) && !dimensionFilter.getModelIds().isEmpty()) { - queryWrapper.in("model_id", dimensionFilter.getModelIds()); + queryWrapper.lambda().in(DimensionDO::getModelId, dimensionFilter.getModelIds()); } if (StringUtils.isNotBlank(dimensionFilter.getName())) { - queryWrapper.like("name", dimensionFilter.getName()); + queryWrapper.lambda().like(DimensionDO::getName, dimensionFilter.getName()); } if (StringUtils.isNotBlank(dimensionFilter.getId())) { - queryWrapper.like("biz_name", dimensionFilter.getBizName()); + queryWrapper.lambda().like(DimensionDO::getBizName, dimensionFilter.getBizName()); } if (Objects.nonNull(dimensionFilter.getStatus())) { - queryWrapper.eq("status", dimensionFilter.getStatus()); + queryWrapper.lambda().eq(DimensionDO::getStatus, dimensionFilter.getStatus()); } if (Objects.nonNull(dimensionFilter.getSensitiveLevel())) { - queryWrapper.eq("sensitive_level", dimensionFilter.getSensitiveLevel()); + queryWrapper.lambda().eq(DimensionDO::getSensitiveLevel, + dimensionFilter.getSensitiveLevel()); } if (StringUtils.isNotBlank(dimensionFilter.getCreatedBy())) { - queryWrapper.eq("created_by", dimensionFilter.getCreatedBy()); + queryWrapper.lambda().eq(DimensionDO::getCreatedBy, dimensionFilter.getCreatedBy()); } if (StringUtils.isNotBlank(dimensionFilter.getKey())) { String key = dimensionFilter.getKey(); - queryWrapper.like("name", key).or().like("biz_name", key).or().like("description", key) - .or().like("alias", key).or().like("created_by", key); + queryWrapper.lambda().like(DimensionDO::getName, key).or() + .like(DimensionDO::getBizName, key).or().like(DimensionDO::getDescription, key) + .or().like(DimensionDO::getAlias, key).or() + .like(DimensionDO::getCreatedBy, key); } return dimensionDOMapper.selectList(queryWrapper); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java index 4b39af5be..3cf5eb0b9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java @@ -76,42 +76,42 @@ public class MetricRepositoryImpl implements MetricRepository { @Override public List getMetric(MetricFilter metricFilter) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("status", 3); + queryWrapper.lambda().ne(MetricDO::getStatus, 3); if (Objects.nonNull(metricFilter.getIds()) && !metricFilter.getIds().isEmpty()) { - queryWrapper.in("id", metricFilter.getIds()); + queryWrapper.lambda().in(MetricDO::getId, metricFilter.getIds()); } if (StringUtils.isNotBlank(metricFilter.getId())) { - queryWrapper.eq("id", metricFilter.getId()); + queryWrapper.lambda().eq(MetricDO::getId, metricFilter.getId()); } if (Objects.nonNull(metricFilter.getModelIds()) && !metricFilter.getModelIds().isEmpty()) { - queryWrapper.in("model_id", metricFilter.getModelIds()); + queryWrapper.lambda().in(MetricDO::getModelId, metricFilter.getModelIds()); } if (StringUtils.isNotBlank(metricFilter.getType())) { - queryWrapper.eq("type", metricFilter.getType()); + queryWrapper.lambda().eq(MetricDO::getType, metricFilter.getType()); } if (StringUtils.isNotBlank(metricFilter.getName())) { - queryWrapper.like("name", metricFilter.getName()); + queryWrapper.lambda().like(MetricDO::getName, metricFilter.getName()); } if (StringUtils.isNotBlank(metricFilter.getId())) { - queryWrapper.like("biz_name", metricFilter.getBizName()); + queryWrapper.lambda().like(MetricDO::getBizName, metricFilter.getBizName()); } if (Objects.nonNull(metricFilter.getStatus())) { - queryWrapper.eq("status", metricFilter.getStatus()); + queryWrapper.lambda().eq(MetricDO::getStatus, metricFilter.getStatus()); } if (Objects.nonNull(metricFilter.getSensitiveLevel())) { - queryWrapper.eq("sensitive_level", metricFilter.getSensitiveLevel()); + queryWrapper.lambda().eq(MetricDO::getSensitiveLevel, metricFilter.getSensitiveLevel()); } if (StringUtils.isNotBlank(metricFilter.getCreatedBy())) { - queryWrapper.eq("created_by", metricFilter.getCreatedBy()); + queryWrapper.lambda().eq(MetricDO::getCreatedBy, metricFilter.getCreatedBy()); } if (Objects.nonNull(metricFilter.getIsPublish()) && metricFilter.getIsPublish() == 1) { - queryWrapper.eq("is_publish", metricFilter.getIsPublish()); + queryWrapper.lambda().eq(MetricDO::getIsPublish, metricFilter.getIsPublish()); } if (StringUtils.isNotBlank(metricFilter.getKey())) { String key = metricFilter.getKey(); - queryWrapper.like("name", key).or().like("biz_name", key).or().like("description", key) - .or().like("alias", key).or().like("classifications", key).or() - .like("created_by", key); + queryWrapper.lambda().like(MetricDO::getName, key).or().like(MetricDO::getBizName, key) + .or().like(MetricDO::getDescription, key).or().like(MetricDO::getAlias, key) + .or().like(MetricDO::getCreatedBy, key); } return metricDOMapper.selectList(queryWrapper); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/QueryRuleRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/QueryRuleRepositoryImpl.java index 62bd35806..8ca7461b3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/QueryRuleRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/QueryRuleRepositoryImpl.java @@ -51,7 +51,7 @@ public class QueryRuleRepositoryImpl implements QueryRuleRepository { QueryWrapper wrapperSys = new QueryWrapper<>(); // 返回系统设置的规则 - wrapperSys.or().eq("priority", 0L); + wrapperSys.lambda().or().eq(QueryRuleDO::getPriority, 0L); List queryRuleDOListSys = mapper.selectList(wrapperSys); queryRuleDOList.addAll(queryRuleDOListSys); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java index 9383bc607..064f38b78 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java @@ -74,13 +74,13 @@ public class StatRepositoryImpl implements StatRepository { private List getQueryStats(ItemUseReq itemUseReq) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (Objects.nonNull(itemUseReq.getModelId())) { - queryWrapper.eq("model_id", itemUseReq.getModelId()); + queryWrapper.lambda().eq(QueryStatDO::getModelId, itemUseReq.getModelId()); } if (Objects.nonNull(itemUseReq.getModelIds()) && !itemUseReq.getModelIds().isEmpty()) { - queryWrapper.in("model_id", itemUseReq.getModelIds()); + queryWrapper.lambda().in(QueryStatDO::getModelId, itemUseReq.getModelIds()); } if (Objects.nonNull(itemUseReq.getMetric())) { - queryWrapper.like("metrics", itemUseReq.getMetric()); + queryWrapper.lambda().like(QueryStatDO::getMetrics, itemUseReq.getMetric()); } return statMapper.selectList(queryWrapper);