ZF/weiyu
1
0
Fork 0
mirror of https://gitee.com/270580156/weiyu.git synced 2026-05-18 05:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update modules/kbase: add 2 mod 330 files

Browse Source
This commit is contained in:
jack ning
2025-07-03 12:15:52 +08:00
parent 25bec5cc24
commit 936bf253fc
232 changed files with 940 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/AbstractArticleEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -92,10 +92,10 @@ public abstract class AbstractArticleEntity extends BaseEntity {
private String editor = BytedeskConsts.EMPTY_STRING;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 是否需要审核
@Column(name = "need_audit")

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -58,9 +58,9 @@ public class ArticleRequest extends BaseRequest {
@Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT)
private List<String> tagList = new ArrayList<>();
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Builder.Default
private Boolean top = false;

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/ArticleResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -44,10 +44,10 @@ public class ArticleResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean top;

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/elastic/ArticleElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -82,10 +82,10 @@ public class ArticleElastic {
private String categoryUid;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Field(type = FieldType.Integer)
private Integer readCount;

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/elastic/ArticleElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -174,8 +174,8 @@ public class ArticleElasticService {
// 添加过滤条件：发布状态
boolQueryBuilder.filter(QueryBuilders.term().field("published").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
ZonedDateTime currentTime = ZonedDateTime.now();
String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// 创建startDate范围查询

6
modules/kbase/src/main/java/com/bytedesk/kbase/article/vector/ArticleVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -83,10 +83,10 @@ public class ArticleVector {
// 有效日期范围
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 统计数据
@Field(type = FieldType.Integer)

6
modules/kbase/src/main/java/com/bytedesk/kbase/article_archive/ArticleArchiveRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article_archive;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -58,9 +58,9 @@ public class ArticleArchiveRequest extends BaseRequest {
@Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT)
private List<String> tagList = new ArrayList<>();
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Builder.Default

10
modules/kbase/src/main/java/com/bytedesk/kbase/article_archive/ArticleArchiveResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.article_archive;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -45,10 +45,10 @@ public class ArticleArchiveResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean top;
@@ -84,9 +84,9 @@ public class ArticleArchiveResponse extends BaseResponse {
// private String orgUid;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
private UserProtobuf user;

6
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/fixed/AutoReplyFixedEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.fixed;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -72,10 +72,10 @@ public class AutoReplyFixedEntity extends BaseEntity {
private Integer replyCount = 0;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid; // 文章分类。生成页面时，先查询分类，后通过分类查询相关文章。

6
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/fixed/AutoReplyFixedRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.fixed;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -44,9 +44,9 @@ public class AutoReplyFixedRequest extends BaseRequest {
@Builder.Default
private Boolean enabled = true;
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/fixed/AutoReplyFixedResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.fixed;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -43,10 +43,10 @@ public class AutoReplyFixedResponse extends BaseResponse {
private Boolean enabled;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid; // 文章分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/keyword/AutoReplyKeywordEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.keyword;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -86,10 +86,10 @@ public class AutoReplyKeywordEntity extends BaseEntity {
private Integer replyCount = 0;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid; // 文章分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/keyword/AutoReplyKeywordRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.keyword;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -54,9 +54,9 @@ public class AutoReplyKeywordRequest extends BaseRequest {
@Builder.Default
private Integer replyCount = 0;
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;

8
modules/kbase/src/main/java/com/bytedesk/kbase/auto_reply/keyword/AutoReplyKeywordResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.auto_reply.keyword;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -48,10 +48,10 @@ public class AutoReplyKeywordResponse extends BaseResponse {
private Integer replyCount;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;
@@ -61,5 +61,5 @@ public class AutoReplyKeywordResponse extends BaseResponse {
private String kbUid; // 对应知识库
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/comment/CommentRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.comment;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -52,9 +52,9 @@ public class CommentRequest extends BaseRequest {
@Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT)
private List<String> tagList = new ArrayList<>();
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
// @Builder.Default
// private String level = LevelEnum.ORGANIZATION.name();

4
modules/kbase/src/main/java/com/bytedesk/kbase/comment/CommentResponse.java
View File

@@ -53,8 +53,8 @@ public class CommentResponse extends BaseResponse {
// 评论者
private String user;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -149,12 +149,12 @@ public class FaqEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
// 分类
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqExcel.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -71,12 +71,12 @@ public class FaqExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ColumnWidth(25)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ColumnWidth(25)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@ExcelProperty(value = "扩展问答")
@ColumnWidth(20)

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -104,11 +104,11 @@ public class FaqRequest extends BaseRequest {
private List<String> tagList = new ArrayList<>();
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -80,10 +80,10 @@ public class FaqResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid; // 分类

10
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqRestService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
@@ -665,8 +665,8 @@ public class FaqRestService extends BaseRestServiceWithExcel<FaqEntity, FaqReque
.client(threadEntity.getClient())
.user(user)
.orgUid(threadEntity.getOrgUid())
.createdAt(LocalDateTime.now())
.updatedAt(LocalDateTime.now())
.createdAt(ZonedDateTime.now())
.updatedAt(ZonedDateTime.now())
.thread(threadEntity)
.extra(extra)
.build();
@@ -705,8 +705,8 @@ public class FaqRestService extends BaseRestServiceWithExcel<FaqEntity, FaqReque
.client(ClientEnum.SYSTEM.name())
.user(answerUser)
.orgUid(threadEntity.getOrgUid())
.createdAt(LocalDateTime.now())
.updatedAt(LocalDateTime.now())
.createdAt(ZonedDateTime.now())
.updatedAt(ZonedDateTime.now())
.thread(threadEntity)
.extra(extra)
.build();

4
modules/kbase/src/main/java/com/bytedesk/kbase/faq/FaqSpecification.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +54,7 @@ public class FaqSpecification extends BaseSpecification {
if (request.getOnlyLoadValid() != null && request.getOnlyLoadValid()) {
predicates.add(criteriaBuilder.equal(root.get("enabled"), true));
// 当前时间 > startDate && 当前时间 < endDate
LocalDateTime now = LocalDateTime.now();
ZonedDateTime now = ZonedDateTime.now();
predicates.add(criteriaBuilder.greaterThanOrEqualTo(root.get("startDate"), now));
predicates.add(criteriaBuilder.lessThanOrEqualTo(root.get("endDate"), now));
}

10
modules/kbase/src/main/java/com/bytedesk/kbase/faq/elastic/FaqElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -65,17 +65,17 @@ public class FaqElastic {
// startDate
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
// endDate
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
@Field(type = FieldType.Integer)
private Integer viewCount;

10
modules/kbase/src/main/java/com/bytedesk/kbase/faq/elastic/FaqElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -174,8 +174,8 @@ public class FaqElasticService {
// 添加过滤条件：启用状态
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
ZonedDateTime currentTime = ZonedDateTime.now();
String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// 创建startDate范围查询
@@ -273,8 +273,8 @@ public class FaqElasticService {
// 添加过滤条件：启用状态
// boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
// LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
// ZonedDateTime currentTime = ZonedDateTime.now();
// String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// // 创建startDate范围查询

6
modules/kbase/src/main/java/com/bytedesk/kbase/faq/vector/FaqVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -81,10 +81,10 @@ public class FaqVector {
// 有效日期范围
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 统计数据
@Field(type = FieldType.Integer)

6
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.file;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -70,12 +70,12 @@ public class FileEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
@Builder.Default
private String elasticStatus = ChunkStatusEnum.NEW.name();

8
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileExcel.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.file;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -59,12 +59,12 @@ public class FileExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ColumnWidth(25)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ColumnWidth(25)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@ExcelProperty(value = "知识库")
@ColumnWidth(20)
@@ -73,5 +73,5 @@ public class FileExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ColumnWidth(25)
private LocalDateTime createdAt;
private ZonedDateTime createdAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.file;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -49,12 +49,12 @@ public class FileRequest extends BaseRequest {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
@Builder.Default
private String elasticStatus = ChunkStatusEnum.NEW.name();

10
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.file;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -50,10 +50,10 @@ public class FileResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;
@@ -93,7 +93,7 @@ public class FileResponse extends BaseResponse {
// 上传用户
private String userUid;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
}

4
modules/kbase/src/main/java/com/bytedesk/kbase/file/FileRestService.java
View File

@@ -270,8 +270,8 @@ public class FileRestService extends BaseRestServiceWithExcel<FileEntity, FileRe
// .fileUrl("https://www.bytedesk.com")
// .content("文件内容")
// .enabled(true)
// .startDate(LocalDateTime.now())
// .endDate(LocalDateTime.now().plusDays(1))
// .startDate(ZonedDateTime.now())
// .endDate(ZonedDateTime.now().plusDays(1))
// .orgUid(orgUid)
// .build();
// Optional<KbaseEntity> kbase = kbaseRestService.findByUid(kbUid);

6
modules/kbase/src/main/java/com/bytedesk/kbase/kbase/KbaseEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.kbase;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -148,10 +148,10 @@ public class KbaseEntity extends BaseEntity {
private String language = LanguageEnum.ZH_CN.name();
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Builder.Default
@Convert(converter = StringListConverter.class)

6
modules/kbase/src/main/java/com/bytedesk/kbase/kbase/KbaseRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.kbase;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -140,9 +140,9 @@ public class KbaseRequest extends BaseRequest {
@Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT)
private List<String> tagList = new ArrayList<>();
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 大模型知识库-嵌入向量提供者
@Builder.Default

6
modules/kbase/src/main/java/com/bytedesk/kbase/kbase/KbaseResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.kbase;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -94,10 +94,10 @@ public class KbaseResponse extends BaseResponse {
private Boolean published;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 大模型知识库-嵌入向量提供者
private String embeddingProvider;

2
modules/kbase/src/main/java/com/bytedesk/kbase/kbase_invite/KbaseInviteResponse.java
View File

@@ -40,5 +40,5 @@ public class KbaseInviteResponse extends BaseResponse {
private Integer order;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -82,12 +82,12 @@ public class ChunkEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
// 对应 拆分 document 的 id
private String docId;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEventListener.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -79,8 +79,8 @@ public class ChunkEventListener {
.userUid(fileResponse.getUserUid())
.orgUid(fileResponse.getOrgUid())
.enabled(true) // 使用文件的启用状态，默认为true
.startDate(LocalDateTime.now()) // 使用文件的开始日期，默认为当前时间
.endDate(LocalDateTime.now().plusYears(100)) // 使用文件的结束日期，默认为100年后
.startDate(ZonedDateTime.now()) // 使用文件的开始日期，默认为当前时间
.endDate(ZonedDateTime.now().plusYears(100)) // 使用文件的结束日期，默认为100年后
.build();
chunkRestService.create(splitRequest);
}

8
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkExcel.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -54,12 +54,12 @@ public class ChunkExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ColumnWidth(25)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ColumnWidth(25)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@ExcelProperty(value = "文件名称")
@ColumnWidth(20)
@@ -72,5 +72,5 @@ public class ChunkExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ColumnWidth(25)
private LocalDateTime createdAt;
private ZonedDateTime createdAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -54,12 +54,12 @@ public class ChunkRequest extends BaseRequest {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
// 对应 拆分 document 的 id
private String docId;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -49,10 +49,10 @@ public class ChunkResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.Optional;
@@ -299,8 +299,8 @@ public class ChunkRestService extends BaseRestServiceWithExcel<ChunkEntity, Chun
.name("测试chunk")
.content("测试chunk内容")
.enabled(true)
.startDate(LocalDateTime.now())
.endDate(LocalDateTime.now().plusDays(1))
.startDate(ZonedDateTime.now())
.endDate(ZonedDateTime.now().plusDays(1))
.orgUid(orgUid)
.build();
Optional<KbaseEntity> kbase = kbaseRestService.findByUid(kbUid);

10
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/elastic/ChunkElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -57,10 +57,10 @@ public class ChunkElastic {
private Boolean enabled;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Field(type = FieldType.Keyword)
private String docId;
@@ -75,10 +75,10 @@ public class ChunkElastic {
private String kbaseUid;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
// @Field(type = FieldType.Keyword)
// private String createdBy;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/elastic/ChunkElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -201,7 +201,7 @@ public class ChunkElasticService {
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加时间过滤
LocalDateTime now = LocalDateTime.now();
ZonedDateTime now = ZonedDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
String nowStr = now.format(formatter);
@@ -363,7 +363,7 @@ public class ChunkElasticService {
}
// 添加时间过滤
LocalDateTime now = LocalDateTime.now();
ZonedDateTime now = ZonedDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
String nowStr = now.format(formatter);

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/vector/ChunkVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_chunk.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -82,10 +82,10 @@ public class ChunkVector {
// 有效日期范围
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 状态字段
@Field(type = FieldType.Keyword)

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -78,12 +78,12 @@ public class TextEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid; // 所属分类

8
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextExcel.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -58,12 +58,12 @@ public class TextExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效开始日期")
@ColumnWidth(25)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "有效结束日期")
@ColumnWidth(25)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@ExcelProperty(value = "知识库")
@ColumnWidth(20)
@@ -72,6 +72,6 @@ public class TextExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ColumnWidth(25)
private LocalDateTime createdAt;
private ZonedDateTime createdAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -49,12 +49,12 @@ public class TextRequest extends BaseRequest {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
@Builder.Default
private String elasticStatus = ChunkStatusEnum.NEW.name();

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -42,10 +42,10 @@ public class TextResponse extends BaseResponse {
private Boolean enabled;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String elasticStatus;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRestService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.Optional;
@@ -306,8 +306,8 @@ public class TextRestService extends BaseRestServiceWithExcel<TextEntity, TextRe
.title("初始化文本")
.content("初始化文本内容")
.enabled(true)
.startDate(LocalDateTime.now())
.endDate(LocalDateTime.now().plusDays(1))
.startDate(ZonedDateTime.now())
.endDate(ZonedDateTime.now().plusDays(1))
.build();
Optional<KbaseEntity> kbase = kbaseRestService.findByUid(kbUid);
if (kbase.isPresent()) {

14
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/elastic/TextElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -57,17 +57,17 @@ public class TextElastic {
// startDate
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
// endDate
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
@Field(type = FieldType.Keyword)
private String categoryUid;
@@ -79,10 +79,10 @@ public class TextElastic {
private List<String> docIdList;
// @Field(type = FieldType.Date)
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// @Field(type = FieldType.Date)
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
// @Field(type = FieldType.Keyword)
// private String createdBy;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/elastic/TextElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -203,7 +203,7 @@ public class TextElasticService {
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加时间过滤
LocalDateTime now = LocalDateTime.now();
ZonedDateTime now = ZonedDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
String nowStr = now.format(formatter);
@@ -368,7 +368,7 @@ public class TextElasticService {
}
// 添加时间过滤
LocalDateTime now = LocalDateTime.now();
ZonedDateTime now = ZonedDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
String nowStr = now.format(formatter);

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/vector/TextVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_text.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -81,10 +81,10 @@ public class TextVector {
// 有效日期范围
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 状态字段
@Field(type = FieldType.Keyword)

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/WebpageEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -84,12 +84,12 @@ public class WebpageEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid; // 所属分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/WebpageRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -57,12 +57,12 @@ public class WebpageRequest extends BaseRequest {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid; // 所属分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/WebpageResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -48,10 +48,10 @@ public class WebpageResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/elastic/WebpageElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -71,10 +71,10 @@ public class WebpageElastic {
private Boolean enabled;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Field(type = FieldType.Integer)
private Integer viewCount;

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/elastic/WebpageElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -171,8 +171,8 @@ public class WebpageElasticService {
// 添加过滤条件：启用状态
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
ZonedDateTime currentTime = ZonedDateTime.now();
String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// 创建startDate范围查询

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_webpage/vector/WebpageVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_webpage.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.annotation.Id;
@@ -83,10 +83,10 @@ public class WebpageVector {
// 有效日期范围
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second_millis)
private LocalDateTime endDate;
private ZonedDateTime endDate;
// 统计数据
@Field(type = FieldType.Integer)

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_website;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -84,12 +84,12 @@ public class WebsiteEntity extends BaseEntity {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid; // 所属分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_website;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -57,12 +57,12 @@ public class WebsiteRequest extends BaseRequest {
// 有效开始日期
@Builder.Default
private LocalDateTime startDate = LocalDateTime.now();
private ZonedDateTime startDate = ZonedDateTime.now();
// 有效结束日期
// 当前 + 100 年
@Builder.Default
private LocalDateTime endDate = LocalDateTime.now().plusYears(100);
private ZonedDateTime endDate = ZonedDateTime.now().plusYears(100);
private String categoryUid; // 所属分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.llm_website;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -48,10 +48,10 @@ public class WebsiteResponse extends BaseResponse {
private List<String> tagList;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private Boolean enabled;

6
modules/kbase/src/main/java/com/bytedesk/kbase/material/MaterialExcel.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.material;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
@@ -42,11 +42,11 @@ public class MaterialExcel {
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "创建时间")
@ColumnWidth(25)
private LocalDateTime createdAt;
private ZonedDateTime createdAt;
@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
@ExcelProperty(value = "修改时间")
@ColumnWidth(25)
private LocalDateTime updatedAt;
private ZonedDateTime updatedAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyEntity.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.List;
@@ -75,10 +75,10 @@ public class QuickReplyEntity extends BaseEntity {
private Integer clickCount = 0;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid; // 文章分类

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -53,9 +53,9 @@ public class QuickReplyRequest extends BaseRequest {
@Builder.Default
private Integer clickCount = 0;
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/QuickReplyResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -47,10 +47,10 @@ public class QuickReplyResponse extends BaseResponse {
private Integer clickCount;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/elastic/QuickReplyElastic.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.elasticsearch.annotations.Document;
@@ -65,10 +65,10 @@ public class QuickReplyElastic extends BaseEntity {
private Integer clickCount;
@Field(type = FieldType.Date)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Field(type = FieldType.Keyword)
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/elastic/QuickReplyElasticService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply.elastic;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Optional;
@@ -144,8 +144,8 @@ public class QuickReplyElasticService {
// 添加过滤条件：启用状态
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
ZonedDateTime currentTime = ZonedDateTime.now();
String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// 创建startDate范围查询

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/vector/QuickReplyVector.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import org.springframework.data.elasticsearch.annotations.Document;
@@ -66,10 +66,10 @@ public class QuickReplyVector extends BaseEntity {
private Integer clickCount;
@Field(type = FieldType.Date)
private LocalDateTime startDate;
private ZonedDateTime startDate;
@Field(type = FieldType.Date)
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Field(type = FieldType.Keyword)
private String categoryUid;

6
modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/vector/QuickReplyVectorService.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.quick_reply.vector;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -148,8 +148,8 @@ public class QuickReplyVectorService {
// 添加过滤条件：启用状态
boolQueryBuilder.filter(QueryBuilders.term().field("enabled").value(true).build()._toQuery());
// 添加日期范围过滤 - 将LocalDateTime转换为ISO格式的字符串
LocalDateTime currentTime = LocalDateTime.now();
// 添加日期范围过滤 - 将ZonedDateTime转换为ISO格式的字符串
ZonedDateTime currentTime = ZonedDateTime.now();
String currentTimeStr = currentTime.format(DateTimeFormatter.ISO_DATE_TIME);
// 创建startDate范围查询

6
modules/kbase/src/main/java/com/bytedesk/kbase/settings/ServiceSettings.java
View File

@@ -14,7 +14,7 @@
package com.bytedesk.kbase.settings;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -65,9 +65,9 @@ public class ServiceSettings implements Serializable {
@Builder.Default
private String topTip = I18Consts.I18N_TOP_TIP;
private LocalDateTime topTipStart;
private ZonedDateTime topTipStart;
private LocalDateTime topTipEnd;
private ZonedDateTime topTipEnd;
// 满意度评价设置--------------------------------------------------
// show rate btn on chat toolbar

6
modules/kbase/src/main/java/com/bytedesk/kbase/settings/ServiceSettingsRequest.java
View File

@@ -14,7 +14,7 @@
package com.bytedesk.kbase.settings;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -48,9 +48,9 @@ public class ServiceSettingsRequest implements Serializable {
@Builder.Default
private String topTip = I18Consts.I18N_TOP_TIP;
private LocalDateTime topTipStart;
private ZonedDateTime topTipStart;
private LocalDateTime topTipEnd;
private ZonedDateTime topTipEnd;
// show rate btn on chat toolbar
@Builder.Default

6
modules/kbase/src/main/java/com/bytedesk/kbase/settings/ServiceSettingsResponse.java
View File

@@ -14,7 +14,7 @@
package com.bytedesk.kbase.settings;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
@@ -43,9 +43,9 @@ public class ServiceSettingsResponse implements Serializable {
private String topTip;
private LocalDateTime topTipStart;
private ZonedDateTime topTipStart;
private LocalDateTime topTipEnd;
private ZonedDateTime topTipEnd;
// show rate btn on chat toolbar
private Boolean showRateBtn;

2
modules/kbase/src/main/java/com/bytedesk/kbase/settings_intention/IntentionSettingsResponse.java
View File

@@ -41,5 +41,5 @@ public class IntentionSettingsResponse extends BaseResponse {
private Integer order;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
}

2
modules/kbase/src/main/java/com/bytedesk/kbase/settings_invite/InviteSettingsResponse.java
View File

@@ -41,5 +41,5 @@ public class InviteSettingsResponse extends BaseResponse {
private Integer order;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
}

4
modules/kbase/src/main/java/com/bytedesk/kbase/settings_service/ServiceSettingsEntity.java
View File

@@ -73,9 +73,9 @@ public class ServiceSettingsEntity extends BaseEntity {
// @Builder.Default
// private String topTip = I18Consts.I18N_TOP_TIP;
// private LocalDateTime topTipStart;
// private ZonedDateTime topTipStart;
// private LocalDateTime topTipEnd;
// private ZonedDateTime topTipEnd;
// // 满意度评价设置--------------------------------------------------
// // show rate btn on chat toolbar

2
modules/kbase/src/main/java/com/bytedesk/kbase/settings_service/ServiceSettingsResponse.java
View File

@@ -41,5 +41,5 @@ public class ServiceSettingsResponse extends BaseResponse {
private Integer order;
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
}

6
modules/kbase/src/main/java/com/bytedesk/kbase/taboo_message/TabooMessageRequest.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.taboo_message;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import java.util.ArrayList;
@@ -41,9 +41,9 @@ public class TabooMessageRequest extends BaseRequest {
@Builder.Default
private List<String> tagList = new ArrayList<>();
private LocalDateTime startDate;
private ZonedDateTime startDate;
private LocalDateTime endDate;
private ZonedDateTime endDate;
@Builder.Default
private String level = LevelEnum.ORGANIZATION.name();

10
modules/kbase/src/main/java/com/bytedesk/kbase/taboo_message/TabooMessageResponse.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.taboo_message;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.List;
import com.bytedesk.core.base.BaseResponse;
@@ -44,16 +44,16 @@ public class TabooMessageResponse extends BaseResponse {
private Boolean enabled;
// 有效开始日期
private LocalDateTime startDate;
private ZonedDateTime startDate;
// 有效结束日期
private LocalDateTime endDate;
private ZonedDateTime endDate;
private String categoryUid;
private String kbUid; // 对应知识库
// private LocalDateTime createdAt;
// private ZonedDateTime createdAt;
// private LocalDateTime updatedAt;
// private ZonedDateTime updatedAt;
}

4
modules/kbase/src/test/java/com/bytedesk/kbase/faq/FaqBulkIndexTester.java
View File

@@ -13,7 +13,7 @@
*/
package com.bytedesk.kbase.faq;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -72,7 +72,7 @@ public class FaqBulkIndexTester {
});
}
log.info("批量索引测试任务已提交，时间: {}", LocalDateTime.now());
log.info("批量索引测试任务已提交，时间: {}", ZonedDateTime.now());
}
/**