From 580d70b15ae47bc180a0b579af8c47c506eefac6 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 11 七月 2025 20:13:38 +0800 Subject: [PATCH] 修改 --- src/main/java/com/linghu/controller/KeywordController.java | 373 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 309 insertions(+), 64 deletions(-) diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java index d875871..3e94579 100644 --- a/src/main/java/com/linghu/controller/KeywordController.java +++ b/src/main/java/com/linghu/controller/KeywordController.java @@ -1,46 +1,63 @@ package com.linghu.controller; import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; +import com.alibaba.excel.write.handler.SheetWriteHandler; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; +import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.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.PlatformService; import com.linghu.service.ReferenceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.DataValidation; +import org.apache.poi.ss.usermodel.DataValidationConstraint; +import org.apache.poi.ss.usermodel.DataValidationHelper; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.util.CellRangeAddressList; 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.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import javax.xml.bind.ValidationException; 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.Objects; +import java.util.stream.Collectors; @RestController @RequestMapping("/keyword") @@ -54,6 +71,10 @@ @Autowired private ReferenceService referenceService; + @Autowired + private ReferenceMapper referenceMapper; + @Autowired + private PlatformService platformService; /** * 关键词统计 EChart图 @@ -62,15 +83,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(); @@ -90,21 +154,30 @@ */ @GetMapping("/getResultByTypeId") @ApiOperation(value = "根据类别查看") - public ResponseResult<ResultByTypeIdVO> getResultByTypeId(@RequestParam("keywordId") Integer keywordId, + public ResponseResult<List<PlatformProportionVO> > getResultByTypeId(@RequestParam("keywordId") Integer keywordId, @RequestParam(value = "questionId", required = false) Integer questionId, - @RequestParam(value = "typeId", required = false) Integer typeId) { - ResultByTypeIdVO vo = new ResultByTypeIdVO(); + @RequestParam(value = "typeId", required = false) Integer typeId, + @RequestParam(value = "isNow") Integer isNow) { Keyword keyword = keywordService.getById(keywordId); - List<PlatformProportionVO> nowList = keywordMapper.getResultByTypeId(keywordId, questionId, - keyword.getNum(), typeId); - vo.setNowList(nowList); - if (keyword.getNum()>1){ - List<PlatformProportionVO> beforeList = keywordMapper.getResultByTypeId(keywordId, questionId, - keyword.getNum()-1, typeId); - vo.setBeforeList(beforeList); + if (isNow == 0) { + List<PlatformProportionVO> result = keywordMapper.getResultByTypeId(keywordId, questionId, + keyword.getNum() , typeId); + // 检查列表是否为空或只包含null元素 + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); + + 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<>()); + } - return ResponseResult.success(vo); } /** @@ -112,18 +185,51 @@ */ @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()); + } + + //查询所有平台名称 + List<String> typeNameList = result.stream() + .map(PlatformProportionVO::getType_name) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + // 3. 导出Excel ByteArrayOutputStream out = new ByteArrayOutputStream(); - EasyExcel.write(out, PlatformProportionVO.class) - .sheet("引用数据") - .doWrite(result); + // 3. 使用自定义的SheetWriteHandler来添加数据验证 + ExcelWriter excelWriter = EasyExcel.write(out, PlatformProportionVO.class) + .registerWriteHandler(new SheetWriteHandler() { + @Override + public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, + WriteSheetHolder writeSheetHolder) { + Sheet sheet = writeSheetHolder.getSheet(); + + // 添加数据验证(下拉框) + DataValidationHelper helper = sheet.getDataValidationHelper(); + CellRangeAddressList rangeList = new CellRangeAddressList( + 1, 65535, 0, 0); // D列(第4列) + + DataValidationConstraint constraint = helper.createExplicitListConstraint( + typeNameList.toArray(new String[0])); + DataValidation validation = helper.createValidation(constraint, rangeList); + sheet.addValidationData(validation); + } + }) + .build(); + + + WriteSheet writeSheet = EasyExcel.writerSheet("平台分布占比").build(); + excelWriter.write(result, writeSheet); + excelWriter.finish(); // 4. 构建响应 return ResponseEntity.ok() @@ -135,44 +241,81 @@ /** * 根据平台查看 */ - @GetMapping("/getResultByPlatformId") + @PostMapping("/getResultByPlatformId") @ApiOperation(value = "根据平台查看") - public ResponseResult<ResultByPlatformVO> getResultByPlatformId(@RequestParam("keywordId") 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) { - ResultByPlatformVO vo = new ResultByPlatformVO(); + @RequestParam(value = "platformId", required = false) Integer platformId, + @RequestParam(value = "isNow") Integer isNow) { Keyword keyword = keywordService.getById(keywordId); - - List<ResultListVO> nowList = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum(), - platformId); - vo.setNowList(nowList); - - if (keyword.getNum()>1){ - List<ResultListVO> beforeList = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum()-1, + if (isNow == 0) { + List<ResultListVO> result = keywordMapper.getResultByPlatformId(keywordId, questionId, keyword.getNum(), platformId); - vo.setBeforeList(beforeList); + boolean isValid = result != null && result.stream() + .anyMatch(Objects::nonNull); + + 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<>()); } - return ResponseResult.success(vo); } /** * 根据平台查看 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); + @PostMapping("/exportGetResultByPlatformId") + @ApiOperation(value = "导出:根据平台查看") + 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()); + } + //查询所有平台名称 + List<String> platfromNames = result.stream() + .map(ResultListVO::getPlatform_name) + .filter(Objects::nonNull) + .collect(Collectors.toList()); // 3. 导出Excel ByteArrayOutputStream out = new ByteArrayOutputStream(); - EasyExcel.write(out, ResultListVO.class) - .sheet("引用数据") - .doWrite(result); + + // 3. 使用自定义的SheetWriteHandler来添加数据验证 + ExcelWriter excelWriter = EasyExcel.write(out, ResultListVO.class) + .registerWriteHandler(new SheetWriteHandler() { + @Override + public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, + WriteSheetHolder writeSheetHolder) { + Sheet sheet = writeSheetHolder.getSheet(); + + // 添加数据验证(下拉框) + DataValidationHelper helper = sheet.getDataValidationHelper(); + CellRangeAddressList rangeList = new CellRangeAddressList( + 1, 65535, 0, 0); // D列(第4列) + + DataValidationConstraint constraint = helper.createExplicitListConstraint( + platfromNames.toArray(new String[0])); + DataValidation validation = helper.createValidation(constraint, rangeList); + sheet.addValidationData(validation); + } + }) + .build(); + + + WriteSheet writeSheet = EasyExcel.writerSheet("平台分布占比").build(); + excelWriter.write(result, writeSheet); + excelWriter.finish(); // 4. 构建响应 return ResponseEntity.ok() @@ -210,9 +353,42 @@ /** * 投喂 */ - @PostMapping("/importFeed") + @PostMapping("/importFeed/{keywordId}") @ApiOperation("投喂") - public ResponseResult<List<FeedExportExcel>> importTemplate(@RequestParam("file") MultipartFile file) { + 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()); + //平台名称 + 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()) { @@ -242,27 +418,87 @@ errorMessages.add("发布时间不能为空"); continue; } + if (!StringUtils.hasText(excel.getUrl())) { errorMessages.add("发布网址不能为空"); continue; } - //todo 查询出当前这次的结果 做出对比 + 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 (Exception e) { + }catch (DateTimeParseException e) { + return ResponseResult.error("文件解析失败:发布时间格式输入错误"); + } + catch (Exception e) { // 记录详细异常信息 return ResponseResult.error("文件解析失败:" + e.getMessage()); } } + + 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; + } + /** * 导出投喂结果 @@ -316,6 +552,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("修改成功"); } @@ -326,13 +565,17 @@ @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("删除成功"); } // 下载模板 @PostMapping("/downloadTemplate") - @ApiOperation("下载模板") + @ApiOperation("下载关键词导入模板") public ResponseEntity<byte[]> downloadTemplate() throws IOException { ByteArrayOutputStream out = new ByteArrayOutputStream(); EasyExcel.write(out, KeywordExcel.class).sheet("关键词模板").doWrite(new ArrayList<>()); @@ -365,5 +608,7 @@ return ResponseResult.error("导入失败:" + e.getMessage()); } } + //根据关键词id查询任务id + } -- Gitblit v1.7.1