From 70beeda88720131e21baf4c51fd20d5bf486959a Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 09 三月 2026 22:14:02 +0800
Subject: [PATCH] bugfix
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java | 129 +++++++++++++++++++++++++++++++-----------
1 files changed, 95 insertions(+), 34 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
index 748469c..0879dd1 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpInvitationCodeController.java
@@ -6,10 +6,9 @@
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.xiaopeng.api.model.account.SysUser;
import com.xiaopeng.api.model.operation.XpInvitationCode;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.common.core.domain.R;
@@ -17,21 +16,18 @@
import com.xiaopeng.common.core.utils.DateUtils;
import com.xiaopeng.common.core.utils.WebUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
-import com.xiaopeng.common.log.annotation.Log;
-import com.xiaopeng.common.log.enums.BusinessType;
+import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.dto.InvitationAddDto;
import com.xiaopeng.operation.exportExcle.XpInvitationCodeExportExcel;
-import com.xiaopeng.operation.exportExcle.XpWhitelistExportExcel;
import com.xiaopeng.operation.importExcel.InvitationCodeImportExcel;
import com.xiaopeng.operation.query.InvitationPageListQuery;
-import com.xiaopeng.operation.query.WhitelistPageListQuery;
import com.xiaopeng.operation.service.IXpInvitationCodeService;
import com.xiaopeng.operation.service.IXpWhitelistService;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException;
import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.transaction.annotation.Propagation;
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
@@ -41,7 +37,6 @@
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
@@ -49,6 +44,7 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.regex.Pattern;
/**
* <p>
@@ -67,6 +63,10 @@
private IXpInvitationCodeService xpInvitationCodeService;
@Resource
private IXpWhitelistService xpWhitelistService;
+ @Resource
+ private MessageSource messageSource;
+
+ private static final Pattern CHINESE_PATTERN = Pattern.compile("\\p{IsHan}");
@ApiOperation(value = "邀请码管理分页列表",response = XpInvitationCode.class)
@PostMapping("/api/v1/invitation/pageList")
@@ -135,9 +135,6 @@
@ApiOperation(value = "邀请码导入")
@PostMapping("/base/v1/invitation/importExcel")
public R<String> importExcel(@RequestPart("file") MultipartFile file) {
- System.out.println("文件名 = " + file.getOriginalFilename());
- System.out.println("文件大小 = " + file.getSize());
- System.out.println("ContentType = " + file.getContentType());
ImportParams params = new ImportParams();
params.setHeadRows(1); //表头行数
InputStream inputStream = null;
@@ -152,31 +149,87 @@
throw new ServiceException("邀请码导入失败!");
} finally {
try {
- inputStream.close();
+ if (inputStream != null) {
+ inputStream.close();
+ }
} catch (IOException e) {
throw new ServiceException(e.getMessage());
}
}
if (CollectionUtils.isEmpty(invitationCodeImportExcels)) {
- throw new ServiceException("邀请码数据为空!");
+ return R.fail(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_DATA_EMPTY, null, I18nKeyConstant.INVITATION_IMPORT_DATA_EMPTY, LocaleContextHolder.getLocale()));
}
- // 校验邀请码是否有重复的
- long count = invitationCodeImportExcels.stream().map(InvitationCodeImportExcel::getInvitationCode)
- .distinct().count();
- if (count!=invitationCodeImportExcels.size()){
- return R.fail("邀请码存在重复!");
+
+ // 批量校验：账号必须为手机号；邀请码不能为空且不能包含中文；同时校验文件内重复/数据库已存在
+ List<String> errors = new ArrayList<>();
+ Set<String> importCodes = new HashSet<>();
+ for (int i = 0; i < invitationCodeImportExcels.size(); i++) {
+ InvitationCodeImportExcel row = invitationCodeImportExcels.get(i);
+ int rowNum = i + 2;
+
+ String invitationCode = trimToNull(row.getInvitationCode());
+ String bindAccount = trimToNull(row.getBindAccount());
+ row.setInvitationCode(invitationCode);
+ row.setBindAccount(bindAccount);
+
+ if (!StringUtils.hasLength(invitationCode)) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_EMPTY, new Object[]{rowNum}, I18nKeyConstant.INVITATION_IMPORT_CODE_EMPTY, LocaleContextHolder.getLocale()));
+ } else {
+ if (containsChinese(invitationCode)) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_CONTAINS_CHINESE, new Object[]{rowNum, bindAccount}, I18nKeyConstant.INVITATION_IMPORT_CODE_CONTAINS_CHINESE, LocaleContextHolder.getLocale()));
+ }
+ importCodes.add(invitationCode);
+ }
+
+ if (!StringUtils.hasLength(bindAccount)) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_EMPTY, new Object[]{rowNum}, I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_EMPTY, LocaleContextHolder.getLocale()));
+ } else if (!PhoneUtil.isPhone(bindAccount)) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_INVALID, new Object[]{rowNum, bindAccount}, I18nKeyConstant.INVITATION_IMPORT_ACCOUNT_INVALID, LocaleContextHolder.getLocale()));
+ }
+
+ if (StringUtils.hasLength(row.getBindTime())) {
+ row.setBindTime(row.getBindTime().trim());
+ }
}
- Map<String, Long> codeMap = xpInvitationCodeService.list().stream()
- .collect(Collectors.toMap(XpInvitationCode::getInvitationCode, XpInvitationCode::getId));
- JSONObject result = new JSONObject();
+
+ Map<String, Long> codeCountMap = invitationCodeImportExcels.stream()
+ .map(InvitationCodeImportExcel::getInvitationCode)
+ .filter(StringUtils::hasLength)
+ .collect(Collectors.groupingBy(code -> code, Collectors.counting()));
+ List<String> duplicatedCodes = codeCountMap.entrySet().stream()
+ .filter(entry -> entry.getValue() != null && entry.getValue() > 1)
+ .map(Map.Entry::getKey)
+ .sorted()
+ .collect(Collectors.toList());
+ if (!duplicatedCodes.isEmpty()) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_DUPLICATE, new Object[]{String.join(",", duplicatedCodes)}, I18nKeyConstant.INVITATION_IMPORT_CODE_DUPLICATE, LocaleContextHolder.getLocale()));
+ }
+
+ if (!importCodes.isEmpty()) {
+ List<XpInvitationCode> existsList = xpInvitationCodeService.lambdaQuery()
+ .in(XpInvitationCode::getInvitationCode, importCodes)
+ .list();
+ if (!CollectionUtils.isEmpty(existsList)) {
+ List<String> existsCodes = existsList.stream()
+ .map(XpInvitationCode::getInvitationCode)
+ .filter(StringUtils::hasLength)
+ .distinct()
+ .sorted()
+ .collect(Collectors.toList());
+ if (!existsCodes.isEmpty()) {
+ errors.add(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_CODE_EXISTS, new Object[]{String.join(",", existsCodes)}, I18nKeyConstant.INVITATION_IMPORT_CODE_EXISTS, LocaleContextHolder.getLocale()));
+ }
+ }
+ }
+
+ if (!errors.isEmpty()) {
+ return R.fail(messageSource.getMessage(I18nKeyConstant.INVITATION_IMPORT_VALIDATE_FAIL, new Object[]{String.join("\n", errors)},I18nKeyConstant.INVITATION_IMPORT_VALIDATE_FAIL, LocaleContextHolder.getLocale()));
+ }
+
List<XpInvitationCode> addList = new ArrayList<>();
List<XpWhitelist> addWhitelistList = new ArrayList<>();
for (InvitationCodeImportExcel locationExcel : invitationCodeImportExcels) {
- Long id = codeMap.get(locationExcel.getInvitationCode());
- if (id!=null){
- result.append("邀请码：[", locationExcel.getInvitationCode()+"]已存在");
- }
locationExcel.setBindTime(locationExcel.getBindTime());
XpInvitationCode xpInvitationCode = new XpInvitationCode();
xpInvitationCode.setInvitationCode(locationExcel.getInvitationCode());
@@ -188,11 +241,7 @@
}
xpInvitationCode.setBindTime(DateUtils.stringToLocalDateTime(locationExcel.getBindTime()));
- if (StringUtils.hasLength(locationExcel.getBindAccount())){
- xpInvitationCode.setStatus(2);
- }else{
- xpInvitationCode.setStatus(1);
- }
+ xpInvitationCode.setStatus(2);
XpWhitelist xpWhitelist = new XpWhitelist();
xpWhitelist.setAccount(locationExcel.getBindAccount());
xpWhitelist.setStatus(true);
@@ -201,13 +250,25 @@
addWhitelistList.add(xpWhitelist);
addList.add(xpInvitationCode);
}
- if(!result.isEmpty()){
- return R.ok(result.toString());
- }
xpInvitationCodeService.saveBatch(addList);
xpWhitelistService.saveBatch(addWhitelistList);
return R.ok();
}
+
+ private static String trimToNull(String value) {
+ if (!StringUtils.hasLength(value)) {
+ return null;
+ }
+ String trimmed = value.trim();
+ return StringUtils.hasLength(trimmed) ? trimmed : null;
+ }
+
+ private static boolean containsChinese(String value) {
+ if (!StringUtils.hasLength(value)) {
+ return false;
+ }
+ return CHINESE_PATTERN.matcher(value).find();
+ }
@ApiOperation(value = "邀请码导出")
@PostMapping(value = "/api/v1/invitation/exportExcel")
public void exportExcel(@RequestBody InvitationPageListQuery query) {
--
Gitblit v1.7.1