From 7c1335ff559c08bbcef479bd2b01a08a1f4e55f2 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 15 八月 2025 10:59:18 +0800
Subject: [PATCH] 增加json时区，修付开始采集状态，修改导出校验
---
src/main/java/com/linghu/model/entity/QuestionResultList.java | 3 +++
src/main/java/com/linghu/model/vo/GetTimeVO.java | 8 ++++----
src/main/java/com/linghu/model/entity/KeywordTask.java | 5 ++++-
src/main/java/com/linghu/model/dto/ExportStaticsDTO.java | 1 -
src/main/java/com/linghu/service/impl/CollectionServiceImpl.java | 4 ++--
src/main/java/com/linghu/model/entity/User.java | 2 +-
src/main/java/com/linghu/utils/OpenCryptUtil.java | 4 +---
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/linghu/model/dto/ExportStaticsDTO.java b/src/main/java/com/linghu/model/dto/ExportStaticsDTO.java
index b431e34..bc72805 100644
--- a/src/main/java/com/linghu/model/dto/ExportStaticsDTO.java
+++ b/src/main/java/com/linghu/model/dto/ExportStaticsDTO.java
@@ -13,7 +13,6 @@
@NotNull(message = "关键词id不能为空")
private Integer keywordId;
@ApiModelProperty("提问词id")
- @NotNull(message = "提问词id不能为空")
private Integer questionId;
@ApiModelProperty("是否首次 0-否 1- 是")
@Max(value = 1 , message = "是否首次选择范围为0-1")
diff --git a/src/main/java/com/linghu/model/entity/KeywordTask.java b/src/main/java/com/linghu/model/entity/KeywordTask.java
index 57d55b5..224f86a 100644
--- a/src/main/java/com/linghu/model/entity/KeywordTask.java
+++ b/src/main/java/com/linghu/model/entity/KeywordTask.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@@ -34,7 +36,8 @@
private String status;
private Integer num;
private String error;
- private Date create_time;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime create_time;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/linghu/model/entity/QuestionResultList.java b/src/main/java/com/linghu/model/entity/QuestionResultList.java
index d5a226c..84b1282 100644
--- a/src/main/java/com/linghu/model/entity/QuestionResultList.java
+++ b/src/main/java/com/linghu/model/entity/QuestionResultList.java
@@ -7,6 +7,8 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
/**
@@ -70,6 +72,7 @@
/**
* 记录创建时间
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date create_time;
private Integer keyword_id;
diff --git a/src/main/java/com/linghu/model/entity/User.java b/src/main/java/com/linghu/model/entity/User.java
index 9673030..c42346d 100644
--- a/src/main/java/com/linghu/model/entity/User.java
+++ b/src/main/java/com/linghu/model/entity/User.java
@@ -64,7 +64,7 @@
* 创建时间
*/
@ApiModelProperty(hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime create_time;
/**
diff --git a/src/main/java/com/linghu/model/vo/GetTimeVO.java b/src/main/java/com/linghu/model/vo/GetTimeVO.java
index 88fbf83..e74d6d8 100644
--- a/src/main/java/com/linghu/model/vo/GetTimeVO.java
+++ b/src/main/java/com/linghu/model/vo/GetTimeVO.java
@@ -13,10 +13,10 @@
public class GetTimeVO {
@ApiModelProperty("本次采集时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date now;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime now;
@ApiModelProperty("首次采集时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date first;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime first;
}
diff --git a/src/main/java/com/linghu/service/impl/CollectionServiceImpl.java b/src/main/java/com/linghu/service/impl/CollectionServiceImpl.java
index 4e9bd21..5795140 100644
--- a/src/main/java/com/linghu/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/CollectionServiceImpl.java
@@ -396,7 +396,7 @@
KeywordTask keywordTask = new KeywordTask();
keywordTask.setKeyword_id(keywordId);
keywordTask.setTask_id(null); // 任务ID为空
- keywordTask.setCreate_time(new Date());
+ keywordTask.setCreate_time( LocalDateTime.now());
keywordTask.setNum(keyword.getNum());
keywordTaskService.save(keywordTask); // 保存 KeywordTask
@@ -439,7 +439,7 @@
//更新关键词状态
LambdaUpdateWrapper<Keyword> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Keyword::getKeyword_id, batchRequest.getKeyword_id());
- updateWrapper.set(Keyword::getStatus, FinalStatus.COMPLETED.getValue());
+ updateWrapper.set(Keyword::getStatus, FinalStatus.SUBMITTED.getValue());
updateWrapper.set(Keyword::getTask_id, taskResponse.getTask_id());
keywordService.update(updateWrapper);
//设置轮数
diff --git a/src/main/java/com/linghu/utils/OpenCryptUtil.java b/src/main/java/com/linghu/utils/OpenCryptUtil.java
index 121590a..21e1d33 100644
--- a/src/main/java/com/linghu/utils/OpenCryptUtil.java
+++ b/src/main/java/com/linghu/utils/OpenCryptUtil.java
@@ -14,9 +14,7 @@
@Component
public class OpenCryptUtil {
- // 加密密钥（从配置文件读取，避免硬编码）
-// @Value("${app.crypt.secret-key}") // 长度需符合算法要求（如AES-256需32位）
-// private String secret;
+
// 初始化加密配置（若需要）
@PostConstruct
--
Gitblit v1.7.1