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/PlatformController.java | 20 +++
src/main/java/com/linghu/controller/CollectController.java | 10 -
src/main/java/com/linghu/controller/AuthController.java | 19 ++
src/main/java/com/linghu/controller/UserController.java | 133 ++++++++++++++++------
src/main/java/com/linghu/service/impl/KeywordServiceImpl.java | 2
src/main/java/com/linghu/handler/SectionalizationDropdownHandler.java | 48 ++++++++
src/main/java/com/linghu/listener/UserExcelListener.java | 30 +++++
src/main/java/com/linghu/controller/KeywordController.java | 91 ++++++++++++--
src/main/java/com/linghu/timeTask/ScheduledTasks.java | 2
9 files changed, 290 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/linghu/controller/AuthController.java b/src/main/java/com/linghu/controller/AuthController.java
index 0761d8f..6d7e0c4 100644
--- a/src/main/java/com/linghu/controller/AuthController.java
+++ b/src/main/java/com/linghu/controller/AuthController.java
@@ -2,8 +2,13 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.linghu.utils.OpenCryptUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
@@ -50,7 +55,7 @@
//open-crypt解析token
@GetMapping("/parseToken")
@ApiOperation(value = "解析token")
- public ResponseEntity<?> parseToken(@RequestParam String token) {
+ public ResponseEntity<?> parseToken(@RequestParam String token) throws JsonProcessingException {
if (token == null || "".equals(token)){
return ResponseEntity.ok("token为空");
}
@@ -59,11 +64,19 @@
String decrypt = openCryptUtil.decrypt(token);
System.out.println(decrypt);
System.out.println("----------------");
- JSONObject jsonObject = JSONObject.parseObject(decrypt);
+ // 1. 去除外层多余的引号
+ String jsonStr = decrypt.replaceAll("^\"|\"$", "");
+ // 处理后：{"name":"ceshi"}（但实际可能仍包含转义字符）
+ // 2. 处理剩余的转义字符（将 \" 转换为 "）
+ jsonStr = jsonStr.replace("\\\"", "\"");
+
+ // 3. 解析 JSON
+ ObjectMapper objectMapper = new ObjectMapper();
+ String name = objectMapper.readTree(jsonStr).get("name").asText();
// 返回用户信息
- return ResponseEntity.ok(jsonObject.get("name"));
+ return ResponseEntity.ok(name);
}
@GetMapping("/getToken")
diff --git a/src/main/java/com/linghu/controller/CollectController.java b/src/main/java/com/linghu/controller/CollectController.java
index 4c68e73..da004b9 100644
--- a/src/main/java/com/linghu/controller/CollectController.java
+++ b/src/main/java/com/linghu/controller/CollectController.java
@@ -290,12 +290,12 @@
private List<List<UserDto>> splitUsersIntoBatches(List<UserDto> users, int batchSize,Integer keywordId) {
- /* Keyword keyword = keywordService.getById(keywordId);
+ Keyword keyword = keywordService.getById(keywordId);
if (null==keyword.getNum()){
keyword.setNum(0);
}
keyword.setNum(keyword.getNum()+1);
- keywordService.updateById(keyword);*/
+ keywordService.updateById(keyword);
List<List<UserDto>> batches = new ArrayList<>();
for (int i = 0; i < users.size(); i += batchSize) {
@@ -325,11 +325,7 @@
keywordService.update(updateWrapper);
//设置轮数
Keyword keyword = keywordService.getById(batchRequest.getKeyword_id());
- if (null==keyword.getNum()){
- keyword.setNum(0);
- }
- keyword.setNum(keyword.getNum()+1);
- keywordService.updateById(keyword);
+
//设置订单进入采集状态
LambdaUpdateWrapper<Orders> updateOrderWrapper = new LambdaUpdateWrapper<>();
updateOrderWrapper.eq(Orders::getOrder_id, keyword.getOrder_id()) // 确保字段名正确
diff --git a/src/main/java/com/linghu/controller/KeywordController.java b/src/main/java/com/linghu/controller/KeywordController.java
index cee397f..3e94579 100644
--- a/src/main/java/com/linghu/controller/KeywordController.java
+++ b/src/main/java/com/linghu/controller/KeywordController.java
@@ -1,8 +1,13 @@
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;
@@ -13,24 +18,24 @@
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;
-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.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;
@@ -68,6 +73,8 @@
private ReferenceService referenceService;
@Autowired
private ReferenceMapper referenceMapper;
+ @Autowired
+ private PlatformService platformService;
/**
* 关键词统计 EChart图
@@ -190,13 +197,39 @@
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()
@@ -250,11 +283,39 @@
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()
diff --git a/src/main/java/com/linghu/controller/PlatformController.java b/src/main/java/com/linghu/controller/PlatformController.java
index 395545f..468a7f6 100644
--- a/src/main/java/com/linghu/controller/PlatformController.java
+++ b/src/main/java/com/linghu/controller/PlatformController.java
@@ -1,6 +1,11 @@
package com.linghu.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linghu.listener.PlatformExcelListener;
@@ -9,9 +14,11 @@
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.excel.ExcelDataWithRow;
import com.linghu.model.excel.PlatformExcel;
+import com.linghu.model.excel.UserExcel;
import com.linghu.model.page.CustomPage;
import com.linghu.service.PlatformService;
import com.linghu.service.TypeService;
@@ -20,6 +27,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j;
import lombok.extern.slf4j.Slf4j;
+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;
@@ -35,6 +47,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController
@@ -114,11 +127,14 @@
@ApiOperation("查询平台列表，不传页数和大小就查全部")
public ResponseResult<CustomPage<Platform>> list(
@RequestParam(required = false) Integer page,
- @RequestParam(required = false) Integer pageSize) {
+ @RequestParam(required = false) Integer pageSize,
+ @RequestParam(required = false) Integer type_id) {
// 构建查询条件并添加排序（按创建时间倒序）
LambdaQueryWrapper<Platform> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.orderByDesc(Platform::getCreate_time); // 新增的排序条件
-
+ if (type_id != null) {
+ queryWrapper.eq(Platform::getType_id, type_id);
+ }
if (page != null && pageSize != null) {
Page<Platform> pageInfo = new Page<>(page, pageSize);
Page<Platform> result = platformService.page(pageInfo, queryWrapper);
diff --git a/src/main/java/com/linghu/controller/UserController.java b/src/main/java/com/linghu/controller/UserController.java
index 9c77be3..adb5599 100644
--- a/src/main/java/com/linghu/controller/UserController.java
+++ b/src/main/java/com/linghu/controller/UserController.java
@@ -1,17 +1,32 @@
package com.linghu.controller;
import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.linghu.listener.PlatformExcelListener;
+import com.linghu.listener.UserExcelListener;
import com.linghu.model.common.ResponseResult;
+import com.linghu.model.entity.Platform;
import com.linghu.model.entity.Sectionalization;
import com.linghu.model.entity.User;
+import com.linghu.model.excel.ExcelDataWithRow;
+import com.linghu.model.excel.PlatformExcel;
import com.linghu.model.excel.UserExcel;
import com.linghu.model.vo.UserPageVO;
import com.linghu.service.SectionalizationService;
import com.linghu.service.UserService;
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;
@@ -22,9 +37,11 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@RestController
@@ -104,15 +121,48 @@
@GetMapping("/downloadTemplate")
@ApiOperation("下载模板")
public ResponseEntity<byte[]> downloadTemplate() throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- EasyExcel.write(out, UserExcel.class).sheet("账号模板").doWrite(new ArrayList<>());
+ // 1. 查询所有分组名称
+ List<Sectionalization> sections = sectionalizationService.list(null);
+ List<String> sectionNames = sections.stream()
+ .map(Sectionalization::getSectionalization_name)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ // 2. 创建Excel写出器
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+ // 3. 使用自定义的SheetWriteHandler来添加数据验证
+ ExcelWriter excelWriter = EasyExcel.write(out, UserExcel.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, 3, 3); // D列（第4列）
+
+ DataValidationConstraint constraint = helper.createExplicitListConstraint(
+ sectionNames.toArray(new String[0]));
+ DataValidation validation = helper.createValidation(constraint, rangeList);
+ sheet.addValidationData(validation);
+ }
+ })
+ .build();
+
+ // 4. 写入空数据
+ WriteSheet writeSheet = EasyExcel.writerSheet("账号模板").build();
+ excelWriter.write(new ArrayList<>(), writeSheet);
+ excelWriter.finish();
+
+ // 5. 构建响应
return ResponseEntity.ok()
- .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=keyword_template.xlsx")
+ .header(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=user_template.xlsx")
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(out.toByteArray());
}
-
/**
* 导入文件
@@ -148,62 +198,73 @@
if (file.isEmpty()) {
return ResponseResult.error("上传文件不能为空");
}
+ // 使用自定义监听器读取数据（包含行号）
+ UserExcelListener listener = new UserExcelListener();
// 读取Excel数据
- List<UserExcel> excelList = EasyExcel.read(file.getInputStream())
+ EasyExcel.read(file.getInputStream())
.head(UserExcel.class)
.sheet()
.doReadSync();
// 数据转换与验证
+ List<ExcelDataWithRow<UserExcel>> excelList = listener.getDataList();
+ List<User> insertUserList = new ArrayList<>();
List<String> errorMessages = new ArrayList<>();
- for (UserExcel excel : excelList) {
+ List<String> emailList = new ArrayList<>();
+ for (ExcelDataWithRow<UserExcel> excelData : excelList) {
+ int rowNum = excelData.getRowNumber();
+ UserExcel excel = excelData.getData();
+ List<String> rowErrors = new ArrayList<>();
// 检查必要字段
if (!StringUtils.hasText(excel.getUser_name())) {
- errorMessages.add("账户名不能为空");
- continue;
+ rowErrors.add("用户名称不能为空");
}
if (!StringUtils.hasText(excel.getUser_email())) {
- errorMessages.add("邮箱不能为空");
- continue;
+ rowErrors.add("邮箱不能为空");
+ }else{
+ if (emailList.contains(excel.getUser_email())) {
+ rowErrors.add("导入数据中邮箱重复");
+ }
+ if (nameMap.containsKey(excel.getUser_email())){
+ rowErrors.add("邮箱与数据库中重复");
+ }
}
if (!StringUtils.hasText(String.valueOf(excel.getPassword()))) {
- errorMessages.add("密码不能为空");
- continue;
+ rowErrors.add("密码不能为空");
}
if (!StringUtils.hasText(excel.getSectionalization_name())) {
- errorMessages.add("分组不能为空");
- continue;
+ rowErrors.add("分组不能为空");
+ }else if (!sectionalizationMap.containsKey(excel.getSectionalization_name())){
+ rowErrors.add("分组不存在");
}
- if (nameMap.containsKey(excel.getUser_name())){
- errorMessages.add("用户名称重复");
- continue;
+
+ if (!rowErrors.isEmpty()) {
+ errorMessages.add(String.format("第%d行错误: %s", rowNum, String.join("；", rowErrors)));
+ }else {
+ // 构建Platform对象...
+ User user = new User();
+ user.setUser_name(excel.getUser_name());
+ user.setUser_email(excel.getUser_email());
+ user.setPassword(excel.getPassword());
+ user.setSectionalization_id(sectionalizationMap.get(excel.getSectionalization_name()).getSectionalization_id());
+ user.setStatus("正常");
+ insertUserList.add(user);
+ emailList.add(excel.getUser_email());
}
}
// 处理错误
if (!errorMessages.isEmpty()) {
- return ResponseResult.error("数据验证失败: " + String.join("; ", errorMessages));
+ // 构建清晰的错误信息
+ 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());
}
// 开始添加
- for (UserExcel excel : excelList) {
- User user = new User();
- if (sectionalizationMap.containsKey(excel.getSectionalization_name())) {
- user.setSectionalization_id(sectionalizationMap.get(excel.getSectionalization_name()).getSectionalization_id());
- }else {
- //新增
- Sectionalization sectionalization = new Sectionalization();
- sectionalization.setSectionalization_name(excel.getSectionalization_name());
- sectionalizationService.save(sectionalization);
- user.setSectionalization_id(sectionalization.getSectionalization_id());
- }
- user.setUser_email(excel.getUser_email());
- user.setUser_name(excel.getUser_name());
- user.setPassword(excel.getPassword());
- user.setStatus("正常");
- userService.save(user);
-
- }
+ userService.saveBatch(insertUserList);
// 返回信息
return ResponseResult.success();
}
diff --git a/src/main/java/com/linghu/handler/SectionalizationDropdownHandler.java b/src/main/java/com/linghu/handler/SectionalizationDropdownHandler.java
new file mode 100644
index 0000000..451ceb2
--- /dev/null
+++ b/src/main/java/com/linghu/handler/SectionalizationDropdownHandler.java
@@ -0,0 +1,48 @@
+package com.linghu.handler;
+
+import com.alibaba.excel.write.handler.SheetWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+
+import java.util.List;
+
+// 自定义下拉框处理器
+public class SectionalizationDropdownHandler implements SheetWriteHandler {
+
+ private List<String> dropdownData; // 下拉选项数据
+ private int columnIndex; // 要添加下拉框的列索引（从0开始）
+
+ public SectionalizationDropdownHandler(List<String> dropdownData, int columnIndex) {
+ this.dropdownData = dropdownData;
+ this.columnIndex = columnIndex;
+ }
+
+ @Override
+ public void beforeSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+ // sheet创建前不做处理
+ }
+
+ @Override
+ public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+ Sheet sheet = writeSheetHolder.getSheet();
+ DataValidationHelper helper = sheet.getDataValidationHelper();
+
+ // 1. 设置下拉选项来源
+ String[] dropdownArray = dropdownData.toArray(new String[0]);
+ DataValidationConstraint constraint = helper.createExplicitListConstraint(dropdownArray);
+
+ // 2. 设置下拉框作用范围（从第2行到第1000行，第columnIndex列）
+ // 注意：Excel行号从0开始，第0行为表头，数据行从1开始
+ CellRangeAddressList addressList = new CellRangeAddressList(1, 1000, columnIndex, columnIndex);
+
+ // 3. 创建数据验证并添加到sheet
+ DataValidation validation = helper.createValidation(constraint, addressList);
+ // 阻止输入非下拉选项的值
+ validation.setShowErrorBox(true);
+// validation.setErrorTitle("输入错误");
+// validation.setErrorMessage("请从下拉列表中选择分组");
+ sheet.addValidationData(validation);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/linghu/listener/UserExcelListener.java b/src/main/java/com/linghu/listener/UserExcelListener.java
new file mode 100644
index 0000000..99fdb7f
--- /dev/null
+++ b/src/main/java/com/linghu/listener/UserExcelListener.java
@@ -0,0 +1,30 @@
+package com.linghu.listener;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.linghu.model.excel.ExcelDataWithRow;
+import com.linghu.model.excel.PlatformExcel;
+import com.linghu.model.excel.UserExcel;
+
+import java.util.ArrayList;
+import java.util.List;
+// 自定义监听器
+public class UserExcelListener extends AnalysisEventListener<UserExcel> {
+ private List<ExcelDataWithRow<UserExcel>> dataList = new ArrayList<>();
+ private int rowNumber = 0; // 行号计数器（从1开始）
+
+ @Override
+ public void invoke(UserExcel data, AnalysisContext context) {
+ rowNumber++; // 跳过表头行（如果表头是第1行，这里从第2行开始计数）
+ dataList.add(new ExcelDataWithRow<>(rowNumber, data));
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ }
+
+ public List<ExcelDataWithRow<UserExcel>> getDataList() {
+ return dataList;
+ }
+
+}
diff --git a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
index 087c037..3c848df 100644
--- a/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
+++ b/src/main/java/com/linghu/service/impl/KeywordServiceImpl.java
@@ -36,7 +36,7 @@
return ResponseResult.error("关键词不存在");
}
if (!"completed".equals(keyword.getStatus())) {
- return ResponseResult.error("关键词采集未完成");
+ return ResponseResult.success();
}
List<KeywordStaticsVO> statics = this.getBaseMapper().statics(keywordId, questionId, keyword.getNum());
vo.setNowRecord(statics);
diff --git a/src/main/java/com/linghu/timeTask/ScheduledTasks.java b/src/main/java/com/linghu/timeTask/ScheduledTasks.java
index a22011b..db77954 100644
--- a/src/main/java/com/linghu/timeTask/ScheduledTasks.java
+++ b/src/main/java/com/linghu/timeTask/ScheduledTasks.java
@@ -32,7 +32,7 @@
@Autowired
private CollectController collectController;
- @Scheduled(fixedRate = 5000) // 每5秒执行一次
+ @Scheduled(fixedRate = 10000) // 每5秒执行一次
public void scheduleFixedRateTask() {
// 查询所有状态为pending的任务
LambdaQueryWrapper<KeywordTask> queryWrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.7.1