From 114757358ee9fae1e6d50e0be51acdae8f9f01a8 Mon Sep 17 00:00:00 2001
From: DYL <Dn1332079466>
Date: 星期六, 18 一月 2025 22:10:35 +0800
Subject: [PATCH] 知识库联调
---
zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java | 5 +++++
zhitan-system/src/main/java/com/zhitan/knowledgeBase/service/impl/KnowledgeBaseServiceImpl.java | 22 ++++++++++++----------
zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBaseDetailVO.java | 3 +++
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBaseDetailVO.java b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBaseDetailVO.java
index 099829e..9796ccb 100644
--- a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBaseDetailVO.java
+++ b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBaseDetailVO.java
@@ -1,5 +1,7 @@
package com.zhitan.knowledgeBase.domain.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +19,7 @@
* id
*/
@ApiModelProperty(value = "id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 鏍囬
diff --git a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java
index 22b923d..0ef28d5 100644
--- a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java
+++ b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/domain/vo/KnowledgeBasePageVO.java
@@ -1,5 +1,8 @@
package com.zhitan.knowledgeBase.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
/**
@@ -11,6 +14,7 @@
/**
* id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 鏍囬
@@ -31,5 +35,6 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
}
diff --git a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/service/impl/KnowledgeBaseServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/service/impl/KnowledgeBaseServiceImpl.java
index 44f17b7..390231d 100644
--- a/zhitan-system/src/main/java/com/zhitan/knowledgeBase/service/impl/KnowledgeBaseServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/knowledgeBase/service/impl/KnowledgeBaseServiceImpl.java
@@ -48,12 +48,14 @@
// 鍒嗛〉鏌ヨ
Page<KnowledgeBase> knowledgeBasePage = baseMapper.selectPage(new Page<>(pageDTO.getPageNum(), pageDTO.getPageSize()),
Wrappers.<KnowledgeBase>lambdaQuery()
+ .select(KnowledgeBase::getId, KnowledgeBase::getTitle, KnowledgeBase::getType,
+ KnowledgeBase::getContent, KnowledgeBase::getCreateTime)
.like(ObjectUtils.isNotEmpty(pageDTO.getTitle()), KnowledgeBase::getTitle, pageDTO.getTitle())
.eq(ObjectUtils.isNotEmpty(pageDTO.getType()), KnowledgeBase::getType, pageDTO.getType())
.eq(KnowledgeBase::getDelFlag, false).orderByDesc(KnowledgeBase::getCreateTime));
List<KnowledgeBase> records = knowledgeBasePage.getRecords();
- if (records.isEmpty()){
+ if (records.isEmpty()) {
return voPage;
}
// 鏁版嵁杞崲
@@ -75,12 +77,12 @@
// 鏌ヨ鏁版嵁
KnowledgeBase knowledgeBase = baseMapper.selectById(id);
- if (knowledgeBase != null){
+ if (knowledgeBase != null) {
// 鏁版嵁杞崲
BeanUtil.copyProperties(knowledgeBase, vo);
vo.setUrl(fileMapper.selectList(Wrappers.<KnowledgeBaseFile>lambdaQuery()
- .select(KnowledgeBaseFile::getUrl)
- .eq(KnowledgeBaseFile::getKnowledgeBaseId, id))
+ .select(KnowledgeBaseFile::getUrl)
+ .eq(KnowledgeBaseFile::getKnowledgeBaseId, id))
.stream().map(KnowledgeBaseFile::getUrl).collect(Collectors.toList()));
}
return vo;
@@ -97,8 +99,8 @@
baseMapper.insert(knowledgeBase);
// 鎻掑叆鏂囦欢
- if (ObjectUtils.isNotEmpty(addDTO.getUrl())){
- addDTO.getUrl().forEach(url->{
+ if (ObjectUtils.isNotEmpty(addDTO.getUrl())) {
+ addDTO.getUrl().forEach(url -> {
KnowledgeBaseFile file = new KnowledgeBaseFile();
file.setKnowledgeBaseId(knowledgeBase.getId());
file.setUrl(url);
@@ -114,7 +116,7 @@
public void edit(KnowledgeBaseEditDTO editDTO) {
// 鏌ヨ鏁版嵁
KnowledgeBase knowledgeBase = baseMapper.selectById(editDTO.getId());
- if (ObjectUtils.isEmpty(knowledgeBase)){
+ if (ObjectUtils.isEmpty(knowledgeBase)) {
throw new ServiceException(MessageConstant.KNOWLEDGE_BASE_NOT_EXIST);
}
// 鏇存柊鏁版嵁
@@ -126,8 +128,8 @@
.eq(KnowledgeBaseFile::getKnowledgeBaseId, knowledgeBase.getId()));
// 鎻掑叆鏂囦欢
- if (ObjectUtils.isNotEmpty(editDTO.getUrl())){
- editDTO.getUrl().forEach(url->{
+ if (ObjectUtils.isNotEmpty(editDTO.getUrl())) {
+ editDTO.getUrl().forEach(url -> {
KnowledgeBaseFile file = new KnowledgeBaseFile();
file.setKnowledgeBaseId(knowledgeBase.getId());
file.setUrl(url);
@@ -143,7 +145,7 @@
public void delete(Long id) {
// 鏌ヨ鏁版嵁
KnowledgeBase knowledgeBase = baseMapper.selectById(id);
- if (ObjectUtils.isEmpty(knowledgeBase)){
+ if (ObjectUtils.isEmpty(knowledgeBase)) {
throw new ServiceException(MessageConstant.KNOWLEDGE_BASE_NOT_EXIST);
}
// 鍒犻櫎鏁版嵁
--
Gitblit v1.9.3