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 | 230 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 148 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index 9b6e913..eda21a9 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -1,28 +1,44 @@
package com.linghu.controller;
import com.alibaba.excel.EasyExcel;
-import com.linghu.mapper.KeywordMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.linghu.config.FinalStatus;
+import com.linghu.listener.KeywordExcelListener;
import com.linghu.model.common.ResponseResult;
-import com.linghu.model.entity.Keyword;
-import com.linghu.model.entity.Reference;
+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.*;
+import com.linghu.model.excel.*;
+import com.linghu.model.validator.UpdateGroup;
+import com.linghu.model.vo.*;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
import java.util.ArrayList;
import java.util.List;
+
@RestController
@RequestMapping("/keyword")
@@ -32,10 +48,10 @@
private KeywordService keywordService;
@Autowired
- private KeywordMapper keywordMapper;
+ private ReferenceService referenceService;
@Autowired
- private ReferenceService referenceService;
+ private OrderService orderService;
/**
* 关键词统计 EChart图
@@ -47,103 +63,88 @@
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);
}
+
/**
* 根据类别查看
*/
@GetMapping("/getResultByTypeId")
@ApiOperation(value = "根据类别查看")
- public ResponseResult<List<PlatformProportionVO>> getResultByTypeId(@RequestParam("id") Integer keywordId,
- @RequestParam(value = "questionId", required = false) Integer questionId,
- @RequestParam(value = "typeId", required = false) Integer typeId) {
- return keywordService.getResultByTypeId(keywordId, questionId, typeId);
+ public ResponseResult<List<PlatformProportionVO> > getResultByTypeId(@RequestParam("keywordId") Integer keywordId,
+ @RequestParam(value = "questionId", required = false) Integer questionId,
+ @RequestParam(value = "typeId", required = false) Integer typeId,
+ @RequestParam(value = "isNow") Integer isNow) {
+ return keywordService.getByTypeId(keywordId, questionId, typeId, isNow);
+
}
+
+
/**
* 导出：根据类别查看
*/
@PostMapping(value = "/exportGetResultByTypeId")
@ApiOperation(value = "导出：根据类别查看")
- public ResponseEntity<byte[]> exportGetResultByTypeId(@RequestParam("id") 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("id") Integer keywordId,
+ public ResponseResult<List<ResultListVO>> getResultByPlatformId(@RequestParam("keywordId") Integer keywordId,
@RequestParam(value = "questionId", required = false) Integer questionId,
- @RequestParam(value = "platformId", required = false) Integer platformId) {
- return keywordService.getResultByPlatformId(keywordId, questionId, platformId);
+ @RequestParam(value = "platformId", required = false) Integer platformId,
+ @RequestParam(value = "isNow") Integer isNow) {
+ return keywordService.getResultByPlatform(keywordId, questionId, platformId, isNow);
+
}
+
+
/**
* 根据平台查看 0-当前轮 1-代表前1轮 2-代表前2轮
*/
- @GetMapping("/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());
+ @PostMapping("/exportGetResultByPlatformId")
+ @ApiOperation(value = "导出：根据平台查看")
+ 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);
+ }
+
/**
* 查看详情
*/
@GetMapping("/getResultById")
- @ApiOperation(value = "根据平台查看")
+ @ApiOperation(value = "查看")
public ResponseResult getResultById(@RequestParam("referenceId") Integer referenceId) {
Reference reference = referenceService.getById(referenceId);
if (reference == null) {
@@ -151,26 +152,36 @@
}
return ResponseResult.success(reference);
}
+ /**
+ * 下载模版
+ */
+ @GetMapping("/download")
+ @ApiOperation("下载投喂模板")
+ public ResponseEntity<byte[]> downTemplate() throws IOException {
+ return keywordService.downloadKeywrodFeed();
+ }
+
/**
* 投喂
*/
+ @PostMapping("/importFeed/{keywordId}")
+ @ApiOperation("投喂")
+ public ResponseResult<List<FeedExportExcel>> importTemplate(@PathVariable("keywordId") Integer keywordId,@RequestParam("file") MultipartFile file) {
+ return keywordService.importFeedByKeyWord(keywordId, file);
+ }
+
+
/**
- * 批量新增关键词
+ * 导出投喂结果
*/
- @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("新增失败");
- }
-
+ @PostMapping("/exportFeed")
+ @ApiOperation(value = "导出投喂结果")
+ public ResponseEntity<byte[]> exportGetResultByPlatformId( @Valid @RequestBody ExportFeedDTO dto) {
+ return keywordService.exportFeedResult(dto);
}
+
/**
* 根据订单ID查询关键词
@@ -187,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("修改成功");
}
@@ -198,8 +212,60 @@
@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("删除成功");
}
+ // 下载模板
+ @PostMapping("/downloadTemplate")
+ @ApiOperation("下载关键词导入模板")
+ public ResponseEntity<byte[]> downloadTemplate() throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ EasyExcel.write(out, KeywordExcel.class).sheet("关键词模板").doWrite(new ArrayList<>());
+
+ return ResponseEntity.ok()
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=keyword_template.xlsx")
+ .contentType(MediaType.APPLICATION_OCTET_STREAM)
+ .body(out.toByteArray());
+ }
+
+ // 导入文件
+ @PostMapping("/import")
+ @ApiOperation("导入关键词数据")
+ public ResponseResult<String> importPlatforms(@RequestParam("file") MultipartFile file) {
+ try {
+ if (file.isEmpty()) {
+ return ResponseResult.error("上传文件不能为空");
+ }
+ // 创建数据监听器
+ KeywordExcelListener listener = new KeywordExcelListener();
+ EasyExcel.read(file.getInputStream(), KeywordExcel.class, listener)
+ .sheet()
+ .doRead();
+ // 获取并合并关键词
+ String mergedKeywords = String.join("\n", listener.getMergedKeywords());
+ return ResponseResult.success(mergedKeywords);
+ } catch (IOException e) {
+ return ResponseResult.error("文件读取失败：" + e.getMessage());
+ } catch (Exception e) {
+ return ResponseResult.error("导入失败：" + e.getMessage());
+ }
+ }
+ //根据关键词id查询任务id
+
+
}
--
Gitblit v1.7.1