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/controller/KeywordController.java | 347 +++++++++++++--------------------------------------------
1 files changed, 80 insertions(+), 267 deletions(-)
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index f2491a5..eda21a9 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -1,54 +1,44 @@
package com.linghu.controller;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linghu.config.FinalStatus;
import com.linghu.listener.KeywordExcelListener;
-import com.linghu.mapper.KeywordMapper;
-import com.linghu.mapper.ReferenceMapper;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.dto.ExportFeedDTO;
-import com.linghu.model.entity.Keyword;
-import com.linghu.model.entity.Platform;
-import com.linghu.model.entity.Reference;
-import com.linghu.model.entity.Type;
-import com.linghu.model.excel.FeedExportExcel;
-import com.linghu.model.excel.PlatformExcel;
-import com.linghu.model.excel.ReferenceExcel;
+import com.linghu.model.dto.ExportGetResultByPlatformIdDTO;
+import com.linghu.model.dto.ExportGetResultDTO;
+import com.linghu.model.dto.ExportStaticsDTO;
+import com.linghu.model.entity.*;
+import com.linghu.model.excel.*;
+import com.linghu.model.validator.UpdateGroup;
import com.linghu.model.vo.*;
-import com.linghu.model.excel.KeywordExcel;
-import com.linghu.model.excel.PlatformExcel;
import com.linghu.model.vo.KeywordStaticsListVO;
-import com.linghu.model.vo.KeywordStaticsVO;
import com.linghu.model.vo.PlatformProportionVO;
import com.linghu.model.vo.ResultListVO;
import com.linghu.service.KeywordService;
+
+import com.linghu.service.OrderService;
import com.linghu.service.ReferenceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.ValidationException;
+import javax.validation.Valid;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.time.LocalDateTime;
-import java.io.IOException;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
+
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+
@RestController
@RequestMapping("/keyword")
@@ -58,12 +48,10 @@
private KeywordService keywordService;
@Autowired
- private KeywordMapper keywordMapper;
+ private ReferenceService referenceService;
@Autowired
- private ReferenceService referenceService;
- @Autowired
- private ReferenceMapper referenceMapper;
+ private OrderService orderService;
/**
* 关键词统计 EChart图
@@ -75,25 +63,22 @@
return keywordService.statics(keywordId, questionId);
}
+ @GetMapping("/getTime")
+ @ApiOperation(value = "查看时间")
+ public ResponseResult<GetTimeVO> getTime(@RequestParam("id") Integer keywordId,@RequestParam(value = "questionId", required = false) Integer questionId) {
+ return keywordService.getTimeVOResponseResult(keywordId, questionId);
+ }
+
+
+
+
@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(@Valid @RequestBody ExportStaticsDTO exportStaticsDTO) {
- // 3. 导出Excel
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, KeywordStaticsVO.class)
- .sheet("引用数据")
- .doWrite(voList);
-
- // 4. 构建响应
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=references_export.xlsx")
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(out.toByteArray());
+ return keywordService.exportEChart(exportStaticsDTO);
}
+
/**
* 根据类别查看
@@ -104,78 +89,56 @@
@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);
+ return keywordService.getByTypeId(keywordId, questionId, typeId, isNow);
- return ResponseResult.success(result);
}
+
+
/**
* 导出：根据类别查看
*/
@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);
- // 3. 导出Excel
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, PlatformProportionVO.class)
- .sheet("引用数据")
- .doWrite(result);
-
- // 4. 构建响应
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=references_export.xlsx")
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(out.toByteArray());
+ public ResponseEntity<byte[]> exportGetResultByTypeId(@Valid @RequestBody ExportGetResultDTO dto) {
+ return keywordService.exportResult(dto);
}
+
/**
* 根据平台查看
*/
- @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);
+ return keywordService.getResultByPlatform(keywordId, questionId, platformId, isNow);
- return ResponseResult.success(result);
}
+
+
/**
* 根据平台查看 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);
- // 3. 导出Excel
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, ResultListVO.class)
- .sheet("引用数据")
- .doWrite(result);
-
- // 4. 构建响应
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=references_export.xlsx")
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(out.toByteArray());
+ public ResponseEntity<byte[]> exportGetResultByPlatformId(@Valid @RequestBody ExportGetResultByPlatformIdDTO dto) {
+ return keywordService.exportResultByPlatform(dto);
}
+
+
+ /**
+ * 根据平台查看 0-当前轮 1-代表前1轮 2-代表前2轮
+ */
+ @PostMapping("/exportGetResultByPlatformId2")
+ @ApiOperation(value = "导出：根据平台查看2")
+ public ResponseEntity<byte[]> exportGetResultByPlatformId2(@Valid @RequestBody ExportGetResultByPlatformIdDTO dto) {
+ return keywordService.exportResultByPlatform2(dto);
+ }
+
/**
* 查看详情
@@ -195,162 +158,19 @@
@GetMapping("/download")
@ApiOperation("下载投喂模板")
public ResponseEntity<byte[]> downTemplate() throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, ReferenceExcel.class).sheet("投喂模板").doWrite(new ArrayList<>());
-
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=platform_template.xlsx")
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(out.toByteArray());
+ return keywordService.downloadKeywrodFeed();
}
+
+
/**
* 投喂
*/
- @PostMapping("/importFeed")
+ @PostMapping("/importFeed/{keywordId}")
@ApiOperation("投喂")
- public ResponseResult<List<FeedExportExcel>> importTemplate(@RequestParam("file") MultipartFile file,@RequestParam("keywordId") Integer keywordId) {
- Keyword keyword = keywordService.getById(keywordId);
- //查找出最近一次的结果
- List<FeedExportExcel> references = referenceMapper.importTemplateList(keywordId,keyword.getNum());
- //平台名称
- Map<String, FeedExportExcel> nameMap = references.stream()
- .collect(Collectors.toMap(
- FeedExportExcel::getPlatform_name, // Key映射
- excel -> excel, // Value映射
- (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
- ));
- //URL
- Map<String, FeedExportExcel> urlMap = references.stream()
- .collect(Collectors.toMap(
- FeedExportExcel::getUrl, // Key映射
- excel -> excel, // Value映射
- (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
- ));
- //title
- Map<String, FeedExportExcel> titleMap = references.stream()
- .collect(Collectors.toMap(
- FeedExportExcel::getTitle, // Key映射
- excel -> excel, // Value映射
- (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
- ));
-
- //time
- Map<LocalDateTime, FeedExportExcel> timeMap = references.stream()
- .collect(Collectors.toMap(
- FeedExportExcel::getCreate_time, // Key映射
- excel -> excel, // Value映射
- (oldValue, newValue) -> oldValue // 键冲突处理（保留旧值）
- ));
-
- try {
- // 检查文件是否为空
- if (file.isEmpty()) {
- return ResponseResult.error("上传文件不能为空");
- }
-
- // 读取Excel数据
- List<ReferenceExcel> excelList = EasyExcel.read(file.getInputStream())
- .head(ReferenceExcel.class)
- .sheet()
- .doReadSync();
-
- // 数据转换与验证
- List<String> errorMessages = new ArrayList<>();
- List<FeedExportExcel> result = new ArrayList<>();
- for (ReferenceExcel excel : excelList) {
- // 检查必要字段
- if (!StringUtils.hasText(excel.getPlatform_name())) {
- errorMessages.add("平台名称不能为空");
- continue;
- }
- if (!StringUtils.hasText(excel.getTitle())) {
- errorMessages.add("标题不能为空");
- continue;
- }
- if (!StringUtils.hasText(String.valueOf(excel.getCreate_time()))) {
- errorMessages.add("发布时间不能为空");
- continue;
- }
-
- if (!StringUtils.hasText(excel.getUrl())) {
- errorMessages.add("发布网址不能为空");
- continue;
- }
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- LocalDateTime dateTime = LocalDateTime.parse(excel.getCreate_time(), formatter);
- excel.setCreateTimeAsDateTime(dateTime);
- FeedExportExcel feedExportExcel = getFeedExportExcel(excel, nameMap, urlMap, titleMap, timeMap);
- result.add(feedExportExcel);
-
- }
- // 处理错误
- if (!errorMessages.isEmpty()) {
- return ResponseResult.error("数据验证失败: " + String.join("; ", errorMessages));
- }
-
-
- // 返回信息
- return ResponseResult.success(result);
- }catch (DateTimeParseException e) {
- return ResponseResult.error("文件解析失败：发布时间格式输入错误");
- }
- catch (Exception e) {
- // 记录详细异常信息
-
- return ResponseResult.error("文件解析失败：" + e.getMessage());
- }
+ public ResponseResult<List<FeedExportExcel>> importTemplate(@PathVariable("keywordId") Integer keywordId,@RequestParam("file") MultipartFile file) {
+ return keywordService.importFeedByKeyWord(keywordId, file);
}
- private FeedExportExcel getFeedExportExcel(ReferenceExcel excel, Map<String, FeedExportExcel> nameMap, Map<String, FeedExportExcel> urlMap, Map<String, FeedExportExcel> titleMap, Map<LocalDateTime, FeedExportExcel> timeMap) {
- FeedExportExcel vo=new FeedExportExcel();
- vo.setPlatform_name(excel.getPlatform_name());
- vo.setTitle(excel.getTitle());
- vo.setCreate_time(excel.getCreateTimeAsDateTime());
- vo.setUrl(excel.getUrl());
- vo.setInclusionStatus("未收录");
- vo.setPlatformIs(0);
- vo.setTitleIs(0);
- vo.setUrlIs(0);
- vo.setCreateIs(0);
- //平台名称
- if (nameMap.containsKey(excel.getPlatform_name())) {
- vo.setPlatformIs(1);
- if (urlMap.containsKey(excel.getUrl())) {
- vo.setUrlIs(1);
- }
- if (titleMap.containsKey(excel.getTitle())) {
- vo.setTitleIs(1);
- }
- if (timeMap.containsKey(excel.getCreateTimeAsDateTime())) {
- vo.setCreateIs(1);
- }
- return vo;
- }
- //网站链接
- if (urlMap.containsKey(excel.getUrl())) {
- vo.setUrlIs(1);
- if (titleMap.containsKey(excel.getTitle())) {
- vo.setTitleIs(1);
- }
- if (timeMap.containsKey(excel.getCreateTimeAsDateTime())) {
- vo.setCreateIs(1);
- }
- return vo;
- }
- //标题
- if (titleMap.containsKey(excel.getTitle())) {
- vo.setTitleIs(1);
- if (timeMap.containsKey(excel.getCreateTimeAsDateTime())) {
- vo.setCreateIs(1);
- }
- }
- //时间
- if (timeMap.containsKey(excel.getCreateTimeAsDateTime())) {
- vo.setCreateIs(1);
- return vo;
- }
- return vo;
- }
/**
@@ -358,36 +178,10 @@
*/
@PostMapping("/exportFeed")
@ApiOperation(value = "导出投喂结果")
- public ResponseEntity<byte[]> exportGetResultByPlatformId(@RequestBody ExportFeedDTO dto) {
- // 3. 导出Excel
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, FeedExportExcel.class)
- .sheet("导出投喂结果")
- .doWrite(dto.getExcels());
-
- // 4. 构建响应
- return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=references_export.xlsx")
- .contentType(MediaType.APPLICATION_OCTET_STREAM)
- .body(out.toByteArray());
+ public ResponseEntity<byte[]> exportGetResultByPlatformId( @Valid @RequestBody ExportFeedDTO dto) {
+ return keywordService.exportFeedResult(dto);
}
-
- /**
- * 批量新增关键词
- */
- @PostMapping("/batchAdd")
- @ApiOperation(value = "批量新增关键词")
- public ResponseResult<String> batchAdd(String keywords, String order_id) {
- Boolean saveKeywords = keywordService.saveKeywords(keywords, order_id);
-
- if (saveKeywords) {
- return ResponseResult.success("新增成功");
- } else {
- return ResponseResult.error("新增失败");
- }
-
- }
/**
* 根据订单ID查询关键词
@@ -404,7 +198,10 @@
*/
@PostMapping("/updateKeyword")
@ApiOperation(value = "修改关键词")
- public ResponseResult<String> updateKeyword(@RequestBody Keyword keyword) {
+ public ResponseResult<String> updateKeyword(@Validated(UpdateGroup.class) @RequestBody Keyword keyword) {
+ if(FinalStatus.SUBMITTED.getValue().equals(keyword.getStatus())){
+ return ResponseResult.error("关键词已开始采集不允许修改！");
+ }
keywordService.updateById(keyword);
return ResponseResult.success("修改成功");
}
@@ -415,7 +212,21 @@
@DeleteMapping("/deleteKeyword")
@ApiOperation(value = "删除关键词")
public ResponseResult<String> deleteKeyword(@RequestParam("keywordId") Integer keywordId) {
+ Keyword keyword = keywordService.getById(keywordId);
+ if(FinalStatus.SUBMITTED.getValue().equals(keyword.getStatus())){
+ return ResponseResult.error("关键词已开始采集或不允许删除！");
+ }
+
keywordService.removeById(keywordId);
+ //找到订单
+ Orders order = orderService.getById(keyword.getOrder_id());
+ //更新关键词数量
+ LambdaQueryWrapper<Keyword> queryKeywordsQueryWrapper = new LambdaQueryWrapper<>();
+ queryKeywordsQueryWrapper.eq(Keyword::getOrder_id, keyword.getOrder_id());
+ int count1 = (int) keywordService.count(queryKeywordsQueryWrapper);
+ order.setKeyword_num(count1);
+ orderService.updateById(order);
+
return ResponseResult.success("删除成功");
}
@@ -454,5 +265,7 @@
return ResponseResult.error("导入失败：" + e.getMessage());
}
}
+ //根据关键词id查询任务id
+
}
--
Gitblit v1.7.1