From dd028e18a12ad9ae7c43ed09b15ddd6bde1a43e9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期三, 03 九月 2025 11:27:50 +0800
Subject: [PATCH] 采集中状态修改提前，统计数据合并
---
src/main/java/com/linghu/service/impl/KeywordServiceImpl.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
index 8c65515..389b4c0 100644
--- a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
@@ -16,6 +16,7 @@
import com.linghu.model.dto.ExportGetResultDTO;
import com.linghu.model.dto.ExportStaticsDTO;
import com.linghu.model.entity.Keyword;
+import com.linghu.model.entity.KeywordTask;
import com.linghu.model.entity.Platform;
import com.linghu.model.entity.Reference;
import com.linghu.model.excel.FeedExportExcel;
@@ -25,6 +26,7 @@
import com.linghu.service.KeywordService;
import com.linghu.mapper.KeywordMapper;
+import com.linghu.service.KeywordTaskService;
import com.linghu.service.PlatformService;
import com.linghu.service.ReferenceService;
import org.apache.poi.ss.usermodel.DataValidation;
@@ -67,6 +69,8 @@
private ReferenceMapper referenceMapper;
@Autowired
private PlatformService platformService;
+ @Autowired
+ private KeywordTaskService keywordTaskService;
@Override
public ResponseResult<KeywordStaticsListVO> statics(Integer keywordId, Integer questionId) {
@@ -137,26 +141,20 @@
GetTimeVO vo = new GetTimeVO();
Keyword keyword = this.getById(keywordId);
- LambdaQueryWrapper<Reference> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Reference::getKeyword_id, keywordId);
- if (questionId != null) {
- queryWrapper.eq(Reference::getQuestion_id, questionId);
- }
- queryWrapper.eq(Reference::getNum,keyword.getNum());
+ LambdaQueryWrapper<KeywordTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(KeywordTask::getKeyword_id, keywordId);
+ queryWrapper.eq(KeywordTask::getNum,keyword.getNum());
- List<Reference> list = referenceService.list(queryWrapper);
+ List<KeywordTask> list = keywordTaskService.list(queryWrapper);
if (null != list && !list.isEmpty()) {
vo.setNow(list.get(0).getCreate_time());
}
//首次
- LambdaQueryWrapper<Reference> queryWrapper2 = new LambdaQueryWrapper<>();
- queryWrapper2.eq(Reference::getKeyword_id, keywordId);
- if (questionId != null) {
- queryWrapper2.eq(Reference::getQuestion_id, questionId);
- }
- queryWrapper2.eq(Reference::getNum,1);
+ LambdaQueryWrapper<KeywordTask> queryWrapper2 = new LambdaQueryWrapper<>();
+ queryWrapper2.eq(KeywordTask::getKeyword_id, keywordId);
+ queryWrapper2.eq(KeywordTask::getNum,1);
- List<Reference> list2 = referenceService.list(queryWrapper2);
+ List<KeywordTask> list2 = keywordTaskService.list(queryWrapper2);
if (null != list2 && !list2.isEmpty()) {
vo.setFirst(list2.get(0).getCreate_time());
}
--
Gitblit v1.7.1