|
@@ -52,11 +52,17 @@ public class DanKnowledgeBaseService extends ServiceImpl<DanKnowledgeBaseMapper,
|
|
|
private LanggraphSyncService langgraphSyncService;
|
|
private LanggraphSyncService langgraphSyncService;
|
|
|
|
|
|
|
|
public Map<String, Object> list(String keyword, Integer status, int page, int size) {
|
|
public Map<String, Object> list(String keyword, Integer status, int page, int size) {
|
|
|
- return list(keyword, status, page, size, null, null);
|
|
|
|
|
|
|
+ return list(keyword, status, page, size, null, null, null, null);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public Map<String, Object> list(String keyword, Integer status, int page, int size,
|
|
public Map<String, Object> list(String keyword, Integer status, int page, int size,
|
|
|
Long tagId, Long dimensionId) {
|
|
Long tagId, Long dimensionId) {
|
|
|
|
|
+ return list(keyword, status, page, size, tagId, dimensionId, null, null);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ public Map<String, Object> list(String keyword, Integer status, int page, int size,
|
|
|
|
|
+ Long tagId, Long dimensionId, String sourceType,
|
|
|
|
|
+ String excludeSourceType) {
|
|
|
Page<DanKnowledgeBase> p = new Page<>(page, size);
|
|
Page<DanKnowledgeBase> p = new Page<>(page, size);
|
|
|
LambdaQueryWrapper<DanKnowledgeBase> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<DanKnowledgeBase> wrapper = new LambdaQueryWrapper<>();
|
|
|
if (keyword != null && !keyword.isEmpty()) {
|
|
if (keyword != null && !keyword.isEmpty()) {
|
|
@@ -77,7 +83,13 @@ public class DanKnowledgeBaseService extends ServiceImpl<DanKnowledgeBaseMapper,
|
|
|
wrapper.in(DanKnowledgeBase::getId,
|
|
wrapper.in(DanKnowledgeBase::getId,
|
|
|
ids.isEmpty() ? Collections.singletonList(-1L) : ids);
|
|
ids.isEmpty() ? Collections.singletonList(-1L) : ids);
|
|
|
}
|
|
}
|
|
|
- wrapper.orderByAsc(DanKnowledgeBase::getSort);
|
|
|
|
|
|
|
+ if (sourceType != null && !sourceType.isEmpty()) {
|
|
|
|
|
+ wrapper.eq(DanKnowledgeBase::getSourceType, sourceType);
|
|
|
|
|
+ }
|
|
|
|
|
+ if (excludeSourceType != null && !excludeSourceType.isEmpty()) {
|
|
|
|
|
+ wrapper.ne(DanKnowledgeBase::getSourceType, excludeSourceType);
|
|
|
|
|
+ }
|
|
|
|
|
+ wrapper.orderByAsc(DanKnowledgeBase::getSort).orderByAsc(DanKnowledgeBase::getId);
|
|
|
this.page(p, wrapper);
|
|
this.page(p, wrapper);
|
|
|
|
|
|
|
|
SortUtil.applySort(wrapper);
|
|
SortUtil.applySort(wrapper);
|