From f3aa9e35dfc2852e0ae1ae807bc5cc844cd7ca74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 09:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java | 182 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 177 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
index 7ada13f..c630cbe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java
@@ -13,6 +13,7 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.system.export.LargeKeyGridPointUserImport;
import com.ruoyi.system.export.LargeKeyGridUserImport;
import com.ruoyi.system.model.TLargeKeyGridUser;
import com.ruoyi.system.model.TLargeKeyPersonnelType;
@@ -140,7 +141,7 @@
return R.ok(largeKeyGridUserService.removeByIds(ids));
}
- @ApiOperation(value = "重点人员-网格人员导入模板下载")
+ @ApiOperation(value = "网格人员导入模板下载")
@GetMapping("/import-template")
public void importTemplate() {
List<LargeKeyGridUserImport> largeLargeKeyGridUserImports = new ArrayList<>();
@@ -150,7 +151,7 @@
HttpServletResponse response = WebUtils.response();
ServletOutputStream outputStream = null;
try {
- String fileName = URLEncoder.encode("重点人员-网格人员信息导入模板.xls", "utf-8");
+ String fileName = URLEncoder.encode("网格人员信息导入模板.xls", "utf-8");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
response.setHeader("content-Type", "application/vnd.ms-excel");
response.setHeader("Pragma", "no-cache");
@@ -159,7 +160,35 @@
workbook.write(outputStream);
} catch (IOException e) {
e.printStackTrace();
- System.out.println("重点人员-网格人员导入模板下载失败!");
+ System.out.println("网格人员导入模板下载失败!");
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ @ApiOperation(value = "重点人员导入模板下载")
+ @GetMapping("/import-point-template")
+ public void importPointTemplate() {
+ List<LargeKeyGridPointUserImport> largeKeyGridPointUserImports = new ArrayList<>();
+ LargeKeyGridPointUserImport largeKeyGridPointUserImport = new LargeKeyGridPointUserImport();
+ largeKeyGridPointUserImports.add(largeKeyGridPointUserImport);
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), LargeKeyGridPointUserImport.class, largeKeyGridPointUserImports);
+ HttpServletResponse response = WebUtils.response();
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("重点人员信息导入模板.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("content-Type", "application/vnd.ms-excel");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ System.out.println("重点人员导入模板下载失败!");
} finally {
try {
outputStream.close();
@@ -202,50 +231,62 @@
for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
result.append("第"+i+"行：[", "网格"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
result.append("第"+i+"行：[", "小区名称"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
result.append("第"+i+"行：[", "单元号"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
result.append("第"+i+"行：[", "门牌号"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
result.append("第"+i+"行：[", "姓名"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getUserSexStr())){
result.append("第"+i+"行：[", "性别"+"]不能为空");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getIdCard())){
result.append("第"+i+"行：[", "身份证号"+"]不能为空");
+ i++;
continue;
}
- if (largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\\\d{7}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])\\\\d{3}$)|(^[1-9]\\\\d{5}[1-9]\\\\d{3}((0\\\\d)|(1[0-2]))(([0-2]\\\\d)|3[0-1])((\\\\d{4})|\\\\d{3}[Xx])$)")){
+ if (!largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)")){
result.append("第"+i+"行：[", "身份证号"+"]格式不正确");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getContactNumber())){
result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ i++;
continue;
}
- if (largeKeyGridUserImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
+ if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
+ i++;
continue;
}
if (!StringUtils.hasLength(largeKeyGridUserImport.getTypeName())){
result.append("第"+i+"行：[", "类型名称"+"]不能为空");
+ i++;
continue;
}
TLargeKeyGridUser largeKeyGridUser = new TLargeKeyGridUser();
@@ -260,6 +301,7 @@
break;
default:
result.append("第"+i+"行：[", "性别"+"]格式错误");
+ i++;
continue;
}
@@ -268,6 +310,7 @@
.last("LIMIT 1"));
if(Objects.isNull(largeKeyPersonnelType)){
result.append("第"+i+"行：[", "类型名称"+"]不存在");
+ i++;
continue;
}
largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
@@ -282,5 +325,134 @@
return R.ok();
}
+ @Log(title = "重点人员-网格人员信息-网格人员信息导入", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "网格人员信息导入")
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+ @PostMapping("/importGrid")
+ public R<String> importGrid(@RequestPart("file") MultipartFile file) {
+ List<TLargeKeyGridUser> largeKeyGridUsers = new ArrayList<>();
+ ImportParams params = new ImportParams();
+ params.setHeadRows(1); //表头行数
+ InputStream inputStream = null;
+ List<LargeKeyGridUserImport> largeKeyGridUserImports;
+ try {
+ inputStream = file.getInputStream();
+ largeKeyGridUserImports = ExcelImportUtil.importExcel(inputStream,
+ LargeKeyGridUserImport.class, params);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("网格人员信息导入失败:{}", e.getMessage());
+ throw new ServiceException("网格人员信息导入失败!");
+ } finally {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ throw new ServiceException(e.getMessage());
+ }
+ }
+ if (CollectionUtils.isEmpty(largeKeyGridUserImports)) {
+ throw new ServiceException("网格人员信息数据为空!");
+ }
+ JSONObject result = new JSONObject();
+ int i = 1;
+ for (LargeKeyGridUserImport largeKeyGridUserImport : largeKeyGridUserImports) {
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getGridInfo())){
+ result.append("第"+i+"行：[", "网格"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
+ result.append("第"+i+"行：[", "小区名称"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getRegisteredResidence())){
+ result.append("第"+i+"行：[", "户籍地"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
+ result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
+ result.append("第"+i+"行：[", "单元号"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
+ result.append("第"+i+"行：[", "门牌号"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
+ result.append("第"+i+"行：[", "姓名"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUserSexStr())){
+ result.append("第"+i+"行：[", "性别"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getIdCard())){
+ result.append("第"+i+"行：[", "身份证号"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!largeKeyGridUserImport.getIdCard().matches("^$|(^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$)|(^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])((\\d{4})|\\d{3}[Xx])$)")){
+ result.append("第"+i+"行：[", "身份证号"+"]格式不正确");
+ i++;
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getContactNumber())){
+ result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ i++;
+ continue;
+ }
+ if (!largeKeyGridUserImport.getContactNumber().matches("^$|^1[3-9]\\d{9}$")){
+ result.append("第"+i+"行：[", "联系电话"+"]格式不正确");
+ i++;
+ continue;
+ }
+ TLargeKeyGridUser largeKeyGridUser = new TLargeKeyGridUser();
+ BeanUtils.copyProperties(largeKeyGridUserImport, largeKeyGridUser);
+
+ switch (largeKeyGridUserImport.getUserSexStr()){
+ case "男":
+ largeKeyGridUser.setUserSex(1);
+ break;
+ case "女":
+ largeKeyGridUser.setUserSex(2);
+ break;
+ default:
+ result.append("第"+i+"行：[", "性别"+"]格式错误");
+ i++;
+ continue;
+ }
+
+ if(StringUtils.hasLength(largeKeyGridUserImport.getTypeName())){
+ TLargeKeyPersonnelType largeKeyPersonnelType = largeKeyPersonnelTypeService.getOne(Wrappers.lambdaQuery(TLargeKeyPersonnelType.class)
+ .eq(TLargeKeyPersonnelType::getTypeName, largeKeyGridUserImport.getTypeName())
+ .last("LIMIT 1"));
+ if(Objects.isNull(largeKeyPersonnelType)){
+ result.append("第"+i+"行：[", "类型名称"+"]不存在");
+ i++;
+ continue;
+ }
+ largeKeyGridUser.setTypeId(largeKeyPersonnelType.getId());
+ }
+ largeKeyGridUser.setUserType(2);
+ largeKeyGridUsers.add(largeKeyGridUser);
+ i++;
+ }
+ largeKeyGridUserService.saveBatch(largeKeyGridUsers);
+ if(!result.isEmpty()){
+ return R.fail(result.toString());
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1