From 9daf1936174685bad526ed41a026d2f2c421f6b0 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期六, 26 七月 2025 23:32:04 +0800
Subject: [PATCH] 修改获取结果方法，重复次数计算
---
src/main/java/com/linghu/controller/PlatformController.java | 116 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/linghu/controller/PlatformController.java b/src/main/java/com/linghu/controller/PlatformController.java
index 468a7f6..3ea5942 100644
--- a/src/main/java/com/linghu/controller/PlatformController.java
+++ b/src/main/java/com/linghu/controller/PlatformController.java
@@ -10,12 +10,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.listener.PlatformExcelListener;
import com.linghu.listener.TypeDropdownWriteHandler;
+import com.linghu.mapper.KeywordMapper;
import com.linghu.mapper.ReferenceMapper;
import com.linghu.model.common.ResponseResult;
-import com.linghu.model.entity.Platform;
-import com.linghu.model.entity.Reference;
-import com.linghu.model.entity.Sectionalization;
-import com.linghu.model.entity.Type;
+import com.linghu.model.entity.*;
import com.linghu.model.excel.ExcelDataWithRow;
import com.linghu.model.excel.PlatformExcel;
import com.linghu.model.excel.UserExcel;
@@ -44,9 +42,7 @@
import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -63,6 +59,8 @@
private TypeService typeService;
@Autowired
private ReferenceMapper referenceMapper;
+ @Autowired
+ private KeywordMapper keywordMapper;
@PostMapping
@ApiOperation(value = "添加平台")
@@ -74,6 +72,7 @@
if (!StringUtils.hasText(platform.getDomain())) {
return ResponseResult.error("平台域名不能为空");
}
+ platform.setCreate_time(LocalDateTime.now());
boolean success = platformService.save(platform);
if (success) {
@@ -86,7 +85,7 @@
@ApiOperation(value = "删除平台")
public ResponseResult<Void> delete(@PathVariable Integer platformId) {
//平台被引用了没
- Integer count = referenceMapper.selectCount(new LambdaQueryWrapper<Reference>().eq(Reference::getPlatform_id, platformId));
+ Integer count = Math.toIntExact(referenceMapper.selectCount(new LambdaQueryWrapper<Reference>().eq(Reference::getPlatform_id, platformId)));
if (count > 0) {
return ResponseResult.error("该平台被引用中，不能删除");
}
@@ -126,15 +125,59 @@
@GetMapping("/list")
@ApiOperation("查询平台列表，不传页数和大小就查全部")
public ResponseResult<CustomPage<Platform>> list(
- @RequestParam(required = false) Integer page,
- @RequestParam(required = false) Integer pageSize,
- @RequestParam(required = false) Integer type_id) {
+ @RequestParam(value = "page",required = false) Integer page,
+ @RequestParam(value = "pageSize",required = false) Integer pageSize,
+ @RequestParam(value = "type_id",required = false) Integer type_id,
+ @RequestParam(value = "keywordId", required = false) Integer keywordId,
+ @RequestParam(value = "questionId",required = false) Integer questionId,
+ @RequestParam(value = "isNow",required = false) Integer isNow
+ ) {
+ List<Integer> platForm=new ArrayList<>();
+ //先查找当前关键词下，所有的回答 的 所有的平台名称
+ Keyword keyword=new Keyword();
+ if (keywordId!=null){
+ keyword = keywordMapper.selectById(keywordId);
+ }
+
+ if (keywordId != null && questionId == null) {
+
+ List<Reference> references = referenceMapper.selectList(new LambdaQueryWrapper<Reference>()
+ .eq(Reference::getKeyword_id, keywordId)
+ .eq(Reference::getNum, isNow== 0 ? 1 : keyword.getNum())
+ );
+ platForm = references.stream().map(Reference::getPlatform_id).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ }
+ if (keywordId != null && questionId != null) {
+ List<Reference> references = referenceMapper.selectList(new LambdaQueryWrapper<Reference>()
+ .eq(Reference::getKeyword_id, keywordId)
+ .eq(Reference::getNum, isNow== 0 ? 1 : keyword.getNum())
+ .eq(Reference::getQuestion_id, questionId)
+ );
+ platForm = references.stream().map(Reference::getPlatform_id).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ }
+
// 构建查询条件并添加排序（按创建时间倒序）
LambdaQueryWrapper<Platform> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.orderByDesc(Platform::getCreate_time); // 新增的排序条件
+ if (!platForm.isEmpty()){
+ queryWrapper.in(Platform::getPlatform_id, platForm);
+ }else {
+ if (page != null && pageSize != null){
+ Page<Platform> pageInfo = new Page<>(page, pageSize);
+ Page<Platform> result = platformService.page(pageInfo, queryWrapper);
+ return ResponseResult.success(new CustomPage<>(result));
+ }else {
+ CustomPage<Platform> customPage = new CustomPage<>(new Page<>());
+ customPage.setRecords(new ArrayList<>());
+ customPage.setTotal(0);
+ return ResponseResult.success(customPage);
+ }
+
+ }
+
if (type_id != null) {
queryWrapper.eq(Platform::getType_id, type_id);
}
+ queryWrapper.orderByDesc(Platform::getCreate_time); // 新增的排序条件
if (page != null && pageSize != null) {
Page<Platform> pageInfo = new Page<>(page, pageSize);
Page<Platform> result = platformService.page(pageInfo, queryWrapper);
@@ -179,6 +222,9 @@
return ResponseResult.error("上传文件不能为空");
}
+ // 获取数据库中的旧数据
+ List<Platform> oldPlatforms = platformService.list();
+
// 使用自定义监听器读取数据（包含行号）
PlatformExcelListener listener = new PlatformExcelListener();
EasyExcel.read(file.getInputStream())
@@ -191,11 +237,12 @@
List<Platform> platforms = new ArrayList<>();
List<String> errorMessages = new ArrayList<>();
- // 遍历数据并验证（逻辑同方案一）
+ // 遍历数据并验证
for (ExcelDataWithRow<PlatformExcel> excelData : excelList) {
int rowNum = excelData.getRowNumber();
PlatformExcel excel = excelData.getData();
List<String> rowErrors = new ArrayList<>();
+
// 验证逻辑
if (!StringUtils.hasText(excel.getPlatform_name())) {
rowErrors.add("平台名称不能为空");
@@ -203,47 +250,66 @@
if (!StringUtils.hasText(excel.getDomain())) {
rowErrors.add("平台域名不能为空");
}
- // ... 其他验证
+
// 查找类型（仅当类型名称不为空时检查，避免空指针）
Integer typeId = null;
if (StringUtils.hasText(excel.getType_name())) {
Type typeByName = typeService.getTypeByName(excel.getType_name());
if (typeByName == null) {
rowErrors.add("未知的平台类型: " + excel.getType_name());
+ } else {
+ typeId = typeByName.getType_id();
}
- typeId = typeByName.getType_id();
-
- }else {
+ } else {
rowErrors.add("平台类型不能为空");
}
+
if (!rowErrors.isEmpty()) {
errorMessages.add(String.format("第%d行错误: %s", rowNum, String.join("；", rowErrors)));
} else {
- // 构建Platform对象...
+ // 构建Platform对象
Platform platform = new Platform();
platform.setPlatform_name(excel.getPlatform_name());
platform.setDomain(excel.getDomain());
platform.setType_id(typeId);
platform.setCreate_time(LocalDateTime.now());
- platforms.add(platform);
+
+ // 检查重复性
+ boolean isDuplicate = false;
+ for (Platform oldPlatform : oldPlatforms) {
+ // 判断重复的条件，这里假设平台名称和域名都相同才算重复
+ if (oldPlatform.getPlatform_name().equals(platform.getPlatform_name()) &&
+ oldPlatform.getDomain().equals(platform.getDomain())) {
+ isDuplicate = true;
+ break;
+ }
+ }
+
+ // 如果不重复才添加到导入列表
+ if (!isDuplicate) {
+ platforms.add(platform);
+ }
}
}
- // 错误处理和导入逻辑（同方案一）
+ // 错误处理
if (!errorMessages.isEmpty()) {
- // 构建清晰的错误信息
StringBuilder errorMsg = new StringBuilder();
errorMsg.append("导入失败，共").append(errorMessages.size()).append("条数据存在错误：\n");
errorMessages.forEach(msg -> errorMsg.append(msg).append("\n"));
-
return ResponseResult.error(400, errorMsg.toString());
}
- // 无错误时导入...
- return ResponseResult.success("导入成功，共" + platforms.size() + "条数据");
+ // 无错误时导入
+ if (!platforms.isEmpty()) {
+ platformService.saveBatch(platforms);
+ return ResponseResult.success("导入成功，新增" + platforms.size() + "条数据");
+ } else {
+ return ResponseResult.error("导入完成，没有新增数据（所有数据均已存在）");
+ }
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("文件解析失败", e);
return ResponseResult.error("文件解析失败：" + e.getMessage());
}
}
--
Gitblit v1.7.1