From b7ff8446a58d59e7df8a588104c231c7af7d8573 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 11 七月 2025 14:31:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/controller/KeywordController.java | 151 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 123 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index f2491a5..cee397f 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -10,6 +10,9 @@
import com.linghu.model.common.ResponseResult;
import com.linghu.model.dto.ExportFeedDTO;
+import com.linghu.model.dto.ExportGetResultByPlatformIdDTO;
+import com.linghu.model.dto.ExportGetResultDTO;
+import com.linghu.model.dto.ExportStaticsDTO;
import com.linghu.model.entity.Keyword;
import com.linghu.model.entity.Platform;
import com.linghu.model.entity.Reference;
@@ -48,6 +51,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController
@@ -72,15 +76,58 @@
@ApiOperation(value = "EChart图")
public ResponseResult<KeywordStaticsListVO> statics(@RequestParam("id") Integer keywordId,
@RequestParam(value = "questionId", required = false) Integer questionId) {
+ //
return keywordService.statics(keywordId, questionId);
}
+ @GetMapping("/getTime")
+ @ApiOperation(value = "查看时间")
+ public ResponseResult<GetTimeVO> getTime(@RequestParam("id") Integer keywordId,@RequestParam(value = "questionId", required = false) Integer questionId) {
+ //
+ GetTimeVO vo = new GetTimeVO();
+ Keyword keyword = keywordService.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());
+
+ List<Reference> list = referenceService.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);
+
+ List<Reference> list2 = referenceService.list(queryWrapper2);
+ if (null != list2 && !list2.isEmpty()) {
+ vo.setFirst(list2.get(0).getCreate_time());
+ }
+
+ return ResponseResult.success(vo);
+ }
+
+
@PostMapping(value = "/exportStatics")
@ApiOperation(value = "EChart图导出")
- public ResponseEntity<byte[]> exportStatics(@RequestParam("id") Integer keywordId,
- @RequestParam(value = "questionId", required = false) Integer questionId, HttpServletResponse response) {
- Keyword keyword = keywordMapper.selectById(keywordId);
- List<KeywordStaticsVO> voList = keywordMapper.statics(keywordId, questionId, keyword.getNum());
+ public ResponseEntity<byte[]> exportStatics(@RequestBody ExportStaticsDTO exportStaticsDTO) {
+
+ Keyword keyword = keywordMapper.selectById(exportStaticsDTO.getKeywordId());
+ List<KeywordStaticsVO> voList=new ArrayList<>();
+ if (exportStaticsDTO.getIsFirst()==0){
+ voList = keywordMapper.statics(exportStaticsDTO.getKeywordId(), exportStaticsDTO.getQuestionId(), keyword.getNum());
+
+ }else {
+ voList = keywordMapper.statics(exportStaticsDTO.getKeywordId(), exportStaticsDTO.getQuestionId(), 1);
+
+ }
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -105,10 +152,25 @@
@RequestParam(value = "typeId", required = false) Integer typeId,
@RequestParam(value = "isNow") Integer isNow) {
Keyword keyword = keywordService.getById(keywordId);
- List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
- keyword.getNum() - isNow, typeId);
+ if (isNow == 0) {
+ List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
+ keyword.getNum() , typeId);
+ // 检查列表是否为空或只包含null元素
+ boolean isValid = result != null && result.stream()
+ .anyMatch(Objects::nonNull);
- return ResponseResult.success(result);
+ return isValid ? ResponseResult.success(result)
+ : ResponseResult.success(new ArrayList<>());
+ }else {
+ List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, 1, typeId);
+ boolean isValid = result != null && result.stream()
+ .anyMatch(Objects::nonNull);
+
+ return isValid ? ResponseResult.success(result)
+ : ResponseResult.success(new ArrayList<>());
+
+ }
+
}
/**
@@ -116,13 +178,20 @@
*/
@PostMapping(value = "/exportGetResultByTypeId")
@ApiOperation(value = "导出：根据类别查看")
- public ResponseEntity<byte[]> exportGetResultByTypeId(@RequestParam("keywordId") Integer keywordId,
- @RequestParam(value = "questionId", required = false) Integer questionId,
- @RequestParam(value = "typeId", required = false) Integer typeId,
- @RequestParam(value = "isNow") Integer isNow) {
- Keyword keyword = keywordService.getById(keywordId);
- List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId,
- keyword.getNum() - isNow, typeId);
+ public ResponseEntity<byte[]> exportGetResultByTypeId(@RequestBody ExportGetResultDTO dto) {
+ Keyword keyword = keywordService.getById(dto.getKeywordId());
+ List<PlatformProportionVO> result =new ArrayList<>();
+
+ if (dto.getIsNow()==0){
+ result = keywordMapper.getResultByTypeId(dto.getKeywordId(), dto.getQuestionId(),
+ keyword.getNum() , dto.getTypeId());
+ }else {
+ result = keywordMapper.getResultByTypeId(dto.getKeywordId(), dto.getQuestionId(),
+ 1 , dto.getTypeId());
+ }
+
+
+
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
EasyExcel.write(out, PlatformProportionVO.class)
@@ -139,31 +208,48 @@
/**
* 根据平台查看
*/
- @GetMapping("/getResultByPlatformId")
+ @PostMapping("/getResultByPlatformId")
@ApiOperation(value = "根据平台查看")
public ResponseResult<List<ResultListVO>> getResultByPlatformId(@RequestParam("keywordId") Integer keywordId,
@RequestParam(value = "questionId", required = false) Integer questionId,
@RequestParam(value = "platformId", required = false) Integer platformId,
@RequestParam(value = "isNow") Integer isNow) {
Keyword keyword = keywordService.getById(keywordId);
- List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum() - isNow,
- platformId);
+ if (isNow == 0) {
+ List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum(),
+ platformId);
+ boolean isValid = result != null && result.stream()
+ .anyMatch(Objects::nonNull);
- return ResponseResult.success(result);
+ return isValid ? ResponseResult.success(result)
+ : ResponseResult.success(new ArrayList<>());
+ } else {
+ List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, 1,
+ platformId);
+ boolean isValid = result != null && result.stream()
+ .anyMatch(Objects::nonNull);
+
+ return isValid ? ResponseResult.success(result)
+ : ResponseResult.success(new ArrayList<>());
+ }
+
}
/**
* 根据平台查看 0-当前轮 1-代表前1轮 2-代表前2轮
*/
- @GetMapping("/exportGetResultByPlatformId")
+ @PostMapping("/exportGetResultByPlatformId")
@ApiOperation(value = "导出：根据平台查看")
- public ResponseEntity<byte[]> exportGetResultByPlatformId(@RequestParam("id") Integer keywordId,
- @RequestParam(value = "questionId", required = false) Integer questionId,
- @RequestParam(value = "platformId", required = false) Integer platformId,
- @RequestParam(value = "isNow") Integer isNow) {
- Keyword keyword = keywordService.getById(keywordId);
- List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum() - isNow,
- platformId);
+ public ResponseEntity<byte[]> exportGetResultByPlatformId(@RequestBody ExportGetResultByPlatformIdDTO dto) {
+ Keyword keyword = keywordService.getById(dto.getKeywordId());
+ List<ResultListVO> result=new ArrayList<>();
+ if (dto.getIsNow()==0){
+ result = keywordMapper.getResultByPlatformId(dto.getKeywordId(), dto.getQuestionId(), keyword.getNum(),
+ dto.getPlatformId());
+ }else {
+ result = keywordMapper.getResultByPlatformId(dto.getKeywordId(), dto.getQuestionId(), 1,
+ dto.getPlatformId());
+ }
// 3. 导出Excel
ByteArrayOutputStream out = new ByteArrayOutputStream();
EasyExcel.write(out, ResultListVO.class)
@@ -206,9 +292,9 @@
/**
* 投喂
*/
- @PostMapping("/importFeed")
+ @PostMapping("/importFeed/{keywordId}")
@ApiOperation("投喂")
- public ResponseResult<List<FeedExportExcel>> importTemplate(@RequestParam("file") MultipartFile file,@RequestParam("keywordId") Integer keywordId) {
+ public ResponseResult<List<FeedExportExcel>> importTemplate(@PathVariable("keywordId") Integer keywordId,@RequestParam("file") MultipartFile file) {
Keyword keyword = keywordService.getById(keywordId);
//查找出最近一次的结果
List<FeedExportExcel> references = referenceMapper.importTemplateList(keywordId,keyword.getNum());
@@ -405,6 +491,9 @@
@PostMapping("/updateKeyword")
@ApiOperation(value = "修改关键词")
public ResponseResult<String> updateKeyword(@RequestBody Keyword keyword) {
+ if(!"notSubmitted".equals(keyword.getStatus())){
+ return ResponseResult.error("关键词已开始采集或采集完成不允许修改！");
+ }
keywordService.updateById(keyword);
return ResponseResult.success("修改成功");
}
@@ -415,6 +504,10 @@
@DeleteMapping("/deleteKeyword")
@ApiOperation(value = "删除关键词")
public ResponseResult<String> deleteKeyword(@RequestParam("keywordId") Integer keywordId) {
+ Keyword keyword = keywordService.getById(keywordId);
+ if(!"notSubmitted".equals(keyword.getStatus())){
+ return ResponseResult.error("关键词已开始采集或采集完成不允许删除！");
+ }
keywordService.removeById(keywordId);
return ResponseResult.success("删除成功");
}
@@ -454,5 +547,7 @@
return ResponseResult.error("导入失败：" + e.getMessage());
}
}
+ //根据关键词id查询任务id
+
}
--
Gitblit v1.7.1