wfansh 2 bulan lalu
induk
melakukan
d4799e0a4c

TEMPAT SAMPAH
conf/adweb_v3.sql.zip


+ 2 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/gpt/entity/ChatHistory.java

@@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -46,7 +47,7 @@ public class ChatHistory implements Serializable {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "对话时间,如每周或每月第一天")
-    private Date date;
+    private LocalDate date;
 
     /** 内容 */
     @Excel(name = "内容", width = 15)

+ 4 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/gpt/service/impl/ChatHistoryServiceImpl.java

@@ -11,6 +11,8 @@ import org.jeecg.modules.adweb.gpt.mapper.ChatHistoryMapper;
 import org.jeecg.modules.adweb.gpt.service.IChatHistoryService;
 import org.springframework.stereotype.Service;
 
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
@@ -29,8 +31,8 @@ public class ChatHistoryServiceImpl extends ServiceImpl<ChatHistoryMapper, ChatH
     /** 获取用户本周的{@link ChatHistory}记录 */
     @Override
     public ChatHistory getChatHistoryOfWeek(String uid) {
-        // 1. 根据uid查询 - 每周对话存储为一条DB记录,date为每周第一天(默认为周
-        Date firstDayOfWeek = DateUtil.getDateRangeByType(DateUtil.DATE_TYPE_THIS_WEEK).getLeft();
+        // 1. 根据uid查询 - 每周对话存储为一条DB记录,date为每周第一天(默认为周
+        LocalDate firstDayOfWeek = LocalDate.now().with(DayOfWeek.MONDAY);
         ChatHistory chatHistory =
                 this.getOne(
                         new LambdaQueryWrapper<ChatHistory>()