From 2e900e6472bf9ee65d21edce0c3a3386b2aeb0ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 12 十一月 2025 18:19:55 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeKeyGridUserController.java | 111 +++++++++++++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.java | 15 +----
ruoyi-system/src/main/java/com/ruoyi/system/dto/TServiceGuideFileDTO.java | 18 ++++++
4 files changed, 134 insertions(+), 14 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..2e92259 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
@@ -282,5 +282,116 @@
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+"行：[", "网格"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getCommunityName())){
+ result.append("第"+i+"行：[", "小区名称"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getBuildingInfo())){
+ result.append("第"+i+"行：[", "楼栋信息"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUnitNumber())){
+ result.append("第"+i+"行：[", "单元号"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getHouseNumber())){
+ result.append("第"+i+"行：[", "门牌号"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUserName())){
+ result.append("第"+i+"行：[", "姓名"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getUserSexStr())){
+ result.append("第"+i+"行：[", "性别"+"]不能为空");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getIdCard())){
+ result.append("第"+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])$)")){
+ result.append("第"+i+"行：[", "身份证号"+"]格式不正确");
+ continue;
+ }
+ if (!StringUtils.hasLength(largeKeyGridUserImport.getContactNumber())){
+ result.append("第"+i+"行：[", "联系电话"+"]不能为空");
+ continue;
+ }
+ if (largeKeyGridUserImport.getContactNumber().matches("^1[3-9]\\\\d{9}$")){
+ result.append("第"+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+"行：[", "性别"+"]格式错误");
+ 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+"行：[", "类型名称"+"]不存在");
+ 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();
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
index 3df9c08..7dda67b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TLargeVolunteerController.java
@@ -247,13 +247,13 @@
continue;
}
try{
- largeVolunteer.setRegisterDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getBirthDateStr()));
+ largeVolunteer.setRegisterDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getRegisterDateStr()));
}catch (Exception e){
result.append("第"+i+"行：[", "注册日期"+"]格式错误");
continue;
}
try{
- largeVolunteer.setJoinTeamDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getBirthDateStr()));
+ largeVolunteer.setJoinTeamDate(DateUtils.stringToLocalDateTime(largeVolunteerImport.getJoinTeamDateStr()));
}catch (Exception e){
result.append("第"+i+"行：[", "加入队伍时间"+"]格式错误");
continue;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.java
index 15872f6..ac1e1a2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.TServiceGuideFileDTO;
import com.ruoyi.system.model.TServiceGuideFile;
import com.ruoyi.system.query.TServiceGuideFileQuery;
import com.ruoyi.system.service.TServiceGuideFileService;
@@ -60,18 +61,8 @@
@Log(title = "办事指南文件管理信息-新增办事指南文件管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加办事指南文件管理")
@PostMapping(value = "/add")
- public R<Boolean> add(@Validated @RequestBody List<TServiceGuideFile> dto) {
- return R.ok(serviceGuideFileService.saveBatch(dto));
- }
-
- /**
- * 修改办事指南文件管理
- */
- @Log(title = "办事指南文件管理信息-修改办事指南文件管理", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "修改办事指南文件管理")
- @PostMapping(value = "/update")
- public R<Boolean> update(@Validated @RequestBody TServiceGuideFile dto) {
- return R.ok(serviceGuideFileService.updateById(dto));
+ public R<Boolean> add(@Validated @RequestBody TServiceGuideFileDTO dto) {
+ return R.ok(serviceGuideFileService.saveBatch(dto.getList()));
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TServiceGuideFileDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TServiceGuideFileDTO.java
new file mode 100644
index 0000000..17c7f2d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TServiceGuideFileDTO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TServiceGuideFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel(value = "办事指南文件管理对象TServiceGuideFileDTO", description = "办事指南文件管理对象")
+public class TServiceGuideFileDTO implements Serializable {
+
+ @ApiModelProperty(value = "集合")
+ private List<TServiceGuideFile> list;
+
+}
--
Gitblit v1.7.1